Skip to content

Commit 321cd55

Browse files
committed
Moved line-ending combobox to send message bar
1 parent 8666ce8 commit 321cd55

File tree

1 file changed

+36
-33
lines changed

1 file changed

+36
-33
lines changed

src/mainwindow.ui

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</property>
7777
</widget>
7878
</item>
79-
<item row="1" column="4">
79+
<item row="1" column="5">
8080
<widget class="QPushButton" name="pushButtonClearHistory">
8181
<property name="minimumSize">
8282
<size>
@@ -114,7 +114,6 @@
114114
</property>
115115
<property name="font">
116116
<font>
117-
<family>Consolas</family>
118117
<pointsize>9</pointsize>
119118
</font>
120119
</property>
@@ -126,6 +125,36 @@
126125
</property>
127126
</widget>
128127
</item>
128+
<item row="1" column="4">
129+
<widget class="QComboBox" name="comboBoxLineEnding">
130+
<property name="minimumSize">
131+
<size>
132+
<width>0</width>
133+
<height>30</height>
134+
</size>
135+
</property>
136+
<item>
137+
<property name="text">
138+
<string>No line ending</string>
139+
</property>
140+
</item>
141+
<item>
142+
<property name="text">
143+
<string>New line</string>
144+
</property>
145+
</item>
146+
<item>
147+
<property name="text">
148+
<string>Carriage return</string>
149+
</property>
150+
</item>
151+
<item>
152+
<property name="text">
153+
<string>Both CR &amp; NL</string>
154+
</property>
155+
</item>
156+
</widget>
157+
</item>
129158
</layout>
130159
</widget>
131160
</item>
@@ -219,8 +248,8 @@
219248
<rect>
220249
<x>0</x>
221250
<y>0</y>
222-
<width>586</width>
223-
<height>116</height>
251+
<width>648</width>
252+
<height>108</height>
224253
</rect>
225254
</property>
226255
<property name="sizePolicy">
@@ -498,30 +527,6 @@
498527
</item>
499528
</widget>
500529
</item>
501-
<item row="6" column="1" colspan="11">
502-
<widget class="QComboBox" name="comboBoxLineEnding">
503-
<item>
504-
<property name="text">
505-
<string>No line ending</string>
506-
</property>
507-
</item>
508-
<item>
509-
<property name="text">
510-
<string>New line</string>
511-
</property>
512-
</item>
513-
<item>
514-
<property name="text">
515-
<string>Carriage return</string>
516-
</property>
517-
</item>
518-
<item>
519-
<property name="text">
520-
<string>Both CR &amp; NL</string>
521-
</property>
522-
</item>
523-
</widget>
524-
</item>
525530
</layout>
526531
</item>
527532
<item>
@@ -758,8 +763,8 @@ p, li { white-space: pre-wrap; }
758763
<rect>
759764
<x>0</x>
760765
<y>0</y>
761-
<width>1177</width>
762-
<height>99</height>
766+
<width>1164</width>
767+
<height>103</height>
763768
</rect>
764769
</property>
765770
<layout class="QGridLayout" name="gridLayout_24">
@@ -1113,7 +1118,6 @@ p, li { white-space: pre-wrap; }
11131118
</property>
11141119
<property name="font">
11151120
<font>
1116-
<weight>50</weight>
11171121
<italic>false</italic>
11181122
<bold>false</bold>
11191123
<underline>true</underline>
@@ -2913,7 +2917,6 @@ p, li { white-space: pre-wrap; }
29132917
</property>
29142918
<property name="font">
29152919
<font>
2916-
<weight>50</weight>
29172920
<bold>false</bold>
29182921
<underline>true</underline>
29192922
</font>
@@ -3231,7 +3234,7 @@ p, li { white-space: pre-wrap; }
32313234
<x>0</x>
32323235
<y>0</y>
32333236
<width>1797</width>
3234-
<height>21</height>
3237+
<height>19</height>
32353238
</rect>
32363239
</property>
32373240
<widget class="QMenu" name="menuFile">

0 commit comments

Comments
 (0)