Changeset 272

Timestamp:

02/12/06 18:24:44 (3 years ago)

Author:

edmanm

Message:

The config dialog will want to play with the TorControl? object, too.

Location:

trunk/src/gui

Files:

• configdialog/configdialog.cpp (modified) (2 diffs)
• configdialog/configdialog.h (modified) (3 diffs)
• mainwindow.cpp (modified) (1 diff)

trunk/src/gui/configdialog/configdialog.cpp

@@ -25 +25 @@
 
 /** Constructor */
-ConfigDialog::ConfigDialog(QWidget* parent)
+ConfigDialog::ConfigDialog(TorControl *torControl, QWidget* parent)
 : QDialog(parent)
 {
@@ -31 +31 @@
   ui.setupUi(this);
   ui.lineControlPort->setValidator(new QIntValidator(0, 65535, this));
+  
+  /* A previously-created TorControl object used to talk to Tor */
+  _torControl = torControl;
   
   /* Create necessary ConfigDialog QObjects */

trunk/src/gui/configdialog/configdialog.h

@@ -29 +29 @@
 #include "ui_configdialog.h"
 
+#include "../../control/torcontrol.h"
 #include "../../config/vidaliasettings.h"
 
@@ -37 +38 @@
 public:
   /** Default Constructor */
-  ConfigDialog(QWidget *parent = 0);
+  ConfigDialog(TorControl *torControl, QWidget *parent = 0);
   /** Default Destructor */
   ~ConfigDialog();
@@ -70 +71 @@
   void saveAdvancedSettings();
 
+  /** A TorControl object used to talk to Tor. */
+  TorControl* _torControl;
   /** A VidaliaSettings object taht handles getting/saving settings */
   VidaliaSettings* _settings;

trunk/src/gui/mainwindow.cpp

@@ -435 +435 @@
 MainWindow::showConfig()
 {
-  static ConfigDialog* configDialog = new ConfigDialog(this);
+  static ConfigDialog* configDialog = new ConfigDialog(_torControl, this);
   if(!configDialog->isVisible()) {
     configDialog->show();