X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fcoreaccountsettingspage.h;h=f90450871213538c1fbd5c5443aa923702642bd0;hp=d74f967e60ec4fc60923c4815f9de4d8903804d3;hb=89f0a6efb5689090cced7ee5c979cbb82e49a049;hpb=c6229d7d7dd7f0a4aa91a3d5606f8d5c10423e24

diff --git a/src/qtui/settingspages/coreaccountsettingspage.h b/src/qtui/settingspages/coreaccountsettingspage.h
index d74f967e..f9045087 100644
--- a/src/qtui/settingspages/coreaccountsettingspage.h
+++ b/src/qtui/settingspages/coreaccountsettingspage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by the Quassel Project                             *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,12 +15,13 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef COREACCOUNTSETTINGSPAGE_H_
 #define COREACCOUNTSETTINGSPAGE_H_
 
+#include <QNetworkProxy>
 #include <QSortFilterProxyModel>
 
 #include "settingspage.h"
@@ -33,10 +34,11 @@
 class CoreAccountModel;
 class FilteredCoreAccountModel;
 
-class CoreAccountSettingsPage : public SettingsPage {
-  Q_OBJECT
+class CoreAccountSettingsPage : public SettingsPage
+{
+    Q_OBJECT
 
-  public:
+public:
     CoreAccountSettingsPage(QWidget *parent = 0);
 
     inline bool hasDefaults() const { return false; }
@@ -44,7 +46,7 @@ class CoreAccountSettingsPage : public SettingsPage {
 
     AccountId selectedAccount() const;
 
-  public slots:
+public slots:
     void save();
     void load();
 
@@ -54,18 +56,19 @@ class CoreAccountSettingsPage : public SettingsPage {
 signals:
     void connectToCore(AccountId accId);
 
-  private slots:
+private slots:
     void on_addAccountButton_clicked();
     void on_editAccountButton_clicked();
     void on_deleteAccountButton_clicked();
     void on_accountView_doubleClicked(const QModelIndex &index);
 
     void setWidgetStates();
+    void widgetHasChanged();
 
     void rowsAboutToBeRemoved(const QModelIndex &index, int start, int end);
     void rowsInserted(const QModelIndex &index, int start, int end);
 
-  private:
+private:
     Ui::CoreAccountSettingsPage ui;
 
     CoreAccountModel *_model;
@@ -76,56 +79,59 @@ signals:
     AccountId _lastAccountId, _lastAutoConnectId;
     bool _standalone;
 
-    virtual QVariant loadAutoWidgetValue(const QString &widgetName);
-    virtual void saveAutoWidgetValue(const QString &widgetName, const QVariant &value);
-
     void editAccount(const QModelIndex &);
 
-    void widgetHasChanged();
     bool testHasChanged();
 
     inline QString settingsKey() const { return QString("CoreAccounts"); }
 };
 
+
 // ========================================
 //  CoreAccountEditDlg
 // ========================================
-class CoreAccountEditDlg : public QDialog {
-  Q_OBJECT
+class CoreAccountEditDlg : public QDialog
+{
+    Q_OBJECT
 
 public:
-  CoreAccountEditDlg(const CoreAccount &account, QWidget *parent = 0);
+    CoreAccountEditDlg(const CoreAccount &account, QWidget *parent = 0);
 
-  CoreAccount account();
+    CoreAccount account();
 
 private slots:
-  void on_hostName_textChanged(const QString &);
-  void on_accountName_textChanged(const QString &);
-  void on_user_textChanged(const QString &);
+    void on_hostName_textChanged(const QString &);
+    void on_accountName_textChanged(const QString &);
+    void on_user_textChanged(const QString &);
+    void on_radioButtonManualProxy_toggled(bool checked);
 
-  void setWidgetStates();
+    void setWidgetStates();
 
 private:
-  Ui::CoreAccountEditDlg ui;
-  CoreAccount _account;
+    Ui::CoreAccountEditDlg ui;
+    CoreAccount _account;
+    enum ProxyType { NoProxy, SystemProxy, ManualProxy };
 };
 
+
 // ========================================
 //  FilteredCoreAccountModel
 // ========================================
 
 //! This filters out the internal account from the non-monolithic client's UI
-class FilteredCoreAccountModel : public QSortFilterProxyModel {
-  Q_OBJECT
+class FilteredCoreAccountModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
 
 public:
-  FilteredCoreAccountModel(CoreAccountModel *model, QObject *parent = 0);
+    FilteredCoreAccountModel(CoreAccountModel *model, QObject *parent = 0);
 
 protected:
-  virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+    virtual bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
 
 private:
-  AccountId _internalAccount;
+    AccountId _internalAccount;
 };
 
+
 #endif