Attached is an attempt to create a patch. I hope everything is set up
correctly. I did some minor dialog alignment fixes using Qt Creator.
One thing I couldn't try out is the Advanced Search & Replace dialog
when docked to the top or bottom. I remember that this is possible, for
example, on MacOS but it seems not to be on Windows. So, it would be
great if someone could test what it looks like when docked to the top.
It is only the main Search tab page where I changed the alignment of
buttons at the bottom. Also, try to dock to the top and then undock and
resize.
By the way, how does LyX know what the top docked dialog looks like? In
Qt Creator I only see the side docked variant. Or maybe it just aligns
it automatically based on the side layout?
Daniel
From 544a80b53d318822630486c07b425f0fba0540b5 Mon Sep 17 00:00:00 2001
From: Daniel Ramoeller <d....@web.de>
Date: Tue, 23 Oct 2018 10:48:50 +0200
Subject: [PATCH] Several minor dialog alignment fixes: - Thesaurus: Close
button to right - Label: to top - Search: decouple lower buttons and
checkboxes, align Close button to bottom - ProgressView: fixed Debug messages
group width - FindAndReplace: decouple lower buttons and checkboxes, don't
expand button widths
---
src/frontends/qt4/ui/FindAndReplaceUi.ui | 191 +++++-----
src/frontends/qt4/ui/LabelUi.ui | 38 +-
src/frontends/qt4/ui/ProgressViewUi.ui | 213 +++++++-----
src/frontends/qt4/ui/SearchUi.ui | 426 ++++++++++++-----------
src/frontends/qt4/ui/ThesaurusUi.ui | 27 +-
5 files changed, 495 insertions(+), 400 deletions(-)
diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui
b/src/frontends/qt4/ui/FindAndReplaceUi.ui
index 9510685470..13d5585533 100644
--- a/src/frontends/qt4/ui/FindAndReplaceUi.ui
+++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui
@@ -72,97 +72,112 @@
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QCheckBox" name="caseCB">
- <property name="toolTip">
- <string>Perform a case-sensitive search</string>
- </property>
- <property name="text">
- <string>Case &sensitive</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="findNextPB">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>100</horstretch>
- <verstretch>32</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Find next occurrence [Enter]</string>
- </property>
- <property name="text">
- <string>Find &Next</string>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="caseCB">
+ <property name="toolTip">
+ <string>Perform a case-sensitive search</string>
+ </property>
+ <property name="text">
+ <string>Case &sensitive</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="wordsCB">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="toolTip">
+ <string>Restrict search to whole words only</string>
+ </property>
+ <property name="text">
+ <string>W&hole words</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="searchbackCB">
+ <property name="toolTip">
+ <string>Shift+Enter search backwards directly</string>
+ </property>
+ <property name="text">
+ <string>Search &backwards</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="wordsCB">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="toolTip">
- <string>Restrict search to whole words only</string>
- </property>
- <property name="text">
- <string>W&hole words</string>
- </property>
- </widget>
+ <item row="0" column="2">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QPushButton" name="findNextPB">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>100</horstretch>
+ <verstretch>32</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Find next occurrence [Enter]</string>
+ </property>
+ <property name="text">
+ <string>Find &Next</string>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="replacePB">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>100</horstretch>
+ <verstretch>32</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Replace and find next occurrence [Enter]</string>
+ </property>
+ <property name="text">
+ <string>&Replace</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="replaceallPB">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>100</horstretch>
+ <verstretch>32</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Replace all occurrences at once</string>
+ </property>
+ <property name="text">
+ <string>Replace &All</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="1" column="1">
- <widget class="QPushButton" name="replacePB">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>100</horstretch>
- <verstretch>32</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Replace and find next occurrence [Enter]</string>
- </property>
- <property name="text">
- <string>&Replace</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QCheckBox" name="searchbackCB">
- <property name="toolTip">
- <string>Shift+Enter search backwards directly</string>
- </property>
- <property name="text">
- <string>Search &backwards</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QPushButton" name="replaceallPB">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>100</horstretch>
- <verstretch>32</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Replace all occurrences at once</string>
- </property>
- <property name="text">
- <string>Replace &All</string>
+ <item row="0" column="1">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
+ </spacer>
</item>
</layout>
</item>
diff --git a/src/frontends/qt4/ui/LabelUi.ui b/src/frontends/qt4/ui/LabelUi.ui
index 714d28cc2b..7892637e6a 100644
--- a/src/frontends/qt4/ui/LabelUi.ui
+++ b/src/frontends/qt4/ui/LabelUi.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>LabelUi</class>
<widget class="QWidget" name="LabelUi">
@@ -16,7 +17,16 @@
<property name="spacing">
<number>6</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>11</number>
+ </property>
+ <property name="topMargin">
+ <number>11</number>
+ </property>
+ <property name="rightMargin">
+ <number>11</number>
+ </property>
+ <property name="bottomMargin">
<number>11</number>
</property>
<item>
@@ -24,31 +34,47 @@
<property name="spacing">
<number>6</number>
</property>
- <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>
<widget class="QLabel" name="keywordLA">
<property name="toolTip">
- <string/>
+ <string/>
</property>
<property name="text">
- <string>&Label:</string>
+ <string>&Label:</string>
</property>
<property name="buddy">
- <cstring>keywordED</cstring>
+ <cstring>keywordED</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="keywordED">
<property name="toolTip">
- <string/>
+ <string/>
</property>
</widget>
</item>
</layout>
</item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<includes>
diff --git a/src/frontends/qt4/ui/ProgressViewUi.ui
b/src/frontends/qt4/ui/ProgressViewUi.ui
index 1ae1c6d653..1b5201c199 100644
--- a/src/frontends/qt4/ui/ProgressViewUi.ui
+++ b/src/frontends/qt4/ui/ProgressViewUi.ui
@@ -1,10 +1,8 @@
-<ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>ProgressViewUi</class>
- <widget class="QWidget" name="ProgressViewUi" >
- <property name="geometry" >
+ <widget class="QWidget" name="ProgressViewUi">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -12,154 +10,175 @@
<height>298</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>13</vsizetype>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="sizeIncrement" >
+ <property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="baseSize" >
+ <property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string/>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="leftMargin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QTabWidget" name="tabWidget" >
- <property name="enabled" >
+ <item row="0" column="0">
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>13</vsizetype>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="baseSize" >
+ <property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="acceptDrops" >
+ <property name="acceptDrops">
<bool>false</bool>
</property>
- <property name="layoutDirection" >
+ <property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
- <property name="autoFillBackground" >
+ <property name="autoFillBackground">
<bool>false</bool>
</property>
- <property name="tabPosition" >
+ <property name="tabPosition">
<enum>QTabWidget::East</enum>
</property>
- <property name="tabShape" >
+ <property name="tabShape">
<enum>QTabWidget::Rounded</enum>
</property>
- <property name="currentIndex" >
- <number>0</number>
+ <property name="currentIndex">
+ <number>1</number>
</property>
- <widget class="QWidget" name="tab" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
<string>Output</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QTextEdit" name="outTE" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>13</vsizetype>
+ <item row="0" column="0">
+ <widget class="QTextEdit" name="outTE">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Ignored">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
- <property name="lineWidth" >
+ <property name="lineWidth">
<number>1</number>
</property>
- <property name="readOnly" >
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab_2" >
- <attribute name="title" >
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
<string>Settings</string>
</attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="leftMargin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>9</number>
+ </property>
+ <property name="spacing">
<number>6</number>
</property>
- <item rowspan="4" row="0" column="1" >
- <widget class="QTreeWidget" name="debugMessagesTW" >
- <property name="toolTip" >
+ <item row="0" column="1" rowspan="4">
+ <widget class="QTreeWidget" name="debugMessagesTW">
+ <property name="toolTip">
<string>Select the debug messages that should be displayed</string>
</property>
<column>
- <property name="text" >
+ <property name="text">
<string>1</string>
</property>
</column>
</widget>
</item>
- <item row="3" column="0" >
+ <item row="3" column="0">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>187</width>
<height>3</height>
@@ -167,62 +186,69 @@
</property>
</spacer>
</item>
- <item row="2" column="0" >
- <widget class="QCheckBox" name="autoClearCB" >
- <property name="toolTip" >
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="autoClearCB">
+ <property name="toolTip">
<string>Automatic cleanup of the window before LaTeX compilation
proceeds</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&Clear automatically</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="groupBox" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Debug messages</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
<number>9</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0" >
- <widget class="QRadioButton" name="debugNoneRB" >
- <property name="toolTip" >
+ <item row="0" column="0">
+ <widget class="QRadioButton" name="debugNoneRB">
+ <property name="toolTip">
<string>Display no debug messages</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&None</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QRadioButton" name="debugSelectedRB" >
- <property name="toolTip" >
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="debugSelectedRB">
+ <property name="toolTip">
<string>Display the debug messages selected to the right</string>
</property>
- <property name="text" >
+ <property name="text">
<string>S&elected</string>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QRadioButton" name="debugAnyRB" >
- <property name="toolTip" >
+ <item row="0" column="2">
+ <widget class="QRadioButton" name="debugAnyRB">
+ <property name="toolTip">
<string>Display all debug messages</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&All</string>
</property>
</widget>
@@ -230,15 +256,15 @@
</layout>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QCheckBox" name="sbarCB" >
- <property name="toolTip" >
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="sbarCB">
+ <property name="toolTip">
<string>Display statusbar messages?</string>
</property>
- <property name="text" >
+ <property name="text">
<string>&Statusbar messages</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
@@ -249,9 +275,8 @@
</item>
</layout>
</widget>
- <pixmapfunction></pixmapfunction>
<includes>
- <include location="local" >qt_i18n.h</include>
+ <include location="local">qt_i18n.h</include>
</includes>
<resources/>
<connections/>
diff --git a/src/frontends/qt4/ui/SearchUi.ui b/src/frontends/qt4/ui/SearchUi.ui
index 7fc1e31739..4355eda08f 100644
--- a/src/frontends/qt4/ui/SearchUi.ui
+++ b/src/frontends/qt4/ui/SearchUi.ui
@@ -1,222 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SearchUi</class>
<widget class="QDialog" name="SearchUi">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>357</width>
- <height>152</height>
- </rect>
- </property>
<property name="windowTitle">
<string/>
</property>
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <layout class="QGridLayout">
- <property name="margin">
- <number>11</number>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout_1">
<property name="spacing">
<number>6</number>
</property>
- <item row="0" column="0">
- <widget class="QLabel" name="findLA">
- <property name="text">
- <string>&Find:</string>
- </property>
- <property name="buddy">
- <cstring>findCO</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <widget class="QComboBox" name="findCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="editable">
- <bool>true</bool>
- </property>
- <property name="maxCount">
- <number>666</number>
- </property>
- <property name="insertPolicy">
- <enum>QComboBox::InsertAtTop</enum>
- </property>
- <property name="autoCompletion">
- <bool>false</bool>
- </property>
- <property name="duplicatesEnabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="replaceLA">
- <property name="text">
- <string>Replace &with:</string>
- </property>
- <property name="buddy">
- <cstring>replaceCO</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QComboBox" name="replaceCO">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="editable">
- <bool>true</bool>
- </property>
- <property name="maxCount">
- <number>666</number>
- </property>
- <property name="insertPolicy">
- <enum>QComboBox::InsertAtTop</enum>
- </property>
- <property name="autoCompletion">
- <bool>false</bool>
- </property>
- <property name="duplicatesEnabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QCheckBox" name="caseCB">
- <property name="text">
- <string>Case &sensitive[[search]]</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" rowspan="2" colspan="2">
- <widget class="QCheckBox" name="wordsCB">
- <property name="text">
- <string>Match w&hole words only</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <spacer>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="6" column="0" colspan="2">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="6" column="3">
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="3">
- <widget class="QPushButton" name="findPB">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Find &Next</string>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QPushButton" name="replacePB">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>&Replace</string>
- </property>
- </widget>
- </item>
- <item row="2" column="3" rowspan="2">
- <widget class="QPushButton" name="replaceallPB">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Replace &All</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0" colspan="2">
- <widget class="QCheckBox" name="backwardsCB">
- <property name="text">
- <string>Search &backwards</string>
- </property>
- </widget>
+ <property name="sizeConstraint">
+ <enum>QLayout::SetDefaultConstraint</enum>
+ </property>
+ <property name="leftMargin">
+ <number>11</number>
+ </property>
+ <property name="topMargin">
+ <number>11</number>
+ </property>
+ <property name="rightMargin">
+ <number>11</number>
+ </property>
+ <property name="bottomMargin">
+ <number>11</number>
+ </property>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="findLA">
+ <property name="text">
+ <string>&Find:</string>
+ </property>
+ <property name="buddy">
+ <cstring>findCO</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QPushButton" name="findPB">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Find &Next</string>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="findCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ <property name="maxCount">
+ <number>666</number>
+ </property>
+ <property name="insertPolicy">
+ <enum>QComboBox::InsertAtTop</enum>
+ </property>
+ <property name="autoCompletion">
+ <bool>false</bool>
+ </property>
+ <property name="duplicatesEnabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="replaceCO">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ <property name="maxCount">
+ <number>666</number>
+ </property>
+ <property name="insertPolicy">
+ <enum>QComboBox::InsertAtTop</enum>
+ </property>
+ <property name="autoCompletion">
+ <bool>false</bool>
+ </property>
+ <property name="duplicatesEnabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QPushButton" name="replacePB">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>&Replace</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="replaceLA">
+ <property name="text">
+ <string>Replace &with:</string>
+ </property>
+ <property name="buddy">
+ <cstring>replaceCO</cstring>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="4" column="3" rowspan="2">
- <widget class="QPushButton" name="closePB">
- <property name="text">
- <string>&Close</string>
- </property>
- </widget>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <spacer name="verticalSpacer1">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>10</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="caseCB">
+ <property name="text">
+ <string>Case &sensitive[[search]]</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="wordsCB">
+ <property name="text">
+ <string>Match w&hole words only</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="backwardsCB">
+ <property name="text">
+ <string>Search &backwards</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QPushButton" name="replaceallPB">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Replace &All</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="closePB">
+ <property name="text">
+ <string>&Close</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</item>
</layout>
</widget>
- <tabstops>
- <tabstop>findCO</tabstop>
- <tabstop>replaceCO</tabstop>
- <tabstop>caseCB</tabstop>
- <tabstop>wordsCB</tabstop>
- <tabstop>backwardsCB</tabstop>
- <tabstop>findPB</tabstop>
- <tabstop>replacePB</tabstop>
- <tabstop>replaceallPB</tabstop>
- <tabstop>closePB</tabstop>
- </tabstops>
<includes>
<include location="local">qt_i18n.h</include>
</includes>
diff --git a/src/frontends/qt4/ui/ThesaurusUi.ui
b/src/frontends/qt4/ui/ThesaurusUi.ui
index a9f340f429..11ea0f0b6f 100644
--- a/src/frontends/qt4/ui/ThesaurusUi.ui
+++ b/src/frontends/qt4/ui/ThesaurusUi.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ThesaurusUi</class>
<widget class="QDialog" name="ThesaurusUi">
@@ -113,7 +114,16 @@
<property name="spacing">
<number>6</number>
</property>
- <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>
@@ -132,15 +142,15 @@
</property>
</spacer>
</item>
- <item>
- <widget class="QPushButton" name="closePB">
- <property name="text">
- <string>&Close</string>
- </property>
- </widget>
- </item>
</layout>
</item>
+ <item row="4" column="2">
+ <widget class="QPushButton" name="closePB">
+ <property name="text">
+ <string>&Close</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<tabstops>
@@ -150,7 +160,6 @@
<tabstop>replaceED</tabstop>
<tabstop>replacePB</tabstop>
<tabstop>meaningsTV</tabstop>
- <tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local">qt_i18n.h</include>
--
2.17.0.windows.1
