--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sun Jan 18 16:09:07 2015 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sun Jan 18 17:28:53 2015 +0100
@@ -13,96 +13,30 @@
<property name="windowTitle">
<string>Mercurial Log</string>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="5" column="0" colspan="2">
- <widget class="QGroupBox" name="errorGroup">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>1</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Errors</string>
- </property>
- <layout class="QVBoxLayout">
- <item>
- <widget class="QTextEdit" name="errors">
- <property name="whatsThis">
- <string><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></string>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- <property name="acceptRichText">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="6" column="0" colspan="2">
- <widget class="QGroupBox" name="inputGroup">
- <property name="title">
- <string>Input</string>
- </property>
- <layout class="QGridLayout">
- <item row="1" column="1">
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>327</width>
- <height>29</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="2">
- <widget class="QPushButton" name="sendButton">
- <property name="toolTip">
- <string>Press to send the input to the hg process</string>
- </property>
- <property name="text">
- <string>&Send</string>
- </property>
- <property name="shortcut">
- <string>Alt+S</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="3">
- <widget class="QLineEdit" name="input">
- <property name="toolTip">
- <string>Enter data to be sent to the hg process</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="passwordCheckBox">
- <property name="toolTip">
- <string>Select to switch the input field to password mode</string>
- </property>
- <property name="text">
- <string>&Password Mode</string>
- </property>
- <property name="shortcut">
- <string>Alt+P</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="0" column="0" colspan="2">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
+ <widget class="QComboBox" name="modeComboBox">
+ <property name="toolTip">
+ <string>Select the mode (find or filter)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_4">
+ <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="QLabel" name="label">
<property name="text">
<string>From:</string>
@@ -184,33 +118,32 @@
<property name="toolTip">
<string>Select the field to filter on</string>
</property>
- <item>
- <property name="text">
- <string>Revision</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Author</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Message</string>
- </property>
- </item>
</widget>
</item>
<item>
<widget class="E5ClearableLineEdit" name="rxEdit">
<property name="toolTip">
- <string>Enter the regular expression to filter on</string>
+ <string>Enter the regular expression to filter on or search for</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="findPrevButton">
+ <property name="toolTip">
+ <string>Press to find the previous occurrence</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="findNextButton">
+ <property name="toolTip">
+ <string>Press to find the next occurrence</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="1" column="0" colspan="2">
+ <item>
<widget class="QTreeWidget" name="logTree">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -275,20 +208,45 @@
</column>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QTextEdit" name="messageEdit">
+ <item>
+ <widget class="QSplitter" name="commitSplitter">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>2</horstretch>
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
<verstretch>3</verstretch>
</sizepolicy>
</property>
- <property name="readOnly">
- <bool>true</bool>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="childrenCollapsible">
+ <bool>false</bool>
</property>
+ <widget class="QTextEdit" name="detailsEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>1</horstretch>
+ <verstretch>3</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="readOnly">
+ <bool>true</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">
+ <bool>true</bool>
+ </property>
+ </widget>
</widget>
</item>
- <item row="3" column="0" colspan="2">
+ <item>
<widget class="QTreeWidget" name="filesTree">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -328,7 +286,7 @@
</column>
</widget>
</item>
- <item row="4" column="0" colspan="2">
+ <item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QPushButton" name="nextButton">
@@ -460,7 +418,93 @@
</item>
</layout>
</item>
- <item row="7" column="0" colspan="2">
+ <item>
+ <widget class="QGroupBox" name="errorGroup">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>1</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Errors</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QTextEdit" name="errors">
+ <property name="whatsThis">
+ <string><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></string>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ <property name="acceptRichText">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="inputGroup">
+ <property name="title">
+ <string>Input</string>
+ </property>
+ <layout class="QGridLayout">
+ <item row="1" column="1">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>327</width>
+ <height>29</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="2">
+ <widget class="QPushButton" name="sendButton">
+ <property name="toolTip">
+ <string>Press to send the input to the hg process</string>
+ </property>
+ <property name="text">
+ <string>&Send</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+S</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" colspan="3">
+ <widget class="QLineEdit" name="input">
+ <property name="toolTip">
+ <string>Enter data to be sent to the hg process</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="passwordCheckBox">
+ <property name="toolTip">
+ <string>Select to switch the input field to password mode</string>
+ </property>
+ <property name="text">
+ <string>&Password Mode</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+P</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -470,19 +514,6 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QTextEdit" name="detailsEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>1</horstretch>
- <verstretch>3</verstretch>
- </sizepolicy>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</widget>
<customwidgets>
@@ -493,11 +524,14 @@
</customwidget>
</customwidgets>
<tabstops>
+ <tabstop>modeComboBox</tabstop>
<tabstop>fromDate</tabstop>
<tabstop>toDate</tabstop>
<tabstop>branchCombo</tabstop>
<tabstop>fieldCombo</tabstop>
<tabstop>rxEdit</tabstop>
+ <tabstop>findPrevButton</tabstop>
+ <tabstop>findNextButton</tabstop>
<tabstop>logTree</tabstop>
<tabstop>detailsEdit</tabstop>
<tabstop>messageEdit</tabstop>
@@ -514,7 +548,6 @@
<tabstop>input</tabstop>
<tabstop>passwordCheckBox</tabstop>
<tabstop>sendButton</tabstop>
- <tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections/>
