WebSVN - Projects - Path Comparison - /QMK-Groundstation/trunk/ Rev 908 and /QMK-Groundstation/trunk Rev 906

Ignore whitespace Rev 908 → Rev 906

/QMK-Groundstation/trunk/QMK-Communicator/QMK-Communicator_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-Communicator/QMK-Communicator_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-Communicator/QMK-Communicator_fr.ts
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /QMK-Groundstation/trunk/QMK-Communicator/QMK-Communicator.pro
 ,10 → 5,6
 TARGET = QMK-Communicator
 TEMPLATE = app
-TRANSLATIONS = $${TARGET}_en.ts \
-               $${TARGET}_de.ts \
-               $${TARGET}_fr.ts
 include(../Global/Class_SerialPort.pri)
 DESTDIR = ../Binary
 ,25 → 13,11
   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-Communicator
+UI_DIR = ../Binary/.build/QMK-Communicator
+MOC_DIR = ../Binary/.build/QMK-Communicator
+RCC_DIR = ../Binary/.build/QMK-Communicator
+RESOURCES += QMK-Communicator.qrc
 SOURCES += main.cpp \
     ../Global/Class_Input/Input.cpp \
     ../Global/Class_Input/Input_TTY.cpp \
 ,7 → 28,6
     Classes/cSettings.cpp \
     Dialogs/dlg_Preferences.cpp \
     Dialogs/dlg_Terminal.cpp
 HEADERS += Defines.h \
     ../Global/Kopter.h \
     ../Global/Class_Input/Input.h \
 ,7 → 41,6
     ../Global/Global.h \
     Dialogs/dlg_Preferences.h \
     Dialogs/dlg_Terminal.h
 FORMS += Dialogs/dlg_Main.ui \
     Dialogs/dlg_Preferences.ui \
     Dialogs/dlg_Terminal.ui

 /QMK-Groundstation/trunk/QMK-Communicator/main.cpp
 ,8 → 18,6
  ***************************************************************************/
 #include <QtGui/QApplication>
-#include <QTranslator>
 #include "Dialogs/dlg_Main.h"
 int main(int argc, char *argv[])
 ,20 → 24,6
 {
     QApplication App(argc, argv);
-    QString locale = QLocale::system().name();
-    qDebug() << "QMK-Communicator_" << 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->set_ARGV(argv[0]);
 ,5 → 32,6
     int iReturn = App.exec();
     delete MainApp;
     return iReturn;
 }

/QMK-Groundstation/trunk/QMK-Maps/QMK-Maps_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-Maps/QMK-Maps_fr.ts
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

/QMK-Groundstation/trunk/QMK-Maps/QMK-Maps_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-Maps/QMK-Maps.pro
 ,37 → 5,17
 include(../Global/Class_QMapControl.pri)
 include(../Global/Widget_Connection.pri)
-QT += network xml
+QT += network \
+    xml
 TARGET = QMK-Maps
 TEMPLATE = app
-TRANSLATIONS = $${TARGET}_en.ts \
-               $${TARGET}_de.ts \
-               $${TARGET}_fr.ts
+DESTDIR = ../Binary
 debug:DEFINES += _BETA_
-DESTDIR = ../Binary
-OBJECTS_DIR = ../Binary/.build/$${TARGET}
-UI_DIR = ../Binary/.build/$${TARGET}
-MOC_DIR = ../Binary/.build/$${TARGET}
-RCC_DIR = ../Binary/.build/$${TARGET}
-# 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/.
-}
-RESOURCES += $${TARGET}.qrc
+OBJECTS_DIR = ../Binary/.build/QMK-Maps
+UI_DIR = ../Binary/.build/QMK-Maps
+MOC_DIR = ../Binary/.build/QMK-Maps
+RCC_DIR = ../Binary/.build/QMK-Maps
+RESOURCES += QMK-Maps.qrc
 SOURCES += main.cpp \
     Dialogs/dlg_Main.cpp \
     Dialogs/dlg_MapPos.cpp \

 /QMK-Groundstation/trunk/QMK-Maps/main.cpp
 ,7 → 18,6
  ***************************************************************************/
 #include <QtGui/QApplication>
