Skip to content

Commit a888acc

Browse files
GutsGuts
committed
Fix and improve some texts
1 parent a3489f2 commit a888acc

File tree

3 files changed

+218
-61
lines changed

3 files changed

+218
-61
lines changed

‎pyqgis_resource_browser/gui/dlg_settings.ui

Lines changed: 79 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>Form</class>
4-
<widget class="QWidget" name="Form">
3+
<class>wdg_resource_browser_settings</class>
4+
<widget class="QWidget" name="wdg_resource_browser_settings">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
88
<y>0</y>
99
<width>673</width>
10-
<height>460</height>
10+
<height>525</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Form</string>
14+
<string>PyQGIS Resource Browser - Settings</string>
1515
</property>
1616
<property name="locale">
1717
<locale language="English" country="UnitedStates"/>
@@ -41,7 +41,7 @@
4141
<locale language="English" country="UnitedStates"/>
4242
</property>
4343
<property name="text">
44-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PluginTitle - Version X.X.X&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
44+
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;PluginTitle - Version X.X.X&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
4545
</property>
4646
<property name="scaledContents">
4747
<bool>true</bool>
@@ -86,17 +86,32 @@
8686
<layout class="QVBoxLayout" name="verticalLayout_2">
8787
<item>
8888
<widget class="QTextEdit" name="te_resource_prefixes">
89+
<property name="markdown">
90+
<string notr="true">:/images/
91+
92+
:/oauth2method/
93+
94+
:/topology
95+
96+
:/geometrychecker/
97+
98+
:/offline_editing/
99+
100+
:/qt-project.org/
101+
102+
</string>
103+
</property>
89104
<property name="html">
90-
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
105+
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
91106
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
92107
p, li { white-space: pre-wrap; }
93-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
94-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/images/&lt;/p&gt;
95-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/oauth2method/&lt;/p&gt;
96-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/topology&lt;/p&gt;
97-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/geometrychecker/&lt;/p&gt;
98-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/offline_editing/&lt;/p&gt;
99-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/qt-project.org/&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
108+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
109+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/images/&lt;/p&gt;
110+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/oauth2method/&lt;/p&gt;
111+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/topology&lt;/p&gt;
112+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/geometrychecker/&lt;/p&gt;
113+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/offline_editing/&lt;/p&gt;
114+
&lt;p style=&quot; margin-top:7px; margin-bottom:7px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;:/qt-project.org/&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
100115
</property>
101116
</widget>
102117
</item>
@@ -118,7 +133,7 @@ p, li { white-space: pre-wrap; }
118133
<item>
119134
<widget class="QPlainTextEdit" name="te_resource_filetypes">
120135
<property name="plainText">
121-
<string>svg
136+
<string notr="true">svg
122137
png
123138
ico
124139
xpn</string>
@@ -149,7 +164,7 @@ xpn</string>
149164
<bool>false</bool>
150165
</property>
151166
<layout class="QGridLayout" name="gridLayout">
152-
<item row="2" column="1">
167+
<item row="3" column="1">
153168
<widget class="QLabel" name="lbl_version_saved_value">
154169
<property name="minimumSize">
155170
<size>
@@ -174,33 +189,33 @@ xpn</string>
174189
</property>
175190
</widget>
176191
</item>
177-
<item row="0" column="1">
178-
<widget class="QPushButton" name="btn_report">
192+
<item row="3" column="0">
193+
<widget class="QLabel" name="lbl_version_saved">
179194
<property name="minimumSize">
180195
<size>
181-
<width>200</width>
196+
<width>0</width>
182197
<height>25</height>
183198
</size>
184199
</property>
185200
<property name="maximumSize">
186201
<size>
187-
<width>500</width>
202+
<width>16777215</width>
188203
<height>30</height>
189204
</size>
190205
</property>
191206
<property name="locale">
192207
<locale language="English" country="UnitedStates"/>
193208
</property>
194209
<property name="text">
195-
<string>Report an issue</string>
210+
<string>Version used to save settings:</string>
196211
</property>
197212
</widget>
198213
</item>
199-
<item row="2" column="0">
200-
<widget class="QLabel" name="lbl_version_saved">
214+
<item row="4" column="0" colspan="2">
215+
<widget class="QPushButton" name="btn_reset">
201216
<property name="minimumSize">
202217
<size>
203-
<width>0</width>
218+
<width>200</width>
204219
<height>25</height>
205220
</size>
206221
</property>
@@ -210,38 +225,47 @@ xpn</string>
210225
<height>30</height>
211226
</size>
212227
</property>
213-
<property name="locale">
214-
<locale language="English" country="UnitedStates"/>
228+
<property name="autoFillBackground">
229+
<bool>true</bool>
215230
</property>
216231
<property name="text">
217-
<string>Version used to save settings:</string>
232+
<string>Reset setttings to factory defaults</string>
218233
</property>
219234
</widget>
220235
</item>
221-
<item row="0" column="0">
222-
<widget class="QPushButton" name="btn_help">
236+
<item row="2" column="0" colspan="2">
237+
<widget class="QCheckBox" name="opt_debug">
223238
<property name="minimumSize">
224239
<size>
225-
<width>200</width>
240+
<width>0</width>
226241
<height>25</height>
227242
</size>
228243
</property>
229244
<property name="maximumSize">
230245
<size>
231-
<width>500</width>
246+
<width>16777215</width>
232247
<height>30</height>
233248
</size>
234249
</property>
250+
<property name="toolTip">
251+
<string>Enable debug mode.</string>
252+
</property>
253+
<property name="autoFillBackground">
254+
<bool>true</bool>
255+
</property>
235256
<property name="locale">
236257
<locale language="English" country="UnitedStates"/>
237258
</property>
238259
<property name="text">
239-
<string>Help</string>
260+
<string>Debug mode (degraded performances)</string>
261+
</property>
262+
<property name="tristate">
263+
<bool>false</bool>
240264
</property>
241265
</widget>
242266
</item>
243-
<item row="3" column="0" colspan="2">
244-
<widget class="QPushButton" name="btn_reset">
267+
<item row="0" column="1">
268+
<widget class="QPushButton" name="btn_report">
245269
<property name="minimumSize">
246270
<size>
247271
<width>200</width>
@@ -250,49 +274,53 @@ xpn</string>
250274
</property>
251275
<property name="maximumSize">
252276
<size>
253-
<width>16777215</width>
277+
<width>500</width>
254278
<height>30</height>
255279
</size>
256280
</property>
257-
<property name="autoFillBackground">
258-
<bool>true</bool>
281+
<property name="locale">
282+
<locale language="English" country="UnitedStates"/>
259283
</property>
260284
<property name="text">
261-
<string>Reset setttings to factory defaults</string>
285+
<string>Report an issue</string>
262286
</property>
263287
</widget>
264288
</item>
265-
<item row="1" column="0" colspan="2">
266-
<widget class="QCheckBox" name="opt_debug">
289+
<item row="0" column="0">
290+
<widget class="QPushButton" name="btn_help">
267291
<property name="minimumSize">
268292
<size>
269-
<width>0</width>
293+
<width>200</width>
270294
<height>25</height>
271295
</size>
272296
</property>
273297
<property name="maximumSize">
274298
<size>
275-
<width>16777215</width>
299+
<width>500</width>
276300
<height>30</height>
277301
</size>
278302
</property>
279-
<property name="toolTip">
280-
<string>Enable debug mode.</string>
281-
</property>
282-
<property name="autoFillBackground">
283-
<bool>true</bool>
284-
</property>
285303
<property name="locale">
286304
<locale language="English" country="UnitedStates"/>
287305
</property>
288306
<property name="text">
289-
<string>Debug mode (degraded performances)</string>
290-
</property>
291-
<property name="tristate">
292-
<bool>false</bool>
307+
<string>Help</string>
293308
</property>
294309
</widget>
295310
</item>
311+
<item row="1" column="0">
312+
<spacer name="verticalSpacer_2">
313+
<property name="orientation">
314+
<enum>Qt::Vertical</enum>
315+
</property>
316+
<property name="sizeHint" stdset="0">
317+
<size>
318+
<width>20</width>
319+
<height>40</height>
320+
</size>
321+
</property>
322+
</spacer>
323+
</item>
296324
</layout>
297325
</widget>
298326
</item>

