Differential D5122 Diff 14222 projectbuilders/makebuilder/makeconfig.ui

Changeset View

Standalone View

View Options

projectbuilders/makebuilder/makeconfig.ui

1<?xml version="1.0" encoding="UTF-8"?> 1​<?xml version="1.0" encoding="UTF-8"?>
2<ui version="4.0"> 2​<ui version="4.1">
3 <class>MakeConfig</class> 3​ <class>MakeConfig</class>
4 <widget class="QWidget" name="MakeConfig"> 4​ <widget class="QWidget" name="MakeConfig">
5 <property name="geometry"> 5​ <property name="geometry">
6 <rect> 6​ <rect>
7 <x>0</x> 7​ <x>0</x>
8 <y>0</y> 8​ <y>0</y>
9 <width>521</width> 9​ <width>521</width>
10 <height>362</height> 10​ <height>362</height>
11 </rect> 11​ </rect>
12 </property> 12​ </property>
13 <layout class="QFormLayout" name="formLayout"> 13​ <layout class="QFormLayout" name="formLayout">
14 <property name="margin"> ​
15 <number>0</number> ​
16 </property> ​
17 <property name="fieldGrowthPolicy"> 14​ <property name="fieldGrowthPolicy">
18 <enum>QFormLayout::AllNonFixedFieldsGrow</enum> 15​ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
19 </property> 16​ </property>
17​ <property name="leftMargin">
18​ <number>0</number>
19​ </property>
20​ <property name="topMargin">
21​ <number>0</number>
22​ </property>
23​ <property name="rightMargin">
24​ <number>0</number>
25​ </property>
26​ <property name="bottomMargin">
27​ <number>0</number>
28​ </property>
20 <item row="0" column="0"> 29​ <item row="0" column="0">
21 <widget class="QLabel" name="label_8"> 30​ <widget class="QLabel" name="label_8">
22 <property name="text"> 31​ <property name="text">
23 <string>&amp;Abort on first error:</string> 32​ <string>&amp;Abort on first error:</string>
24 </property> 33​ </property>
25 <property name="alignment"> 34​ <property name="alignment">
26 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 35​ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
27 </property> 36​ </property>
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Line(s)89 <item row="3" column="0">
90 </property> 99​ </property>
91 </widget> 100​ </widget>
92 </item> 101​ </item>
93 <item row="3" column="1"> 102​ <item row="3" column="1">
94 <widget class="KComboBox" name="kcfg_suCommand"> 103​ <widget class="KComboBox" name="kcfg_suCommand">
95 <property name="enabled"> 104​ <property name="enabled">
96 <bool>false</bool> 105​ <bool>false</bool>
97 </property> 106​ </property>
107​ <property name="editable">
108​ <bool>true</bool>
109​ </property>
98 <item> 110​ <item>
99 <property name="text"> 111​ <property name="text">
100 <string>kdesu</string> 112​ <string>kdesu</string>
101 </property> 113​ </property>
102 </item> 114​ </item>
103 <item> 115​ <item>
104 <property name="text"> 116​ <property name="text">
105 <string>kdesudo</string> 117​ <string>kdesudo</string>
106 </property> 118​ </property>
107 </item> 119​ </item>
108 <item> 120​ <item>
109 <property name="text"> 121​ <property name="text">
110 <string>sudo</string> 122​ <string>gksu</string>
kossebauUnsubmitted
Not Done

This string does not match the handling in switch(suCommandNum) for value 2, or?

kossebau: This string does not match the handling in `switch(suCommandNum)` for value 2, or?
zhigalinUnsubmitted
Not Done

sudo just doesn't work as we don't have an interactive terminal here, so I removed it
However, if a user has previously selected sudo, it will be kept as transition code in makejob.cpp still works

zhigalin: sudo just doesn't work as we don't have an interactive terminal here, so I removed it However…
kossebauUnsubmitted
Not Done

Ah, now I see, okay, so that is for backward compat support.

Please add a comment to the if(suCommandIsDigit) code section to make that clear,
as otherwise some future reader of the code could be confused as well by the handling of those magic numbers.

