Skip to content
This repository was archived by the owner on Mar 1, 2025. It is now read-only.

Commit 672819f

Browse files
authored
Merge pull request FreeCAD#18299 from Roy-043/Draft-change-position-of-Scale-multiplier-field-in-UI
Draft: change position of 'Scale multiplier' field in UI
2 parents e41ac03 + afdf077 commit 672819f

File tree

3 files changed

+183
-131
lines changed

3 files changed

+183
-131
lines changed

src/Mod/Draft/Resources/ui/TaskPanel_SetStyle.ui

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,39 @@
282282
<item>
283283
<widget class="QGroupBox" name="groupBox_3">
284284
<property name="title">
285-
<string>Texts</string>
285+
<string>Annotations</string>
286286
</property>
287287
<layout class="QGridLayout" name="gridLayout_3" columnstretch="1,0" columnminimumwidth="0,100">
288+
<item row="0" column="0">
289+
<widget class="QLabel" name="label_ScaleMultiplier">
290+
<property name="text">
291+
<string>Scale multiplier</string>
292+
</property>
293+
</widget>
294+
</item>
295+
<item row="0" column="1">
296+
<widget class="QDoubleSpinBox" name="ScaleMultiplier">
297+
<property name="toolTip">
298+
<string>The annotation scale multiplier is the inverse of the scale set in the
299+
Annotation scale widget. If the scale is 1:100 the multiplier is 100.</string>
300+
</property>
301+
<property name="minimum">
302+
<number>0</number>
303+
</property>
304+
<property name="maximum">
305+
<number>10000</number>
306+
</property>
307+
</widget>
308+
</item>
309+
</layout>
310+
</widget>
311+
</item>
312+
<item>
313+
<widget class="QGroupBox" name="groupBox_4">
314+
<property name="title">
315+
<string>Texts</string>
316+
</property>
317+
<layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0" columnminimumwidth="0,100">
288318
<item row="0" column="0">
289319
<widget class="QLabel" name="label_TextFont">
290320
<property name="text">
@@ -337,34 +367,13 @@
337367
</widget>
338368
</item>
339369
<item row="3" column="0">
340-
<widget class="QLabel" name="label_ScaleMultiplier">
341-
<property name="text">
342-
<string>Scale multiplier</string>
343-
</property>
344-
</widget>
345-
</item>
346-
<item row="3" column="1">
347-
<widget class="QDoubleSpinBox" name="ScaleMultiplier">
348-
<property name="toolTip">
349-
<string>The annotation scale multiplier is the inverse of the scale set in the
350-
Annotation scale widget. If the scale is 1:100 the multiplier is 100.</string>
351-
</property>
352-
<property name="minimum">
353-
<number>0</number>
354-
</property>
355-
<property name="maximum">
356-
<number>10000</number>
357-
</property>
358-
</widget>
359-
</item>
360-
<item row="4" column="0">
361370
<widget class="QLabel" name="label_TextColor">
362371
<property name="text">
363372
<string>Text color</string>
364373
</property>
365374
</widget>
366375
</item>
367-
<item row="4" column="1">
376+
<item row="3" column="1">
368377
<widget class="Gui::ColorButton" name="TextColor">
369378
<property name="toolTip">
370379
<string>The color for texts, dimension texts and label texts</string>
@@ -375,11 +384,11 @@ Annotation scale widget. If the scale is 1:100 the multiplier is 100.</string>
375384
</widget>
376385
</item>
377386
<item>
378-
<widget class="QGroupBox" name="groupBox_4">
387+
<widget class="QGroupBox" name="groupBox_5">
379388
<property name="title">
380389
<string>Lines and arrows</string>
381390
</property>
382-
<layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0" columnminimumwidth="0,100">
391+
<layout class="QGridLayout" name="gridLayout_5" columnstretch="1,0" columnminimumwidth="0,100">
383392
<item row="0" column="0">
384393
<widget class="QLabel" name="label_AnnoLineWidth">
385394
<property name="text">
@@ -459,11 +468,11 @@ Annotation scale widget. If the scale is 1:100 the multiplier is 100.</string>
459468
</widget>
460469
</item>
461470
<item>
462-
<widget class="QGroupBox" name="groupBox_5">
471+
<widget class="QGroupBox" name="groupBox_6">
463472
<property name="title">
464473
<string>Dimensions</string>
465474
</property>
466-
<layout class="QGridLayout" name="gridLayout_5" columnstretch="1,0" columnminimumwidth="0,100">
475+
<layout class="QGridLayout" name="gridLayout_6" columnstretch="1,0" columnminimumwidth="0,100">
467476
<item row="0" column="0">
468477
<widget class="QLabel" name="label_ShowUnit">
469478
<property name="text">

0 commit comments

Comments
 (0)