Changeset 121 in tspsg-svn for trunk/src

Timestamp:

Jun 22, 2010, 3:38:24 PM (14 years ago)

Author:

laleppa

Message:

• TSPSG will now try to use your current icon theme in Linux if it follows freedesktop.org icon and naming spesifications: see ​http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html and ​http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
• Translations are now bundled "inside" TSPSG (as resources). You can override a bundled translation by placing your version with the same name into the l10n folder.
• Some small MacOSX related fixes.

Location:

trunk/src

Files:

• _.h (added)
• globals.h (modified) (1 diff)
• main.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (13 diffs)
• settingsdialog.cpp (modified) (2 diffs)
• settingsdialog.h (modified) (1 diff)

trunk/src/globals.h

@@ -42 +42 @@
 
 #ifndef HANDHELD
-        #include <QtToolBarDialog>
+        #include "qttoolbardialog.h"
 #endif
 

trunk/src/main.cpp

@@ -56 +56 @@
         if (en.load("tspsg_en", PATH_L10N))
                 app.installTranslator(&en);
+        else if (en.load("tspsg_en", ":/l10n"))
+                app.installTranslator(&en);
 
 MainWindow mainwindow;

trunk/src/mainwindow.cpp

@@ -23 +23 @@
 
 #include "mainwindow.h"