kossebau: Ah, now I see, okay, so that is for backward compat support. Please add a comment to the `if…
111 </property> 123​ </property>
112 </item> 124​ </item>
kfunkUnsubmitted
Done

Casing: Custom Command

kfunk: Casing: `Custom Command`
113 </widget> 125​ </widget>
114 </item> 126​ </item>
115 <item row="5" column="0"> 127​ <item row="5" column="0">
116 <widget class="QLabel" name="label"> 128​ <widget class="QLabel" name="label">
117 <property name="enabled"> 129​ <property name="enabled">
118 <bool>false</bool> 130​ <bool>false</bool>
119 </property> 131​ </property>
120 <property name="text"> 132​ <property name="text">
Show All 26 Lines158 <property name="alignment">
147 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> 159​ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
148 </property> 160​ </property>
149 <property name="buddy"> 161​ <property name="buddy">
150 <cstring>makeExecutable</cstring> 162​ <cstring>makeExecutable</cstring>
151 </property> 163​ </property>
152 </widget> 164​ </widget>
153 </item> 165​ </item>
154 <item row="6" column="1"> 166​ <item row="6" column="1">
155 <widget class="KUrlRequester" name="makeExecutable"> 167​ <widget class="KUrlRequester" name="makeExecutable" native="true">
156 <property name="sizePolicy"> 168​ <property name="sizePolicy">
157 <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> 169​ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
158 <horstretch>0</horstretch> 170​ <horstretch>0</horstretch>
159 <verstretch>0</verstretch> 171​ <verstretch>0</verstretch>
160 </sizepolicy> 172​ </sizepolicy>
161 </property> 173​ </property>
162 </widget> 174​ </widget>
163 </item> 175​ </item>
▲ Show 20 Lines • Show All 101 Lines • ▼ Show 20 Line(s)
265 </layout> 277​ </layout>
266 </widget> 278​ </widget>
267 <customwidgets> 279​ <customwidgets>
268 <customwidget> 280​ <customwidget>
269 <class>KUrlRequester</class> 281​ <class>KUrlRequester</class>
270 <extends>QWidget</extends> 282​ <extends>QWidget</extends>
271 <header>kurlrequester.h</header> 283​ <header>kurlrequester.h</header>
272 <container>1</container> 284​ <container>1</container>
273 </customwidget> 285​ </customwidget>
brauchUnsubmitted
Done

should have a : at the end

brauch: should have a : at the end
274 <customwidget> 286​ <customwidget>
275 <class>KComboBox</class> 287​ <class>KComboBox</class>
276 <extends>QComboBox</extends> 288​ <extends>QComboBox</extends>
277 <header>kcombobox.h</header> 289​ <header>kcombobox.h</header>
278 </customwidget> 290​ </customwidget>
279 <customwidget> 291​ <customwidget>
280 <class>KDevelop::EnvironmentSelectionWidget</class> 292​ <class>KDevelop::EnvironmentSelectionWidget</class>
281 <extends>KComboBox</extends> 293​ <extends>KComboBox</extends>
Show All 35 Lines325 <hints>
317 </hint> 329​ </hint>
318 <hint type="destinationlabel"> 330​ <hint type="destinationlabel">
319 <x>195</x> 331​ <x>195</x>
320 <y>97</y> 332​ <y>97</y>
321 </hint> 333​ </hint>
322 </hints> 334​ </hints>
323 </connection> 335​ </connection>
324 <connection> 336​ <connection>
337​ <sender>kcfg_installAsRoot</sender>
338​ <signal>toggled(bool)</signal>
339​ <receiver>kcfg_suCommand</receiver>
340​ <slot>setEnabled(bool)</slot>
341​ <hints>
342​ <hint type="sourcelabel">
343​ <x>516</x>
344​ <y>74</y>
345​ </hint>
346​ <hint type="destinationlabel">
347​ <x>195</x>
348​ <y>97</y>
349​ </hint>
350​ </hints>
351​ </connection>
352​ <connection>
325 <sender>kcfg_overrideNumberOfJobs</sender> 353​ <sender>kcfg_overrideNumberOfJobs</sender>
326 <signal>clicked(bool)</signal> 354​ <signal>clicked(bool)</signal>
327 <receiver>kcfg_numberOfJobs</receiver> 355​ <receiver>kcfg_numberOfJobs</receiver>
328 <slot>setEnabled(bool)</slot> 356​ <slot>setEnabled(bool)</slot>
329 <hints> 357​ <hints>
330 <hint type="sourcelabel"> 358​ <hint type="sourcelabel">
331 <x>411</x> 359​ <x>411</x>
332 <y>128</y> 360​ <y>128</y>
Show All 25 Lines