‎pyqgis_resource_browser/gui/resource_browser.ui

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>Form</class>
4-
<widget class="QWidget" name="Form">
3+
<class>wdg_resource_browser</class>
4+
<widget class="QWidget" name="wdg_resource_browser">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -11,7 +11,10 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Form</string>
14+
<string>PyQGIS Icons Browser</string>
15+
</property>
16+
<property name="locale">
17+
<locale language="English" country="UnitedStates"/>
1518
</property>
1619
<layout class="QVBoxLayout" name="verticalLayout">
1720
<property name="spacing">
@@ -54,7 +57,7 @@
5457
<item>
5558
<widget class="QToolButton" name="btnUseRegex">
5659
<property name="text">
57-
<string>...</string>
60+
<string notr="true">...</string>
5861
</property>
5962
<property name="autoRaise">
6063
<bool>true</bool>
@@ -64,7 +67,7 @@
6467
<item>
6568
<widget class="QToolButton" name="btnCaseSensitive">
6669
<property name="text">
67-
<string>...</string>
70+
<string notr="true">...</string>
6871
</property>
6972
<property name="autoRaise">
7073
<bool>true</bool>
@@ -74,7 +77,7 @@
7477
<item>
7578
<widget class="QToolButton" name="btnReload">
7679
<property name="text">
77-
<string>...</string>
80+
<string notr="true">...</string>
7881
</property>
7982
<property name="autoRaise">
8083
<bool>true</bool>
@@ -129,7 +132,7 @@ QSplitter::handle:pressed {
129132
</sizepolicy>
130133
</property>
131134
<property name="currentIndex">
132-
<number>0</number>
135+
<number>1</number>
133136
</property>
134137
<widget class="QWidget" name="pageImage">
135138
<attribute name="title">
@@ -219,7 +222,7 @@ QSplitter::handle:pressed {
219222
<bool>true</bool>
220223
</property>
221224
<property name="text">
222-
<string>.*</string>
225+
<string notr="true">.*</string>
223226
</property>
224227
<property name="toolTip">
225228
<string>Activate to use regular expressions</string>
@@ -233,16 +236,19 @@ QSplitter::handle:pressed {
233236
<property name="text">
234237
<string>Reload</string>
235238
</property>
239+
<property name="toolTip">
240+
<string>Reload</string>
241+
</property>
236242
</action>
237243
<action name="optionCaseSensitive">
238244
<property name="checkable">
239245
<bool>true</bool>
240246
</property>
241247
<property name="text">
242-
<string>cC</string>
248+
<string notr="true">cC</string>
243249
</property>
244250
<property name="toolTip">
245-
<string>Activate to filter case-sensitive</string>
251+
<string notr="true">Activate to filter case-sensitive</string>
246252
</property>
247253
</action>
248254
</widget>

0 commit comments

Comments
 (0)