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

List:       kde-commits
Subject:    KDE/kdebase/apps/konsole/src
From:       Kurt Hindenburg <kurt.hindenburg () gmail ! com>
Date:       2010-03-25 14:45:21
Message-ID: 20100325144521.0D293AC87D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1107401 by hindenburg:

Use static getColor instead of dialog->exec

 M  +10 -10    ColorSchemeEditor.cpp  


--- trunk/KDE/kdebase/apps/konsole/src/ColorSchemeEditor.cpp #1107400:1107401
@@ -120,18 +120,18 @@
     if ( item->column() != 1 ) 
         return;
 
-    KColorDialog* dialog = new KColorDialog(this);
-    dialog->setColor( item->background().color() );
+    QColor color = item->background().color();
+    int result = KColorDialog::getColor( color );
+    if ( result == KColorDialog::Accepted ) {
+        item->setBackground( color );
 
-    dialog->exec();
+        ColorEntry entry( _colors->colorEntry(item->row()) );
+        entry.color = color;
+        _colors->setColorTableEntry( item->row(), entry ); 
+    
+        emit colorsChanged( _colors );
 
-    item->setBackground( dialog->color() );
-
-    ColorEntry entry(_colors->colorEntry(item->row()));
-    entry.color = dialog->color();
-    _colors->setColorTableEntry(item->row(),entry); 
-
-    emit colorsChanged(_colors);
+    }
 }
 void ColorSchemeEditor::setDescription(const QString& text)
 {
[prev in list] [next in list] [prev in thread] [next in thread]