+
+#ifdef _T_T_L_
+#include "_.h"
+_B_ _I_ _N_ _G_ _O_
+#endif
 
 /*!
@@ -510 +515 @@
         bb->button(QDialogButtonBox::Ok)->setCursor(QCursor(Qt::PointingHandCursor));
 
-        lblTranslated->setText(QApplication::translate("--------", "TRANSLATION", "Please, provide translator credits here."));
-        if (lblTranslated->text() == "TRANSLATION")
+        lblTranslated->setText(QApplication::translate("--------", "AUTHORS", "Please, provide translator credits here."));
+        if (lblTranslated->text() == "AUTHORS")
                 lblTranslated->hide();
         else {
@@ -520 +525 @@
                 hb2->addWidget(lblTranslated);
         }
+
+        // This one isn't displayed anywhere, yet. Provided as a placeholder for future use.
+        QApplication::translate("--------", "VERSION", "Please, provide your translation version here.");
 
         hb2->addWidget(bb);
@@ -535 +543 @@
         dlg->setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
         dlg->setWindowTitle(tr("About %1").arg(QApplication::applicationName()));
-        dlg->setWindowIcon(QIcon(":/images/icons/help-about.png"));
+        dlg->setWindowIcon(QIcon::fromTheme("help-about", QIcon(":/images/icons/help-about.png")));
         dlg->setLayout(vb);
 
@@ -635 +643 @@
         cur.insertText(tr("Task:"));
         outputMatrix(cur, matrix);
-        if (settings->value("Output/ShowGraph", DEF_SHOW_GRAPH).toBool())
+        if (settings->value("Output/ShowGraph", DEF_SHOW_GRAPH).toBool()) {
+#ifdef _T_T_L_
+                _m_ _a_ _g_ _i_ _c_(pic)
+#endif
                 drawNode(pic, 0);
+        }
         cur.insertHtml("<hr>");
         cur.insertBlock(fmt_paragraph);
@@ -880 +892 @@
         y = r * (3 * nstep + 1);
 
+#ifdef _T_T_L_
+        if (nstep == -481124) {
+                _t_t_l_(pic, r, x);
+                return;
+        }
+#endif
+
         pic.drawEllipse(QPointF(x, y), r, r);
 
@@ -979 +998 @@
 void MainWindow::loadLangList()
 {
-QDir dir(PATH_L10N, "tspsg_*.qm", QDir::Name | QDir::IgnoreCase, QDir::Files);
-        if (!dir.exists())
-                return;
-QFileInfoList langs = dir.entryInfoList();
-        if (langs.size() <= 0)
-                return;
+QMap<QString, QStringList> langlist;
+QFileInfoList langs;
+QFileInfo lang;
+QString name;
+QStringList language, dirs;
+QTranslator t;
+QDir dir;
+        dir.setFilter(QDir::Files);
+        dir.setNameFilters(QStringList("tspsg_*.qm"));
+        dir.setSorting(QDir::NoSort);
+
+        dirs << PATH_L10N << ":/l10n";
+        foreach (QString dirname, dirs) {
+                dir.setPath(dirname);
+                if (dir.exists()) {
+                        langs = dir.entryInfoList();
+                        for (int k = 0; k < langs.size(); k++) {
+                                lang = langs.at(k);
+                                if (lang.completeBaseName().compare("tspsg_en", Qt::CaseInsensitive) && !langlist.contains(lang.completeBaseName().mid(6)) && t.load(lang.completeBaseName(), dirname)) {
+
+                                        language.clear();
+                                        language.append(lang.completeBaseName().mid(6));
+                                        language.append(t.translate("--------", "COUNTRY", "Please, provide an ISO 3166-1 alpha-2 country code for this translation language here (eg., UA).").toLower());
+                                        language.append(t.translate("--------", "LANGNAME", "Please, provide a native name of your translation language here."));
+                                        language.append(t.translate("MainWindow", "Set application language to %1", "").arg(name));
+
+                                        langlist.insert(language.at(0), language);
+                                }
+                        }
+                }
+        }
+
 QAction *a;
-QTranslator t;
-QString name;
-        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_L10N)) {
-                        name = t.translate("--------", "LANGNAME", "Please, provide a native name of your translation language here.");
-                        a = menuSettingsLanguage->addAction(name);
-                        a->setStatusTip(t.translate("MainWindow", "Set application language to %1", "").arg(name));
-                        a->setData(lang.completeBaseName().mid(6));
-                        a->setCheckable(true);
-                        a->setActionGroup(groupSettingsLanguageList);
-                        if (settings->value("Language", QLocale::system().name()).toString().startsWith(lang.completeBaseName().mid(6)))
-                                a->setChecked(true);
-                }
+        foreach (language, langlist) {
+                a = menuSettingsLanguage->addAction(language.at(2));
+                a->setStatusTip(language.at(3));
+                a->setIcon(QIcon::fromTheme(QString("flag-%1").arg(language.at(1))/*, QIcon(QString(":/images/icons/l10n/%1.png").arg(language.at(1)))*/));
+                a->setData(language.at(0));
+                a->setCheckable(true);
+                a->setActionGroup(groupSettingsLanguageList);
+                if (settings->value("Language", QLocale::system().name()).toString().startsWith(language.at(0)))
+                        a->setChecked(true);
         }
 }
