Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 908 → Rev 904

/QMK-Groundstation/trunk/QMK-Settings/QMK-Settings_en.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/QMK-Groundstation/trunk/QMK-Settings/QMK-Settings_fr.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/QMK-Groundstation/trunk/QMK-Settings/QMK-Settings_en.ts
File deleted
/QMK-Groundstation/trunk/QMK-Settings/QMK-Settings_fr.ts
File deleted
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
/QMK-Groundstation/trunk/QMK-Settings/QMK-Settings.pro
9,37 → 9,20
TEMPLATE = app
DESTDIR = ../Binary
 
TRANSLATIONS = $${TARGET}_en.ts \
$${TARGET}_fr.ts
 
debug {
DEFINES += _BETA_
}
 
# Mac specific stuff
macx:{
LIBS += /System/Library/Frameworks/CoreFoundation.framework/CoreFoundation
ICON = ../Global/Images/Icons/$${TARGET}.icns
QMAKE_POST_LINK = cp ../$${TARGET}/*.qm ../Binary/$${TARGET}.app/Contents/MacOS/.
}
 
# And other
!macx:{
QMAKE_POST_LINK = cp ../$${TARGET}/*.qm ../Binary/.
}
 
OBJECTS_DIR = ../Binary/.build/$${TARGET}
UI_DIR = ../Binary/.build/$${TARGET}
MOC_DIR = ../Binary/.build/$${TARGET}
RCC_DIR = ../Binary/.build/$${TARGET}
RESOURCES += $${TARGET}.qrc
 
OBJECTS_DIR = ../Binary/.build/QMK-Settings
UI_DIR = ../Binary/.build/QMK-Settings
MOC_DIR = ../Binary/.build/QMK-Settings
RCC_DIR = ../Binary/.build/QMK-Settings
RESOURCES += QMK-Settings.qrc
SOURCES += main.cpp \
Dialogs/dlg_Main.cpp \
Dialogs/dlg_MotorMixer.cpp \
Dialogs/dlg_MotorTest.cpp \
Classes/cSettings.cpp
 
HEADERS += Defines.h \
../Global/Global.h \
Dialogs/dlg_Main.h \
47,7 → 30,6
Dialogs/dlg_MotorTest.h \
Classes/cSettings.h \
TypeDefs.h
 
FORMS += Dialogs/dlg_Main.ui \
Dialogs/dlg_MotorMixer.ui \
Dialogs/dlg_MotorTest.ui
/QMK-Groundstation/trunk/QMK-Settings/main.cpp
18,8 → 18,6
***************************************************************************/
 
#include <QtGui/QApplication>
#include <QTranslator>
 
#include "Dialogs/dlg_Main.h"
 
int main(int argc, char *argv[])
26,26 → 24,13
{
QApplication App(argc, argv);
 
QString locale = QLocale::system().name();
qDebug() << "QMK-Setting_" << locale;
 
// Enable translation service
QTranslator translator;
 
QDir dir(argv[0]);
QString appPath = dir.canonicalPath().toAscii().append("_");
 
if (!translator.load(QString(appPath).append(locale))) {
qDebug() << "Error loading translation file: " << appPath << locale;
}
 
App.installTranslator(&translator);
 
dlg_Main *MainApp = new dlg_Main();
 
MainApp->show();
 
int iReturn = App.exec();
 
delete MainApp;
 
return iReturn;
}