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

Timestamp:

Apr 6, 2013 10:49:35 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Removing some obsolete code which I forgot to remove in r84799.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (4 diffs)
• VBoxGlobalSettings.h (modified) (3 diffs)
• settings/global/UIGlobalSettingsGeneral.cpp (modified) (6 diffs)
• settings/global/UIGlobalSettingsGeneral.h (modified) (1 diff)
• settings/global/UIGlobalSettingsGeneral.ui (modified) (4 diffs)

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

@@ -62 +62 @@
     remapScancodes = QString::null;
     proxySettings = QString::null;
-    trayIconEnabled = false;
     presentationModeEnabled = false;
     hostScreenSaverDisabled = false;
@@ -76 +75 @@
     remapScancodes = that.remapScancodes;
     proxySettings = that.proxySettings;
-    trayIconEnabled = that.trayIconEnabled;
     presentationModeEnabled = that.presentationModeEnabled;
     hostScreenSaverDisabled = that.hostScreenSaverDisabled;
@@ -95 +93 @@
          remapScancodes == that.remapScancodes &&
          proxySettings == that.proxySettings &&
-         trayIconEnabled == that.trayIconEnabled &&
          presentationModeEnabled == that.presentationModeEnabled &&
          hostScreenSaverDisabled == that.hostScreenSaverDisabled
@@ -126 +123 @@
     { "GUI/RemapScancodes",                        "remapScancodes",          "(\\d+=\\d+,)*\\d+=\\d+", true },
     { "GUI/ProxySettings",                         "proxySettings",           "[\\s\\S]*", true },
-    { "GUI/TrayIcon/Enabled",                      "trayIconEnabled",         "true|false", true },
 #ifdef Q_WS_MAC
     { GUI_PresentationModeEnabled,                 "presentationModeEnabled", "true|false", true },

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -45 +45 @@
     QString remapScancodes;
     QString proxySettings;
-    bool trayIconEnabled;
     bool presentationModeEnabled;
     bool hostScreenSaverDisabled;
@@ -64 +63 @@
     Q_PROPERTY (QString remapScancodes READ remapScancodes WRITE setRemapScancodes)
     Q_PROPERTY (QString proxySettings READ proxySettings WRITE setProxySettings)
-    Q_PROPERTY (bool trayIconEnabled READ trayIconEnabled WRITE setTrayIconEnabled)
     Q_PROPERTY (bool presentationModeEnabled READ presentationModeEnabled WRITE setPresentationModeEnabled)
     Q_PROPERTY (bool hostScreenSaverDisabled READ hostScreenSaverDisabled WRITE setHostScreenSaverDisabled)
@@ -122 +120 @@
     }
 
-    bool trayIconEnabled() const { return data()->trayIconEnabled; }
-    void setTrayIconEnabled (bool enabled)
-    {
-        mData()->trayIconEnabled = enabled;
-    }
-
     bool presentationModeEnabled() const { return data()->presentationModeEnabled; }
     void setPresentationModeEnabled (bool enabled)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp

@@ -41 +41 @@
 
     /* If all checkboxes hidden, hide separator too: */
-    if (m_pEnableTrayIconCheckbox->isHidden() &&
-        m_pEnablePresentationModeCheckbox->isHidden() &&
+    if (m_pEnablePresentationModeCheckbox->isHidden() &&
         m_pDisableHostScreenSaverCheckbox->isHidden())
         m_pLineSeparator2->hide();
@@ -65 +64 @@
     m_cache.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder();
     m_cache.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary();
-    m_cache.m_fTrayIconEnabled = m_settings.trayIconEnabled();
 #ifdef Q_WS_MAC
     m_cache.m_fPresentationModeEnabled = m_settings.presentationModeEnabled();
@@ -82 +80 @@
     m_pMachineFolderSelector->setPath(m_cache.m_strDefaultMachineFolder);
     m_pVRDPLibNameSelector->setPath(m_cache.m_strVRDEAuthLibrary);
-    m_pEnableTrayIconCheckbox->setChecked(m_cache.m_fTrayIconEnabled);
 #ifdef Q_WS_MAC
     m_pEnablePresentationModeCheckbox->setChecked(m_cache.m_fPresentationModeEnabled);
@@ -96 +93 @@
     m_cache.m_strDefaultMachineFolder = m_pMachineFolderSelector->path();
     m_cache.m_strVRDEAuthLibrary = m_pVRDPLibNameSelector->path();
-    m_cache.m_fTrayIconEnabled = m_pEnableTrayIconCheckbox->isChecked();
 #ifdef Q_WS_MAC
     m_cache.m_fPresentationModeEnabled = m_pEnablePresentationModeCheckbox->isChecked();
@@ -115 +111 @@
     if (m_properties.isOk() && m_pVRDPLibNameSelector->isModified())
         m_properties.SetVRDEAuthLibrary(m_cache.m_strVRDEAuthLibrary);
-    m_settings.setTrayIconEnabled(m_cache.m_fTrayIconEnabled);
 #ifdef Q_WS_MAC
     m_settings.setPresentationModeEnabled(m_cache.m_fPresentationModeEnabled);
@@ -130 +125 @@
     setTabOrder(pWidget, m_pMachineFolderSelector);
     setTabOrder(m_pMachineFolderSelector, m_pVRDPLibNameSelector);
-    setTabOrder(m_pVRDPLibNameSelector, m_pEnableTrayIconCheckbox);
-    setTabOrder(m_pEnableTrayIconCheckbox, m_pEnablePresentationModeCheckbox);
+    setTabOrder(m_pVRDPLibNameSelector, m_pEnablePresentationModeCheckbox);
     setTabOrder(m_pEnablePresentationModeCheckbox, m_pDisableHostScreenSaverCheckbox);
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h

@@ -29 +29 @@
     QString m_strDefaultMachineFolder;
     QString m_strVRDEAuthLibrary;
-    bool m_fTrayIconEnabled;
 #ifdef Q_WS_MAC
     bool m_fPresentationModeEnabled;

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.ui

@@ -88 +88 @@
    </item>
    <item row="4" column="0">
-    <widget class="QWidget" name="m_pSpacerWidget1">
+    <widget class="QWidget" name="m_pSpacerWidget2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -101 +101 @@
    </item>
    <item row="4" column="1" colspan="2">
-    <widget class="QCheckBox" name="m_pEnableTrayIconCheckbox">
-     <property name="whatsThis">
-      <string>When checked, the application will provide an icon with the context menu in the system tray.</string>
-     </property>
+    <widget class="QCheckBox" name="m_pEnablePresentationModeCheckbox">
      <property name="text">
-      <string>&amp;Show System Tray Icon</string>
+      <string>&amp;Auto show Dock and Menubar in fullscreen</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0">
-    <widget class="QWidget" name="m_pSpacerWidget2">
+    <widget class="QWidget" name="m_pSpacerWidget3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -124 +121 @@
    </item>
    <item row="5" column="1" colspan="2">
-    <widget class="QCheckBox" name="m_pEnablePresentationModeCheckbox">
-     <property name="text">
-      <string>&amp;Auto show Dock and Menubar in fullscreen</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QWidget" name="m_pSpacerWidget3">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumWidth">
-      <number>34</number>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="2">
     <widget class="QCheckBox" name="m_pDisableHostScreenSaverCheckbox">
      <property name="whatsThis">
@@ -153 +130 @@
     </widget>
    </item>
-   <item row="7" column="0" colspan="3">
+   <item row="6" column="0" colspan="3">
     <spacer>
      <property name="orientation">