[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdevelop/3.4/buildtools/custommakefiles
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2007-01-31 16:08:46
Message-ID: 1170259726.175488.12368.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 628825 by apaku:

Allow to disable the -j argument to make


 M  +6 -1      custommakeconfigwidget.cpp  
 M  +46 -5     custommakeconfigwidgetbase.ui  


--- branches/kdevelop/3.4/buildtools/custommakefiles/custommakeconfigwidget.cpp #628824:628825
@@ -34,6 +34,8 @@
 {
     abort_box->setChecked(DomUtil::readBoolEntry(m_dom, m_configGroup + "/make/abortonerror"));
     jobs_box->setValue(DomUtil::readIntEntry(m_dom, m_configGroup + "/make/numberofjobs"));
+    runMultiJobs->setChecked( (jobs_box->value() > 0 ) );
+
     prio_box->setValue(DomUtil::readIntEntry(m_dom, m_configGroup + "/make/prio"));
     dontact_box->setChecked(DomUtil::readBoolEntry(m_dom, m_configGroup + "/make/dontact"));
     makebin_edit->setText(DomUtil::readEntry(m_dom, m_configGroup + "/make/makebin"));
@@ -115,7 +117,10 @@
 void CustomMakeConfigWidget::accept()
 {
     DomUtil::writeBoolEntry(m_dom, m_configGroup + "/make/abortonerror", abort_box->isChecked());
-    DomUtil::writeIntEntry(m_dom, m_configGroup + "/make/numberofjobs", jobs_box->value());
+    if( runMultiJobs->isChecked() )
+        DomUtil::writeIntEntry(m_dom, m_configGroup + "/make/numberofjobs", jobs_box->value());
+    else
+        DomUtil::writeIntEntry(m_dom, m_configGroup + "/make/numberofjobs", 0);
     DomUtil::writeIntEntry(m_dom, m_configGroup + "/make/prio", prio_box->value());
     DomUtil::writeBoolEntry(m_dom, m_configGroup + "/make/dontact", dontact_box->isChecked());
     DomUtil::writeEntry(m_dom, m_configGroup + "/make/makebin", makebin_edit->text());
--- branches/kdevelop/3.4/buildtools/custommakefiles/custommakeconfigwidgetbase.ui #628824:628825
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>CustomMakeConfigWidgetBase</class>
 <widget class="QWidget">
     <property name="name">
@@ -95,16 +95,27 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>runMultiJobs</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Run multiple jobs</string>
+                    </property>
+                </widget>
                 <widget class="QLabel">
                     <property name="name">
                         <cstring>jobs_label</cstring>
                     </property>
+                    <property name="enabled">
+                        <bool>false</bool>
+                    </property>
                     <property name="text">
                         <string>Number of simultaneous &amp;jobs:</string>
                     </property>
@@ -116,6 +127,9 @@
                     <property name="name">
                         <cstring>jobs_box</cstring>
                     </property>
+                    <property name="enabled">
+                        <bool>false</bool>
+                    </property>
                     <property name="sizePolicy">
                         <sizepolicy>
                             <hsizetype>0</hsizetype>
@@ -139,15 +153,25 @@
                         <enum>Horizontal</enum>
                     </property>
                     <property name="sizeType">
-                        <enum>Fixed</enum>
+                        <enum>Expanding</enum>
                     </property>
                     <property name="sizeHint">
                         <size>
-                            <width>20</width>
+                            <width>200</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
+            </hbox>
+        </widget>
+        <widget class="QLayoutWidget">
+            <property name="name">
+                <cstring>layout5</cstring>
+            </property>
+            <hbox>
+                <property name="name">
+                    <cstring>unnamed</cstring>
+                </property>
                 <widget class="QLabel">
                     <property name="name">
                         <cstring>prio_label</cstring>
@@ -193,7 +217,7 @@
                     </property>
                     <property name="sizeHint">
                         <size>
-                            <width>40</width>
+                            <width>192</width>
                             <height>20</height>
                         </size>
                     </property>
@@ -327,6 +351,18 @@
         <receiver>CustomMakeConfigWidgetBase</receiver>
         <slot>envRemoved()</slot>
     </connection>
+    <connection>
+        <sender>runMultiJobs</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>jobs_label</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>runMultiJobs</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>jobs_box</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
 </connections>
 <tabstops>
     <tabstop>abort_box</tabstop>
@@ -351,4 +387,9 @@
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includehints>
+    <includehint>klineedit.h</includehint>
+    <includehint>klineedit.h</includehint>
+    <includehint>klineedit.h</includehint>
+</includehints>
 </UI>
[prev in list] [next in list] [prev in thread] [next in thread]