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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdevplatform/1=2E2=5D_plugins/execute=3A_fix_proble?=
From:       Milian Wolff <mail () milianw ! de>
Date:       2011-03-04 15:06:53
Message-ID: 20110304150653.6311CA60C9 () git ! kde ! org
[Download RAW message or body]

Git commit f217705674bdea6b46d172f86bc36dc2052ac43e by Milian Wolff. on behalf of \
Gerhard Stengel Committed on 28/02/2011 at 23:27.
Pushed by mwolff into branch '1.2'.

fix problem not being able to select a project target in the launch dialogue. REVIEW: \
100692

M  +5    -12   plugins/execute/nativeappconfig.cpp     
M  +17   -1    plugins/execute/nativeappconfig.ui     

http://commits.kde.org/kdevplatform/f217705674bdea6b46d172f86bc36dc2052ac43e

diff --git a/plugins/execute/nativeappconfig.cpp \
b/plugins/execute/nativeappconfig.cpp index 66b9e9e..08dfe14 100644
--- a/plugins/execute/nativeappconfig.cpp
+++ b/plugins/execute/nativeappconfig.cpp
@@ -67,14 +67,14 @@ static KDevelop::ProjectBaseItem* itemForPath(const QStringList& \
path, KDevelop:  void NativeAppConfigPage::loadFromConfiguration(const KConfigGroup& \
cfg, KDevelop::IProject* project )   {
     bool b = blockSignals( true );
+    projectTarget->setBaseItem( project ? project->projectItem() : 0, true);
+    projectTarget->setCurrentItemPath( cfg.readEntry( \
ExecutePlugin::projectTargetEntry, QStringList() ) ); +    executablePath->setUrl( \
cfg.readEntry( ExecutePlugin::executableEntry, KUrl() ) );  if( cfg.readEntry( \
ExecutePlugin::isExecutableEntry, false ) )   {
         executableRadio->setChecked( true );
-        executablePath->setUrl( cfg.readEntry( ExecutePlugin::executableEntry, \
KUrl() ) );  } else 
     {
-        projectTarget->setBaseItem( project ? project->projectItem() : 0, true);
-        projectTarget->setCurrentItemPath( cfg.readEntry( \
ExecutePlugin::projectTargetEntry, QStringList() ) );  \
projectTargetRadio->setChecked( true );  }
     arguments->setText( cfg.readEntry( ExecutePlugin::argumentsEntry, "" ) );
@@ -253,15 +253,8 @@ void NativeAppConfigPage::saveToConfiguration( KConfigGroup cfg, \
KDevelop::IProj  {
     Q_UNUSED( project );
     cfg.writeEntry( ExecutePlugin::isExecutableEntry, executableRadio->isChecked() \
                );
-    if( executableRadio-> isChecked() )
-    {
-        cfg.writeEntry( ExecutePlugin::executableEntry, executablePath->url() );
-        cfg.deleteEntry( ExecutePlugin::projectTargetEntry );
-    } else
-    {
-        cfg.writeEntry( ExecutePlugin::projectTargetEntry, \
                projectTarget->currentItemPath() );
-        cfg.deleteEntry( ExecutePlugin::executableEntry );
-    }
+    cfg.writeEntry( ExecutePlugin::executableEntry, executablePath->url() );
+    cfg.writeEntry( ExecutePlugin::projectTargetEntry, \
projectTarget->currentItemPath() );  cfg.writeEntry( ExecutePlugin::argumentsEntry, \
                arguments->text() );
     cfg.writeEntry( ExecutePlugin::workingDirEntry, workingDirectory->url() );
     cfg.writeEntry( ExecutePlugin::environmentGroupEntry, \
                environment->currentProfile() );
diff --git a/plugins/execute/nativeappconfig.ui b/plugins/execute/nativeappconfig.ui
index 51d53a4..511fcdf 100644
--- a/plugins/execute/nativeappconfig.ui
+++ b/plugins/execute/nativeappconfig.ui
@@ -32,7 +32,7 @@
         <item>
          <widget class="QRadioButton" name="projectTargetRadio">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -508,5 +508,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>executableRadio</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>projectTarget</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>106</x>
+     <y>73</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>310</x>
+     <y>45</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>


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