From 60d9ea006f25cf0363c31a75a0a556a3f97b1350 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 29 Jan 2017 21:47:13 +0100 Subject: [PATCH] changed more ConfigPages to not requiring calls to save() --- retroshare-gui/src/gui/settings/AboutPage.h | 2 - .../src/gui/settings/AppearancePage.cpp | 89 +++--- .../src/gui/settings/AppearancePage.h | 16 +- retroshare-gui/src/gui/settings/ChatPage.h | 2 - .../src/gui/settings/MessagePage.cpp | 29 +- retroshare-gui/src/gui/settings/MessagePage.h | 7 +- .../src/gui/settings/NetworkPage.cpp | 7 - retroshare-gui/src/gui/settings/NetworkPage.h | 2 - .../src/gui/settings/NotifyPage.cpp | 293 ++++++++++-------- retroshare-gui/src/gui/settings/NotifyPage.h | 16 +- .../src/gui/settings/PeoplePage.cpp | 30 +- retroshare-gui/src/gui/settings/PeoplePage.h | 11 +- .../src/gui/settings/ServerPage.cpp | 48 +-- retroshare-gui/src/gui/settings/ServerPage.h | 4 +- .../src/gui/settings/ServicePermissionsPage.h | 2 - retroshare-gui/src/gui/settings/SoundPage.h | 2 - .../src/gui/settings/TransferPage.h | 2 - retroshare-gui/src/gui/settings/WebuiPage.h | 2 - 18 files changed, 310 insertions(+), 254 deletions(-) diff --git a/retroshare-gui/src/gui/settings/AboutPage.h b/retroshare-gui/src/gui/settings/AboutPage.h index e374a0c23..3f41750e0 100644 --- a/retroshare-gui/src/gui/settings/AboutPage.h +++ b/retroshare-gui/src/gui/settings/AboutPage.h @@ -36,8 +36,6 @@ public: /** Default Destructor */ ~AboutPage(); - /** Saves the changes on this page */ - virtual bool save(QString &errmsg) { return true;} /** Loads the settings for this page */ virtual void load(); diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index 7bc85a103..819997f25 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -83,44 +83,53 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags) foreach (QString name, styleSheets.keys()) { ui.cmboStyleSheet->addItem(name, styleSheets[name]); } + + connect(ui.cmboTollButtonsSize, SIGNAL(currentItemChanged(int)), this, SLOT(updateCmboToolButtonSize() )); + connect(ui.cmboListItemSize, SIGNAL(currentItemChanged(int)), this, SLOT(updateCmboListItemSize() )); + connect(ui.cmboTollButtonsStyle, SIGNAL(currentItemChanged(int)), this, SLOT(updateCmboToolButtonStyle())); + connect(ui.cmboLanguage, SIGNAL(currentItemChanged(int)), this, SLOT(updateLanguageCode() )); + connect(ui.cmboStyle, SIGNAL(currentItemChanged(int)), this, SLOT(updateInterfaceStyle() )); + connect(ui.cmboStyleSheet, SIGNAL(currentItemChanged(int)), this, SLOT(updateSheetName() )); + connect(ui.rbtPageOnToolBar, SIGNAL(toggled(bool)), this, SLOT(updateRbtPageOnToolBar() )); + connect(ui.rbtActionOnToolBar, SIGNAL(toggled(bool)), this, SLOT(updateActionButtonLoc() )); + connect(ui.checkBoxDisableSysTrayToolTip, SIGNAL(toggled(bool)), this, SLOT(updateStatusToolTip() )); } -void AppearancePage::switch_status_grpStatus(bool b) { switch_status(MainWindow::StatusGrpStatus ,b) ; } -void AppearancePage::switch_status_compactMode(bool b) { switch_status(MainWindow::StatusCompactMode,b) ; } -void AppearancePage::switch_status_showToolTip(bool b) { switch_status(MainWindow::StatusShowToolTip,b) ; } -void AppearancePage::switch_status_ShowStatus(bool b) { switch_status(MainWindow::StatusShowStatus ,b) ; } -void AppearancePage::switch_status_ShowPeer(bool b) { switch_status(MainWindow::StatusShowPeer ,b) ; } -void AppearancePage::switch_status_ShowDHT(bool b) { switch_status(MainWindow::StatusShowDHT ,b) ; } -void AppearancePage::switch_status_ShowHashing(bool b) { switch_status(MainWindow::StatusShowHashing,b) ; } -void AppearancePage::switch_status_ShowDisc(bool b) { switch_status(MainWindow::StatusShowDisc ,b) ; } -void AppearancePage::switch_status_ShowRate(bool b) { switch_status(MainWindow::StatusShowRate ,b) ; } -void AppearancePage::switch_status_ShowOpMode(bool b) { switch_status(MainWindow::StatusShowOpMode ,b) ; } -void AppearancePage::switch_status_ShowSound(bool b) { switch_status(MainWindow::StatusShowSound ,b) ; } -void AppearancePage::switch_status_ShowToaster(bool b) { switch_status(MainWindow::StatusShowToaster,b) ; } -void AppearancePage::switch_status_ShowSystray(bool b) { switch_status(MainWindow::StatusShowSystray,b) ; } +void AppearancePage::switch_status_grpStatus(bool b) { switch_status(MainWindow::StatusGrpStatus ,"ShowStatusBar", b) ; } +void AppearancePage::switch_status_compactMode(bool b) { switch_status(MainWindow::StatusCompactMode,"CompactMode", b) ; } +void AppearancePage::switch_status_showToolTip(bool b) { switch_status(MainWindow::StatusShowToolTip,"DisableSysTrayToolTip", b) ; } +void AppearancePage::switch_status_ShowStatus(bool b) { switch_status(MainWindow::StatusShowStatus ,"ShowStatus", b) ; } +void AppearancePage::switch_status_ShowPeer(bool b) { switch_status(MainWindow::StatusShowPeer ,"ShowPeer", b) ; } +void AppearancePage::switch_status_ShowDHT(bool b) { switch_status(MainWindow::StatusShowDHT ,"ShowDHT", b) ; } +void AppearancePage::switch_status_ShowHashing(bool b) { switch_status(MainWindow::StatusShowHashing,"ShowHashing", b) ; } +void AppearancePage::switch_status_ShowDisc(bool b) { switch_status(MainWindow::StatusShowDisc ,"ShowDisc", b) ; } +void AppearancePage::switch_status_ShowRate(bool b) { switch_status(MainWindow::StatusShowRate ,"ShowRate", b) ; } +void AppearancePage::switch_status_ShowOpMode(bool b) { switch_status(MainWindow::StatusShowOpMode ,"ShowOpMode", b) ; } +void AppearancePage::switch_status_ShowSound(bool b) { switch_status(MainWindow::StatusShowSound ,"ShowSound", b) ; } +void AppearancePage::switch_status_ShowToaster(bool b) { switch_status(MainWindow::StatusShowToaster,"ShowToaster", b) ; } +void AppearancePage::switch_status_ShowSystray(bool b) { switch_status(MainWindow::StatusShowSystray,"ShowSysTrayOnStatusBar",b) ; } -void AppearancePage::switch_status(MainWindow::StatusElement s,bool b) +void AppearancePage::switch_status(MainWindow::StatusElement s,const QString& key, bool b) { MainWindow *pMainWindow = MainWindow::getInstance(); if(!pMainWindow) return ; + Settings->setValueToGroup("StatusBar", key, QVariant(b)); + pMainWindow->switchVisibilityStatus(s,b) ; } -/** Saves the changes on this page */ -bool AppearancePage::save(QString &errmsg) +void AppearancePage::updateLanguageCode() { Settings->setLanguageCode(LanguageSupport::languageCode(ui.cmboLanguage->currentText())); } +void AppearancePage::updateInterfaceStyle() { Settings->setInterfaceStyle(ui.cmboStyle->currentText()); } +void AppearancePage::updateSheetName() { Settings->setSheetName(ui.cmboStyleSheet->itemData(ui.cmboStyleSheet->currentIndex()).toString()); } +void AppearancePage::updateRbtPageOnToolBar() { Settings->setPageButtonLoc(ui.rbtPageOnToolBar->isChecked());} +void AppearancePage::updateActionButtonLoc() { Settings->setActionButtonLoc(ui.rbtActionOnToolBar->isChecked()); } +void AppearancePage::updateStatusToolTip() { MainWindow::getInstance()->toggleStatusToolTip(ui.checkBoxDisableSysTrayToolTip->isChecked()); } + +void AppearancePage::updateCmboToolButtonStyle() { - Q_UNUSED(errmsg); - - QString languageCode = LanguageSupport::languageCode(ui.cmboLanguage->currentText()); - - Settings->setLanguageCode(languageCode); - Settings->setInterfaceStyle(ui.cmboStyle->currentText()); - Settings->setSheetName(ui.cmboStyleSheet->itemData(ui.cmboStyleSheet->currentIndex()).toString()); - Settings->setPageButtonLoc(ui.rbtPageOnToolBar->isChecked()); - Settings->setActionButtonLoc(ui.rbtActionOnToolBar->isChecked()); switch (ui.cmboTollButtonsStyle->currentIndex()) { case 0: @@ -136,6 +145,10 @@ bool AppearancePage::save(QString &errmsg) default: Settings->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); } +} + +void AppearancePage::updateCmboToolButtonSize() +{ switch (ui.cmboTollButtonsSize->currentIndex()) { case 0: @@ -157,6 +170,9 @@ bool AppearancePage::save(QString &errmsg) case 5: Settings->setToolButtonSize(128); } +} +void AppearancePage::updateCmboListItemSize() +{ switch (ui.cmboListItemSize->currentIndex()) { case 0: @@ -178,29 +194,10 @@ bool AppearancePage::save(QString &errmsg) case 5: Settings->setListItemIconSize(128); } - - /* Set to new style */ - Rshare::setStyle(ui.cmboStyle->currentText()); - - Settings->setValueToGroup("StatusBar", "ShowStatusBar", QVariant(ui.grpStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "CompactMode", QVariant(ui.checkBoxStatusCompactMode->isChecked())); - Settings->setValueToGroup("StatusBar", "DisableSysTrayToolTip", QVariant(ui.checkBoxDisableSysTrayToolTip->isChecked())); - MainWindow::getInstance()->toggleStatusToolTip(ui.checkBoxDisableSysTrayToolTip->isChecked()); - Settings->setValueToGroup("StatusBar", "ShowStatus", QVariant(ui.checkBoxShowStatusStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowPeer", QVariant(ui.checkBoxShowPeerStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowNAT", QVariant(ui.checkBoxShowNATStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowDHT", QVariant(ui.checkBoxShowDHTStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowHashing", QVariant(ui.checkBoxShowHashingStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowDisc", QVariant(ui.checkBoxShowDiscStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowRate", QVariant(ui.checkBoxShowRateStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowOpMode", QVariant(ui.checkBoxShowOpModeStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowSound", QVariant(ui.checkBoxShowSoundStatus->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowToaster", QVariant(ui.checkBoxShowToasterDisable->isChecked())); - Settings->setValueToGroup("StatusBar", "ShowSysTrayOnStatusBar", QVariant(ui.checkBoxShowSystrayOnStatus->isChecked())); - - return true; } +void AppearancePage::updateStyle() { Rshare::setStyle(ui.cmboStyle->currentText()); } + /** Loads the settings for this page */ void AppearancePage::load() { diff --git a/retroshare-gui/src/gui/settings/AppearancePage.h b/retroshare-gui/src/gui/settings/AppearancePage.h index 2ae6ce212..a80b97d1a 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.h +++ b/retroshare-gui/src/gui/settings/AppearancePage.h @@ -34,8 +34,6 @@ public: /** Default Constructor */ AppearancePage(QWidget * parent = 0, Qt::WindowFlags flags = 0); - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load(); @@ -60,8 +58,20 @@ private slots: void switch_status_ShowToaster(bool) ; void switch_status_ShowSystray(bool) ; + void updateLanguageCode() ; + void updateInterfaceStyle() ; + void updateSheetName() ; + void updateRbtPageOnToolBar(); + void updateActionButtonLoc() ; + void updateStatusToolTip() ; + + void updateCmboToolButtonStyle(); + void updateCmboToolButtonSize(); + void updateCmboListItemSize(); + + void updateStyle() ; private: - void switch_status(MainWindow::StatusElement s,bool b); + void switch_status(MainWindow::StatusElement s,const QString& key,bool b); /** Qt Designer generated object */ Ui::AppearancePage ui; diff --git a/retroshare-gui/src/gui/settings/ChatPage.h b/retroshare-gui/src/gui/settings/ChatPage.h index f6445d4d5..838fcc2ad 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.h +++ b/retroshare-gui/src/gui/settings/ChatPage.h @@ -35,8 +35,6 @@ class ChatPage : public ConfigPage /** Default Destructor */ ~ChatPage() {} - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load(); diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp index 89dcaa0ac..14ab9791d 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.cpp +++ b/retroshare-gui/src/gui/settings/MessagePage.cpp @@ -51,8 +51,12 @@ MessagePage::MessagePage(QWidget * parent, Qt::WindowFlags flags) connect(ui.comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(distantMsgsComboBoxChanged(int))); + connect(ui.setMsgToReadOnActivate,SIGNAL(toggled(bool)), this,SLOT(updateMsgToReadOnActivate())); + connect(ui.loadEmbeddedImages, SIGNAL(toggled(bool)), this,SLOT(updateLoadEmbededImages() )); + connect(ui.openComboBox, SIGNAL(currentItemChanged(int)),this,SLOT(updateMsgOpen() )); + connect(ui.comboBox, SIGNAL(currebtItemChanged(int)),this,SLOT(updateDistantMsgs() )); - //ui.encryptedMsgs_CB->setEnabled(false) ; + connect(ui.comboBox, SIGNAL(currebtItemChanged(int)),this,SLOT(updateMsgTags() )); } MessagePage::~MessagePage() @@ -79,17 +83,13 @@ void MessagePage::distantMsgsComboBoxChanged(int i) } -/** Saves the changes on this page */ -bool -MessagePage::save(QString &/*errmsg*/) -{ - Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); - Settings->setMsgLoadEmbeddedImages(ui.loadEmbeddedImages->isChecked()); - Settings->setMsgOpen((RshareSettings::enumMsgOpen) ui.openComboBox->itemData(ui.openComboBox->currentIndex()).toInt()); - - // state of distant Message combobox - Settings->setValue("DistantMessages", ui.comboBox->currentIndex()); +void MessagePage::updateMsgToReadOnActivate() { Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); } +void MessagePage::updateLoadEmbededImages() { Settings->setMsgLoadEmbeddedImages(ui.loadEmbeddedImages->isChecked()); } +void MessagePage::updateMsgOpen() { Settings->setMsgOpen((RshareSettings::enumMsgOpen) ui.openComboBox->itemData(ui.openComboBox->currentIndex()).toInt());} +void MessagePage::updateDistantMsgs() { Settings->setValue("DistantMessages", ui.comboBox->currentIndex()); } +void MessagePage::updateMsgTags() +{ std::map >::iterator Tag; for (Tag = m_pTags->types.begin(); Tag != m_pTags->types.end(); ++Tag) { // check for changed tags @@ -107,8 +107,6 @@ MessagePage::save(QString &/*errmsg*/) } } } - - return true; } /** Loads the settings for this page */ @@ -166,6 +164,8 @@ void MessagePage::addTag() m_changedTagIds.push_back(TagDlg.m_nId); } } + + updateMsgTags(); } void MessagePage::editTag() @@ -196,6 +196,7 @@ void MessagePage::editTag() } } } + updateMsgTags(); } void MessagePage::deleteTag() @@ -228,6 +229,7 @@ void MessagePage::deleteTag() if (std::find(m_changedTagIds.begin(), m_changedTagIds.end(), nId) == m_changedTagIds.end()) { m_changedTagIds.push_back(nId); } + updateMsgTags(); } void MessagePage::defaultTag() @@ -244,6 +246,7 @@ void MessagePage::defaultTag() } } + updateMsgTags(); fillTags(); } diff --git a/retroshare-gui/src/gui/settings/MessagePage.h b/retroshare-gui/src/gui/settings/MessagePage.h index 99d3ca5f2..c58ab6e0f 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.h +++ b/retroshare-gui/src/gui/settings/MessagePage.h @@ -37,8 +37,6 @@ public: MessagePage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~MessagePage(); - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load(); @@ -56,6 +54,11 @@ private slots: void currentRowChangedTag(int row); void distantMsgsComboBoxChanged(int); + void updateMsgToReadOnActivate() ; + void updateLoadEmbededImages() ; + void updateMsgOpen() ; + void updateDistantMsgs() ; + void updateMsgTags() ; private: void fillTags(); diff --git a/retroshare-gui/src/gui/settings/NetworkPage.cpp b/retroshare-gui/src/gui/settings/NetworkPage.cpp index 4bc31e1b2..0c0bd7f67 100755 --- a/retroshare-gui/src/gui/settings/NetworkPage.cpp +++ b/retroshare-gui/src/gui/settings/NetworkPage.cpp @@ -30,13 +30,6 @@ NetworkPage::NetworkPage(QWidget * parent, Qt::WindowFlags flags) } -/** Saves the changes on this page */ -bool -NetworkPage::save(QString &/*errmsg*/) -{ - return true; -} - /** Loads the settings for this page */ void NetworkPage::load() diff --git a/retroshare-gui/src/gui/settings/NetworkPage.h b/retroshare-gui/src/gui/settings/NetworkPage.h index 9244e99a0..fa1cf8968 100755 --- a/retroshare-gui/src/gui/settings/NetworkPage.h +++ b/retroshare-gui/src/gui/settings/NetworkPage.h @@ -31,8 +31,6 @@ public: NetworkPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~NetworkPage() {} - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load(); diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp index 1c31af679..2c9dbde5b 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.cpp +++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp @@ -37,106 +37,151 @@ NotifyPage::NotifyPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) { - /* Invoke the Qt Designer generated object setup routine */ - ui.setupUi(this); + /* Invoke the Qt Designer generated object setup routine */ + ui.setupUi(this); - connect(ui.testFeedButton, SIGNAL(clicked()), this, SLOT(testFeed())); - connect(ui.testToasterButton, SIGNAL(clicked()), this, SLOT(testToaster())); - connect(ui.pushButtonDisableAll,SIGNAL(toggled(bool)), NotifyQt::getInstance(), SLOT(SetDisableAll(bool))); - connect(NotifyQt::getInstance(),SIGNAL(disableAllChanged(bool)), ui.pushButtonDisableAll, SLOT(setChecked(bool))); - connect(ui.chatLobbies_CountFollowingText,SIGNAL(toggled(bool)),ui.chatLobbies_TextToNotify,SLOT(setEnabled(bool))); + connect(ui.testFeedButton, SIGNAL(clicked()), this, SLOT(testFeed())); + connect(ui.testToasterButton, SIGNAL(clicked()), this, SLOT(testToaster())); + connect(ui.pushButtonDisableAll,SIGNAL(toggled(bool)), NotifyQt::getInstance(), SLOT(SetDisableAll(bool))); + connect(NotifyQt::getInstance(),SIGNAL(disableAllChanged(bool)), ui.pushButtonDisableAll, SLOT(setChecked(bool))); + connect(ui.chatLobbies_CountFollowingText,SIGNAL(toggled(bool)),ui.chatLobbies_TextToNotify,SLOT(setEnabled(bool))); - ui.notify_Blogs->hide(); + ui.notify_Blogs->hide(); - QFont font = ui.notify_Peers->font(); // use font from existing checkbox + QFont font = ui.notify_Peers->font(); // use font from existing checkbox - /* add feed and Toaster notify */ - int rowFeed = 0; - int rowToaster = 0; - int pluginCount = rsPlugins->nbPlugins(); - for (int i = 0; i < pluginCount; ++i) { - RsPlugin *rsPlugin = rsPlugins->plugin(i); - if (rsPlugin) { - FeedNotify *feedNotify = rsPlugin->qt_feedNotify(); - if (feedNotify) { - QString name; - if (feedNotify->hasSetting(name)) { + /* add feed and Toaster notify */ + int rowFeed = 0; + int rowToaster = 0; + int pluginCount = rsPlugins->nbPlugins(); + for (int i = 0; i < pluginCount; ++i) + { + RsPlugin *rsPlugin = rsPlugins->plugin(i); + if (rsPlugin) { + FeedNotify *feedNotify = rsPlugin->qt_feedNotify(); + if (feedNotify) { + QString name; + if (feedNotify->hasSetting(name)) { - QCheckBox *enabledCheckBox = new QCheckBox(name, this); - enabledCheckBox->setFont(font); - ui.feedLayout->addWidget(enabledCheckBox, rowFeed++); + QCheckBox *enabledCheckBox = new QCheckBox(name, this); + enabledCheckBox->setFont(font); + ui.feedLayout->addWidget(enabledCheckBox, rowFeed++); - mFeedNotifySettingList.push_back(FeedNotifySetting(feedNotify, enabledCheckBox)); - } - } + mFeedNotifySettingList.push_back(FeedNotifySetting(feedNotify, enabledCheckBox)); - ToasterNotify *toasterNotify = rsPlugin->qt_toasterNotify(); - if (toasterNotify) { - QString name; - if (toasterNotify->hasSetting(name)) { + connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateFeedNotifySettings())) ; + } + } - QCheckBox *enabledCheckBox = new QCheckBox(name, this); - enabledCheckBox->setFont(font); - ui.toasterLayout->addWidget(enabledCheckBox, rowToaster++); + ToasterNotify *toasterNotify = rsPlugin->qt_toasterNotify(); + if (toasterNotify) { + QString name; + if (toasterNotify->hasSetting(name)) { - mToasterNotifySettingList.push_back(ToasterNotifySetting(toasterNotify, enabledCheckBox)); - } + QCheckBox *enabledCheckBox = new QCheckBox(name, this); + enabledCheckBox->setFont(font); + ui.toasterLayout->addWidget(enabledCheckBox, rowToaster++); - QMap map; - if (toasterNotify->hasSettings(name, map)) { - if (!map.empty()){ - QWidget* widget = new QWidget(); - QVBoxLayout* vbLayout = new QVBoxLayout(widget); - QLabel *label = new QLabel(name, this); - QFont fontBold = QFont(font); - fontBold.setBold(true); - label->setFont(fontBold); - vbLayout->addWidget(label); - for (QMap::const_iterator it = map.begin(); it != map.end(); ++it){ - QCheckBox *enabledCheckBox = new QCheckBox(it.value(), this); - enabledCheckBox->setAccessibleName(it.key()); - enabledCheckBox->setFont(font); - vbLayout->addWidget(enabledCheckBox); - mToasterNotifySettingList.push_back(ToasterNotifySetting(toasterNotify, enabledCheckBox)); - } - ui.toasterLayout->addWidget(widget, rowToaster++); - } - } - } - } - } + mToasterNotifySettingList.push_back(ToasterNotifySetting(toasterNotify, enabledCheckBox)); - /* add user notify */ - const QList &userNotifyList = MainWindow::getInstance()->getUserNotifyList(); - QList::const_iterator it; - rowFeed = 0; - mChatLobbyUserNotify = 0; - for (it = userNotifyList.begin(); it != userNotifyList.end(); ++it) { - UserNotify *userNotify = *it; + connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateToasterNotifySettings())) ; + } - QString name; - if (!userNotify->hasSetting(&name, NULL)) { - continue; - } + QMap map; + if (toasterNotify->hasSettings(name, map)) { + if (!map.empty()){ + QWidget* widget = new QWidget(); + QVBoxLayout* vbLayout = new QVBoxLayout(widget); + QLabel *label = new QLabel(name, this); + QFont fontBold = QFont(font); + fontBold.setBold(true); + label->setFont(fontBold); + vbLayout->addWidget(label); + for (QMap::const_iterator it = map.begin(); it != map.end(); ++it){ + QCheckBox *enabledCheckBox = new QCheckBox(it.value(), this); + enabledCheckBox->setAccessibleName(it.key()); + enabledCheckBox->setFont(font); + vbLayout->addWidget(enabledCheckBox); + mToasterNotifySettingList.push_back(ToasterNotifySetting(toasterNotify, enabledCheckBox)); - QCheckBox *enabledCheckBox = new QCheckBox(name, this); - enabledCheckBox->setFont(font); - ui.notifyLayout->addWidget(enabledCheckBox, rowFeed, 0, 0); - connect(enabledCheckBox, SIGNAL(toggled(bool)), this, SLOT(notifyToggled())); + connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateToasterNotifySettings())) ; + } + ui.toasterLayout->addWidget(widget, rowToaster++); + } + } + } + } - QCheckBox *combinedCheckBox = new QCheckBox(tr("Combined"), this); - combinedCheckBox->setFont(font); - ui.notifyLayout->addWidget(combinedCheckBox, rowFeed, 1); + } - QCheckBox *blinkCheckBox = new QCheckBox(tr("Blink"), this); - blinkCheckBox->setFont(font); - ui.notifyLayout->addWidget(blinkCheckBox, rowFeed++, 2); + /* add user notify */ + const QList &userNotifyList = MainWindow::getInstance()->getUserNotifyList(); + QList::const_iterator it; + rowFeed = 0; + mChatLobbyUserNotify = 0; + for (it = userNotifyList.begin(); it != userNotifyList.end(); ++it) { + UserNotify *userNotify = *it; - mUserNotifySettingList.push_back(UserNotifySetting(userNotify, enabledCheckBox, combinedCheckBox, blinkCheckBox)); + QString name; + if (!userNotify->hasSetting(&name, NULL)) { + continue; + } - //To get ChatLobbyUserNotify Settings - if (!mChatLobbyUserNotify) mChatLobbyUserNotify = dynamic_cast(*it); - } + QCheckBox *enabledCheckBox = new QCheckBox(name, this); + enabledCheckBox->setFont(font); + ui.notifyLayout->addWidget(enabledCheckBox, rowFeed, 0, 0); + connect(enabledCheckBox, SIGNAL(toggled(bool)), this, SLOT(notifyToggled())); + + QCheckBox *combinedCheckBox = new QCheckBox(tr("Combined"), this); + combinedCheckBox->setFont(font); + ui.notifyLayout->addWidget(combinedCheckBox, rowFeed, 1); + + QCheckBox *blinkCheckBox = new QCheckBox(tr("Blink"), this); + blinkCheckBox->setFont(font); + ui.notifyLayout->addWidget(blinkCheckBox, rowFeed++, 2); + + mUserNotifySettingList.push_back(UserNotifySetting(userNotify, enabledCheckBox, combinedCheckBox, blinkCheckBox)); + + connect(enabledCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; + connect(blinkCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; + connect(combinedCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateUserNotifySettings())) ; + + //To get ChatLobbyUserNotify Settings + if (!mChatLobbyUserNotify) mChatLobbyUserNotify = dynamic_cast(*it); + } + + connect(ui.popup_Connect, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; + connect(ui.popup_NewMsg, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; + connect(ui.popup_DownloadFinished, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; + connect(ui.popup_PrivateChat, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; + connect(ui.popup_GroupChat, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; + connect(ui.popup_ChatLobby, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; + connect(ui.popup_ConnectAttempt, SIGNAL(toggled(bool)), this, SLOT(updateNotifyFlags())) ; + + connect(ui.message_ConnectAttempt, SIGNAL(toggled(bool)), this, SLOT(updateMessageFlags())) ; + + connect(ui.notify_Peers, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); + connect(ui.notify_Channels, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); + connect(ui.notify_Forums, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); + connect(ui.notify_Posted, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); + connect(ui.notify_Messages, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); + connect(ui.notify_Chat, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); + connect(ui.notify_Security, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); + connect(ui.notify_SecurityIp, SIGNAL(toggled(bool)), this, SLOT(updateNewsFeedFlags())); + + connect(ui.systray_ChatLobby, SIGNAL(toggled(bool)),this,SLOT(updateSystrayChatLobby())); + connect(ui.systray_GroupChat, SIGNAL(toggled(bool)),this,SLOT(updateSystrayGroupChat())); + + connect(ui.spinBoxToasterXMargin, SIGNAL(valueChanged(int)),this, SLOT(updateToasterMargin())) ; + connect(ui.spinBoxToasterYMargin, SIGNAL(valueChanged(int)),this, SLOT(updateToasterMargin())) ; + + connect(ui.comboBoxToasterPosition, SIGNAL(currentIndexChanged(int)),this, SLOT(updateToasterPosition())) ; + + connect(ui.chatLobbies_CountUnRead, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; + connect(ui.chatLobbies_CheckNickName, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; + connect(ui.chatLobbies_CountFollowingText, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; + connect(ui.chatLobbies_TextToNotify, SIGNAL(textChanged(QString)),this, SLOT(updateChatLobbyUserNotify())); + connect(ui.chatLobbies_TextCaseSensitive, SIGNAL(toggled(bool)),this, SLOT(updateChatLobbyUserNotify())) ; } NotifyPage::~NotifyPage() @@ -203,64 +248,62 @@ uint NotifyPage::getNotifyFlags() return notifyFlags; } -/** Saves the changes on this page */ -bool -NotifyPage::save(QString &/*errmsg*/) + +void NotifyPage::updateFeedNotifySettings() { - /* extract from rsNotify the flags */ - - uint messageflags = 0; - - if (ui.message_ConnectAttempt->isChecked()) - messageflags |= RS_MESSAGE_CONNECT_ATTEMPT; - - /* save feed notify */ - QList::iterator feedNotifyIt; - for (feedNotifyIt = mFeedNotifySettingList.begin(); feedNotifyIt != mFeedNotifySettingList.end(); ++feedNotifyIt) { - feedNotifyIt->mFeedNotify->setNotifyEnabled(feedNotifyIt->mEnabledCheckBox->isChecked()); - } + /* save feed notify */ + QList::iterator feedNotifyIt; + for (feedNotifyIt = mFeedNotifySettingList.begin(); feedNotifyIt != mFeedNotifySettingList.end(); ++feedNotifyIt) + feedNotifyIt->mFeedNotify->setNotifyEnabled(feedNotifyIt->mEnabledCheckBox->isChecked()); +} +void NotifyPage::updateToasterNotifySettings() +{ /* save toaster notify */ QList::iterator toasterNotifyIt; for (toasterNotifyIt = mToasterNotifySettingList.begin(); toasterNotifyIt != mToasterNotifySettingList.end(); ++toasterNotifyIt) { - if(toasterNotifyIt->mEnabledCheckBox->accessibleName().isEmpty()){ + if(toasterNotifyIt->mEnabledCheckBox->accessibleName().isEmpty()) toasterNotifyIt->mToasterNotify->setNotifyEnabled(toasterNotifyIt->mEnabledCheckBox->isChecked()) ; - } else { + else toasterNotifyIt->mToasterNotify->setNotifyEnabled(toasterNotifyIt->mEnabledCheckBox->accessibleName(), toasterNotifyIt->mEnabledCheckBox->isChecked()) ; - } } +} - /* save user notify */ - QList::iterator notifyIt; - for (notifyIt = mUserNotifySettingList.begin(); notifyIt != mUserNotifySettingList.end(); ++notifyIt) { - notifyIt->mUserNotify->setNotifyEnabled(notifyIt->mEnabledCheckBox->isChecked(), notifyIt->mCombinedCheckBox->isChecked(), notifyIt->mBlinkCheckBox->isChecked()); - } +void NotifyPage::updateUserNotifySettings() +{ + /* save user notify */ + QList::iterator notifyIt; + for (notifyIt = mUserNotifySettingList.begin(); notifyIt != mUserNotifySettingList.end(); ++notifyIt) + notifyIt->mUserNotify->setNotifyEnabled(notifyIt->mEnabledCheckBox->isChecked(), notifyIt->mCombinedCheckBox->isChecked(), notifyIt->mBlinkCheckBox->isChecked()); - Settings->setNotifyFlags(getNotifyFlags()); - Settings->setNewsFeedFlags(getNewsFlags()); - Settings->setMessageFlags(messageflags); + MainWindow::installNotifyIcons(); +} - Settings->setDisplayTrayChatLobby(ui.systray_ChatLobby->isChecked()); - Settings->setDisplayTrayGroupChat(ui.systray_GroupChat->isChecked()); - MainWindow::installGroupChatNotifier(); - MainWindow::installNotifyIcons(); +void NotifyPage::updateMessageFlags() { Settings->setMessageFlags( ui.message_ConnectAttempt->isChecked()? RS_MESSAGE_CONNECT_ATTEMPT : 0); } +void NotifyPage::updateNotifyFlags() { Settings->setNotifyFlags(getNotifyFlags()); } +void NotifyPage::updateNewsFeedFlags(){ Settings->setNewsFeedFlags(getNewsFlags()); } +void NotifyPage::updateSystrayChatLobby() { Settings->setDisplayTrayChatLobby(ui.systray_ChatLobby->isChecked()); } +void NotifyPage::updateSystrayGroupChat() { Settings->setDisplayTrayGroupChat(ui.systray_GroupChat->isChecked()); MainWindow::installGroupChatNotifier(); } +void NotifyPage::updateToasterMargin() { Settings->setToasterMargin(QPoint(ui.spinBoxToasterXMargin->value(), ui.spinBoxToasterYMargin->value())); } + +void NotifyPage::updateToasterPosition() +{ int index = ui.comboBoxToasterPosition->currentIndex(); - if (index != -1) { + if (index != -1) Settings->setToasterPosition((RshareSettings::enumToasterPosition) ui.comboBoxToasterPosition->itemData(index).toInt()); - } +} - Settings->setToasterMargin(QPoint(ui.spinBoxToasterXMargin->value(), ui.spinBoxToasterYMargin->value())); +void NotifyPage::updateChatLobbyUserNotify() +{ + if(!mChatLobbyUserNotify) + return ; - if (mChatLobbyUserNotify){ - mChatLobbyUserNotify->setCountUnRead(ui.chatLobbies_CountUnRead->isChecked()) ; - mChatLobbyUserNotify->setCheckForNickName(ui.chatLobbies_CheckNickName->isChecked()) ; - mChatLobbyUserNotify->setCountSpecificText(ui.chatLobbies_CountFollowingText->isChecked()) ; - mChatLobbyUserNotify->setTextToNotify(ui.chatLobbies_TextToNotify->document()->toPlainText()); - mChatLobbyUserNotify->setTextCaseSensitive(ui.chatLobbies_TextCaseSensitive->isChecked()); - } - load(); - return true; + mChatLobbyUserNotify->setCountUnRead(ui.chatLobbies_CountUnRead->isChecked()) ; + mChatLobbyUserNotify->setCheckForNickName(ui.chatLobbies_CheckNickName->isChecked()) ; + mChatLobbyUserNotify->setCountSpecificText(ui.chatLobbies_CountFollowingText->isChecked()) ; + mChatLobbyUserNotify->setTextToNotify(ui.chatLobbies_TextToNotify->document()->toPlainText()); + mChatLobbyUserNotify->setTextCaseSensitive(ui.chatLobbies_TextCaseSensitive->isChecked()); } /** Loads the settings for this page */ diff --git a/retroshare-gui/src/gui/settings/NotifyPage.h b/retroshare-gui/src/gui/settings/NotifyPage.h index 900c8efb6..547af2767 100755 --- a/retroshare-gui/src/gui/settings/NotifyPage.h +++ b/retroshare-gui/src/gui/settings/NotifyPage.h @@ -76,8 +76,6 @@ public: /** Default Destructor */ ~NotifyPage(); - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load(); @@ -90,6 +88,20 @@ private slots: void testToaster(); void testFeed(); + void updateFeedNotifySettings(); + void updateToasterNotifySettings(); + void updateUserNotifySettings(); + void updateMessageFlags() ; + void updateNotifyFlags() ; + void updateNewsFeedFlags(); + + void updateSystrayChatLobby(); + void updateSystrayGroupChat(); + void updateToasterMargin(); + + void updateToasterPosition(); + void updateChatLobbyUserNotify(); + private: uint getNewsFlags(); uint getNotifyFlags(); diff --git a/retroshare-gui/src/gui/settings/PeoplePage.cpp b/retroshare-gui/src/gui/settings/PeoplePage.cpp index 66265f4de..8f95b2b2f 100644 --- a/retroshare-gui/src/gui/settings/PeoplePage.cpp +++ b/retroshare-gui/src/gui/settings/PeoplePage.cpp @@ -29,28 +29,26 @@ PeoplePage::PeoplePage(QWidget * parent, Qt::WindowFlags flags) { ui.setupUi(this); setAttribute(Qt::WA_QuitOnClose, false); + + connect(ui.autoPositiveOpinion_CB,SIGNAL(toggled(bool)),this,SLOT(updateAutoPositiveOpinion())) ; + connect(ui.thresholdForPositive_SB,SIGNAL(valueChanged(int)),this,SLOT(updateThresholdForRemotelyPositiveReputation())); + connect(ui.thresholdForNegative_SB,SIGNAL(valueChanged(int)),this,SLOT(updateThresholdForRemotelyNegativeReputation())); + connect(ui.preventReloadingBannedIdentitiesFor_SB,SIGNAL(valueChanged(int)),this,SLOT(updateRememberDeletedNodes())); + connect(ui.deleteBannedIdentitiesAfter_SB,SIGNAL(valueChanged(int)),this,SLOT(updateDeleteBannedNodesThreshold())); } +void PeoplePage::updateAutoPositiveOpinion() { rsReputations->setNodeAutoPositiveOpinionForContacts(ui.autoPositiveOpinion_CB->isChecked()) ; } + +void PeoplePage::updateThresholdForRemotelyPositiveReputation() { rsReputations->setThresholdForRemotelyPositiveReputation(ui.thresholdForPositive_SB->value()); } +void PeoplePage::updateThresholdForRemotelyNegativeReputation() { rsReputations->setThresholdForRemotelyNegativeReputation(ui.thresholdForNegative_SB->value()); } + +void PeoplePage::updateRememberDeletedNodes() { rsReputations->setRememberDeletedNodesThreshold(ui.preventReloadingBannedIdentitiesFor_SB->value()); } +void PeoplePage::updateDeleteBannedNodesThreshold() { rsIdentity->setDeleteBannedNodesThreshold(ui.deleteBannedIdentitiesAfter_SB->value());} + PeoplePage::~PeoplePage() { } -/** Saves the changes on this page */ -bool PeoplePage::save(QString &/*errmsg*/) -{ - if(ui.autoPositiveOpinion_CB->isChecked()) - rsReputations->setNodeAutoPositiveOpinionForContacts(true) ; - else - rsReputations->setNodeAutoPositiveOpinionForContacts(false) ; - - rsReputations->setThresholdForRemotelyPositiveReputation(ui.thresholdForPositive_SB->value()); - rsReputations->setThresholdForRemotelyNegativeReputation(ui.thresholdForNegative_SB->value()); - rsReputations->setRememberDeletedNodesThreshold(ui.preventReloadingBannedIdentitiesFor_SB->value()); - rsIdentity->setDeleteBannedNodesThreshold(ui.deleteBannedIdentitiesAfter_SB->value()); - - return true; -} - /** Loads the settings for this page */ void PeoplePage::load() { diff --git a/retroshare-gui/src/gui/settings/PeoplePage.h b/retroshare-gui/src/gui/settings/PeoplePage.h index 393436f57..b3e14adfa 100644 --- a/retroshare-gui/src/gui/settings/PeoplePage.h +++ b/retroshare-gui/src/gui/settings/PeoplePage.h @@ -33,8 +33,6 @@ public: PeoplePage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~PeoplePage(); - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load(); @@ -42,6 +40,15 @@ public: virtual QString pageName() const { return tr("People") ; } virtual QString helpText() const { return ""; } +protected slots: + void updateAutoPositiveOpinion() ; + + void updateThresholdForRemotelyPositiveReputation(); + void updateThresholdForRemotelyNegativeReputation(); + + void updateRememberDeletedNodes(); + void updateDeleteBannedNodesThreshold() ; + private: Ui::PeoplePage ui; }; diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index 8ece6d7cd..c80a56bbe 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -58,11 +58,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) ); - connect( ui.allowIpDeterminationCB, SIGNAL( toggled( bool ) ), this, SLOT( toggleIpDetermination(bool) ) ); - connect( ui.cleanKnownIPs_PB, SIGNAL( clicked( ) ), this, SLOT( clearKnownAddressList() ) ); - connect( ui.testIncoming_PB, SIGNAL( clicked( ) ), this, SLOT( updateInProxyIndicator() ) ); - manager = NULL ; ui.filteredIpsTable->setHorizontalHeaderItem(COLUMN_RANGE,new QTableWidgetItem(tr("IP Range"))) ; @@ -107,11 +102,32 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags) ui.hiddenpage_incoming->setVisible(false); + connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) ); + connect( ui.allowIpDeterminationCB, SIGNAL( toggled( bool ) ), this, SLOT( toggleIpDetermination(bool) ) ); + connect( ui.cleanKnownIPs_PB, SIGNAL( clicked( ) ), this, SLOT( clearKnownAddressList() ) ); + connect( ui.testIncoming_PB, SIGNAL( clicked( ) ), this, SLOT( updateInProxyIndicator() ) ); + connect( ui.showDiscStatusBar,SIGNAL(toggled(bool)),this,SLOT(updateShowDiscStatusBar())) ; + #ifdef SERVER_DEBUG std::cerr << "ServerPage::ServerPage() called"; std::cerr << std::endl; #endif + + connect(ui.netModeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses())); + connect(ui.discComboBox, SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses())); + connect(ui.localAddress, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); + connect(ui.extAddress, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); + connect(ui.dynDNS, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); + + connect(ui.hiddenpage_proxyAddress_tor, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); + connect(ui.hiddenpage_proxyPort_tor, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); + connect(ui.hiddenpage_proxyAddress_i2p, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); + connect(ui.hiddenpage_proxyPort_i2p, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); + + connect(ui.totalDownloadRate,SIGNAL(valueChanged(int)),this,SLOT(saveRates())); + connect(ui.totalUploadRate, SIGNAL(valueChanged(int)),this,SLOT(saveRates())); } + void ServerPage::checkIpRange(const QString& ipstr) { QColor color; @@ -183,22 +199,7 @@ void ServerPage::toggleTunnelConnection(bool b) //rsPeers->allowTunnelConnection(b) ; } -/** Saves the changes on this page */ -bool -ServerPage::save(QString &/*errmsg*/) -{ - Settings->setStatusBarFlag(STATUSBAR_DISC, ui.showDiscStatusBar->isChecked()); - -/* save the server address */ -/* save local address */ -/* save the url for DNS access */ - -/* restart server */ - -/* save all? */ - saveAddresses(); - return true; -} +void ServerPage::updateShowDiscStatusBar() { Settings->setStatusBarFlag(STATUSBAR_DISC, ui.showDiscStatusBar->isChecked()); } /** Loads the settings for this page */ void ServerPage::load() @@ -815,7 +816,6 @@ void ServerPage::saveAddresses() } rsPeers->setDynDNS(ownId, ui.dynDNS->text().toStdString()); - rsConfig->SetMaxDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() ); // HANDLE PROXY SERVER. std::string orig_proxyaddr, new_proxyaddr; @@ -846,6 +846,10 @@ void ServerPage::saveAddresses() load(); } +void ServerPage::saveRates() +{ + rsConfig->SetMaxDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() ); +} /***********************************************************************************/ /***********************************************************************************/ diff --git a/retroshare-gui/src/gui/settings/ServerPage.h b/retroshare-gui/src/gui/settings/ServerPage.h index 4561cd7ca..02685bfc0 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.h +++ b/retroshare-gui/src/gui/settings/ServerPage.h @@ -47,8 +47,6 @@ public: ServerPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~ServerPage() {} - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load(); @@ -81,6 +79,8 @@ private slots: // server void saveAddresses(); + void saveRates(); + void updateShowDiscStatusBar() ; void toggleUPnP(); void toggleIpDetermination(bool) ; void toggleTunnelConnection(bool) ; diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.h b/retroshare-gui/src/gui/settings/ServicePermissionsPage.h index abc54c9b0..b8559bbef 100644 --- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.h +++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.h @@ -35,8 +35,6 @@ public: ServicePermissionsPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~ServicePermissionsPage() {} - /** Saves the changes on this page */ - virtual bool save(QString &/*errmsg*/) { return true ;} /** Loads the settings for this page */ virtual void load() {} diff --git a/retroshare-gui/src/gui/settings/SoundPage.h b/retroshare-gui/src/gui/settings/SoundPage.h index 831233784..0fc8b315c 100644 --- a/retroshare-gui/src/gui/settings/SoundPage.h +++ b/retroshare-gui/src/gui/settings/SoundPage.h @@ -37,8 +37,6 @@ public: /** Default Destructor */ ~SoundPage(); - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load(); diff --git a/retroshare-gui/src/gui/settings/TransferPage.h b/retroshare-gui/src/gui/settings/TransferPage.h index 75cab1b4c..eca52ace5 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.h +++ b/retroshare-gui/src/gui/settings/TransferPage.h @@ -35,8 +35,6 @@ class TransferPage: public ConfigPage TransferPage(QWidget * parent = 0, Qt::WindowFlags flags = 0); ~TransferPage() {} - /** Saves the changes on this page */ - virtual bool save(QString &/*errmsg*/) { return true ; } /** Loads the settings for this page */ virtual void load() {} diff --git a/retroshare-gui/src/gui/settings/WebuiPage.h b/retroshare-gui/src/gui/settings/WebuiPage.h index 3ff6a45a9..6d14500a5 100644 --- a/retroshare-gui/src/gui/settings/WebuiPage.h +++ b/retroshare-gui/src/gui/settings/WebuiPage.h @@ -20,8 +20,6 @@ public: /** Default Destructor */ ~WebuiPage(); - /** Saves the changes on this page */ - virtual bool save(QString &errmsg); /** Loads the settings for this page */ virtual void load();