@@ -1034 +1074 @@
         else {
                 // No luck. Let's try to load a bundled one.
-                if (qtTranslator->load("qt_" + lng, PATH_L10N))
+                if (qtTranslator->load("qt_" + lng, PATH_L10N)) {
+                        // We have a translation in the localization direcotry.
                         qApp->installTranslator(qtTranslator);
-                else {
-                        // Qt library translation unavailable
+                } else if (qtTranslator->load("qt_" + lng, ":/l10n")) {
+                        // We have a translation "built-in" into application resources.
+                        qApp->installTranslator(qtTranslator);
+                } else {
+                        // Qt library translation unavailable for this language.
                         delete qtTranslator;
                         qtTranslator = NULL;
@@ -1045 +1089 @@
         // Now let's load application translation.
         translator = new QTranslator(this);
-        if (translator->load("tspsg_" + lng, PATH_L10N))
+        if (translator->load("tspsg_" + lng, PATH_L10N)) {
+                // We have a translation in the localization directory.
                 qApp->installTranslator(translator);
-        else {
+        } else if (translator->load("tspsg_" + lng, ":/l10n")) {
+                // We have a translation "built-in" into application resources.
+                qApp->installTranslator(translator);
+        } else {
                 delete translator;
                 translator = NULL;
@@ -1053 +1101 @@
                         settings->remove("Language");
                         QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
-                        if (isVisible())
-                                QMessageBox::warning(this, tr("Language Change"), tr("Unable to load the translation language.\nFalling back to autodetection."));
-                        else
-                                QMessageBox::warning(NULL, tr("Language Change"), tr("Unable to load the translation language.\nFalling back to autodetection."));
+                        QMessageBox::warning(isVisible() ? this : NULL, tr("Language Change"), tr("Unable to load the translation language.\nFalling back to autodetection."));
                         QApplication::restoreOverrideCursor();
                 }
@@ -1236 +1281 @@
         Ui::MainWindow::setupUi(this);
 
+        // File Menu
+        actionFileNew->setIcon(QIcon::fromTheme("document-new", QIcon(":/images/icons/document-new.png")));
+        actionFileOpen->setIcon(QIcon::fromTheme("document-open", QIcon(":/images/icons/document-open.png")));
+        actionFileSave->setIcon(QIcon::fromTheme("document-save", QIcon(":/images/icons/document-save.png")));
+        menuFileSaveAs->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/images/icons/document-save-as.png")));
+        actionFileExit->setIcon(QIcon::fromTheme("application-exit", QIcon(":/images/icons/application-exit.png")));
+        // Settings Menu
+        menuSettingsLanguage->setIcon(QIcon::fromTheme("preferences-desktop-locale", QIcon(":/images/icons/preferences-desktop-locale.png")));
+        actionSettingsLanguageEnglish->setIcon(QIcon::fromTheme("flag-gb"/*, QIcon(":/images/icons/l10n/gb.png")*/));
+        menuSettingsStyle->setIcon(QIcon::fromTheme("preferences-desktop-theme", QIcon(":/images/icons/preferences-desktop-theme.png")));
+        actionSettingsPreferences->setIcon(QIcon::fromTheme("preferences-system", QIcon(":/images/icons/preferences-system.png")));
+        // Help Menu
+        actionHelpContents->setIcon(QIcon::fromTheme("help-contents", QIcon(":/images/icons/help-contents.png")));
+        actionHelpContextual->setIcon(QIcon::fromTheme("help-contextual", QIcon(":/images/icons/help-contextual.png")));
+        actionHelpAbout->setIcon(QIcon::fromTheme("help-about", QIcon(":/images/icons/help-about.png")));
+        // Buttons
+        buttonRandom->setIcon(QIcon::fromTheme("roll", QIcon(":/images/icons/roll.png")));
+        buttonSolve->setIcon(QIcon::fromTheme("dialog-ok", QIcon(":/images/icons/dialog-ok.png")));
+        buttonSaveSolution->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/images/icons/document-save-as.png")));
+        buttonBackToTask->setIcon(QIcon::fromTheme("go-previous", QIcon(":/images/icons/go-previous.png")));
+
+//      action->setIcon(QIcon::fromTheme("", QIcon(":/images/icons/.png")));
+
 #if QT_VERSION >= 0x040600
         setToolButtonStyle(Qt::ToolButtonFollowStyle);
@@ -1276 +1344 @@
         actionFilePrintPreview->setObjectName("actionFilePrintPreview");
         actionFilePrintPreview->setEnabled(false);
-        actionFilePrintPreview->setIcon(QIcon(":/images/icons/document-print-preview.png"));
+        actionFilePrintPreview->setIcon(QIcon::fromTheme("document-print-preview", QIcon(":/images/icons/document-print-preview.png")));
 
         actionFilePrint = new QAction(this);
         actionFilePrint->setObjectName("actionFilePrint");
         actionFilePrint->setEnabled(false);
-        actionFilePrint->setIcon(QIcon(":/images/icons/document-print.png"));
+        actionFilePrint->setIcon(QIcon::fromTheme("document-print", QIcon(":/images/icons/document-print.png")));
 
         menuFile->insertAction(actionFileExit,actionFilePrintPreview);
@@ -1301 +1369 @@
 #ifndef HANDHELD
         actionSettingsToolbarsConfigure = new QAction(this);
-        actionSettingsToolbarsConfigure->setIcon(QIcon(":/images/icons/configure-toolbars.png"));
+        actionSettingsToolbarsConfigure->setIcon(QIcon::fromTheme("configure-toolbars", QIcon(":/images/icons/configure-toolbars.png")));
 #endif // HANDHELD
 
 #ifdef Q_OS_WIN32
         actionHelpCheck4Updates = new QAction(this);
-        actionHelpCheck4Updates->setIcon(QIcon(":/images/icons/system-software-update.png"));
+        actionHelpCheck4Updates->setIcon(QIcon::fromTheme("system-software-update", QIcon(":/images/icons/system-software-update.png")));
         actionHelpCheck4Updates->setEnabled(hasUpdater());
         menuHelp->insertAction(actionHelpAboutQt, actionHelpCheck4Updates);

trunk/src/settingsdialog.cpp

@@ -35 +35 @@
         setupUi(this);
 
-        buttonBox->button(QDialogButtonBox::Save)->setIcon(QIcon(":/images/icons/dialog-ok.png"));
-        buttonBox->button(QDialogButtonBox::Save)->setStatusTip(tr("Save new preferences"));
-        buttonBox->button(QDialogButtonBox::Save)->setCursor(QCursor(Qt::PointingHandCursor));
-        buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":/images/icons/dialog-cancel.png"));
+        setWindowIcon(QIcon::fromTheme("preferences-system", QIcon(":/images/icons/preferences-system.png")));
+
+        buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon::fromTheme("dialog-ok", QIcon(":/images/icons/dialog-ok.png")));
+        buttonBox->button(QDialogButtonBox::Ok)->setStatusTip(tr("Save new preferences"));
+        buttonBox->button(QDialogButtonBox::Ok)->setCursor(QCursor(Qt::PointingHandCursor));
+        buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon::fromTheme("dialog-cancel", QIcon(":/images/icons/dialog-cancel.png")));
         buttonBox->button(QDialogButtonBox::Cancel)->setStatusTip(tr("Close without saving preferences"));
         buttonBox->button(QDialogButtonBox::Cancel)->setCursor(QCursor(Qt::PointingHandCursor));