-#include <QTranslator>
 #include "Dialogs/dlg_Main.h"
 int main(int argc, char *argv[])
 ,25 → 24,12
 {
     QApplication App(argc, argv);
-    QString locale = QLocale::system().name();
-    qDebug() << "QMK-Maps_" << 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();
     MainApp->create_Map();
     int iReturn = App.exec();
     delete MainApp;

/QMK-Groundstation/trunk/QMK-Scope/QMK-Scope_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-Scope/QMK-Scope_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-Scope/QMK-Scope_fr.ts
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /QMK-Groundstation/trunk/QMK-Scope/QMK-Scope.pro
 ,18 → 2,10
 # Project created by QtCreator 2009-07-20T20:04:00
 # -------------------------------------------------
 include(../Global/Widget_Connection.pri)
-# For Mac OS X, please define $QWT_HOME in your environment as path to QWT
 QT += network
 TARGET = QMK-Scope
 TEMPLATE = app
-TRANSLATIONS = $${TARGET}_en.ts \
-               $${TARGET}_de.ts \
-               $${TARGET}_fr.ts
-win32 {
+win32 {
     include( C:\Qt\qwt-5.2.0\examples\examples.pri )
     QWT_ROOT = c:\qt\qwt-5.2.0
     include( $${QWT_ROOT}\qwtconfig.pri )
 ,57 → 25,38
     win32-g++:LIBS += -L$${QWT_ROOT}/lib \
         -l$${QWTLIB}
 }
 DESTDIR = ../Binary
-OBJECTS_DIR = ../Binary/.build/$${TARGET}
-UI_DIR = ../Binary/.build/$${TARGET}
-MOC_DIR = ../Binary/.build/$${TARGET}
-RCC_DIR = ../Binary/.build/$${TARGET}
-# 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/.
+OBJECTS_DIR = ../Binary/.build/QMK-Scope
+UI_DIR = ../Binary/.build/QMK-Scope
+MOC_DIR = ../Binary/.build/QMK-Scope
+RCC_DIR = ../Binary/.build/QMK-Scope
+debug {
+    DEFINES += _BETA_
+    LIBS += -lqwt
+    INCLUDEPATH += $(HOME)/include \
+        /usr/include/qwt
 }
-# And other
-!macx:{
-    QMAKE_POST_LINK = cp ../$${TARGET}/*.qm ../Binary/.
-}
 Suse {
     LIBS += -lqwt
     INCLUDEPATH += $(HOME)/include \
         /usr/include/qwt
 }
 Debian {
     LIBS += -lqwt-qt4
     INCLUDEPATH += $(HOME)/include \
         /usr/include/qwt-qt4
 }
 Gentoo {
     LIBS += -lqwt
     INCLUDEPATH += $(HOME)/include \
         /usr/include/qwt5
 }
 OSX {
-    LIBS += -L$(QWT_HOME)/lib -lqwt
-    INCLUDEPATH += $(QWT_HOME)/include
+    LIBS += -L/opt/local/lib \
+        -lqwt
+    INCLUDEPATH += /opt/local/include
 }
-#debug {
-#    DEFINES += _BETA_
-#   LIBS += -lqwt
-#   INCLUDEPATH += $(HOME)/include \
-#        /usr/include/qwt
-#}
-RESOURCES += $${TARGET}.qrc
+RESOURCES += QMK-Scope.qrc
 SOURCES += main.cpp \
     Dialogs/dlg_Main.cpp \
     Classes/cSettings.cpp \

 /QMK-Groundstation/trunk/QMK-Scope/main.cpp
 ,9 → 18,6
  ***************************************************************************/
 #include <QtGui/QApplication>
-#include <QTranslator>
-#include <QDir>
 #include "Dialogs/dlg_Main.h"
 int main(int argc, char *argv[])
 ,25 → 24,13
 {
     QApplication App(argc, argv);
-    QString locale = QLocale::system().name();
-    qDebug() << "QMK-Scope_" << 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;
 }

/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_fr.ts
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /QMK-Groundstation/trunk/QMK-Settings/QMK-Settings.pro
 ,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 \
 ,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
 ,8 → 18,6
  ***************************************************************************/
 #include <QtGui/QApplication>
-#include <QTranslator>
 #include "Dialogs/dlg_Main.h"
 int main(int argc, char *argv[])
 ,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;
 }

 /QMK-Groundstation/trunk/build-osx.sh
 ,4 → 1,4
-#!/bin/sh
+#!/bin/bash
 QMAKE="qmake-mac"
 MAKEOPT=""
 ,7 → 27,11
 cd ..
 cd Binary
 macdeployqt QMK-Settings.app
+echo Copying QKM-Settings...
 cp QMK-Settings.app/Contents/MacOS/* QMK-Communicator.app/Contents/MacOS/.
+echo Copying frameworks...
+echo "cp -R QMK-Settings.app/Contents/Frameworks/ QMK-Communicator.app/Contents/Frameworks"
+cp -R QMK-Settings.app/Contents/Frameworks/ QMK-Communicator.app/Contents/Frameworks
 cd ..
 cd ./QMK-Maps
 ,18 → 41,23
 cd ..
 cd Binary
 macdeployqt QMK-Maps.app
+echo Copying QMK-Maps...
 cp QMK-Maps.app/Contents/MacOS/* QMK-Communicator.app/Contents/MacOS/.
+echo Copying frameworks...
+echo "cp -R QMK-Maps.app/Contents/Frameworks/ QMK-Communicator.app/Contents/Frameworks"
+cp -R QMK-Maps.app/Contents/Frameworks/ QMK-Communicator.app/Contents/Frameworks
 cd ..
-#cd ./QMK-Scope
-#${QMAKE} QMK-Scope.pro CONFIG+=OSX CONFIG-=debug
-#make clean
-#make ${MAKEOPT}
-#cd ..
-#cd Binary
-#macdeployqt QMK-Scope.app
-#cp QMK-Scope.app/Contents/MacOS/* QMK-Communicator.app/Contents/MacOS/.
-#cd ..
+cd ./QMK-Scope
+${QMAKE} QMK-Scope.pro CONFIG+=OSX CONFIG-=debug
+make clean
+make ${MAKEOPT}
+cd ..
+cd Binary
+macdeployqt QMK-Scope.app
+cp QMK-Scope.app/Contents/MacOS/* QMK-Communicator.app/Contents/MacOS/.
+cp -R QMK-Scope.app/Contents/Frameworks/* QMK-Communicator.app/Contents/Frameworks
+cd ..
 #cd ./QMK-Voice
 #${QMAKE} QMK-Voice.pro ${CONFIG}

Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 908 → Rev 906