Changeset 55513 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 29, 2015 11:37:42 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Settings dialog: Fixing some NLS inconsistency (Settings => Properties for Global Settings dialog).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialog.cpp (modified) (1 diff)
• UISettingsDialog.h (modified) (1 diff)
• UISettingsDialogSpecific.cpp (modified) (2 diffs)
• UISettingsDialogSpecific.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -352 +352 @@
 }
 
-QString UISettingsDialog::titleExtension() const
-{
-#ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
-    return m_pSelector->itemText(m_pSelector->currentId());
-#else
-    return tr("Settings");
-#endif
-}
-
 void UISettingsDialog::addItem(const QString &strBigIcon,
                                const QString &strMediumIcon,

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -97 +97 @@
     void setConfigurationAccessLevel(ConfigurationAccessLevel newConfigurationAccessLevel);
 
-    /* Dialog title: */
+    /** Returns the dialog title extension. */
+    virtual QString titleExtension() const = 0;
+    /** Returns the dialog title. */
     virtual QString title() const = 0;
-    /* Dialog title extension: */
-    virtual QString titleExtension() const;
 
     /* Add settings page: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -280 +280 @@
 }
 
+QString UISettingsDialogGlobal::titleExtension() const
+{
+#ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
+    return m_pSelector->itemText(m_pSelector->currentId());
+#else /* VBOX_GUI_WITH_TOOLBAR_SETTINGS */
+    return tr("Preferences");
+#endif /* !VBOX_GUI_WITH_TOOLBAR_SETTINGS */
+}
+
 QString UISettingsDialogGlobal::title() const
 {
@@ -638 +647 @@
     /* Set dialog's name: */
     setWindowTitle(title());
+}
+
+QString UISettingsDialogMachine::titleExtension() const
+{
+#ifdef VBOX_GUI_WITH_TOOLBAR_SETTINGS
+    return m_pSelector->itemText(m_pSelector->currentId());
+#else /* VBOX_GUI_WITH_TOOLBAR_SETTINGS */
+    return tr("Settings");
+#endif /* !VBOX_GUI_WITH_TOOLBAR_SETTINGS */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

@@ -48 +48 @@
     void retranslateUi();
 
+    /** Returns the dialog title extension. */
+    QString titleExtension() const;
+    /** Returns the dialog title. */
     QString title() const;
 
@@ -74 +77 @@
     void retranslateUi();
 
+    /** Returns the dialog title extension. */
+    QString titleExtension() const;
+    /** Returns the dialog title. */
     QString title() const;