+
+        buttonColor->setIcon(QIcon::fromTheme("format-text-color", QIcon(":/images/icons/format-text-color.png")));
+        buttonFont->setIcon(QIcon::fromTheme("preferences-desktop-font", QIcon(":/images/icons/preferences-desktop-font.png")));
+        buttonHelp->setIcon(QIcon::fromTheme("help-hint", QIcon(":/images/icons/help-hint.png")));
 
 QPalette p = bgWhite->palette();
@@ -108 +114 @@
         imgIcon->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding);
         imgIcon->setFrameShape(QFrame::NoFrame);
-        imgIcon->setPixmap(QPixmap(":/images/icons/preferences-system.png"));
+        imgIcon->setPixmap(QIcon::fromTheme("preferences-system", QIcon(":/images/icons/preferences-system.png")).pixmap(128, 128));
         imgIcon->setStyleSheet("background-color: #0080C0; padding-top: 11px;");
         imgIcon->setAlignment(Qt::AlignTop | Qt::AlignHCenter);

trunk/src/settingsdialog.h

@@ -61 +61 @@
 #ifdef Q_OS_WINCE_WM
         QRect currentGeometry;
-#elif !defined(Q_OS_SYMBIAN)
+#elif !defined(HANDHELD)
         QCheckBox *cbSaveState;
         QLabel *imgIcon;