Changeset 2351 in vbox

Timestamp:

Apr 26, 2007 1:29:59 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

20744

Message:

FE/Qt: Improved the About dialog; changed "Global Settings" to "Preferences" everywhere.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• images/about_600px.png (modified) ( previous)
• src/VBoxProblemReporter.cpp (modified) (3 diffs)
• src/VBoxSelectorWnd.cpp (modified) (1 diff)
• ui/VBoxAboutDlg.ui (modified) (2 diffs)
• ui/VBoxAboutDlg.ui.h (added)
• ui/VBoxGlobalSettingsDlg.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -463 +463 @@
              "<b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
              "<p>The language will be temporarily reset to the system "
-             "default language. Please go to the <b>Global Settings</b> "
+             "default language. Please go to the <b>Preferences</b> "
              "dialog which you can open from the <b>File</b> menu of the "
              "main VirtualBox window, and select one of the existing "
@@ -476 +476 @@
          tr ("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
              "<p>The language will be temporarily reset to English (built-in). "
-             "Please go to the <b>Global Settings</b> "
+             "Please go to the <b>Preferences</b> "
              "dialog which you can open from the <b>File</b> menu of the "
              "main VirtualBox window, and select one of the existing "
@@ -1615 +1615 @@
 
     VBoxAboutDlg dlg (mainWindowShown(), "VBoxAboutDlg");
-    QString versions = dlg.txVersions->text();
-    dlg.txVersions->setText (versions
-                             .arg (COMVersion));
-#ifdef Q_WS_MAC
-    /*
-     * Get rid of the exceedingly ugly pushbutton background.
-     * (We should probably consider doing this on all platforms.)
-     */
-    dlg.buttonOK->setBackgroundOrigin (QWidget::ParentOrigin);
-    dlg.buttonOK->setPaletteBackgroundPixmap (*dlg.paletteBackgroundPixmap());
-#endif
-
+    dlg.setup (COMVersion);
     dlg.exec();
 }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSelectorWnd.cpp

@@ -1032 +1032 @@
      * be really interesting to see how this plays on non-english systems...
      */
-    fileSettingsAction->setMenuText (tr ("Preference..."));
+    fileSettingsAction->setMenuText (tr ("&Preferences...", "global settings"));
 #else
-    fileSettingsAction->setMenuText (tr ("&Global Settings..."));
+    /*
+     * ...and on other platforms we use "Preferences" as well. The #ifdef is
+     * left because of the possible localization problems on Mac we first need
+     * to figure out.
+     */
+    fileSettingsAction->setMenuText (tr ("&Preferences...", "global settings"));
 #endif 
     fileSettingsAction->setAccel (tr ("Ctrl+G"));

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxAboutDlg.ui

@@ -39 +39 @@
         <string>VirtualBox - About</string>
     </property>
-    <widget class="QPushButton">
+    <widget class="QLabel">
         <property name="name">
-            <cstring>buttonOK</cstring>
+            <cstring>mAboutLabel</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>14</x>
-                <y>416</y>
-                <width>82</width>
-                <height>26</height>
-            </rect>
-        </property>
-        <property name="text">
-            <string>&amp;OK</string>
-        </property>
-        <property name="accel">
-            <string>Alt+O</string>
-        </property>
-    </widget>
-    <widget class="QLabel">
-        <property name="name">
-            <cstring>txVersions</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>14</x>
-                <y>10</y>
-                <width>566</width>
-                <height>20</height>
+                <x>10</x>
+                <y>389</y>
+                <width>580</width>
+                <height>56</height>
             </rect>
         </property>
@@ -83 +64 @@
             <enum>ParentOrigin</enum>
         </property>
+        <property name="font">
+            <font>
+                <pointsize>7</pointsize>
+            </font>
+        </property>
         <property name="lineWidth">
             <number>0</number>
         </property>
         <property name="text">
-            <string>VirtualBox Graphical User Interface Version %1</string>
+            <string>&lt;qt&gt;VirtualBox Graphical User Interface Version %1&lt;br&gt;
+%2&lt;/qt&gt;</string>
         </property>
         <property name="alignment">
-            <set>WordBreak|AlignBottom|AlignLeft</set>
+            <set>WordBreak|AlignBottom|AlignHCenter</set>
         </property>
     </widget>
 </widget>
-<connections>
-    <connection>
-        <sender>buttonOK</sender>
-        <signal>clicked()</signal>
-        <receiver>VBoxAboutDlg</receiver>
-        <slot>accept()</slot>
-    </connection>
-</connections>
+<includes>
+    <include location="local" impldecl="in implementation">VBoxAboutDlg.ui.h</include>
+</includes>
+<functions>
+    <function>setup( const QString &amp; aVersion )</function>
+    <function>mouseReleaseEvent( QMouseEvent *aEv )</function>
+</functions>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxGlobalSettingsDlg.ui

@@ -32 +32 @@
     </property>
     <property name="caption">
-        <string>VirtualBox Global Settings</string>
+        <string>VirtualBox Preferences</string>
     </property>
     <property name="sizeGripEnabled">