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

List:       kde-commits
Subject:    extragear/base/konq-plugins/domtreeviewer
From:       Pino Toscano <pino () kde ! org>
Date:       2008-02-29 14:01:18
Message-ID: 1204293678.858931.20674.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780583 by pino:

Make the TextEditDialog more KDE-ish (use KDialog and its standard buttons, etc).


 M  +1 -1      CMakeLists.txt  
 M  +19 -8     domtreeview.cpp  
 M  +0 -8      domtreeview.h  
 D             texteditdialog.ui  
 A             texteditwidget.ui   texteditdialog.ui#780575


--- trunk/extragear/base/konq-plugins/domtreeviewer/CMakeLists.txt #780582:780583
@@ -12,7 +12,7 @@
    domtreecommands.cpp 
    signalreceiver.cpp )
 
-kde4_add_ui_files(domtreeviewerplugin_PART_SRCS domtreeviewbase.ui texteditdialog.ui \
elementeditdialog.ui attributeeditwidget.ui messagedialog.ui) \
+kde4_add_ui_files(domtreeviewerplugin_PART_SRCS domtreeviewbase.ui texteditwidget.ui \
elementeditdialog.ui attributeeditwidget.ui messagedialog.ui)  
 kde4_add_plugin(domtreeviewerplugin WITH_PREFIX ${domtreeviewerplugin_PART_SRCS})
 
--- trunk/extragear/base/konq-plugins/domtreeviewer/domtreeview.cpp #780582:780583
@@ -21,6 +21,7 @@
 
 #include "signalreceiver.h"
 #include "ui_attributeeditwidget.h"
+#include "ui_texteditwidget.h"
 
 #include <assert.h>
 
@@ -70,16 +71,26 @@
 }
 
 
-TextEditDialog::TextEditDialog( QWidget *parent )
-: QDialog( parent )
+class TextEditDialog : public KDialog, public Ui::TextEditWidget
 {
-    setupUi( this );
-    connect(insChildBtn, SIGNAL(clicked()), this, SLOT(accept()));
-    connect(cancelBtn, SIGNAL(clicked()), this, SLOT(reject()));
-    connect(insBeforeBtn, SIGNAL(clicked()), this, SLOT(accept()));
-}
+public:
+    TextEditDialog(QWidget *parent)
+        : KDialog(parent)
+    {
+        setupUi(mainWidget());
 
+        setWindowTitle(i18n("Edit Text"));
+        setButtons(User1 | User2 | Cancel);
+        setButtonText(User1, i18n("&Append as Child"));
+        setButtonText(User2, i18n("Insert &Before Current"));
 
+        connect(this, SIGNAL(cancelClicked()), this, SLOT(reject()));
+        connect(this, SIGNAL(user1Clicked()), this, SLOT(accept()));
+        connect(this, SIGNAL(user2Clicked()), this, SLOT(accept()));
+    }
+};
+
+
 class AttributeEditDialog : public KDialog, public Ui::AttributeEditWidget
 {
 public:
@@ -942,7 +953,7 @@
   {
     TextEditDialog dlg(this);
     dlg.setModal(true);
-    connect(dlg.insBeforeBtn, SIGNAL(clicked()), &addBefore, SLOT(slot()));
+    connect(dlg.button(KDialog::User2), SIGNAL(clicked()), &addBefore, \
SLOT(slot()));  
     if (dlg.exec() != QDialog::Accepted) return;
 
--- trunk/extragear/base/konq-plugins/domtreeviewer/domtreeview.h #780582:780583
@@ -24,7 +24,6 @@
 #include <dom/dom_node.h>
 
 #include "ui_domtreeviewbase.h"
-#include "ui_texteditdialog.h"
 #include "ui_elementeditdialog.h"
 
 namespace DOM {
@@ -48,13 +47,6 @@
 };
 
 
-
-class TextEditDialog : public QDialog, public Ui::TextEditDialog
-{
-public:
-  TextEditDialog( QWidget *parent );
-};
-
 class DOMTreeViewBase : public QWidget, public Ui::DOMTreeViewBase
 {
 public:


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