--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Fri May 21 18:01:11 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Fri May 21 20:14:48 2021 +0200 @@ -20,7 +20,7 @@ <item> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="tab"> <attribute name="title"> @@ -53,13 +53,16 @@ </widget> </item> <item row="0" column="1"> - <widget class="E5ClearableLineEdit" name="userNameEdit"> + <widget class="QLineEdit" name="userNameEdit"> <property name="toolTip"> <string>Enter the user name</string> </property> <property name="placeholderText"> <string>Enter your name</string> </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> </widget> </item> <item row="1" column="0"> @@ -70,13 +73,16 @@ </widget> </item> <item row="1" column="1"> - <widget class="E5ClearableLineEdit" name="emailEdit"> + <widget class="QLineEdit" name="emailEdit"> <property name="toolTip"> <string>Enter the email address</string> </property> <property name="placeholderText"> <string>Enter your email address</string> </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> </widget> </item> </layout> @@ -269,13 +275,16 @@ </widget> </item> <item row="1" column="1" colspan="2"> - <widget class="E5ClearableLineEdit" name="lfFilePatternsEdit"> + <widget class="QLineEdit" name="lfFilePatternsEdit"> <property name="toolTip"> <string>Enter file patterns (space separated) for files to be treated as Large Files</string> </property> <property name="placeholderText"> <string>Enter file patterns for large files</string> </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> </widget> </item> <item row="2" column="0"> @@ -350,13 +359,16 @@ </widget> </item> <item row="0" column="1"> - <widget class="E5ClearableLineEdit" name="proxyHostEdit"> + <widget class="QLineEdit" name="proxyHostEdit"> <property name="toolTip"> <string>Enter the network proxy host name</string> </property> <property name="placeholderText"> <string>Enter Proxy Hostname</string> </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> </widget> </item> <item row="1" column="0"> @@ -367,13 +379,16 @@ </widget> </item> <item row="1" column="1"> - <widget class="E5ClearableLineEdit" name="proxyUserEdit"> + <widget class="QLineEdit" name="proxyUserEdit"> <property name="toolTip"> <string>Enter the user name for the network proxy</string> </property> <property name="placeholderText"> <string>Enter Proxy Username</string> </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> </widget> </item> <item row="2" column="0"> @@ -384,7 +399,7 @@ </widget> </item> <item row="2" column="1"> - <widget class="E5ClearableLineEdit" name="proxyPasswordEdit"> + <widget class="QLineEdit" name="proxyPasswordEdit"> <property name="toolTip"> <string>Enter the password for the network proxy</string> </property> @@ -394,6 +409,9 @@ <property name="placeholderText"> <string>Enter Proxy Password</string> </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> </widget> </item> <item row="3" column="0"> @@ -404,7 +422,7 @@ </widget> </item> <item row="3" column="1"> - <widget class="E5ClearableLineEdit" name="proxyBypassEdit"> + <widget class="QLineEdit" name="proxyBypassEdit"> <property name="toolTip"> <string>Enter the names of hosts bypassing the network proxy sparated by comma</string> </property> @@ -414,6 +432,9 @@ <property name="placeholderText"> <string>Enter hosts bypassing the proxy separated by comma</string> </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> </widget> </item> </layout> @@ -657,11 +678,6 @@ </widget> <customwidgets> <customwidget> - <class>E5ClearableLineEdit</class> - <extends>QLineEdit</extends> - <header>E5Gui/E5LineEdit.h</header> - </customwidget> - <customwidget> <class>E5PathPicker</class> <extends>QWidget</extends> <header>E5Gui/E5PathPicker.h</header>