Cleaned tabs from code. The ones in mainwindow.cpp are mine. The rest come from other contributors.

This commit is contained in:
Kjell Kernen
2014-02-26 15:23:42 +01:00
parent d465ee80a2
commit d57697460b
8 changed files with 23 additions and 23 deletions
+3 -3
View File
@@ -398,13 +398,13 @@ IF( APPLE )
ADD_CUSTOM_TARGET( addframeworks ALL
COMMAND mkdir -p companion.app/Contents/Frameworks
COMMAND mkdir -p companion.app/Contents/Resources
COMMAND mkdir -p companion.app/Contents/translations
COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
COMMAND mkdir -p companion.app/Contents/translations
COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/lib* companion.app/Contents/Frameworks
#COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks
COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
WORKING_DIRECTORY ${WORK_DIR}
DEPENDS ${PROJECT_NAME} )
+1 -1
View File
@@ -166,7 +166,7 @@ class Profile: protected CompStoreObj
void vBatWarn (const int);
Profile();
Profile& operator=(const Profile&);
Profile& operator=(const Profile&);
void remove();
bool existsOnDisk();
void init(int newIndex);
+1 -1
View File
@@ -52,7 +52,7 @@ FlashInterface::FlashInterface(QString fileName)
char * bin_flash = (char *)malloc(MAX_FSIZE);
flash_size = file.read(bin_flash, MAX_FSIZE);
flash = QByteArray(bin_flash, flash_size);
free(bin_flash);
free(bin_flash);
}
else {
flash = QByteArray(temp, flash_size);
+1 -1
View File
@@ -92,5 +92,5 @@ private:
protected:
bool isValidFlag;
};
#endif /* FLASHINTERFACE_H */
#endif /* FLASHINTERFACE_H */
+1 -1
View File
@@ -657,7 +657,7 @@ bool logsDialog::cvsFileParse()
QString line=buffer.trimmed();
list.clear();
if(line.size()<1){
list << "";
list << "";
} else {
while (line.size()>pos2 && (pos2 = rx2.indexIn(line, pos2)) != -1) {
QString col;
+12 -12
View File
@@ -1538,17 +1538,17 @@ MdiChild *MainWindow::createMdiChild()
QAction * MainWindow::addAct(QString icon, QString sName, QString lName, QKeySequence::StandardKey shortcut, const char *slot)
{
QAction * newAction = new QAction( this );
if (!icon.isEmpty())
QAction * newAction = new QAction( this );
if (!icon.isEmpty())
newAction->setIcon(CompanionIcon(icon));
if (!sName.isEmpty())
newAction->setText(sName);
if (!lName.isEmpty())
newAction->setStatusTip(lName);
if (shortcut != 0)
newAction->setShortcuts(shortcut);
if (!sName.isEmpty())
newAction->setText(sName);
if (!lName.isEmpty())
newAction->setStatusTip(lName);
if (shortcut != 0)
newAction->setShortcuts(shortcut);
connect(newAction, SIGNAL(triggered()), this, slot);
return newAction;
return newAction;
}
QAction * MainWindow::addAct(QString icon, QString sName, QString lName, const char *slot)
@@ -1627,7 +1627,7 @@ void MainWindow::createActions()
simulateAct = addAct("simulate.png", tr("Simulate..."), tr("Simulate current model"), SLOT(simulate()));
loadbackupAct = addAct("open.png", tr("Load Backup..."), tr("Load backup from file"), SLOT(loadBackup()));
logsAct = addAct("logs.png", tr("View Log File..."), tr("Open and view log file"), SLOT(logFile()));
appPrefsAct = addAct("apppreferences.png",tr("Settings..."), tr("Edit Settings"), SLOT(appPrefs()));
appPrefsAct = addAct("apppreferences.png",tr("Settings..."), tr("Edit Settings"), SLOT(appPrefs()));
fwPrefsAct = addAct("fwpreferences.png", tr("Download..."), tr("Download firmware and voice files"), SLOT(fwPrefs()));
checkForUpdatesAct = addAct("update.png", tr("Check for Updates..."), tr("Check OpenTX and Companion updates"), SLOT(doUpdates()));
changelogAct = addAct("changelog.png", tr("Companion Changes..."), tr("Show Companion change log"), SLOT(changelog()));
@@ -1799,7 +1799,7 @@ void MainWindow::createToolBars()
recentToolButton->setMenu(createRecentFileMenu());
recentToolButton->setIcon(CompanionIcon("recentdocument.png"));
recentToolButton->setToolTip(tr("Recent Models+Settings"));
recentToolButton->setStatusTip(tr("Show recent Models+Settings documents"));
recentToolButton->setStatusTip(tr("Show recent Models+Settings documents"));
fileToolBar->addWidget(recentToolButton);
fileToolBar->addAction(saveAct);
@@ -1814,7 +1814,7 @@ void MainWindow::createToolBars()
profileButton->setMenu(createProfilesMenu());
profileButton->setIcon(CompanionIcon("profiles.png"));
profileButton->setToolTip(tr("Radio Settings Profile"));
profileButton->setStatusTip(tr("Show a selection list of radio settings profiles"));
profileButton->setStatusTip(tr("Show a selection list of radio settings profiles"));
fileToolBar->addWidget(profileButton);
fileToolBar->addAction(editSplashAct);
+2 -2
View File
@@ -14,7 +14,7 @@
*
*/
#ifndef SPLASHLABEL_H
#define SPLASHLABEL_H
#define SPLASHLABEL_H
#include <QLabel>
#include <QWidget>
@@ -77,5 +77,5 @@ signals:
private:
int index;
};
#endif /* SPLASHLABEL_H */
#endif /* SPLASHLABEL_H */
+2 -2
View File
@@ -1,8 +1,8 @@
#ifndef WARNINGS_H
#define WARNINGS_H
#define WARNINGS_H
#define WARNING_LEVEL 0
#define WARNING_ID 6
#define WARNING QObject::tr("Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.\n\nWe are really appreciative for that!\n\nThe OpenTX/Companion Team.")
#endif /* WARNINGS_H */
#endif /* WARNINGS_H */