# # # patch "src/view/dialogs/CommitRevision.cpp" # from [967f3717219dbeafb3cbf4c46ec0aee4d14f777e] # to [e2dc4e32204e8eda39986d21e88d7d0317bb4969] # # patch "src/view/dialogs/FileDiff.cpp" # from [be3871dc581a46e38867d124ea792f4da757f5cc] # to [5a071f40acfd5cd838526501a11fb6da659b491a] # # patch "src/view/dialogs/OpenPrompt.cpp" # from [ed5bf1ad8f23e68fc35ec4d67bbb188b2a95613b] # to [8dbef3991234b99f94ed430970182cb1180ecef3] # ============================================================ --- src/view/dialogs/FileDiff.cpp be3871dc581a46e38867d124ea792f4da757f5cc +++ src/view/dialogs/FileDiff.cpp 5a071f40acfd5cd838526501a11fb6da659b491a @@ -131,18 +131,10 @@ void FileDiff::init(const MonotoneHandle encoding = attrval.first; } - disconnect( - textEncoding, SIGNAL(currentIndexChanged(const QString &)), - this, SLOT(switchOutputEncoding(const QString &)) - ); - + textEncoding->blockSignals(true); textEncoding->setCurrentIndex(textEncoding->findText(encoding)); + textEncoding->blockSignals(false); - connect( - textEncoding, SIGNAL(currentIndexChanged(const QString &)), - this, SLOT(switchOutputEncoding(const QString &)) - ); - setWindowTitle(tr("Loading file differences")); diffModel->readDiff(monotoneHandle, fileName, base, target, encoding); ============================================================ --- src/view/dialogs/CommitRevision.cpp 967f3717219dbeafb3cbf4c46ec0aee4d14f777e +++ src/view/dialogs/CommitRevision.cpp e2dc4e32204e8eda39986d21e88d7d0317bb4969 @@ -46,6 +46,11 @@ CommitRevision::CommitRevision(QWidget * ); connect( + previousChangelogEntryList, SIGNAL(currentIndexChanged(int)), + this, SLOT(setChangelogEntryFromList(int)) + ); + + connect( changesAgainstParent, SIGNAL(currentIndexChanged(const QString &)), revModel, SLOT(showChangesAgainstParent(const QString &)) ); @@ -67,15 +72,12 @@ void CommitRevision::readWorkspaceRevisi // while we're inserting items we don't want to receive these signals // i.e. we don't want to pre-fill the changelog text - disconnect( - previousChangelogEntryList, SIGNAL(currentIndexChanged(int)), - this, SLOT(setChangelogEntryFromList(int)) - ); + previousChangelogEntryList->blockSignals(true); + previousChangelogEntryList->clear(); QStringList entries = Settings::getItemList("ChangelogEntries"); QRegExp re("\\s+"); - previousChangelogEntryList->clear(); for (int i=0, j=entries.size(); iinsertItem(i, shortened, QVariant(entry)); } - previousChangelogEntryList->setCurrentIndex(-1); - connect( - previousChangelogEntryList, SIGNAL(currentIndexChanged(int)), - this, SLOT(setChangelogEntryFromList(int)) - ); + previousChangelogEntryList->setCurrentIndex(-1); + previousChangelogEntryList->blockSignals(false); QMap privateKeys = MonotoneUtil::getPrivateKeyMap(monotoneHandle); ============================================================ --- src/view/dialogs/OpenPrompt.cpp ed5bf1ad8f23e68fc35ec4d67bbb188b2a95613b +++ src/view/dialogs/OpenPrompt.cpp 8dbef3991234b99f94ed430970182cb1180ecef3 @@ -167,11 +167,7 @@ void OpenPrompt::updateRecentLists() void OpenPrompt::updateRecentLists() { - disconnect( - recentWorkspaces, SIGNAL(currentIndexChanged(int)), - this, SLOT(recentWorkspacesChanged(int)) - ); - + recentWorkspaces->blockSignals(true); QStringList workspaces = Settings::getItemList("RecentWorkspaceList"); if (workspaces.size() > 0) @@ -183,17 +179,9 @@ void OpenPrompt::updateRecentLists() { recentWorkspaces->setEnabled(false); } + recentWorkspaces->blockSignals(false); - connect( - recentWorkspaces, SIGNAL(currentIndexChanged(int)), - this, SLOT(recentWorkspacesChanged(int)) - ); - - disconnect( - recentDatabases, SIGNAL(currentIndexChanged(int)), - this, SLOT(recentDatabasesChanged(int)) - ); - + recentDatabases->blockSignals(true); QStringList databases = Settings::getItemList("RecentDatabaseList"); if (databases.size() > 0) @@ -205,17 +193,9 @@ void OpenPrompt::updateRecentLists() { recentDatabases->setEnabled(false); } + recentDatabases->blockSignals(false); - connect( - recentDatabases, SIGNAL(currentIndexChanged(int)), - this, SLOT(recentDatabasesChanged(int)) - ); - - disconnect( - recentServers, SIGNAL(currentIndexChanged(int)), - this, SLOT(recentServersChanged(int)) - ); - + recentServers->blockSignals(true); QStringList servers = Settings::getItemList("RecentServerList"); if (servers.size() > 0) @@ -240,11 +220,7 @@ void OpenPrompt::updateRecentLists() { recentServers->setEnabled(false); } - - connect( - recentServers, SIGNAL(currentIndexChanged(int)), - this, SLOT(recentServersChanged(int)) - ); + recentServers->blockSignals(false); } void OpenPrompt::checkForPrivateKeys()