Changeset 121 in tspsg-svn for trunk/ui

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/ui

Files:

• mainwindow.ui (modified) (17 diffs)
• settingsdialog.ui (modified) (6 diffs)

trunk/ui/mainwindow.ui

@@ -143 +143 @@
           <string>Random</string>
          </property>
-         <property name="icon">
-          <iconset resource="../resources/tspsg.qrc">
-           <normaloff>:/images/icons/roll.png</normaloff>:/images/icons/roll.png</iconset>
-         </property>
         </widget>
        </item>
@@ -159 +155 @@
          <property name="text">
           <string>Solve</string>
-         </property>
-         <property name="icon">
-          <iconset resource="../resources/tspsg.qrc">
-           <normaloff>:/images/icons/dialog-ok.png</normaloff>:/images/icons/dialog-ok.png</iconset>
          </property>
         </widget>
@@ -210 +202 @@
           <string>Save Solution</string>
          </property>
-         <property name="icon">
-          <iconset resource="../resources/tspsg.qrc">
-           <normaloff>:/images/icons/document-save-as.png</normaloff>:/images/icons/document-save-as.png</iconset>
-         </property>
         </widget>
        </item>
@@ -240 +228 @@
           <string>Back to Task</string>
          </property>
-         <property name="icon">
-          <iconset resource="../resources/tspsg.qrc">
-           <normaloff>:/images/icons/go-previous.png</normaloff>:/images/icons/go-previous.png</iconset>
-         </property>
         </widget>
        </item>
@@ -251 +235 @@
    </widget>
   </widget>
-  <widget class="QMenuBar" name="menubar">
+  <widget class="QMenuBar" name="menuMain">
    <property name="geometry">
     <rect>
@@ -272 +256 @@
      <property name="title">
       <string>Save &amp;As</string>
-     </property>
-     <property name="icon">
-      <iconset resource="../resources/tspsg.qrc">
-       <normaloff>:/images/icons/document-save-as.png</normaloff>:/images/icons/document-save-as.png</iconset>
      </property>
      <addaction name="actionFileSaveAsTask"/>
@@ -295 +275 @@
       <string comment="Please, append &quot; / Language&quot; when translating this string.">&amp;Language</string>
      </property>
-     <property name="icon">
-      <iconset resource="../resources/tspsg.qrc">
-       <normaloff>:/images/icons/preferences-desktop-locale.png</normaloff>:/images/icons/preferences-desktop-locale.png</iconset>
-     </property>
      <addaction name="actionSettingsLanguageAutodetect"/>
      <addaction name="separator"/>
@@ -306 +282 @@
      <property name="title">
       <string>Style</string>
-     </property>
-     <property name="icon">
-      <iconset resource="../resources/tspsg.qrc">
-       <normaloff>:/images/icons/preferences-desktop-theme.png</normaloff>:/images/icons/preferences-desktop-theme.png</iconset>
      </property>
     </widget>
@@ -373 +345 @@
   </action>
   <action name="actionFileNew">
-   <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
-     <normaloff>:/images/icons/document-new.png</normaloff>:/images/icons/document-new.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;New</string>
@@ -391 +359 @@
   </action>
   <action name="actionFileOpen">
-   <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
-     <normaloff>:/images/icons/document-open.png</normaloff>:/images/icons/document-open.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Open...</string>
@@ -409 +373 @@
   </action>
   <action name="actionSettingsPreferences">
-   <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
-     <normaloff>:/images/icons/preferences-system.png</normaloff>:/images/icons/preferences-system.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Preferences...</string>
@@ -424 +384 @@
     <bool>false</bool>
    </property>
-   <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
-     <normaloff>:/images/icons/help-contents.png</normaloff>:/images/icons/help-contents.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Contents</string>
@@ -442 +398 @@
     <bool>false</bool>
    </property>
-   <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
-     <normaloff>:/images/icons/help-contextual.png</normaloff>:/images/icons/help-contextual.png</iconset>
-   </property>
    <property name="text">
     <string>Context &amp;Help</string>
@@ -457 +409 @@
   </action>
   <action name="actionHelpAbout">
-   <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
-     <normaloff>:/images/icons/help-about.png</normaloff>:/images/icons/help-about.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;About TSPSG...</string>
@@ -469 +417 @@
   </action>
   <action name="actionFileExit">
-   <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
-     <normaloff>:/images/icons/application-exit.png</normaloff>:/images/icons/application-exit.png</iconset>
-   </property>
    <property name="text">
     <string>E&amp;xit</string>
@@ -526 +470 @@
   </action>
   <action name="actionFileSave">
-   <property name="icon">
-    <iconset resource="../resources/tspsg.qrc">
-     <normaloff>:/images/icons/document-save.png</normaloff>:/images/icons/document-save.png</iconset>
-   </property>
    <property name="text">
     <string>&amp;Save</string>
@@ -553 +493 @@
    <property name="statusTip">
     <string>About Qt library</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutQtRole</enum>
    </property>
   </action>

trunk/ui/settingsdialog.ui

@@ -6 +6 @@
   <property name="windowTitle">
    <string>Preferences</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="../resources/tspsg.qrc">
-    <normaloff>:/images/icons/preferences-system.png</normaloff>:/images/icons/preferences-system.png</iconset>
   </property>
   <widget class="QWidget" name="bgGrey" native="true">
@@ -72 +68 @@
          <string>Help</string>
         </property>
-        <property name="icon">
-         <iconset resource="../resources/tspsg.qrc">
-          <normaloff>:/images/icons/help-hint.png</normaloff>:/images/icons/help-hint.png</iconset>
-        </property>
         <property name="autoRaise">
          <bool>true</bool>
@@ -84 +76 @@
        <widget class="QDialogButtonBox" name="buttonBox">
         <property name="standardButtons">
-         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
+         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
         </property>
        </widget>
@@ -470 +462 @@
                 <string>&amp;Font...</string>
                </property>
-               <property name="icon">
-                <iconset resource="../resources/tspsg.qrc">
-                 <normaloff>:/images/icons/preferences-desktop-font.png</normaloff>:/images/icons/preferences-desktop-font.png</iconset>
-               </property>
               </widget>
              </item>
@@ -486 +474 @@
                <property name="text">
                 <string>&amp;Color...</string>
-               </property>
-               <property name="icon">
-                <iconset resource="../resources/tspsg.qrc">
-                 <normaloff>:/images/icons/format-text-color.png</normaloff>:/images/icons/format-text-color.png</iconset>
                </property>
               </widget>
@@ -531 +515 @@
   </widget>
  </widget>
- <resources>
-  <include location="../resources/tspsg.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>