Changeset 96 in tspsg-svn for trunk/src/mainwindow.cpp

Timestamp:

Mar 1, 2010, 2:13:23 PM (15 years ago)

Author:

laleppa

Message:

• Fixed some wrong defines that prevented successful compilation under *nix.
• Renamed i18n to l10n to follow common standards.
• Translation and documentation paths are now synchronized between .pro and source.
• Moved some versioning information to .pro file.
• Updated translations.

File:

• trunk/src/mainwindow.cpp (modified) (11 diffs)

trunk/src/mainwindow.cpp

@@ -149 +149 @@
 void MainWindow::actionFileSaveTriggered()
 {
-        if ((fileName == tr("Untitled") + ".tspt") || (!fileName.endsWith(".tspt",Qt::CaseInsensitive)))
+        qDebug() << tr("Untitled");
+        if ((fileName == tr("Untitled") + ".tspt") || (!fileName.endsWith(".tspt", Qt::CaseInsensitive)))
                 saveTask();
         else
@@ -311 +312 @@
         title += QString::fromUtf8("<b><a href=\"http://tspsg.sourceforge.net/\">http://tspsg.sf.net/</a></b><br>");
 QString about;
-        about += QString::fromUtf8("Target OS: <b>%1</b><br>").arg(OS);
+        about += QString::fromUtf8("Target OS (ARCH): <b>%1</b><br>").arg(OS);
 #ifndef STATIC_BUILD
         about += "Qt library (shared):<br>";
@@ -320 +321 @@
 #endif // STATIC_BUILD
         about += QString::fromUtf8("Built on <b>%1</b> at <b>%2</b><br>").arg(__DATE__).arg(__TIME__);
-        about += "<br>";
-        about += QString::fromUtf8("Id: <b>"VERSIONID"</b><br>");
+//      about += "<br>";
+//      about += QString::fromUtf8("Id: <b>"VERSIONID"</b><br>");
         about += QString::fromUtf8("Algorithm: <b>%1</b><br>").arg(CTSPSolver::getVersionId());
         about += "<br>";
@@ -372 +373 @@
         connect(bb, SIGNAL(accepted()), dlg, SLOT(accept()));
 
+#ifdef Q_OS_WIN32
         // Adding some eyecandy in Vista and 7 :-)
         if (QtWin::isCompositionEnabled())  {
                 QtWin::enableBlurBehindWindow(dlg, true);
         }
-
-        dlg->resize(410, 300);
+#endif // Q_OS_WIN32
+
+        dlg->resize(480, 400);
         dlg->exec();
 
@@ -599 +602 @@
 void MainWindow::loadLangList()
 {
-QDir dir(PATH_I18N, "tspsg_*.qm", QDir::Name | QDir::IgnoreCase, QDir::Files);
+QDir dir(PATH_L10N, "tspsg_*.qm", QDir::Name | QDir::IgnoreCase, QDir::Files);
         if (!dir.exists())
                 return;
@@ -610 +613 @@
         for (int k = 0; k < langs.size(); k++) {
                 QFileInfo lang = langs.at(k);
-                if (lang.completeBaseName().compare("tspsg_en", Qt::CaseInsensitive) && t.load(lang.completeBaseName(), PATH_I18N)) {
+                if (lang.completeBaseName().compare("tspsg_en", Qt::CaseInsensitive) && t.load(lang.completeBaseName(), PATH_L10N)) {
                         name = t.translate("--------", "LANGNAME", "Please, provide a native name of your translation language here.");
                         a = menuSettingsLanguage->addAction(name);
@@ -654 +657 @@
         else {
                 // No luck. Let's try to load a bundled one.
-                if (qtTranslator->load("qt_" + lng, PATH_I18N))
+                if (qtTranslator->load("qt_" + lng, PATH_L10N))
                         qApp->installTranslator(qtTranslator);
                 else {
@@ -665 +668 @@
         // Now let's load application translation.
         translator = new QTranslator(this);
-        if (translator->load("tspsg_" + lng, PATH_I18N))
+        if (translator->load("tspsg_" + lng, PATH_L10N))
                 qApp->installTranslator(translator);
         else {
@@ -863 +866 @@
         retranslateUi(false);
 
+#ifdef Q_OS_WIN32
         // Adding some eyecandy in Vista and 7 :-)
         if (QtWin::isCompositionEnabled() && settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool())  {
                 toggleTranclucency(true);
         }
+#endif // Q_OS_WIN32
 }
 
@@ -884 +889 @@
 void MainWindow::toggleTranclucency(bool enable)
 {
+#ifdef Q_OS_WIN32
         QtWin::enableBlurBehindWindow(this, enable);
         QtWin::enableBlurBehindWindow(tabWidget, enable);
@@ -891 +897 @@
         if (QtWin::enableBlurBehindWindow(tabSolution, enable))
                 tabSolution->setAutoFillBackground(enable);
-}
+#else
+        Q_UNUSED(enable);
+#endif // Q_OS_WIN32
+}