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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdebase/kate/app
From:       Laurent Montel <montel () kde ! org>
Date:       2004-08-22 19:26:40
Message-ID: 20040822192640.780CC1DD4 () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Backport all my changes:
-> update menu (add slotChanged())
-> fix enable/disable up/down button
-> fix mem leak
-> Update list when we changed tools name


  M +11 -6     kateexternaltools.cpp   1.10.2.2


--- kdebase/kate/app/kateexternaltools.cpp  #1.10.2.1:1.10.2.2
@@ -226,4 +226,5 @@ void KateExternalToolsMenuAction::reload
 
   m_actionCollection->readShortcutSettings( "Shortcuts", config );
+  delete config;
 }
 
@@ -433,5 +434,5 @@ void KateExternalToolsConfigWidget::relo
     }
   }
-
+  delete config;
 
 }
@@ -475,4 +476,5 @@ void KateExternalToolsConfigWidget::appl
 
   config->sync();
+  delete config;
 }
 
@@ -483,6 +485,6 @@ void KateExternalToolsConfigWidget::slot
   btnEdit->setEnabled( hs && static_cast<ToolItem*>(lbTools->selectedItem()) );
   btnRemove->setEnabled( hs );
-  btnMoveUp->setEnabled( lbTools->currentItem() > 0 );
-  btnMoveDwn->setEnabled( lbTools->currentItem() < (int)lbTools->count()-1 );
+  btnMoveUp->setEnabled( (lbTools->currentItem() > 0) && hs );
+  btnMoveDwn->setEnabled( (lbTools->currentItem() < (int)lbTools->count()-1) && hs \
);  }
 
@@ -529,5 +531,5 @@ void KateExternalToolsConfigWidget::slot
   {
 
-    bool iconChanged = ( editor.btnIcon->icon() != t->icon );
+    bool elementChanged = (( editor.btnIcon->icon() != t->icon ) || \
(editor.leName->text() != t->name ) );  
     t->name = editor.leName->text();
@@ -537,6 +539,6 @@ void KateExternalToolsConfigWidget::slot
     t->mimetypes = QStringList::split( QRegExp("\\s*;\\s*"), \
editor.leMimetypes->text() );  
-    //if the icon has changed, I have to renew the listbox item :S
-    if ( iconChanged )
+    //if the icon has changed or name changed, I have to renew the listbox item :S
+    if ( elementChanged )
     {
       int idx = lbTools->index( lbTools->selectedItem() );
@@ -552,4 +554,5 @@ void KateExternalToolsConfigWidget::slot
 {
   lbTools->insertItem( "---", lbTools->currentItem()+1 );
+  slotChanged();
 }
 
@@ -578,4 +581,5 @@ void KateExternalToolsConfigWidget::slot
   lbTools->setCurrentItem( idx - 1 );
   slotSelectionChanged();
+  slotChanged();
 }
 
@@ -604,4 +608,5 @@ void KateExternalToolsConfigWidget::slot
   lbTools->setCurrentItem( idx+1 );
   slotSelectionChanged();
+  slotChanged();
 }
 //END KateExternalToolsConfigWidget


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