diff options
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/mercurial/optionspage.cpp | 3 | ||||
-rw-r--r-- | src/plugins/mercurial/optionspage.ui | 44 |
3 files changed, 18 insertions, 31 deletions
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index abd529c2ad..8febeebee6 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -606,7 +606,7 @@ bool MercurialPlugin::submitEditorAboutToClose() Core::IDocument *editorFile = commitEditor->document(); QTC_ASSERT(editorFile, return true); - bool dummyPrompt = mercurialSettings.boolValue(MercurialSettings::promptOnSubmitKey); + bool dummyPrompt = false; const VcsBaseSubmitEditor::PromptSubmitResult response = commitEditor->promptSubmit(tr("Close Commit Editor"), tr("Do you want to commit the changes?"), tr("Message check failed. Do you want to proceed?"), diff --git a/src/plugins/mercurial/optionspage.cpp b/src/plugins/mercurial/optionspage.cpp index fa51834145..79e5ca41ad 100644 --- a/src/plugins/mercurial/optionspage.cpp +++ b/src/plugins/mercurial/optionspage.cpp @@ -56,7 +56,6 @@ MercurialSettings OptionsPageWidget::settings() const s.setValue(MercurialSettings::userEmailKey, m_ui.defaultEmailLineEdit->text().trimmed()); s.setValue(MercurialSettings::logCountKey, m_ui.logEntriesCount->value()); s.setValue(MercurialSettings::timeoutKey, m_ui.timeout->value()); - s.setValue(MercurialSettings::promptOnSubmitKey, m_ui.promptOnSubmitCheckBox->isChecked()); return s; } @@ -67,7 +66,6 @@ void OptionsPageWidget::setSettings(const MercurialSettings &s) m_ui.defaultEmailLineEdit->setText(s.stringValue(MercurialSettings::userEmailKey)); m_ui.logEntriesCount->setValue(s.intValue(MercurialSettings::logCountKey)); m_ui.timeout->setValue(s.intValue(MercurialSettings::timeoutKey)); - m_ui.promptOnSubmitCheckBox->setChecked(s.boolValue(MercurialSettings::promptOnSubmitKey)); } QString OptionsPageWidget::searchKeywords() const @@ -83,7 +81,6 @@ QString OptionsPageWidget::searchKeywords() const << sep << m_ui.miscGroupBox->title() << sep << m_ui.showLogEntriesLabel->text() << sep << m_ui.timeoutSecondsLabel->text() - << sep << m_ui.promptOnSubmitCheckBox->text() ; rc.remove(QLatin1Char('&')); return rc; diff --git a/src/plugins/mercurial/optionspage.ui b/src/plugins/mercurial/optionspage.ui index 00f4362d27..2a763c596b 100644 --- a/src/plugins/mercurial/optionspage.ui +++ b/src/plugins/mercurial/optionspage.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>617</width> - <height>327</height> + <height>268</height> </rect> </property> <property name="windowTitle"> @@ -82,26 +82,6 @@ <string>Miscellaneous</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="showLogEntriesLabel"> - <property name="text"> - <string>Log count:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="logEntriesCount"> - <property name="toolTip"> - <string>The number of recent commit logs to show, choose 0 to see all entries.</string> - </property> - <property name="maximum"> - <number>100</number> - </property> - <property name="value"> - <number>100</number> - </property> - </widget> - </item> <item row="0" column="2"> <widget class="QLabel" name="timeoutSecondsLabel"> <property name="text"> @@ -132,13 +112,23 @@ </property> </spacer> </item> - <item row="1" column="0" colspan="2"> - <widget class="QCheckBox" name="promptOnSubmitCheckBox"> - <property name="text"> - <string>Prompt on submit</string> + <item row="0" column="1"> + <widget class="QSpinBox" name="logEntriesCount"> + <property name="toolTip"> + <string>The number of recent commit logs to show, choose 0 to see all entries.</string> + </property> + <property name="maximum"> + <number>100</number> </property> - <property name="checked"> - <bool>true</bool> + <property name="value"> + <number>100</number> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="showLogEntriesLabel"> + <property name="text"> + <string>Log count:</string> </property> </widget> </item> |