--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Fri Oct 21 23:14:16 2016 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Sat Oct 22 17:09:08 2016 +0200
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>436</height>
+ <width>500</width>
+ <height>500</height>
</rect>
</property>
<property name="windowTitle">
@@ -16,186 +16,474 @@
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>User Data</string>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>1</number>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Name:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="E5ClearableLineEdit" name="userNameEdit">
- <property name="toolTip">
- <string>Enter the user name</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Email:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="E5ClearableLineEdit" name="emailEdit">
- <property name="toolTip">
- <string>Enter the email address</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string>User</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>User Data</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="E5ClearableLineEdit" name="userNameEdit">
+ <property name="toolTip">
+ <string>Enter the user name</string>
+ </property>
+ <property name="placeholderText">
+ <string>Enter your name</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Email:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="E5ClearableLineEdit" name="emailEdit">
+ <property name="toolTip">
+ <string>Enter the email address</string>
+ </property>
+ <property name="placeholderText">
+ <string>Enter your email address</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>239</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
+ <string>Extensions</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Extensions</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="fetchCheckBox">
+ <property name="toolTip">
+ <string>Select to activate the fetch extension</string>
+ </property>
+ <property name="text">
+ <string>Fetch</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="gpgCheckBox">
+ <property name="toolTip">
+ <string>Select to activate the GPG extension</string>
+ </property>
+ <property name="text">
+ <string>GPG</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="largefilesCheckBox">
+ <property name="toolTip">
+ <string>Select to activate the largefiles extension</string>
+ </property>
+ <property name="text">
+ <string>Large Files</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="purgeCheckBox">
+ <property name="toolTip">
+ <string>Select to activate the Purge extension</string>
+ </property>
+ <property name="text">
+ <string>Purge</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="queuesCheckBox">
+ <property name="toolTip">
+ <string>Select to activate the queues extension</string>
+ </property>
+ <property name="text">
+ <string>Queues</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <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="0">
+ <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>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="largefilesGroup">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="title">
+ <string>Large Files</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Minimum file size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="lfFileSizeSpinBox">
+ <property name="toolTip">
+ <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>
+ </property>
+ <property name="suffix">
+ <string> MB</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>215</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Patterns:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="E5ClearableLineEdit" 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>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>User Cache:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <widget class="E5PathPicker" name="lfUserCachePicker" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enter the name of the user cache directory</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>39</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_3">
+ <attribute name="title">
+ <string>Network</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Proxy</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Host:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="E5ClearableLineEdit" name="proxyHostEdit">
+ <property name="toolTip">
+ <string>Enter the network proxy host name</string>
+ </property>
+ <property name="placeholderText">
+ <string>Enter Proxy Hostname</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>User:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="E5ClearableLineEdit" 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>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Password:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="E5ClearableLineEdit" name="proxyPasswordEdit">
+ <property name="toolTip">
+ <string>Enter the password for the network proxy</string>
+ </property>
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ <property name="placeholderText">
+ <string>Enter Proxy Password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>Bypass:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="E5ClearableLineEdit" name="proxyBypassEdit">
+ <property name="toolTip">
+ <string>Enter the names of hosts bypassing the network proxy sparated by comma</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="placeholderText">
+ <string>Enter hosts bypassing the proxy separated by comma</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_4">
+ <property name="title">
+ <string>Host Fingerprints</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QTreeWidget" name="fingerprintsList">
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <attribute name="headerStretchLastSection">
+ <bool>false</bool>
+ </attribute>
+ <column>
+ <property name="text">
+ <string>Host</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Fingerprint</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QToolButton" name="fpAddButton">
+ <property name="toolTip">
+ <string>Add a host fingerprint entry</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="fpDeleteButton">
+ <property name="toolTip">
+ <string>Delete a host fingerprint entry</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="fpEditButton">
+ <property name="toolTip">
+ <string>Edit a host fingerprint entry</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Extensions</string>
+ <widget class="QPushButton" name="editorButton">
+ <property name="toolTip">
+ <string>Open the user configuration file in a text editor</string>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QCheckBox" name="fetchCheckBox">
- <property name="toolTip">
- <string>Select to activate the fetch extension</string>
- </property>
- <property name="text">
- <string>Fetch</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="gpgCheckBox">
- <property name="toolTip">
- <string>Select to activate the GPG extension</string>
- </property>
- <property name="text">
- <string>GPG</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="largefilesCheckBox">
- <property name="toolTip">
- <string>Select to activate the largefiles extension</string>
- </property>
- <property name="text">
- <string>Large Files</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QCheckBox" name="purgeCheckBox">
- <property name="toolTip">
- <string>Select to activate the Purge extension</string>
- </property>
- <property name="text">
- <string>Purge</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QCheckBox" name="queuesCheckBox">
- <property name="toolTip">
- <string>Select to activate the queues extension</string>
- </property>
- <property name="text">
- <string>Queues</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <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="0">
- <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>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="largefilesGroup">
- <property name="enabled">
- <bool>false</bool>
+ <property name="text">
+ <string>Open configuration file in editor</string>
</property>
- <property name="title">
- <string>Large Files</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>Minimum file size:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="lfFileSizeSpinBox">
- <property name="toolTip">
- <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>
- </property>
- <property name="suffix">
- <string> MB</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>10</number>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>215</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Patterns:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QLineEdit" name="lfFilePatternsEdit">
- <property name="toolTip">
- <string>Enter file patterns (space separated) for files to be treated as Large Files</string>
- </property>
- </widget>
- </item>
- </layout>
</widget>
</item>
<item>
@@ -216,8 +504,15 @@
<extends>QLineEdit</extends>
<header>E5Gui/E5LineEdit.h</header>
</customwidget>
+ <customwidget>
+ <class>E5PathPicker</class>
+ <extends>QWidget</extends>
+ <header>E5Gui/E5PathPicker.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<tabstops>
+ <tabstop>tabWidget</tabstop>
<tabstop>userNameEdit</tabstop>
<tabstop>emailEdit</tabstop>
<tabstop>fetchCheckBox</tabstop>
@@ -229,7 +524,7 @@
<tabstop>shelveCheckBox</tabstop>
<tabstop>lfFileSizeSpinBox</tabstop>
<tabstop>lfFilePatternsEdit</tabstop>
- <tabstop>buttonBox</tabstop>
+ <tabstop>lfUserCachePicker</tabstop>
</tabstops>
<resources/>
<connections>
