Changeset 123 in tspsg-svn

Timestamp:

Jul 3, 2010, 4:12:40 AM (14 years ago)

Author:

laleppa

Message:

+ Added flags from Flag Icons collection by IconDrawer? (see ReadMe?.rtf or ​http://www.icondrawer.com/).

• Corrected russism in ukrainian translation.
• Deleted generated documentation as it is redundant. Use doxygen to regenerate it yourself.

Location:

trunk

Files:

• docs/html (deleted)
• l10n/tspsg_uk.ts (modified) (1 diff)
• resources/common.qrc (modified) (1 diff)
• resources/desktop.qrc (modified) (1 diff)
• resources/icons/l10n/ReadMe.rtf (added)
• resources/icons/l10n/flag-gb.png (added)
• resources/icons/l10n/flag-ru.png (added)
• resources/icons/l10n/flag-ua.png (added)
• src/mainwindow.cpp (modified) (2 diffs)
• ui/mainwindow.ui (modified) (3 diffs)

trunk/l10n/tspsg_uk.ts

@@ -793 +793 @@
         <location filename="../src/mainwindow.cpp" line="659"/>
         <source>Generating step %v</source>
-        <translation>Генерація шагу %v</translation>
+        <translation>Генерація кроку %v</translation>
     </message>
     <message>

trunk/resources/common.qrc

@@ -14 +14 @@
         <file>icons/help-hint.png</file>
         <file>icons/preferences-desktop-font.png</file>
+        <file>icons/preferences-system.png</file>
         <file>icons/qtlogo-64.png</file>
         <file>icons/roll.png</file>

trunk/resources/desktop.qrc

@@ -8 +8 @@
         <file>icons/preferences-desktop-locale.png</file>
         <file>icons/preferences-desktop-theme.png</file>
-        <file>icons/preferences-system.png</file>
         <file>icons/system-software-update.png</file>
+        <file>icons/l10n/flag-gb.png</file>
+        <file>icons/l10n/flag-ru.png</file>
+        <file>icons/l10n/flag-ua.png</file>
     </qresource>
 </RCC>

trunk/src/mainwindow.cpp

@@ -1034 +1034 @@
                 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->setIcon(QIcon::fromTheme(QString("flag-%1").arg(language.at(1)), QIcon(QString(":/images/icons/l10n/flag-%1.png").arg(language.at(1)))));
                 a->setData(language.at(0));
                 a->setCheckable(true);
@@ -1289 +1289 @@
         // 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")*/));
+        actionSettingsLanguageEnglish->setIcon(QIcon::fromTheme("flag-gb", QIcon(":/images/icons/l10n/flag-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")));

trunk/ui/mainwindow.ui

@@ -12 +12 @@
    </rect>
   </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
   <property name="windowIcon">
-   <iconset resource="../resources/tspsg.qrc">
+   <iconset resource="../resources/common.qrc">
     <normaloff>:/images/tspsg.png</normaloff>:/images/tspsg.png</iconset>
   </property>
@@ -485 +482 @@
   <action name="actionHelpAboutQt">
    <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
+    <iconset resource="../resources/common.qrc">
      <normaloff>:/images/icons/qtlogo-64.png</normaloff>:/images/icons/qtlogo-64.png</iconset>
    </property>
@@ -514 +511 @@
  </widget>
  <resources>
-  <include location="../resources/tspsg.qrc"/>
+  <include location="../resources/common.qrc"/>
  </resources>
  <connections>