Commit emails of the iDok project

["Apache" <apache AT savannah.psi.ch>]

Author: egli AT PSI.CH
Date: Thu Feb  7 09:07:34 2008
New Revision: 718

Log:
New standard main program including translation files enabled

Modified:
   branches/opensource/java/ch/idok/qtgui/DmsGui.java

Modified: branches/opensource/java/ch/idok/qtgui/DmsGui.java
==============================================================================
--- branches/opensource/java/ch/idok/qtgui/DmsGui.java  (original)
+++ branches/opensource/java/ch/idok/qtgui/DmsGui.java  Thu Feb  7 09:07:34 
2008
@@ -25,7 +25,9 @@
 import ch.idok.common.config.Setup;
 
 import com.trolltech.qt.core.QCoreApplication;
+import com.trolltech.qt.core.QLocale;
 import com.trolltech.qt.core.QSettings;
+import com.trolltech.qt.core.QTranslator;
 import com.trolltech.qt.gui.QApplication;
 import com.trolltech.qt.gui.QPixmap;
 import com.trolltech.qt.gui.QSplashScreen;
@@ -49,60 +51,33 @@
             // this is the definition under which name the preferences are
             // stored in QSettings
 
-            // still: move this to generic setup
-            QCoreApplication.setOrganizationName("PSI");
-            QCoreApplication.setOrganizationDomain("psi.ch"); // to keep Mac
-            // users happy
+            QCoreApplication.setOrganizationName("iDok");
+            QCoreApplication.setOrganizationDomain("psi.ch");
             QCoreApplication.setApplicationName("iDok");
-            // System.out.println("Time:"+System.currentTimeMillis());
-
-            // still: move this to PSI specific setup
-            // for windows store settings in different place (PSI specific
-            // solution)
-            if (System.getProperty("os.name").contains("Windows")) {
-                QSettings.setPath(QSettings.Format.IniFormat,
-                        QSettings.Scope.UserScope, "U:\\.qtsettings");
-                Settings = new QSettings(QSettings.Format.IniFormat,
-                        QSettings.Scope.UserScope, "PSI", "iDok");
-            } else {
-                Settings = new QSettings();
-            }
-            // System.out.println("Time:"+System.currentTimeMillis());
+            Settings = new QSettings();
 
             // Run GUI application
             QApplication.initialize(args);
-            // System.out.println("Time:"+System.currentTimeMillis());
 
             QSplashScreen splash = new QSplashScreen(new QPixmap(
-                    "classpath:ch/idok/qtgui/images/splashScreen.png"));
+                    "classpath:ch/psi/dms/qtgui/images/splashScreen.png"));
             splash.show();
             splash
                     .showMessage("                    Loading iDok 
Application...");
             QApplication.processEvents();
-            // System.out.println("Time:"+System.currentTimeMillis());
-
+            
             // load translations
-            // String locale = QLocale.system().name();
-            // System.out.println("Locale:"+locale);
-            // QTranslator translator = new QTranslator();
-            // TODO: Enable locale
-            // translator.load("iDok_"+"de_CH"+".qm");
-            // translator.load("iDok_" + locale + ".qm");
-            // QApplication.installTranslator(translator);
-
+            String locale = QLocale.system().name();
+            QTranslator translator = new QTranslator();
+            if 
(translator.load("classpath:ch/psi/dms/qtgui/translations/iDok_" + locale+ 
".qm")){
+                QApplication.installTranslator(translator);
+            }             
             // Start GUI
             MainWindow d = new MainWindow();
-            // System.out.println("Time:"+System.currentTimeMillis());
             d.show();
-            // System.out.println("Time:"+System.currentTimeMillis());
-
             splash.finish(d);
-            // System.out.println("Before Exec:"+System.currentTimeMillis());
-
             QApplication.exec();
-            // System.out.println("After exec:"+System.currentTimeMillis());
-
-            // Shutdown application: Under some circumstances System.exit() 
is
+           // Shutdown application: Under some circumstances System.exit() is
             // necessary to get rid of all threads and thus to shutdown the 
Java
             // VM
             l.info("Exiting DmsGui.main()");