diff -r d71eab9be477 -r 67b92e2cb719 src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Sat Nov 30 17:47:23 2024 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Sun Dec 01 14:55:31 2024 +0100
@@ -91,7 +91,7 @@
<item>
<spacer name="verticalSpacer">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -146,6 +146,26 @@
</property>
</widget>
</item>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="shelveCheckBox">
+ <property name="toolTip">
+ <string>Select to activate the shelve extension</string>
+ </property>
+ <property name="text">
+ <string>Shelve</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QCheckBox" name="rebaseCheckBox">
+ <property name="toolTip">
+ <string>Select to activate the rebase extension</string>
+ </property>
+ <property name="text">
+ <string>Rebase</string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="0">
<widget class="QCheckBox" name="histeditCheckBox">
<property name="toolTip">
@@ -186,36 +206,6 @@
</property>
</widget>
</item>
- <item row="3" column="0">
- <widget class="QCheckBox" name="rebaseCheckBox">
- <property name="toolTip">
- <string>Select to activate the rebase extension</string>
- </property>
- <property name="text">
- <string>Rebase</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QCheckBox" name="shelveCheckBox">
- <property name="toolTip">
- <string>Select to activate the shelve extension</string>
- </property>
- <property name="text">
- <string>Shelve</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QCheckBox" name="stripCheckBox">
- <property name="toolTip">
- <string>Select to activate the strip extension</string>
- </property>
- <property name="text">
- <string>Strip</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -241,7 +231,7 @@
<string>Enter the minimum file size in MB for files to be treated as Large Files</string>
</property>
<property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<property name="suffix">
<string> MB</string>
@@ -257,7 +247,7 @@
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -303,7 +293,7 @@
</sizepolicy>
</property>
<property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
+ <enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Enter the name of the user cache directory</string>
@@ -316,7 +306,7 @@
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -404,7 +394,7 @@
<string>Enter the password for the network proxy</string>
</property>
<property name="echoMode">
- <enum>QLineEdit::Password</enum>
+ <enum>QLineEdit::EchoMode::Password</enum>
</property>
<property name="placeholderText">
<string>Enter Proxy Password</string>
@@ -443,7 +433,7 @@
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -527,7 +517,7 @@
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -568,7 +558,7 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -635,7 +625,7 @@
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -667,10 +657,10 @@
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
