From 88afe51f3ebf730ce4f8108e0002682a12907a94 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 27 Feb 2017 23:13:45 +0100 Subject: [PATCH] added missing signal blocking calls in several config pages --- .../src/gui/settings/AppearancePage.cpp | 57 ++++++++------- .../src/gui/settings/ChannelPage.cpp | 3 +- retroshare-gui/src/gui/settings/ChatPage.cpp | 73 ++++++++++--------- .../src/gui/settings/DirectoriesPage.cpp | 13 ++-- retroshare-gui/src/gui/settings/ForumPage.cpp | 9 ++- .../src/gui/settings/GeneralPage.cpp | 17 +++-- .../gui/settings/GroupFrameSettingsWidget.cpp | 5 +- .../src/gui/settings/MessagePage.cpp | 13 ++-- 8 files changed, 99 insertions(+), 91 deletions(-) diff --git a/retroshare-gui/src/gui/settings/AppearancePage.cpp b/retroshare-gui/src/gui/settings/AppearancePage.cpp index 025828ee0..67b61aa8d 100755 --- a/retroshare-gui/src/gui/settings/AppearancePage.cpp +++ b/retroshare-gui/src/gui/settings/AppearancePage.cpp @@ -30,6 +30,7 @@ #include #include "AppearancePage.h" #include "rsharesettings.h" +#include "util/misc.h" #include "gui/MainWindow.h" #include "gui/notifyqt.h" #include "gui/statusbar/peerstatus.h" @@ -222,56 +223,56 @@ void AppearancePage::updateStyle() { Rshare::setStyle(ui.cmboStyle->currentText( void AppearancePage::load() { int index = ui.cmboLanguage->findData(Settings->getLanguageCode()); - ui.cmboLanguage->setCurrentIndex(index); + whileBlocking(ui.cmboLanguage)->setCurrentIndex(index); index = ui.cmboStyle->findData(Rshare::style().toLower()); - ui.cmboStyle->setCurrentIndex(index); + whileBlocking(ui.cmboStyle)->setCurrentIndex(index); index = ui.cmboStyleSheet->findData(Settings->getSheetName()); if (index == -1) { /* set standard "no style sheet" */ index = ui.cmboStyleSheet->findData(""); } - ui.cmboStyleSheet->setCurrentIndex(index); + whileBlocking(ui.cmboStyleSheet)->setCurrentIndex(index); - ui.mainPageButtonType_CB->setCurrentIndex(!Settings->getPageButtonLoc()); + whileBlocking(ui.mainPageButtonType_CB)->setCurrentIndex(!Settings->getPageButtonLoc()); // ui.menuItemsButtonType_CB->setCurrentIndex(!Settings->getActionButtonLoc()); switch (Settings->getToolButtonStyle()) { case Qt::ToolButtonIconOnly: - ui.cmboTollButtonsStyle->setCurrentIndex(0); + whileBlocking(ui.cmboTollButtonsStyle)->setCurrentIndex(0); break; case Qt::ToolButtonTextOnly: - ui.cmboTollButtonsStyle->setCurrentIndex(1); + whileBlocking(ui.cmboTollButtonsStyle)->setCurrentIndex(1); break; case Qt::ToolButtonTextBesideIcon: - ui.cmboTollButtonsStyle->setCurrentIndex(2); + whileBlocking(ui.cmboTollButtonsStyle)->setCurrentIndex(2); break; case Qt::ToolButtonTextUnderIcon: default: - ui.cmboTollButtonsStyle->setCurrentIndex(3); + whileBlocking(ui.cmboTollButtonsStyle)->setCurrentIndex(3); } switch (Settings->getToolButtonSize()) { case 8: - ui.cmboTollButtonsSize->setCurrentIndex(0); + whileBlocking(ui.cmboTollButtonsSize)->setCurrentIndex(0); break; case 16: - ui.cmboTollButtonsSize->setCurrentIndex(1); + whileBlocking(ui.cmboTollButtonsSize)->setCurrentIndex(1); break; case 24: default: - ui.cmboTollButtonsSize->setCurrentIndex(2); + whileBlocking(ui.cmboTollButtonsSize)->setCurrentIndex(2); break; case 32: - ui.cmboTollButtonsSize->setCurrentIndex(3); + whileBlocking(ui.cmboTollButtonsSize)->setCurrentIndex(3); break; case 64: - ui.cmboTollButtonsSize->setCurrentIndex(4); + whileBlocking(ui.cmboTollButtonsSize)->setCurrentIndex(4); break; case 128: - ui.cmboTollButtonsSize->setCurrentIndex(5); + whileBlocking(ui.cmboTollButtonsSize)->setCurrentIndex(5); } // switch (Settings->getListItemIconSize()) // { @@ -295,20 +296,20 @@ void AppearancePage::load() // ui.cmboListItemSize->setCurrentIndex(5); // } - ui.grpStatus->setChecked(Settings->valueFromGroup("StatusBar", "ShowStatusBar", QVariant(true)).toBool()); - ui.checkBoxStatusCompactMode->setChecked(Settings->valueFromGroup("StatusBar", "CompactMode", QVariant(false)).toBool()); - ui.checkBoxDisableSysTrayToolTip->setChecked(Settings->valueFromGroup("StatusBar", "DisableSysTrayToolTip", QVariant(false)).toBool()); - ui.checkBoxShowStatusStatus-> setChecked(Settings->valueFromGroup("StatusBar", "ShowStatus", QVariant(true)).toBool()); - ui.checkBoxShowPeerStatus-> setChecked(Settings->valueFromGroup("StatusBar", "ShowPeer", QVariant(true)).toBool()); - ui.checkBoxShowNATStatus-> setChecked(Settings->valueFromGroup("StatusBar", "ShowNAT", QVariant(true)).toBool()); - ui.checkBoxShowDHTStatus-> setChecked(Settings->valueFromGroup("StatusBar", "ShowDHT", QVariant(true)).toBool()); - ui.checkBoxShowHashingStatus-> setChecked(Settings->valueFromGroup("StatusBar", "ShowHashing", QVariant(true)).toBool()); - ui.checkBoxShowDiscStatus-> setChecked(Settings->valueFromGroup("StatusBar", "Show eDisc", QVariant(true)).toBool()); - ui.checkBoxShowRateStatus-> setChecked(Settings->valueFromGroup("StatusBar", "ShowRate", QVariant(true)).toBool()); - ui.checkBoxShowOpModeStatus-> setChecked(Settings->valueFromGroup("StatusBar", "ShowOpMode", QVariant(true)).toBool()); - ui.checkBoxShowSoundStatus-> setChecked(Settings->valueFromGroup("StatusBar", "ShowSound", QVariant(true)).toBool()); - ui.checkBoxShowToasterDisable->setChecked(Settings->valueFromGroup("StatusBar", "ShowToaster", QVariant(true)).toBool()); - ui.checkBoxShowSystrayOnStatus->setChecked(Settings->valueFromGroup("StatusBar", "ShowSysTrayOnStatusBar", QVariant(false)).toBool()); + whileBlocking(ui.grpStatus)->setChecked(Settings->valueFromGroup("StatusBar", "ShowStatusBar", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxStatusCompactMode)->setChecked(Settings->valueFromGroup("StatusBar", "CompactMode", QVariant(false)).toBool()); + whileBlocking(ui.checkBoxDisableSysTrayToolTip)->setChecked(Settings->valueFromGroup("StatusBar", "DisableSysTrayToolTip", QVariant(false)).toBool()); + whileBlocking(ui.checkBoxShowStatusStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "ShowStatus", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowPeerStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "ShowPeer", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowNATStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "ShowNAT", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowDHTStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "ShowDHT", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowHashingStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "ShowHashing", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowDiscStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "Show eDisc", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowRateStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "ShowRate", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowOpModeStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "ShowOpMode", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowSoundStatus)-> setChecked(Settings->valueFromGroup("StatusBar", "ShowSound", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowToasterDisable)->setChecked(Settings->valueFromGroup("StatusBar", "ShowToaster", QVariant(true)).toBool()); + whileBlocking(ui.checkBoxShowSystrayOnStatus)->setChecked(Settings->valueFromGroup("StatusBar", "ShowSysTrayOnStatusBar", QVariant(false)).toBool()); } diff --git a/retroshare-gui/src/gui/settings/ChannelPage.cpp b/retroshare-gui/src/gui/settings/ChannelPage.cpp index b58035a01..199dd5b3a 100644 --- a/retroshare-gui/src/gui/settings/ChannelPage.cpp +++ b/retroshare-gui/src/gui/settings/ChannelPage.cpp @@ -21,6 +21,7 @@ #include "ChannelPage.h" #include "rsharesettings.h" +#include "util/misc.h" ChannelPage::ChannelPage(QWidget * parent, Qt::WindowFlags flags) : ConfigPage(parent, flags) @@ -44,6 +45,6 @@ ChannelPage::~ChannelPage() /** Loads the settings for this page */ void ChannelPage::load() { - ui.loadThreadCheckBox->setChecked(Settings->getChannelLoadThread()); + whileBlocking(ui.loadThreadCheckBox)->setChecked(Settings->getChannelLoadThread()); ui.groupFrameSettingsWidget->loadSettings(GroupFrameSettings::Channel); } diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp index d90bb308c..706163aed 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.cpp +++ b/retroshare-gui/src/gui/settings/ChatPage.cpp @@ -34,6 +34,7 @@ #include "gui/chat/ChatDialog.h" #include "gui/notifyqt.h" #include "rsharesettings.h" +#include "util/misc.h" #include #include @@ -299,26 +300,26 @@ void ChatPage::load() { Settings->beginGroup(QString("Chat")); - ui.checkBox_emoteprivchat->setChecked(Settings->value("Emoteicons_PrivatChat", true).toBool()); - ui.checkBox_emotegroupchat->setChecked(Settings->value("Emoteicons_GroupChat", true).toBool()); - ui.checkBox_enableCustomFonts->setChecked(Settings->value("EnableCustomFonts", true).toBool()); - ui.checkBox_enableCustomFontSize->setChecked(Settings->value("EnableCustomFontSize", true).toBool()); - ui.minimumFontSize->setValue(Settings->value("MinimumFontSize", 10).toInt()); - ui.checkBox_enableBold->setChecked(Settings->value("EnableBold", true).toBool()); - ui.checkBox_enableItalics->setChecked(Settings->value("EnableItalics", true).toBool()); - ui.minimumContrast->setValue(Settings->value("MinimumContrast", 4.5).toDouble()); + whileBlocking(ui.checkBox_emoteprivchat)->setChecked(Settings->value("Emoteicons_PrivatChat", true).toBool()); + whileBlocking(ui.checkBox_emotegroupchat)->setChecked(Settings->value("Emoteicons_GroupChat", true).toBool()); + whileBlocking(ui.checkBox_enableCustomFonts)->setChecked(Settings->value("EnableCustomFonts", true).toBool()); + whileBlocking(ui.checkBox_enableCustomFontSize)->setChecked(Settings->value("EnableCustomFontSize", true).toBool()); + whileBlocking(ui.minimumFontSize)->setValue(Settings->value("MinimumFontSize", 10).toInt()); + whileBlocking(ui.checkBox_enableBold)->setChecked(Settings->value("EnableBold", true).toBool()); + whileBlocking(ui.checkBox_enableItalics)->setChecked(Settings->value("EnableItalics", true).toBool()); + whileBlocking(ui.minimumContrast)->setValue(Settings->value("MinimumContrast", 4.5).toDouble()); Settings->endGroup(); // state of distant Chat combobox int index = Settings->value("DistantChat", 0).toInt(); - ui.distantChatComboBox->setCurrentIndex(index); + whileBlocking(ui.distantChatComboBox)->setCurrentIndex(index); fontTempChat.fromString(Settings->getChatScreenFont()); - ui.sendMessageWithCtrlReturn->setChecked(Settings->getChatSendMessageWithCtrlReturn()); - ui.sendAsPlainTextByDef->setChecked(Settings->getChatSendAsPlainTextByDef()); - ui.loadEmbeddedImages->setChecked(Settings->getChatLoadEmbeddedImages()); - ui.DontSendTyping->setChecked(Settings->getChatDoNotSendIsTyping()); + whileBlocking(ui.sendMessageWithCtrlReturn)->setChecked(Settings->getChatSendMessageWithCtrlReturn()); + whileBlocking(ui.sendAsPlainTextByDef)->setChecked(Settings->getChatSendAsPlainTextByDef()); + whileBlocking(ui.loadEmbeddedImages)->setChecked(Settings->getChatLoadEmbeddedImages()); + whileBlocking(ui.DontSendTyping)->setChecked(Settings->getChatDoNotSendIsTyping()); std::string advsetting; if(rsConfig->getConfigurationOption(RS_CONFIG_ADVANCED, advsetting) && (advsetting == "YES")) @@ -326,36 +327,36 @@ ChatPage::load() else ui.DontSendTyping->hide(); - ui.sbSearch_CharToStart->setValue(Settings->getChatSearchCharToStartSearch()); - ui.cbSearch_CaseSensitively->setChecked(Settings->getChatSearchCaseSensitively()); - ui.cbSearch_WholeWords->setChecked(Settings->getChatSearchWholeWords()); - ui.cbSearch_MoveToCursor->setChecked(Settings->getChatSearchMoveToCursor()); - ui.cbSearch_WithoutLimit->setChecked(Settings->getChatSearchSearchWithoutLimit()); - ui.sbSearch_MaxLimitColor->setValue(Settings->getChatSearchMaxSearchLimitColor()); + whileBlocking(ui.sbSearch_CharToStart)->setValue(Settings->getChatSearchCharToStartSearch()); + whileBlocking(ui.cbSearch_CaseSensitively)->setChecked(Settings->getChatSearchCaseSensitively()); + whileBlocking(ui.cbSearch_WholeWords)->setChecked(Settings->getChatSearchWholeWords()); + whileBlocking(ui.cbSearch_MoveToCursor)->setChecked(Settings->getChatSearchMoveToCursor()); + whileBlocking(ui.cbSearch_WithoutLimit)->setChecked(Settings->getChatSearchSearchWithoutLimit()); + whileBlocking(ui.sbSearch_MaxLimitColor)->setValue(Settings->getChatSearchMaxSearchLimitColor()); rgbChatSearchFoundColor=Settings->getChatSearchFoundColor(); QPixmap pix(24, 24); pix.fill(rgbChatSearchFoundColor); ui.btSearch_FoundColor->setIcon(pix); - ui.publicChatLoadCount->setValue(Settings->getPublicChatHistoryCount()); - ui.privateChatLoadCount->setValue(Settings->getPrivateChatHistoryCount()); - ui.lobbyChatLoadCount->setValue(Settings->getLobbyChatHistoryCount()); + whileBlocking(ui.publicChatLoadCount)->setValue(Settings->getPublicChatHistoryCount()); + whileBlocking(ui.privateChatLoadCount)->setValue(Settings->getPrivateChatHistoryCount()); + whileBlocking(ui.lobbyChatLoadCount)->setValue(Settings->getLobbyChatHistoryCount()); - ui.publicChatEnable->setChecked(rsHistory->getEnable(RS_HISTORY_TYPE_PUBLIC)); - ui.privateChatEnable->setChecked(rsHistory->getEnable(RS_HISTORY_TYPE_PRIVATE)); - ui.lobbyChatEnable->setChecked(rsHistory->getEnable(RS_HISTORY_TYPE_LOBBY)); + whileBlocking(ui.publicChatEnable)->setChecked(rsHistory->getEnable(RS_HISTORY_TYPE_PUBLIC)); + whileBlocking(ui.privateChatEnable)->setChecked(rsHistory->getEnable(RS_HISTORY_TYPE_PRIVATE)); + whileBlocking(ui.lobbyChatEnable)->setChecked(rsHistory->getEnable(RS_HISTORY_TYPE_LOBBY)); - ui.publicChatSaveCount->setValue(rsHistory->getSaveCount(RS_HISTORY_TYPE_PUBLIC)); - ui.privateChatSaveCount->setValue(rsHistory->getSaveCount(RS_HISTORY_TYPE_PRIVATE)); - ui.lobbyChatSaveCount->setValue(rsHistory->getSaveCount(RS_HISTORY_TYPE_LOBBY)); + whileBlocking(ui.publicChatSaveCount)->setValue(rsHistory->getSaveCount(RS_HISTORY_TYPE_PUBLIC)); + whileBlocking(ui.privateChatSaveCount)->setValue(rsHistory->getSaveCount(RS_HISTORY_TYPE_PRIVATE)); + whileBlocking(ui.lobbyChatSaveCount)->setValue(rsHistory->getSaveCount(RS_HISTORY_TYPE_LOBBY)); // using fontTempChat.rawname() does not always work! // see http://doc.qt.digia.com/qt-maemo/qfont.html#rawName QStringList fontname = fontTempChat.toString().split(","); - ui.labelChatFontPreview->setText(fontname[0]); - ui.labelChatFontPreview->setFont(fontTempChat); + whileBlocking(ui.labelChatFontPreview)->setText(fontname[0]); + whileBlocking(ui.labelChatFontPreview)->setFont(fontTempChat); - ui.max_storage_period->setValue(rsHistory->getMaxStorageDuration()/86400) ; + whileBlocking(ui.max_storage_period)->setValue(rsHistory->getMaxStorageDuration()/86400) ; /* Load styles */ publicStylePath = loadStyleInfo(ChatStyle::TYPE_PUBLIC, ui.publicStyle, ui.publicComboBoxVariant, publicStyleVariant); @@ -372,14 +373,14 @@ ChatPage::load() uint chatflags = Settings->getChatFlags(); - ui.chat_NewWindow->setChecked(chatflags & RS_CHAT_OPEN); - ui.chat_Focus->setChecked(chatflags & RS_CHAT_FOCUS); - ui.chat_tabbedWindow->setChecked(chatflags & RS_CHAT_TABBED_WINDOW); - ui.chat_Blink->setChecked(chatflags & RS_CHAT_BLINK); + whileBlocking(ui.chat_NewWindow)->setChecked(chatflags & RS_CHAT_OPEN); + whileBlocking(ui.chat_Focus)->setChecked(chatflags & RS_CHAT_FOCUS); + whileBlocking(ui.chat_tabbedWindow)->setChecked(chatflags & RS_CHAT_TABBED_WINDOW); + whileBlocking(ui.chat_Blink)->setChecked(chatflags & RS_CHAT_BLINK); uint chatLobbyFlags = Settings->getChatLobbyFlags(); - ui.chatLobby_Blink->setChecked(chatLobbyFlags & RS_CHATLOBBY_BLINK); + whileBlocking(ui.chatLobby_Blink)->setChecked(chatLobbyFlags & RS_CHATLOBBY_BLINK); // load personal invites // diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp index 7fdd90cbb..bf75e81b5 100755 --- a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp +++ b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp @@ -21,6 +21,7 @@ #include "DirectoriesPage.h" #include "gui/ShareManager.h" +#include "util/misc.h" #include #include "rshare.h" @@ -62,15 +63,15 @@ void DirectoriesPage::updateFollowSymLinks() { rsFiles->setFollow /** Loads the settings for this page */ void DirectoriesPage::load() { - ui.shareDownloadDirectoryCB->setChecked(rsFiles->getShareDownloadDirectory()); + whileBlocking(ui.shareDownloadDirectoryCB)->setChecked(rsFiles->getShareDownloadDirectory()); int u = rsFiles->watchPeriod() ; - ui.autoCheckDirectoriesDelay_SB->setValue(u) ; - ui.autoCheckDirectories_CB->setChecked(rsFiles->watchEnabled()) ; ; + whileBlocking(ui.autoCheckDirectoriesDelay_SB)->setValue(u) ; + whileBlocking(ui.autoCheckDirectories_CB)->setChecked(rsFiles->watchEnabled()) ; ; - ui.incomingDir->setText(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str())); - ui.partialsDir->setText(QString::fromUtf8(rsFiles->getPartialsDirectory().c_str())); - ui.followSymLinks_CB->setChecked(rsFiles->followSymLinks()); + whileBlocking(ui.incomingDir)->setText(QString::fromUtf8(rsFiles->getDownloadDirectory().c_str())); + whileBlocking(ui.partialsDir)->setText(QString::fromUtf8(rsFiles->getPartialsDirectory().c_str())); + whileBlocking(ui.followSymLinks_CB)->setChecked(rsFiles->followSymLinks()); } void DirectoriesPage::setIncomingDirectory() diff --git a/retroshare-gui/src/gui/settings/ForumPage.cpp b/retroshare-gui/src/gui/settings/ForumPage.cpp index d7681762e..ef1c5dbe4 100644 --- a/retroshare-gui/src/gui/settings/ForumPage.cpp +++ b/retroshare-gui/src/gui/settings/ForumPage.cpp @@ -20,6 +20,7 @@ ****************************************************************/ #include "ForumPage.h" +#include "util/misc.h" #include "rsharesettings.h" ForumPage::ForumPage(QWidget * parent, Qt::WindowFlags flags) @@ -51,10 +52,10 @@ void ForumPage::updateLoadEmoticons() { Settings->setForumLoadEmoticons( /** Loads the settings for this page */ void ForumPage::load() { - ui.setMsgToReadOnActivate->setChecked(Settings->getForumMsgSetToReadOnActivate()); - ui.expandNewMessages->setChecked(Settings->getForumExpandNewMessages()); - ui.loadEmbeddedImages->setChecked(Settings->getForumLoadEmbeddedImages()); - ui.loadEmoticons->setChecked(Settings->getForumLoadEmoticons()); + whileBlocking(ui.setMsgToReadOnActivate)->setChecked(Settings->getForumMsgSetToReadOnActivate()); + whileBlocking(ui.expandNewMessages)->setChecked(Settings->getForumExpandNewMessages()); + whileBlocking(ui.loadEmbeddedImages)->setChecked(Settings->getForumLoadEmbeddedImages()); + whileBlocking(ui.loadEmoticons)->setChecked(Settings->getForumLoadEmoticons()); ui.groupFrameSettingsWidget->loadSettings(GroupFrameSettings::Forum); } diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp index deed5a031..5d8a8e21b 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.cpp +++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp @@ -27,6 +27,7 @@ #include "GeneralPage.h" #include +#include #include #include "rsharesettings.h" #include @@ -157,7 +158,7 @@ void GeneralPage::load() ui.chkRunRetroshareAtSystemStartupMinimized->setChecked(minimized); #endif - ui.checkStartMinimized->setChecked(Settings->getStartMinimized()); + whileBlocking(ui.checkStartMinimized)->setChecked(Settings->getStartMinimized()); bool advancedmode = false; std::string advsetting; @@ -165,13 +166,13 @@ void GeneralPage::load() { advancedmode = true; } - ui.checkAdvanced->setChecked(advancedmode); + whileBlocking(ui.checkAdvanced)->setChecked(advancedmode); - ui.checkQuit->setChecked(Settings->value("doQuit", false).toBool()); - ui.checkCloseToTray->setChecked(Settings->getCloseToTray()); - ui.autoLogin->setChecked(RsInit::getAutoLogin()); - ui.registerRetroShareProtocol->setChecked(Settings->getRetroShareProtocol()); - ui.useLocalServer->setChecked(Settings->getUseLocalServer()); + whileBlocking(ui.checkQuit)->setChecked(Settings->value("doQuit", false).toBool()); + whileBlocking(ui.checkCloseToTray)->setChecked(Settings->getCloseToTray()); + whileBlocking(ui.autoLogin)->setChecked(RsInit::getAutoLogin()); + whileBlocking(ui.registerRetroShareProtocol)->setChecked(Settings->getRetroShareProtocol()); + whileBlocking(ui.useLocalServer)->setChecked(Settings->getUseLocalServer()); - ui.idleSpinBox->setValue(Settings->getMaxTimeBeforeIdle()); + whileBlocking(ui.idleSpinBox)->setValue(Settings->getMaxTimeBeforeIdle()); } diff --git a/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp b/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp index cfbcd3783..a8ebb75bd 100644 --- a/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp +++ b/retroshare-gui/src/gui/settings/GroupFrameSettingsWidget.cpp @@ -1,6 +1,7 @@ #include #include "gui/notifyqt.h" +#include "util/misc.h" #include "GroupFrameSettingsWidget.h" #include "ui_GroupFrameSettingsWidget.h" @@ -33,8 +34,8 @@ void GroupFrameSettingsWidget::loadSettings(GroupFrameSettings::Type type) GroupFrameSettings groupFrameSettings; if (Settings->getGroupFrameSettings(type, groupFrameSettings)) { - ui->openAllInNewTabCheckBox->setChecked(groupFrameSettings.mOpenAllInNewTab); - ui->hideTabBarWithOneTabCheckBox->setChecked(groupFrameSettings.mHideTabBarWithOneTab); + whileBlocking(ui->openAllInNewTabCheckBox)->setChecked(groupFrameSettings.mOpenAllInNewTab); + whileBlocking(ui->hideTabBarWithOneTabCheckBox)->setChecked(groupFrameSettings.mHideTabBarWithOneTab); } else { hide(); mEnable = false; diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp index 1aa4509f0..cc2b41ca8 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.cpp +++ b/retroshare-gui/src/gui/settings/MessagePage.cpp @@ -24,6 +24,7 @@ #include "retroshare/rsmsgs.h" #include "MessagePage.h" +#include "util/misc.h" #include "gui/common/TagDefs.h" #include #include "NewTag.h" @@ -110,20 +111,20 @@ void MessagePage::updateMsgTags() void MessagePage::load() { - ui.setMsgToReadOnActivate->setChecked(Settings->getMsgSetToReadOnActivate()); - ui.loadEmbeddedImages->setChecked(Settings->getMsgLoadEmbeddedImages()); - ui.openComboBox->setCurrentIndex(ui.openComboBox->findData(Settings->getMsgOpen())); + whileBlocking(ui.setMsgToReadOnActivate)->setChecked(Settings->getMsgSetToReadOnActivate()); + whileBlocking(ui.loadEmbeddedImages)->setChecked(Settings->getMsgLoadEmbeddedImages()); + whileBlocking(ui.openComboBox)->setCurrentIndex(ui.openComboBox->findData(Settings->getMsgOpen())); // state of filter combobox uint32_t flags = rsMail->getDistantMessagingPermissionFlags() ; if(flags & RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_FILTER_EVERYBODY) - ui.comboBox->setCurrentIndex(2); + whileBlocking(ui.comboBox)->setCurrentIndex(2); else if(flags & RS_DISTANT_MESSAGING_CONTACT_PERMISSION_FLAG_FILTER_NON_CONTACTS) - ui.comboBox->setCurrentIndex(1); + whileBlocking(ui.comboBox)->setCurrentIndex(1); else - ui.comboBox->setCurrentIndex(0); + whileBlocking(ui.comboBox)->setCurrentIndex(0); // fill items rsMail->getMessageTagTypes(*m_pTags);