From kde-commits  Fri Sep 15 22:17:35 2006
From: Jens Dagerbo <jens.dagerbo () swipnet ! se>
Date: Fri, 15 Sep 2006 22:17:35 +0000
To: kde-commits
Subject: branches/kdevelop/3.4/parts/ctags2
Message-Id: <1158358655.508857.7601.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=115835866818249

SVN commit 584960 by dagerbo:

when restoring a saved custom argument string, enable checkbox and lineedit to indicate that the stored value is in effect. thanks to 'mwoehlke' for the report

 M  +8 -1      ctags2_settingswidget.cpp  
 M  +11 -2     ctags2_settingswidgetbase.ui  


--- branches/kdevelop/3.4/parts/ctags2/ctags2_settingswidget.cpp #584959:584960
@@ -56,7 +56,14 @@
 void CTags2SettingsWidget::loadSettings()
 {
 	QDomDocument & dom = *m_part->projectDom();
-	tagfileCustomEdit->setText( DomUtil::readEntry( dom, "/ctagspart/customArguments" ) );
+
+	QString customArgs = DomUtil::readEntry( dom, "/ctagspart/customArguments" );
+	if ( !customArgs.isEmpty() )
+	{
+		tagfileCustomBox->setChecked( true );
+		tagfileCustomEdit->setText( customArgs );
+	}
+
 	QString customTagfile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" );
 	if (customTagfile.isEmpty())
 	{
--- branches/kdevelop/3.4/parts/ctags2/ctags2_settingswidgetbase.ui #584959:584960
@@ -107,7 +107,7 @@
                             </widget>
                             <widget class="QCheckBox">
                                 <property name="name">
-                                    <cstring>checkBox5</cstring>
+                                    <cstring>tagfileCustomBox</cstring>
                                 </property>
                                 <property name="text">
                                     <string>&amp;Use custom tagfile generation arguments</string>
@@ -281,6 +281,8 @@
         </widget>
     </vbox>
 </widget>
+<customwidgets>
+</customwidgets>
 <connections>
     <connection>
         <sender>addButton</sender>
@@ -301,11 +303,17 @@
         <slot>createNewTagSlot()</slot>
     </connection>
     <connection>
-        <sender>checkBox5</sender>
+        <sender>tagfileCustomBox</sender>
         <signal>toggled(bool)</signal>
         <receiver>tagfileCustomEdit</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
+    <connection>
+        <sender>tagfileCustomBox</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>tagfileCustomEdit</receiver>
+        <slot>clear()</slot>
+    </connection>
 </connections>
 <slots>
     <slot>createNewTagSlot()</slot>
@@ -316,6 +324,7 @@
 </slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
+    <includehint>klineedit.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>