From a357c52124eca42d436751de995606ab07a2a02b Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 31 Jan 2017 21:51:16 +0100 Subject: [PATCH] fixed a few things in options --- libretroshare/src/services/p3gxsreputation.cc | 3 +-- .../src/gui/settings/AppearancePage.cpp | 18 +++++++++++------- .../src/gui/settings/GeneralPage.cpp | 13 +++++++++++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/libretroshare/src/services/p3gxsreputation.cc b/libretroshare/src/services/p3gxsreputation.cc index aa64bec14..bf3dabfcb 100644 --- a/libretroshare/src/services/p3gxsreputation.cc +++ b/libretroshare/src/services/p3gxsreputation.cc @@ -1063,9 +1063,8 @@ bool p3GxsReputation::saveList(bool& cleanup, std::list &savelist) cleanup = true; RsStackMutex stack(mReputationMtx); /****** LOCKED MUTEX *******/ -#ifdef DEBUG_REPUTATION std::cerr << "p3GxsReputation::saveList()" << std::endl; -#endif + /* save */ std::map::iterator it; for(it = mConfig.begin(); it != mConfig.end(); ++it) diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index 819997f25..f3157fb05 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -84,12 +84,12 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags) 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.cmboTollButtonsSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonSize() )); + connect(ui.cmboListItemSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboListItemSize() )); + connect(ui.cmboTollButtonsStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonStyle())); + connect(ui.cmboLanguage, SIGNAL(currentIndexChanged(int)), this, SLOT(updateLanguageCode() )); + connect(ui.cmboStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateInterfaceStyle() )); + connect(ui.cmboStyleSheet, SIGNAL(currentIndexChanged(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() )); @@ -122,7 +122,11 @@ void AppearancePage::switch_status(MainWindow::StatusElement s,const QString& ke } void AppearancePage::updateLanguageCode() { Settings->setLanguageCode(LanguageSupport::languageCode(ui.cmboLanguage->currentText())); } -void AppearancePage::updateInterfaceStyle() { Settings->setInterfaceStyle(ui.cmboStyle->currentText()); } +void AppearancePage::updateInterfaceStyle() +{ + Rshare::setStyle(ui.cmboStyle->currentText()); + 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()); } diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp index a4a8b461d..deed5a031 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.cpp +++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp @@ -82,8 +82,17 @@ GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags) : #endif // RS_AUTOLOGIN /* Connect signals */ - connect(ui.runStartWizard_PB,SIGNAL(clicked()), this,SLOT(runStartWizard())) ; - connect(ui.checkAdvanced,SIGNAL(toggled(bool)), this,SLOT(updateAdvancedMode())) ; + connect(ui.useLocalServer, SIGNAL(toggled(bool)), this,SLOT(updateUseLocalServer())) ; + connect(ui.idleSpinBox, SIGNAL(valueChanged(int)), this,SLOT(updateMaxTimeBeforeIdle())) ; + connect(ui.checkStartMinimized, SIGNAL(toggled(bool)), this,SLOT(updateStartMinimized())) ; + connect(ui.checkQuit, SIGNAL(toggled(bool)), this,SLOT(updateDoQuit())) ; + connect(ui.checkCloseToTray, SIGNAL(toggled(bool)), this,SLOT(updateCloseToTray())) ; + connect(ui.autoLogin, SIGNAL(toggled(bool)), this,SLOT(updateAutoLogin())) ; + connect(ui.chkRunRetroshareAtSystemStartup, SIGNAL(toggled(bool)), this,SLOT(updateRunRSOnBoot())) ; + connect(ui.chkRunRetroshareAtSystemStartupMinimized, SIGNAL(toggled(bool)), this,SLOT(updateRunRSOnBoot())) ; + connect(ui.runStartWizard_PB, SIGNAL(clicked()), this,SLOT(runStartWizard())) ; + connect(ui.checkAdvanced, SIGNAL(toggled(bool)), this,SLOT(updateAdvancedMode())) ; + connect(ui.registerRetroShareProtocol, SIGNAL(toggled(bool)), this,SLOT(updateRegisterRSProtocol())) ; } /** Destructor */