Mercurial Repositories > eric / changeset
changeset
Changed some layouts to make some buttons appear next to each other without space.
Mon, 04 Jun 2018 19:56:34 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 04 Jun 2018 19:56:34 +0200
- changeset 6325
- ebdcf9a36f42
- parent 6324
- b11c36cba2a1
- child 6326
- 5ef9456a0cbe
Changed some layouts to make some buttons appear next to each other without space.
--- a/Cooperation/ChatWidget.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/Cooperation/ChatWidget.ui Mon Jun 04 19:56:34 2018 +0200 @@ -105,6 +105,9 @@ <string>Share Editor</string> </property> <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> <item> <spacer name="horizontalSpacer_2"> <property name="orientation">
--- a/HexEdit/HexEditSearchWidget.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/HexEdit/HexEditSearchWidget.ui Mon Jun 04 19:56:34 2018 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>600</width> - <height>27</height> + <height>28</height> </rect> </property> <property name="sizePolicy"> @@ -19,7 +19,7 @@ <property name="windowTitle"> <string>Find</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="leftMargin"> <number>1</number> </property> @@ -82,18 +82,25 @@ </widget> </item> <item> - <widget class="QToolButton" name="findPrevButton"> - <property name="toolTip"> - <string>Press to find the previous occurrence</string> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="findNextButton"> - <property name="toolTip"> - <string>Press to find the next occurrence</string> - </property> - </widget> + <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> </layout> </widget>
--- a/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.ui Mon Jun 04 19:56:34 2018 +0200 @@ -15,7 +15,7 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> <item> <widget class="QToolButton" name="actionsButton"> <property name="toolTip"> @@ -121,103 +121,110 @@ </widget> </item> <item> - <widget class="QToolButton" name="findPrevButton"> - <property name="toolTip"> - <string>Press to find the previous occurrence</string> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="findNextButton"> - <property name="toolTip"> - <string>Press to find the next occurrence</string> - </property> - </widget> + <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> </layout> </item> <item> - <widget class="QSplitter" name="mainSplitter"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <widget class="QWidget" name="layoutWidget"> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QTreeWidget" name="logTree"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="contextMenuPolicy"> - <enum>Qt::CustomContextMenu</enum> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="allColumnsShowFocus"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>Graph</string> - </property> - </column> - <column> - <property name="text"> - <string>Commit ID</string> - </property> - </column> - <column> - <property name="text"> - <string>Author</string> - </property> - </column> - <column> - <property name="text"> - <string>Date</string> - </property> - </column> - <column> - <property name="text"> - <string>Committer</string> - </property> - </column> - <column> - <property name="text"> - <string>Commit Date</string> - </property> - </column> - <column> - <property name="text"> - <string>Subject</string> - </property> - </column> - <column> - <property name="text"> - <string>Branches</string> - </property> - </column> - <column> - <property name="text"> - <string>Tags</string> - </property> - </column> - </widget> - </item> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="logTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Graph</string> + </property> + </column> + <column> + <property name="text"> + <string>Commit ID</string> + </property> + </column> + <column> + <property name="text"> + <string>Author</string> + </property> + </column> + <column> + <property name="text"> + <string>Date</string> + </property> + </column> + <column> + <property name="text"> + <string>Committer</string> + </property> + </column> + <column> + <property name="text"> + <string>Commit Date</string> + </property> + </column> + <column> + <property name="text"> + <string>Subject</string> + </property> + </column> + <column> + <property name="text"> + <string>Branches</string> + </property> + </column> + <column> + <property name="text"> + <string>Tags</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_5"> <item> <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> <item> <widget class="QToolButton" name="upButton"> <property name="toolTip"> @@ -238,243 +245,245 @@ </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="QPushButton" name="nextButton"> - <property name="toolTip"> - <string>Press to get the next bunch of log entries</string> - </property> - <property name="text"> - <string>&Next</string> - </property> - </widget> - </item> - <item> - <widget class="QSpinBox" name="limitSpinBox"> - <property name="toolTip"> - <string>Enter the limit of entries to fetch</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>10000</number> - </property> - <property name="value"> - <number>20</number> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="stopCheckBox"> - <property name="toolTip"> - <string>Select to stop listing log messages at a copy or move</string> - </property> - <property name="text"> - <string>Stop on Copy/Move</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="sbsSelectLabel"> - <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> </layout> </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="QPushButton" name="nextButton"> + <property name="toolTip"> + <string>Press to get the next bunch of log entries</string> + </property> + <property name="text"> + <string>&Next</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="limitSpinBox"> + <property name="toolTip"> + <string>Enter the limit of entries to fetch</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>10000</number> + </property> + <property name="value"> + <number>20</number> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="stopCheckBox"> + <property name="toolTip"> + <string>Select to stop listing log messages at a copy or move</string> + </property> + <property name="text"> + <string>Stop on Copy/Move</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="sbsSelectLabel"> + <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> </layout> - </widget> - <widget class="QSplitter" name="detailsSplitter"> + </item> + </layout> + </item> + <item> + <widget class="QSplitter" name="detailsSplitter"> + <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="Preferred"> - <horstretch>0</horstretch> - <verstretch>2</verstretch> + <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::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> - <widget class="QTextBrowser" name="detailsEdit"> + <widget class="QTreeWidget" name="filesTree"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>3</horstretch> + <horstretch>7</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> - <property name="readOnly"> + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="openLinks"> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> <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 name="allColumnsShowFocus"> + <bool>true</bool> </property> - <widget class="QTreeWidget" name="filesTree"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>7</horstretch> - <verstretch>1</verstretch> - </sizepolicy> + <column> + <property name="text"> + <string>Action</string> + </property> + </column> + <column> + <property name="text"> + <string>Path</string> </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> + </column> + <column> + <property name="text"> + <string>Additions</string> </property> - <property name="itemsExpandable"> - <bool>false</bool> + </column> + <column> + <property name="text"> + <string>Deletions</string> </property> - <property name="allColumnsShowFocus"> - <bool>true</bool> + </column> + <column> + <property name="text"> + <string>Copy from</string> </property> - <column> - <property name="text"> - <string>Action</string> - </property> - </column> - <column> - <property name="text"> - <string>Path</string> - </property> - </column> - <column> - <property name="text"> - <string>Additions</string> - </property> - </column> - <column> - <property name="text"> - <string>Deletions</string> - </property> - </column> - <column> - <property name="text"> - <string>Copy from</string> - </property> - </column> - </widget> - <widget class="QWidget" name="layoutWidget_2"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="diffLabel"> - <property name="text"> - <string>Differences</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_3"> - <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> + </column> + </widget> + <widget class="QWidget" name="layoutWidget_2"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="diffLabel"> + <property name="text"> + <string>Differences</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <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>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Mon Jun 04 19:56:34 2018 +0200 @@ -15,7 +15,7 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> + <layout class="QHBoxLayout" name="horizontalLayout_4"> <item> <widget class="QToolButton" name="actionsButton"> <property name="toolTip"> @@ -151,95 +151,102 @@ </widget> </item> <item> - <widget class="QToolButton" name="findPrevButton"> - <property name="toolTip"> - <string>Press to find the previous occurrence</string> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="findNextButton"> - <property name="toolTip"> - <string>Press to find the next occurrence</string> - </property> - </widget> + <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> </layout> </item> <item> - <widget class="QSplitter" name="mainSplitter"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <widget class="QWidget" name="layoutWidget"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QTreeWidget" name="logTree"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="allColumnsShowFocus"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>Graph</string> - </property> - </column> - <column> - <property name="text"> - <string>Branch</string> - </property> - </column> - <column> - <property name="text"> - <string>Revision</string> - </property> - </column> - <column> - <property name="text"> - <string>Phase</string> - </property> - </column> - <column> - <property name="text"> - <string>Author</string> - </property> - </column> - <column> - <property name="text"> - <string>Date</string> - </property> - </column> - <column> - <property name="text"> - <string>Message</string> - </property> - </column> - <column> - <property name="text"> - <string>Tags</string> - </property> - </column> - </widget> - </item> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QTreeWidget" name="logTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Graph</string> + </property> + </column> + <column> + <property name="text"> + <string>Branch</string> + </property> + </column> + <column> + <property name="text"> + <string>Revision</string> + </property> + </column> + <column> + <property name="text"> + <string>Phase</string> + </property> + </column> + <column> + <property name="text"> + <string>Author</string> + </property> + </column> + <column> + <property name="text"> + <string>Date</string> + </property> + </column> + <column> + <property name="text"> + <string>Message</string> + </property> + </column> + <column> + <property name="text"> + <string>Tags</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_5"> <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="spacing"> + <number>0</number> + </property> <item> <widget class="QToolButton" name="upButton"> <property name="toolTip"> @@ -260,236 +267,238 @@ </property> </widget> </item> - <item> - <widget class="Line" name="line_6"> - <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="QPushButton" name="nextButton"> - <property name="toolTip"> - <string>Press to get the next bunch of log entries</string> - </property> - <property name="text"> - <string>&Next</string> - </property> - </widget> - </item> - <item> - <widget class="QSpinBox" name="limitSpinBox"> - <property name="toolTip"> - <string>Enter the limit of entries to fetch</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>10000</number> - </property> - <property name="value"> - <number>20</number> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="stopCheckBox"> - <property name="toolTip"> - <string>Select to stop listing log messages at a copy or move</string> - </property> - <property name="text"> - <string>Stop on Copy/Move</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_2"> - <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="sbsSelectLabel"> - <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> </layout> </item> + <item> + <widget class="Line" name="line_6"> + <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="QPushButton" name="nextButton"> + <property name="toolTip"> + <string>Press to get the next bunch of log entries</string> + </property> + <property name="text"> + <string>&Next</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="limitSpinBox"> + <property name="toolTip"> + <string>Enter the limit of entries to fetch</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>10000</number> + </property> + <property name="value"> + <number>20</number> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="stopCheckBox"> + <property name="toolTip"> + <string>Select to stop listing log messages at a copy or move</string> + </property> + <property name="text"> + <string>Stop on Copy/Move</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <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="sbsSelectLabel"> + <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> </layout> - </widget> - <widget class="QSplitter" name="detailsSplitter"> + </item> + </layout> + </item> + <item> + <widget class="QSplitter" name="detailsSplitter"> + <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="Preferred"> - <horstretch>0</horstretch> - <verstretch>2</verstretch> + <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::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> - <widget class="QTextBrowser" name="detailsEdit"> + <widget class="QTreeWidget" name="filesTree"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>3</horstretch> + <horstretch>7</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> - <property name="readOnly"> + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="openLinks"> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> <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 name="sortingEnabled"> + <bool>true</bool> </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <property name="allColumnsShowFocus"> + <bool>true</bool> </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> + <column> + <property name="text"> + <string>Action</string> </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> + </column> + <column> + <property name="text"> + <string>Path</string> </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <property name="allColumnsShowFocus"> - <bool>true</bool> + </column> + <column> + <property name="text"> + <string>Copy from</string> </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> + </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>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Mon Jun 04 19:56:34 2018 +0200 @@ -228,34 +228,41 @@ </property> </widget> </item> - <item row="0" column="3" rowspan="2" colspan="2"> + <item row="0" column="3" rowspan="2"> <widget class="Line" name="line"> <property name="orientation"> <enum>Qt::Vertical</enum> </property> </widget> </item> - <item row="0" column="5"> - <widget class="QToolButton" name="upButton"> - <property name="toolTip"> - <string>Press to move up in the log list</string> + <item row="0" column="4"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> </property> - <property name="autoRepeat"> - <bool>true</bool> - </property> - </widget> + <item> + <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> + <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> + </layout> </item> - <item row="0" column="6"> - <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="7"> + <item row="0" column="5"> <widget class="QPushButton" name="diffPreviousButton"> <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> @@ -265,7 +272,7 @@ </property> </widget> </item> - <item row="0" column="8"> + <item row="0" column="6"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -275,7 +282,7 @@ </property> </widget> </item> - <item row="0" column="9"> + <item row="0" column="7"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -288,7 +295,7 @@ </property> </spacer> </item> - <item row="1" column="4" colspan="6"> + <item row="1" column="4" colspan="3"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui Mon Jun 04 19:56:34 2018 +0200 @@ -189,7 +189,7 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> + <item row="0" column="0" rowspan="2"> <widget class="QPushButton" name="nextButton"> <property name="toolTip"> <string>Press to get the next bunch of log entries</string> @@ -199,7 +199,7 @@ </property> </widget> </item> - <item row="0" column="1"> + <item row="0" column="1" rowspan="2"> <widget class="QSpinBox" name="limitSpinBox"> <property name="toolTip"> <string>Enter the limit of entries to fetch</string> @@ -218,7 +218,7 @@ </property> </widget> </item> - <item row="0" column="2"> + <item row="0" column="2" rowspan="2" colspan="2"> <widget class="QCheckBox" name="stopCheckBox"> <property name="toolTip"> <string>Select to stop listing log messages at a copy or move</string> @@ -228,34 +228,7 @@ </property> </widget> </item> - <item row="0" column="3" rowspan="2"> - <widget class="Line" name="line"> - <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"> + <item row="0" column="5" rowspan="2"> <widget class="QPushButton" name="diffPreviousButton"> <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> @@ -265,7 +238,7 @@ </property> </widget> </item> - <item row="0" column="7"> + <item row="0" column="6" rowspan="2"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -275,7 +248,7 @@ </property> </widget> </item> - <item row="0" column="8"> + <item row="0" column="7" rowspan="2"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -288,7 +261,41 @@ </property> </spacer> </item> - <item row="1" column="4" colspan="5"> + <item row="1" column="3" rowspan="2"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item row="1" column="4"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <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> + <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> + </layout> + </item> + <item row="2" column="4" colspan="3"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string>
--- a/QScintilla/ReplaceWidget.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/QScintilla/ReplaceWidget.ui Mon Jun 04 19:56:34 2018 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>813</width> - <height>56</height> + <height>58</height> </rect> </property> <property name="sizePolicy"> @@ -78,34 +78,44 @@ </widget> </item> <item row="0" column="3"> - <widget class="QToolButton" name="findPrevButton"> - <property name="toolTip"> - <string>Press to find the previous occurrence</string> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>24</number> </property> - </widget> + <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="0" column="4"> - <widget class="QToolButton" name="findNextButton"> - <property name="toolTip"> - <string>Press to find the next occurrence</string> - </property> - </widget> - </item> - <item row="0" column="6"> <widget class="QCheckBox" name="caseCheckBox"> <property name="text"> <string>&Match case</string> </property> </widget> </item> - <item row="0" column="7"> + <item row="0" column="5"> <widget class="QCheckBox" name="wordCheckBox"> <property name="text"> <string>Whole &word</string> </property> </widget> </item> - <item row="0" column="8"> + <item row="0" column="6"> <widget class="QCheckBox" name="regexpCheckBox"> <property name="text"> <string>Rege&xp</string> @@ -148,34 +158,41 @@ </widget> </item> <item row="1" column="3"> - <widget class="QToolButton" name="replaceButton"> - <property name="toolTip"> - <string>Press to replace the selection</string> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>0</number> </property> - </widget> + <item> + <widget class="QToolButton" name="replaceButton"> + <property name="toolTip"> + <string>Press to replace the selection</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="replaceSearchButton"> + <property name="toolTip"> + <string>Press to replace the selection and search for the next occurence</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="replaceAllButton"> + <property name="toolTip"> + <string>Press to replace all occurrences</string> + </property> + </widget> + </item> + </layout> </item> <item row="1" column="4"> - <widget class="QToolButton" name="replaceSearchButton"> - <property name="toolTip"> - <string>Press to replace the selection and search for the next occurence</string> - </property> - </widget> - </item> - <item row="1" column="5"> - <widget class="QToolButton" name="replaceAllButton"> - <property name="toolTip"> - <string>Press to replace all occurrences</string> - </property> - </widget> - </item> - <item row="1" column="6"> <widget class="QCheckBox" name="wrapCheckBox"> <property name="text"> <string>Wrap &around</string> </property> </widget> </item> - <item row="1" column="7"> + <item row="1" column="5"> <widget class="QCheckBox" name="selectionCheckBox"> <property name="text"> <string>&Selection only</string>
--- a/QScintilla/SearchWidget.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/QScintilla/SearchWidget.ui Mon Jun 04 19:56:34 2018 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>973</width> - <height>25</height> + <height>26</height> </rect> </property> <property name="sizePolicy"> @@ -19,7 +19,7 @@ <property name="windowTitle"> <string>Find</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="leftMargin"> <number>0</number> </property> @@ -78,18 +78,25 @@ </widget> </item> <item> - <widget class="QToolButton" name="findPrevButton"> - <property name="toolTip"> - <string>Press to find the previous occurrence</string> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="findNextButton"> - <property name="toolTip"> - <string>Press to find the next occurrence</string> - </property> - </widget> + <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> <widget class="QCheckBox" name="caseCheckBox">
--- a/UI/CompareDialog.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/UI/CompareDialog.ui Mon Jun 04 19:56:34 2018 +0200 @@ -121,6 +121,9 @@ </item> <item row="1" column="1"> <layout class="QVBoxLayout"> + <property name="spacing"> + <number>0</number> + </property> <item> <spacer> <property name="orientation">
--- a/UI/SearchWidget.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/UI/SearchWidget.ui Mon Jun 04 19:56:34 2018 +0200 @@ -14,7 +14,16 @@ <string>Find</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -83,6 +92,22 @@ </item> <item> <layout class="QHBoxLayout" name="horizontalLayout_3"> + <property name="spacing"> + <number>0</number> + </property> + <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="QToolButton" name="findPrevButton"> <property name="toolTip"> @@ -97,6 +122,19 @@ </property> </widget> </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </item> <item>
--- a/UI/SearchWidgetLine.ui Sun Jun 03 14:03:19 2018 +0200 +++ b/UI/SearchWidgetLine.ui Mon Jun 04 19:56:34 2018 +0200 @@ -27,7 +27,7 @@ <number>0</number> </property> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> <widget class="QToolButton" name="closeButton"> <property name="toolTip"> @@ -71,18 +71,25 @@ </widget> </item> <item> - <widget class="QToolButton" name="findPrevButton"> - <property name="toolTip"> - <string>Press to find the previous occurrence</string> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="findNextButton"> - <property name="toolTip"> - <string>Press to find the next occurrence</string> - </property> - </widget> + <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> <widget class="QCheckBox" name="caseCheckBox">
