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

List:       kde-commits
Subject:    kdebase/kate/app
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2005-04-29 19:29:14
Message-ID: 20050429192914.6F769629 () office ! kde ! org
[Download RAW message or body]

CVS commit by cullmann: 

cancel won't work


  M +21 -18    katemwmodonhddialog.cpp   1.3
  M +1 -1      katemwmodonhddialog.h   1.2


--- kdebase/kate/app/katemwmodonhddialog.cpp  #1.2:1.3
@@ -32,4 +32,5 @@
 #include <krun.h>
 #include <ktempfile.h>
+#include <kpushbutton.h>
 
 #include <qlabel.h>
@@ -38,4 +39,5 @@
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
+#include <qvbox.h>
 
 class KateDocItem : public QCheckListItem
@@ -58,6 +60,8 @@ class KateDocItem : public QCheckListIte
 KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, QWidget *parent, const \
char *name )  : KDialogBase( parent, name, true, i18n("Documents Modified on Disk"),
-                 User1|User2|User3|Cancel, User3, false,
-                 i18n("&Ignore"), i18n("&Overwrite"), i18n("&Reload") )
+                 User1|User2|User3, User3, false,
+                 KGuiItem (i18n("&Ignore"), "fileclose"),
+                 KGuiItem (i18n("&Overwrite"), "filesave"),
+                 KGuiItem (i18n("&Reload"), "reload") )
 {
   setButtonWhatsThis( User1, i18n(
@@ -70,23 +74,17 @@ KateMwModOnHdDialog::KateMwModOnHdDialog
       "Reloads the selected documents from disk and closes the dialog if there "
       "are no more unhandled documents.") );
-  setButtonWhatsThis( Cancel, i18n("Do not handle the changes now. You will be "
-      "prompted when individual documents are focused.") );
 
-  QFrame *w = makeMainWidget();
-  QVBoxLayout *lo = new QVBoxLayout( w );
-  lo->setSpacing( KDialog::spacingHint() );
+  QVBox *w = makeVBoxMainWidget();
+  w->setSpacing( KDialog::spacingHint() );
 
-  QHBoxLayout *lo1 = new QHBoxLayout( lo );
+  QHBox *lo1 = new QHBox( w );
 
   // dialog text
-  QLabel *icon = new QLabel( w );
+  QLabel *icon = new QLabel( lo1 );
   icon->setPixmap( DesktopIcon("messagebox_warning") );
-  lo1->addWidget( icon );
-
 
   QLabel *t = new QLabel( i18n(
       "<qt>The documents listed below has changed on disk.<p>Select one "
-      "or more at the time and press an action button until the list is \
                empty.</qt>"), w );
-  lo1->addWidget( t );
+      "or more at the time and press an action button until the list is \
empty.</qt>"), lo1 );  lo1->setStretchFactor( t, 1000 );
 
@@ -101,12 +99,13 @@ KateMwModOnHdDialog::KateMwModOnHdDialog
   for ( uint i=0; i < docs.size(); i++ )
     new KateDocItem( docs[i], l[ (uint)KateDocManager::self()->documentInfo( docs[i] \
                )->modifiedOnDiscReason ], lvDocuments );
-  lo->addWidget( lvDocuments );
+
   connect( lvDocuments, SIGNAL(selectionChanged()), this, \
SLOT(slotSelectionChanged()) );  
   // diff button
-  QHBoxLayout *lo2 = new QHBoxLayout( lo );
-  lo2->addStretch(10);
-  btnDiff = new QPushButton( i18n("&View Difference"), w );
-  lo2->addWidget( btnDiff );
+  QHBox *lo2 = new QHBox ( w );
+  QWidget *d = new QWidget (lo2);
+  lo2->setStretchFactor (d, 2);
+  btnDiff = new KPushButton( KGuiItem (i18n("&View Difference"), "edit"), lo2 );
+
   QWhatsThis::add( btnDiff, i18n(
       "Calculates the difference between the the editor contents and the disk "
@@ -119,4 +118,8 @@ KateMwModOnHdDialog::KateMwModOnHdDialog
 }
 
+KateMwModOnHdDialog::~KateMwModOnHdDialog()
+{
+}
+
 void KateMwModOnHdDialog::slotUser1()
 {

--- kdebase/kate/app/katemwmodonhddialog.h  #1.1:1.2
@@ -37,5 +37,5 @@ class KateMwModOnHdDialog : public KDial
   public:
     KateMwModOnHdDialog( DocVector docs, QWidget *parent=0, const char *name=0 );
-    ~KateMwModOnHdDialog() {};
+    ~KateMwModOnHdDialog();
 
   protected slots:


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