Changeset 547

Timestamp:

04/01/06 01:55:14 (3 years ago)

Author:

edmanm

Message:

Move the Settings button from the bottom of the message log to the toolbar.

Location:

trunk/src/gui

Files:

• log/messagelog.cpp (modified) (5 diffs)
• log/messagelog.h (modified) (1 diff)
• log/messagelog.ui (modified) (4 diffs)
• res/22x22/preferences-desktop.png (added)
• res/vidalia.qrc (modified) (1 diff)

trunk/src/gui/log/messagelog.cpp

@@ -86 +86 @@
   ui.lstMessages->header()->resizeSection(COL_TYPE, COL_TYPE_WIDTH);
   
-  /* Hide Message Log Settings frame */
-  showSettingsFrame(false);
-
   /* Turn off opacity group on unsupported platforms */
 #if defined(Q_WS_WIN)
@@ -137 +134 @@
   connect(ui.sldrOpacity, SIGNAL(valueChanged(int)),
       this, SLOT(setOpacity(int)));
-
-  connect(ui.btnToggleSettings, SIGNAL(toggled(bool)),
-      this, SLOT(showSettingsFrame(bool)));
 
   connect(ui.btnBrowse, SIGNAL(clicked()),
@@ -236 +230 @@
   
   /* Hide the settings frame and reset toggle button*/
-  showSettingsFrame(false);
+  ui.actionSettings->toggle(); 
   
   /* Disable the cursor to prevent problems while refiltering */
@@ -282 +276 @@
 {
   /* Hide the settings frame and reset toggle button */
-  showSettingsFrame(false);
+  ui.actionSettings->toggle();
 
   /* Reload the settings */
@@ -536 +530 @@
 }
 
-/** Toggles the Settings pane on and off and changes toggle button text.
- * \param show Whether to show or hide the Settings frame.
- */
-void
-MessageLog::showSettingsFrame(bool show)
-{
-  if (show) {
-    ui.frmSettings->setVisible(true);
-    ui.btnToggleSettings->setChecked(true);
-    ui.btnToggleSettings->setText(tr("Hide Settings"));
-  } else {
-    ui.frmSettings->setVisible(false);
-    ui.btnToggleSettings->setChecked(false);
-    ui.btnToggleSettings->setText(tr("Show Settings"));
-  }
-}
-
 /** Sets the opacity of the Message Log window.
  * \param value The opaqueness of the window (0-100)

trunk/src/gui/log/messagelog.h

@@ -79 +79 @@
   /** Called when the opactity slider changes value **/
   void setOpacity(int value);
-  /** Called when settings button is toggled **/
-  void showSettingsFrame(bool show);
   /** Called when user saves settings **/
   void saveChanges();

trunk/src/gui/log/messagelog.ui

@@ -356 +356 @@
     </item>
     <item>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>0</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QPushButton" name="btnToggleSettings" >
-        <property name="contextMenuPolicy" >
-         <enum>Qt::NoContextMenu</enum>
-        </property>
-        <property name="toolTip" >
-         <string>Toggles display of Message Log settings</string>
-        </property>
-        <property name="text" >
-         <string>Show Settings</string>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>709</width>
-          <height>29</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </item>
-    <item>
      <widget class="QFrame" name="frmSettings" >
       <property name="enabled" >
        <bool>true</bool>
+      </property>
+      <property name="visible" >
+       <bool>false</bool>
       </property>
       <property name="sizePolicy" >
@@ -885 +849 @@
    <addaction name="actionClear" />
    <addaction name="actionFind" />
+   <addaction name="actionSettings" />
    <addaction name="separator" />
    <addaction name="actionClose" />
@@ -1058 +1023 @@
      <strikeout>false</strikeout>
     </font>
+   </property>
+  </action>
+  <action name="actionSettings" >
+   <property name="icon" >
+    <iconset resource="..\res\vidalia.qrc">:/images/22x22/preferences-desktop.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Settings</string>
+   </property>
+   <property name="statusTip" >
+    <string>Adjust Message Log Settings</string>
+   </property>
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="font" >
+    <font>
+     <family>Arial</family>
+     <pointsize>10</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+     <underline>false</underline>
+     <strikeout>false</strikeout>
+    </font>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+T</string>
    </property>
   </action>
@@ -1169 +1162 @@
   </connection>
   <connection>
+   <sender>actionSettings</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>frmSettings</receiver>
+   <slot>setVisible(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>407</x>
+     <y>393</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
    <sender>sldrOpacity</sender>
    <signal>valueChanged(int)</signal>

trunk/src/gui/res/vidalia.qrc

@@ -39 +39 @@
         <file>22x22/media-floppy.png</file>
         <file>22x22/network-server.png</file>
+        <file>22x22/preferences-desktop.png</file>
         <file>22x22/preferences-desktop-locale.png</file>
         <file>22x22/preferences-system.png</file>