Changeset 74

Timestamp:

01/12/06 18:37:22 (3 years ago)

Author:

edmanm

Message:

Create an instance of TorControl? as a member of MainWindow? and then pass a
pointer to that instance to each child dialog (that needs access to Tor) in
its constructor.

Location:

trunk/src/gui

Files:

• about.cpp (modified) (2 diffs)
• about.h (modified) (2 diffs)
• mainwindow.cpp (modified) (3 diffs)
• mainwindow.h (modified) (3 diffs)

trunk/src/gui/about.cpp

@@ -24 +24 @@
 #include "about.h"
 
-AboutDialog::AboutDialog(QWidget *parent)
+AboutDialog::AboutDialog(TorControl *torControl, QWidget *parent)
 : QDialog(parent)
 {
@@ -32 +32 @@
   ui.lblVidaliaVersion->setText(VidaliaSettings::getVersion());
 
-/* FIXME Need access to global TorControl object to retrieve version */
-/*
-  QString* errmsg;
-  QString torVersion = TorControl::getTorVersion(errmsg);
-  if (errmsg) {
-    ui.lblTorVersion->setText("Unknown");
-  } else {
-    ui.lblTorVersion->setText(torVersion);
-  }
-*/
+  /* Access the TorControl object to retrieve version */
+  ui.lblTorVersion->setText(torControl->getTorVersion());
 
   /* Get Qt's version number */
   ui.lblQtVersion->setText(QT_VERSION_STR);
 }
+

trunk/src/gui/about.h

@@ -27 +27 @@
 #include "ui_aboutdialog.h"
 #include "../config/vidaliasettings.h"
-// #include "../control/torcontrol.h"
+#include "../control/torcontrol.h"
 
 class AboutDialog : public QDialog
@@ -34 +34 @@
 
 public:
-    AboutDialog(QWidget *parent = 0);
+    AboutDialog(TorControl *torControl, QWidget *parent = 0);
 
 private:

trunk/src/gui/mainwindow.cpp

@@ -33 +33 @@
   createActions();
   createMenus();
+ 
+  /* Create a new TorControl object, used to communicate with and manipulate Tor */
+  _torControl = new TorControl();
   
   /* Put an icon in the system tray to indicate the status of Tor */
@@ -38 +41 @@
                            tr("Tor is Started"), _trayMenu, this);
   _trayIcon->show();
+}
+
+MainWindow::~MainWindow()
+{
+  if (_torControl) {
+    delete _torControl;
+  }
 }
 
@@ -131 +141 @@
 void MainWindow::about()
 {
-  AboutDialog* aboutDialog = new AboutDialog(this);
+  AboutDialog* aboutDialog = new AboutDialog(_torControl, this);
   aboutDialog->show();
 }
+

trunk/src/gui/mainwindow.h

@@ -27 +27 @@
 #include <QMainWindow>
 
+#include "../control/torcontrol.h"
+
 #include "tray/trayicon.h"
 #include "about.h"
@@ -36 +38 @@
 public:
   MainWindow();
-
+  ~MainWindow();
+  
 private slots:
   void start();
@@ -46 +49 @@
   void createActions();
 
+  TorControl* _torControl;
+  
   TrayIcon* _trayIcon;