Commit 63e7fe19 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Git: Remove setting for side-by-side diff

Use the diff switcher state as a permanent setting

Change-Id: I6c3669090082787ae750596cf3e62973c04d94c3
Reviewed-by: default avatarJarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 003e25d4
This diff is collapsed.
......@@ -127,12 +127,6 @@ public:
StashFlag m_flags;
};
enum DiffEditorType {
DefaultDiffEditor, // value taken from settings
SideBySideDiffEditor,
SimpleTextDiffEditor
};
static const char *stashNamePrefix;
explicit GitClient(GitSettings *settings);
......@@ -144,17 +138,13 @@ public:
QString findRepositoryForDirectory(const QString &dir);
QString findGitDirForRepository(const QString &repositoryDir) const;
void diff(const QString &workingDirectory,
const QString &fileName,
DiffEditorType editorType = DefaultDiffEditor);
void diff(const QString &workingDirectory, const QString &fileName);
void diff(const QString &workingDirectory,
const QStringList &unstagedFileNames,
const QStringList &stagedFileNames = QStringList(),
DiffEditorType editorType = DefaultDiffEditor);
const QStringList &stagedFileNames = QStringList());
void diffBranch(const QString &workingDirectory,
const QStringList &diffArgs,
const QString &branchName,
DiffEditorType editorType = DefaultDiffEditor);
const QString &branchName);
void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList());
void status(const QString &workingDirectory);
......@@ -341,8 +331,7 @@ public slots:
void show(const QString &source,
const QString &id,
const QStringList &args = QStringList(),
const QString &name = QString(),
DiffEditorType editorType = DefaultDiffEditor);
const QString &name = QString());
void saveSettings();
private slots:
......
......@@ -70,7 +70,6 @@ GitSettings SettingsPageWidget::settings() const
rc.setValue(GitSettings::pathKey, m_ui.pathLineEdit->text());
rc.setValue(GitSettings::logCountKey, m_ui.logCountSpinBox->value());
rc.setValue(GitSettings::timeoutKey, m_ui.timeoutSpinBox->value());
rc.setValue(GitSettings::useDiffEditorKey, m_ui.useDiffEditorCheckBox->isChecked());
rc.setValue(GitSettings::pullRebaseKey, m_ui.pullRebaseCheckBox->isChecked());
rc.setValue(GitSettings::showTagsKey, m_ui.showTagsCheckBox->isChecked());
rc.setValue(GitSettings::promptOnSubmitKey, m_ui.promptToSubmitCheckBox->isChecked());
......@@ -85,7 +84,6 @@ void SettingsPageWidget::setSettings(const GitSettings &s)
m_ui.pathLineEdit->setText(s.stringValue(GitSettings::pathKey));
m_ui.logCountSpinBox->setValue(s.intValue(GitSettings::logCountKey));
m_ui.timeoutSpinBox->setValue(s.intValue(GitSettings::timeoutKey));
m_ui.useDiffEditorCheckBox->setChecked(s.boolValue(GitSettings::useDiffEditorKey));
m_ui.pullRebaseCheckBox->setChecked(s.boolValue(GitSettings::pullRebaseKey));
m_ui.showTagsCheckBox->setChecked(s.boolValue(GitSettings::showTagsKey));
m_ui.promptToSubmitCheckBox->setChecked(s.boolValue(GitSettings::promptOnSubmitKey));
......
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>705</width>
<height>436</height>
<height>459</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
......@@ -60,32 +60,25 @@
<string>Miscellaneous</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="logCountLabel">
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="pullRebaseCheckBox">
<property name="text">
<string>Log count:</string>
<string>Pull with rebase</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="logCountSpinBox">
<property name="toolTip">
<string>Note that huge amount of commits might take some time.</string>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="value">
<number>1000</number>
<item row="0" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="timeoutLabel">
<property name="text">
<string>Timeout:</string>
<property name="sizeHint" stdset="0">
<size>
<width>211</width>
<height>20</height>
</size>
</property>
</widget>
</spacer>
</item>
<item row="0" column="3">
<widget class="QSpinBox" name="timeoutSpinBox">
......@@ -103,19 +96,6 @@
</property>
</widget>
</item>
<item row="0" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>211</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="promptToSubmitCheckBox">
<property name="text">
......@@ -123,24 +103,37 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="pullRebaseCheckBox">
<item row="0" column="0">
<widget class="QLabel" name="logCountLabel">
<property name="text">
<string>Pull with rebase</string>
<string>Log count:</string>
</property>
</widget>
</item>
<item row="1" column="3" colspan="2">
<widget class="QCheckBox" name="showTagsCheckBox">
<item row="0" column="2">
<widget class="QLabel" name="timeoutLabel">
<property name="text">
<string>Show tags in Branches dialog</string>
<string>Timeout:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="logCountSpinBox">
<property name="toolTip">
<string>Note that huge amount of commits might take some time.</string>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="value">
<number>1000</number>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QCheckBox" name="useDiffEditorCheckBox">
<item row="3" column="0">
<widget class="QCheckBox" name="showTagsCheckBox">
<property name="text">
<string>Show diff side-by-side</string>
<string>Show tags in Branches dialog</string>
</property>
</widget>
</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment