Changeset View
Changeset View
Standalone View
Standalone View
authdetails.ui
Show All 11 Lines | 4 | <widget class="QWidget" name="AuthDetails"> | |||
---|---|---|---|---|---|
12 | </property> | 12 | </property> | ||
13 | <property name="sizePolicy"> | 13 | <property name="sizePolicy"> | ||
14 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> | 14 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> | ||
15 | <horstretch>0</horstretch> | 15 | <horstretch>0</horstretch> | ||
16 | <verstretch>0</verstretch> | 16 | <verstretch>0</verstretch> | ||
17 | </sizepolicy> | 17 | </sizepolicy> | ||
18 | </property> | 18 | </property> | ||
19 | <layout class="QGridLayout" name="gridLayout"> | 19 | <layout class="QGridLayout" name="gridLayout"> | ||
20 | <item row="2" column="0"> | 20 | <item row="2" column="1"> | ||
21 | <widget class="QLabel" name="label_3"> | 21 | <widget class="QLabel" name="action_id_label"> | ||
22 | <property name="font"> | 22 | <property name="cursor"> | ||
23 | <font> | 23 | <cursorShape>IBeamCursor</cursorShape> | ||
bruns: Can you try to restore/use the same item order in the XML file as previously?
Should make the… | |||||
The XML file is auto-generated by the form editor in QtCreator. I don’t have any control over it. And I don’t want to mess with it by hand - too easy to break. sharvey: The XML file is auto-generated by the form editor in QtCreator. I don’t have any control over… | |||||
24 | <weight>75</weight> | | |||
25 | <bold>true</bold> | | |||
26 | </font> | | |||
27 | </property> | 24 | </property> | ||
28 | <property name="text"> | 25 | <property name="text"> | ||
29 | <string>Action:</string> | 26 | <string>Action ID:</string> | ||
bruns: I think "ID" is sufficient | |||||
Can you also change it for the placeholder label (row 2, col 1) - convention is to set both (actual label and placeholder) to the same value. And while you are at it, use the same colspan value here as for the other col 1 entries (not you fault, missing since D11950). bruns: Can you also change it for the placeholder label (row 2, col 1) - convention is to set both… | |||||
30 | </property> | 27 | </property> | ||
31 | <property name="alignment"> | 28 | <property name="alignment"> | ||
32 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | 29 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> | ||
30 | </property> | ||||
31 | <property name="textInteractionFlags"> | ||||
32 | <set>Qt::TextSelectableByMouse</set> | ||||
33 | </property> | 33 | </property> | ||
34 | </widget> | 34 | </widget> | ||
35 | </item> | 35 | </item> | ||
36 | <item row="2" column="1" colspan="3"> | 36 | <item row="4" column="0"> | ||
37 | <widget class="QLabel" name="action_label"> | 37 | <widget class="QLabel" name="vendorL"> | ||
38 | <property name="font"> | ||||
39 | <font> | ||||
40 | <weight>75</weight> | ||||
41 | <bold>true</bold> | ||||
42 | </font> | ||||
43 | </property> | ||||
38 | <property name="text"> | 44 | <property name="text"> | ||
39 | <string><null></string> | 45 | <string>Vendor:</string> | ||
40 | </property> | 46 | </property> | ||
41 | <property name="alignment"> | 47 | <property name="alignment"> | ||
42 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> | 48 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
43 | </property> | | |||
44 | </widget> | | |||
45 | </item> | | |||
46 | <item row="0" column="0" colspan="4"> | | |||
47 | <widget class="Line" name="line"> | | |||
48 | <property name="orientation"> | | |||
49 | <enum>Qt::Horizontal</enum> | | |||
50 | </property> | 49 | </property> | ||
51 | </widget> | 50 | </widget> | ||
52 | </item> | 51 | </item> | ||
53 | <item row="5" column="1" colspan="3"> | 52 | <item row="4" column="1" colspan="2"> | ||
54 | <widget class="KUrlLabel" name="vendorUL"> | 53 | <widget class="KUrlLabel" name="vendorUL"> | ||
55 | <property name="text"> | 54 | <property name="text"> | ||
56 | <string>Vendor:</string> | 55 | <string>Vendor:</string> | ||
57 | </property> | 56 | </property> | ||
58 | <property name="tipText"> | 57 | <property name="tipText"> | ||
59 | <string/> | 58 | <string/> | ||
60 | </property> | 59 | </property> | ||
61 | <property name="glowEnabled"> | 60 | <property name="glowEnabled"> | ||
62 | <bool>false</bool> | 61 | <bool>false</bool> | ||
63 | </property> | 62 | </property> | ||
64 | <property name="useTips"> | 63 | <property name="useTips"> | ||
65 | <bool>true</bool> | 64 | <bool>true</bool> | ||
66 | </property> | 65 | </property> | ||
67 | </widget> | 66 | </widget> | ||
68 | </item> | 67 | </item> | ||
69 | <item row="5" column="0"> | 68 | <item row="1" column="1" colspan="2"> | ||
70 | <widget class="QLabel" name="vendorL"> | 69 | <widget class="QLabel" name="action_label"> | ||
71 | <property name="font"> | | |||
72 | <font> | | |||
73 | <weight>75</weight> | | |||
74 | <bold>true</bold> | | |||
75 | </font> | | |||
76 | </property> | | |||
77 | <property name="text"> | 70 | <property name="text"> | ||
78 | <string>Vendor:</string> | 71 | <string><null></string> | ||
79 | </property> | 72 | </property> | ||
80 | <property name="alignment"> | 73 | <property name="alignment"> | ||
81 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | 74 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> | ||
82 | </property> | 75 | </property> | ||
83 | </widget> | 76 | </widget> | ||
84 | </item> | 77 | </item> | ||
85 | <item row="1" column="0"> | 78 | <item row="2" column="0"> | ||
86 | <widget class="QLabel" name="label"> | 79 | <widget class="QLabel" name="label_2"> | ||
87 | <property name="font"> | 80 | <property name="font"> | ||
88 | <font> | 81 | <font> | ||
89 | <weight>75</weight> | 82 | <weight>75</weight> | ||
90 | <bold>true</bold> | 83 | <bold>true</bold> | ||
91 | </font> | 84 | </font> | ||
92 | </property> | 85 | </property> | ||
93 | <property name="text"> | 86 | <property name="text"> | ||
94 | <string>Application:</string> | 87 | <string>ID:</string> | ||
95 | </property> | 88 | </property> | ||
96 | <property name="alignment"> | 89 | <property name="alignment"> | ||
97 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | 90 | <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set> | ||
98 | </property> | 91 | </property> | ||
99 | </widget> | 92 | </widget> | ||
100 | </item> | 93 | </item> | ||
101 | <item row="1" column="1" colspan="3"> | 94 | <item row="1" column="0"> | ||
102 | <widget class="QLabel" name="app_label"> | 95 | <widget class="QLabel" name="label_3"> | ||
103 | <property name="text"> | | |||
104 | <string>Application:</string> | | |||
105 | </property> | | |||
106 | <property name="alignment"> | | |||
107 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> | | |||
108 | </property> | | |||
109 | </widget> | | |||
110 | </item> | | |||
111 | <item row="3" column="1"> | | |||
112 | <widget class="QLabel" name="action_id_label"> | | |||
113 | <property name="cursor"> | | |||
114 | <cursorShape>IBeamCursor</cursorShape> | | |||
115 | </property> | | |||
116 | <property name="text"> | | |||
117 | <string>Action ID:</string> | | |||
118 | </property> | | |||
119 | <property name="textInteractionFlags"> | | |||
120 | <set>Qt::TextSelectableByMouse</set> | | |||
121 | </property> | | |||
122 | </widget> | | |||
123 | </item> | | |||
124 | <item row="3" column="0"> | | |||
125 | <widget class="QLabel" name="label_2"> | | |||
126 | <property name="font"> | 96 | <property name="font"> | ||
127 | <font> | 97 | <font> | ||
128 | <weight>75</weight> | 98 | <weight>75</weight> | ||
129 | <bold>true</bold> | 99 | <bold>true</bold> | ||
130 | </font> | 100 | </font> | ||
131 | </property> | 101 | </property> | ||
132 | <property name="text"> | 102 | <property name="text"> | ||
133 | <string>Action ID:</string> | 103 | <string>Action:</string> | ||
134 | </property> | 104 | </property> | ||
135 | <property name="alignment"> | 105 | <property name="alignment"> | ||
136 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | 106 | <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set> | ||
107 | </property> | ||||
108 | </widget> | ||||
109 | </item> | ||||
110 | <item row="0" column="0" colspan="3"> | ||||
111 | <widget class="Line" name="line"> | ||||
112 | <property name="orientation"> | ||||
113 | <enum>Qt::Horizontal</enum> | ||||
137 | </property> | 114 | </property> | ||
138 | </widget> | 115 | </widget> | ||
139 | </item> | 116 | </item> | ||
140 | </layout> | 117 | </layout> | ||
141 | </widget> | 118 | </widget> | ||
142 | <customwidgets> | 119 | <customwidgets> | ||
143 | <customwidget> | 120 | <customwidget> | ||
144 | <class>KUrlLabel</class> | 121 | <class>KUrlLabel</class> | ||
145 | <extends>QLabel</extends> | 122 | <extends>QLabel</extends> | ||
146 | <header>kurllabel.h</header> | 123 | <header>kurllabel.h</header> | ||
147 | </customwidget> | 124 | </customwidget> | ||
148 | </customwidgets> | 125 | </customwidgets> | ||
149 | <resources/> | 126 | <resources/> | ||
150 | <connections/> | 127 | <connections/> | ||
151 | </ui> | 128 | </ui> |
Can you try to restore/use the same item order in the XML file as previously?
Should make the diff significantly smaller, and easier to review.