--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sat Feb 04 20:18:58 2017 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sat Feb 04 20:20:20 2017 +0100
@@ -13,10 +13,33 @@
<property name="windowTitle">
<string>Mercurial Log</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
+ <widget class="QToolButton" name="actionsButton">
+ <property name="toolTip">
+ <string>Select action from menu</string>
+ </property>
+ <property name="popupMode">
+ <enum>QToolButton::InstantPopup</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_5">
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <property name="lineWidth">
+ <number>2</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QComboBox" name="modeComboBox">
<property name="toolTip">
<string>Select the mode (find or filter)</string>
@@ -148,7 +171,7 @@
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
- <verstretch>7</verstretch>
+ <verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="alternatingRowColors">
@@ -209,98 +232,41 @@
</widget>
</item>
<item>
- <widget class="QSplitter" name="splitter">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>8</verstretch>
- </sizepolicy>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <widget class="QSplitter" name="commitSplitter">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>3</verstretch>
- </sizepolicy>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="childrenCollapsible">
- <bool>false</bool>
- </property>
- <widget class="QTextBrowser" name="detailsEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>1</horstretch>
- <verstretch>3</verstretch>
- </sizepolicy>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QToolButton" name="upButton">
+ <property name="toolTip">
+ <string>Press to move up in the log list</string>
</property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- <property name="openLinks">
- <bool>false</bool>
- </property>
- </widget>
- <widget class="QTextEdit" name="messageEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>2</horstretch>
- <verstretch>3</verstretch>
- </sizepolicy>
- </property>
- <property name="readOnly">
+ <property name="autoRepeat">
<bool>true</bool>
</property>
</widget>
- </widget>
- <widget class="QTreeWidget" name="filesTree">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>4</verstretch>
- </sizepolicy>
- </property>
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="itemsExpandable">
- <bool>false</bool>
- </property>
- <property name="sortingEnabled">
- <bool>true</bool>
- </property>
- <property name="allColumnsShowFocus">
- <bool>true</bool>
- </property>
- <column>
- <property name="text">
- <string>Action</string>
+ </item>
+ <item>
+ <widget class="QToolButton" name="downButton">
+ <property name="toolTip">
+ <string>Press to move down in the log list</string>
+ </property>
+ <property name="autoRepeat">
+ <bool>true</bool>
</property>
- </column>
- <column>
- <property name="text">
- <string>Path</string>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_6">
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
</property>
- </column>
- <column>
- <property name="text">
- <string>Copy from</string>
+ <property name="lineWidth">
+ <number>2</number>
</property>
- </column>
- </widget>
- </widget>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QPushButton" name="nextButton">
<property name="toolTip">
<string>Press to get the next bunch of log entries</string>
@@ -310,7 +276,7 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item>
<widget class="QSpinBox" name="limitSpinBox">
<property name="toolTip">
<string>Enter the limit of entries to fetch</string>
@@ -329,7 +295,7 @@
</property>
</widget>
</item>
- <item row="0" column="2">
+ <item>
<widget class="QCheckBox" name="stopCheckBox">
<property name="toolTip">
<string>Select to stop listing log messages at a copy or move</string>
@@ -339,118 +305,200 @@
</property>
</widget>
</item>
- <item row="0" column="3" rowspan="2">
- <widget class="Line" name="line">
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <property name="lineWidth">
- <number>2</number>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QToolButton" name="upButton">
- <property name="toolTip">
- <string>Press to move up in the log list</string>
- </property>
- <property name="autoRepeat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="5">
- <widget class="QToolButton" name="downButton">
- <property name="toolTip">
- <string>Press to move down in the log list</string>
- </property>
- <property name="autoRepeat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="6">
- <widget class="QPushButton" name="diffP1Button">
- <property name="toolTip">
- <string>Press to generate a diff to the first parent revision</string>
- </property>
- <property name="text">
- <string>Diff to Parent &1</string>
- </property>
- </widget>
- </item>
- <item row="0" column="7">
- <widget class="QPushButton" name="diffP2Button">
- <property name="toolTip">
- <string>Press to generate a diff to the second parent revision</string>
- </property>
- <property name="text">
- <string>Diff to Parent &2</string>
- </property>
- </widget>
- </item>
- <item row="0" column="8">
- <widget class="QPushButton" name="diffRevisionsButton">
- <property name="toolTip">
- <string>Press to compare two revisions</string>
- </property>
- <property name="text">
- <string>&Compare Revisions</string>
- </property>
- </widget>
- </item>
- <item row="0" column="9" rowspan="2">
- <widget class="Line" name="phaseLine">
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <property name="lineWidth">
- <number>2</number>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="10">
- <widget class="QToolButton" name="actionsButton">
- <property name="toolTip">
- <string>Select action from menu</string>
- </property>
- <property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="11">
- <spacer>
+ <item>
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>38</width>
- <height>18</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="4" colspan="5">
- <widget class="QCheckBox" name="sbsCheckBox">
- <property name="toolTip">
- <string>Select to show differences side-by-side</string>
+ <item>
+ <widget class="QLabel" name="sbsSelectLabel">
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
</property>
<property name="text">
- <string>Show differences side-by-side</string>
+ <string/>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
+ <widget class="QSplitter" name="splitter_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <widget class="QTextBrowser" name="detailsEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>3</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="openLinks">
+ <bool>false</bool>
+ </property>
+ </widget>
+ <widget class="QSplitter" name="diffSplitter">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>7</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <widget class="QTreeWidget" name="filesTree">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>7</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="allColumnsShowFocus">
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text">
+ <string>Action</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Path</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Copy from</string>
+ </property>
+ </column>
+ </widget>
+ <widget class="QWidget" name="layoutWidget">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="diffLabel">
+ <property name="text">
+ <string>Differences</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="diffSelectLabel">
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="saveLabel">
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string><a href="save:me">Save</a></string>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QTextEdit" name="diffEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>7</horstretch>
+ <verstretch>2</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="tabChangesFocus">
+ <bool>true</bool>
+ </property>
+ <property name="lineWrapMode">
+ <enum>QTextEdit::NoWrap</enum>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="acceptRichText">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="phaseLine">
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <property name="lineWidth">
+ <number>2</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QGroupBox" name="errorGroup">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@@ -556,6 +604,7 @@
</customwidget>
</customwidgets>
<tabstops>
+ <tabstop>actionsButton</tabstop>
<tabstop>modeComboBox</tabstop>
<tabstop>fromDate</tabstop>
<tabstop>toDate</tabstop>
@@ -565,19 +614,17 @@
<tabstop>findPrevButton</tabstop>
<tabstop>findNextButton</tabstop>
<tabstop>logTree</tabstop>
- <tabstop>detailsEdit</tabstop>
- <tabstop>messageEdit</tabstop>
- <tabstop>filesTree</tabstop>
+ <tabstop>upButton</tabstop>
+ <tabstop>downButton</tabstop>
<tabstop>nextButton</tabstop>
<tabstop>limitSpinBox</tabstop>
<tabstop>stopCheckBox</tabstop>
- <tabstop>upButton</tabstop>
- <tabstop>downButton</tabstop>
- <tabstop>diffP1Button</tabstop>
- <tabstop>diffP2Button</tabstop>
- <tabstop>diffRevisionsButton</tabstop>
- <tabstop>sbsCheckBox</tabstop>
- <tabstop>actionsButton</tabstop>
+ <tabstop>sbsSelectLabel</tabstop>
+ <tabstop>detailsEdit</tabstop>
+ <tabstop>filesTree</tabstop>
+ <tabstop>diffSelectLabel</tabstop>
+ <tabstop>saveLabel</tabstop>
+ <tabstop>diffEdit</tabstop>
<tabstop>errors</tabstop>
<tabstop>input</tabstop>
<tabstop>passwordCheckBox</tabstop>
