Changeset 257

Timestamp:

02/10/06 04:29:39 (3 years ago)

Author:

hipplej

Message:

Hacked out a minimalistic ConfigurationDialog?. Need to figure out more configuration options, design proper icons, and add necessary changes/additions to VidaliaSettings? to make it do something useful. Removed a frivolous #include from graphframe.cpp.

Location:

trunk/src/gui

Files:

• bwgraph/graphframe.cpp (modified) (1 diff)
• configdialog (added)
• configdialog/configdialog.cpp (added)
• configdialog/configdialog.h (added)
• configdialog/configdialog.pri (added)
• configdialog/configdialog.ui (added)
• gui.pri (modified) (1 diff)
• mainwindow.cpp (modified) (2 diffs)
• mainwindow.h (modified) (3 diffs)
• res/vidalia.qrc (modified) (2 diffs)

trunk/src/gui/bwgraph/graphframe.cpp

@@ -150 +150 @@
   delete painter;
 }
-#include <QtDebug>
+
 /**
  Calls paint function for each line that is supposed to 

trunk/src/gui/gui.pri

@@ -49 +49 @@
 include($$PWD/messagelog/messagelog.pri)
 include($$PWD/bwgraph/bwgraph.pri)
+include($$PWD/configdialog/configdialog.pri)

trunk/src/gui/mainwindow.cpp

@@ -159 +159 @@
 
   _configAct = new QAction(tr("Configure"), this);
+  connect(_configAct, SIGNAL(triggered()),
+      this, SLOT(showConfig()));
   
   _aboutAct = new QAction(tr("About"), this);
@@ -421 +423 @@
 }
 
+/** Shows Configuration dialog. If the config dialog is already displayed, the
+ * existing instance will be brought to the foreground. */
+void
+MainWindow::showConfig()
+{
+  static ConfigDialog* configDialog = new ConfigDialog(this);
+  if(!configDialog->isVisible()) {
+    configDialog->show();
+  } else {
+    configDialog->activateWindow();
+    configDialog->raise();
+  }
+}
+

trunk/src/gui/mainwindow.h

@@ -36 +36 @@
 #include "messagelog/messagelog.h"
 #include "bwgraph/bwgraph.h"
+#include "configdialog/configdialog.h"
 
 class MainWindow : public QMainWindow
@@ -70 +71 @@
   /** Called when the user selects "Bandwidth Graph" from the menu. */
   void showBandwidthGraph();
+  /** Called when the user selects "Configuration" from the menu. */
+  void showConfig();
   /** Called when the user exits Vidalia. */
   void close();
@@ -88 +91 @@
   bool _isIntentionalExit;
  
-  /** Instantiates a window for logging messages from Tor */
+  /** A MessageLog object which handles logging Tor messages */
   MessageLog* _messageLog;
-  /** A pointer to a BandwidthGraph object, which displays bw usage */
+  /** A BandwidthGraph object which handles monitoring Tor bandwidth usage */
   BandwidthGraph* _bandwidthGraph;
   /** A TorControl object that handles communication with Tor */

trunk/src/gui/res/vidalia.qrc

@@ -9 +9 @@
         <file>tor_about.png</file>
         <file>tor_logo128.png</file>
+        <file>tor_logo48.png</file>
+        <file>tor_logo32.png</file>
         <file>tor_logo16.png</file>
         <file>tor_logo32.ico</file>
@@ -14 +16 @@
         <file>tor_off32.png</file>
         <file>tor_off48.png</file>
+        <file>tor_off_gray16.png</file>
+        <file>tor_on_gray16.png</file>
         <file>tor_on128.png</file>
         <file>tor_on32.png</file>