Commit 67093c83 authored by Matt Edman's avatar Matt Edman
Browse files

r1940@lysithea: edmanm | 2007-09-21 00:44:36 -0400 

 Add a place on the config dialog for the new firewall/bridge configuration 
 stuff. This isn't the icon we're going to really use, the UI isn't all there,
 and nothing is implemented yet.


svn:r1933
parent d7d74a20

src/gui/config/config.pri

+6 −3
Changes for src/gui/config/config.pri: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ FORMS += $$PWD/configdialog.ui \ 
         $$PWD/generalpage.ui \

         $$PWD/serverpage.ui \

         $$PWD/advancedpage.ui \

         $$PWD/appearancepage.ui

         $$PWD/appearancepage.ui \

         $$PWD/firewallpage.ui



HEADERS += $$PWD/configdialog.h \

           $$PWD/domainvalidator.h \
@@ -37,7 +38,8 @@ HEADERS += $$PWD/configdialog.h \ 
           $$PWD/generalpage.h \

           $$PWD/serverpage.h \

           $$PWD/advancedpage.h \

           $$PWD/appearancepage.h

           $$PWD/appearancepage.h \

           $$PWD/firewallpage.h



SOURCES += $$PWD/configdialog.cpp \

           $$PWD/domainvalidator.cpp \
@@ -48,5 +50,6 @@ SOURCES += $$PWD/configdialog.cpp \ 
           $$PWD/generalpage.cpp \

           $$PWD/serverpage.cpp \

           $$PWD/advancedpage.cpp \

           $$PWD/appearancepage.cpp

           $$PWD/appearancepage.cpp \

           $$PWD/firewallpage.cpp

src/gui/config/configdialog.cpp

+5 −0
Changes for src/gui/config/configdialog.cpp: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


/* Images for toolbar icons */

#define IMAGE_GENERAL       ":/images/22x22/preferences-system.png"

#define IMAGE_FIREWALL      ":/images/22x22/firewall.png"

#define IMAGE_SERVER        ":/images/22x22/network-server.png"

#define IMAGE_APPEARANCE    ":/images/22x22/preferences-desktop-locale.png"

#define IMAGE_ADVANCED      ":/images/22x22/emblem-system.png"
@@ -39,6 +40,7 @@ 
#define IMAGE_CANCEL        ":/images/22x22/emblem-unreadable.png"

#define IMAGE_HELP          ":/images/22x22/help-browser.png"





/** Constructor */

ConfigDialog::ConfigDialog(QWidget* parent)

: VidaliaWindow("ConfigDialog", parent)
@@ -53,6 +55,9 @@ ConfigDialog::ConfigDialog(QWidget* parent) 
  ui.stackPages->add(new GeneralPage(ui.stackPages),

                     createPageAction(QIcon(IMAGE_GENERAL), tr("General"), grp));

  

  ui.stackPages->add(new FirewallPage(ui.stackPages),

                     createPageAction(QIcon(IMAGE_FIREWALL), tr("Firewall"), grp));

  

  ui.stackPages->add(new ServerPage(ui.stackPages),

                     createPageAction(QIcon(IMAGE_SERVER), tr("Server"), grp));

src/gui/config/configdialog.h

+6 −3
Changes for src/gui/config/configdialog.h: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -34,12 +34,14 @@ 
#include <gui/common/vidaliawindow.h>



#include "generalpage.h"

#include "firewallpage.h"

#include "serverpage.h"

#include "advancedpage.h"

#include "appearancepage.h"



#include "ui_configdialog.h"





class ConfigDialog : public VidaliaWindow

{

  Q_OBJECT
@@ -48,9 +50,10 @@ public: 
  /** Config dialog pages. */

  enum Page {

    General = 0,  /** General configuration page. */

    Server     = 1,  /** Server configuration page. */

    Appearance = 2,  /** Appearance configuration page. */

    Advanced   = 3   /** Advanced configuration page. */

    Firewall,     /** Firewall configuration page. */

    Server,       /** Server configuration page. */

    Appearance,   /** Appearance configuration page. */

    Advanced      /** Advanced configuration page. */

  };



  /** Default Constructor */

src/gui/config/configdialog.ui

+1 −1
Changes for src/gui/config/configdialog.ui: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
   <rect>

    <x>0</x>

    <y>0</y>

    <width>519</width>

    <width>550</width>

    <height>400</height>

   </rect>

  </property>

src/gui/config/firewallpage.cpp

0 → 100644
+61 −0
Changes for src/gui/config/firewallpage.cpp: 61 added lines, 0 removed lines.
Original line number Diff line number Diff line 
/****************************************************************

 *  Vidalia is distributed under the following license:

 *

 *  Copyright (C) 2006,  Matt Edman, Justin Hipple

 *

 *  This program is free software; you can redistribute it and/or

 *  modify it under the terms of the GNU General Public License

 *  as published by the Free Software Foundation; either version 2

 *  of the License, or (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, 

 *  Boston, MA  02110-1301, USA.

 ****************************************************************/



/** 

 * \file serverpage.cpp

 * \version $Id$

 * \brief Tor server configuration options

 */



#include <vidalia.h>



#include "firewallpage.h"





/** Constructor */

FirewallPage::FirewallPage(QWidget *parent)

: ConfigPage(parent)

{

  /* Invoke the Qt Designer generated object setup routine */

  ui.setupUi(this);

  

  /* Keep a pointer to the TorControl object used to talk to Tor */

  _torControl = Vidalia::torControl();

}



/** Destructor */

FirewallPage::~FirewallPage()

{

}



/** Saves changes made to settings on the Firewall settings page. */

bool

FirewallPage::save(QString &errmsg)

{

  return true;

}



/** Loads previously saved settings */

void

FirewallPage::load()

{

}