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

List:       kde-commits
Subject:    KDE/kdeutils/khexedit
From:       Laurent Montel <montel () kde ! org>
Date:       2006-06-14 9:03:39
Message-ID: 1150275819.435019.3639.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 551303 by mlaurent:

Start to port it


 M  +10 -4     exportdialog.cc  
 M  +2 -2      exportdialog.h  
 M  +15 -8     fileinfodialog.cc  
 M  +2 -2      fileinfodialog.h  
 M  +1 -1      optiondialog.h  


--- trunk/KDE/kdeutils/khexedit/exportdialog.cc #551302:551303
@@ -36,13 +36,19 @@
 
 
 CExportDialog::CExportDialog( QWidget *parent, char *name, bool modal )
-  :KDialogBase( Tabbed, i18n("Export Document"), Help|Ok|Cancel, Ok,
-		parent, name,  modal )
+  :KPageDialog( parent)
 {
+    setCaption( i18n("Export Document") );
+    setButtons( KDialog::Help|KDialog::Ok|KDialog::Cancel );
+    setDefaultButton( KDialog::Ok );
+    setFaceType( KPageWidget::Tabbed );
+    setModal( modal );
   setHelp( "khexedit/khexedit.html", QString::null );
 
-  mFrame[ page_destination ] = addPage( i18n("Destination") );
-  mFrame[ page_option ] = addPage( i18n("Options") );
+  mFrame[ page_destination ] = new QFrame( this );
+  addPage( mFrame[ page_destination ], i18n("Destination") );
+  mFrame[ page_option ] = new QFrame( this );
+  addPage( mFrame[ page_option ], i18n("Options") );
 
   setupDestinationPage();
   setupOptionPage();
--- trunk/KDE/kdeutils/khexedit/exportdialog.h #551302:551303
@@ -36,11 +36,11 @@
 class Q3WidgetStack;
 class KSimpleConfig;
 
-#include <kdialogbase.h>
+#include <kpagedialog.h>
 #include "hexbuffer.h"
 
 
-class CExportDialog : public KDialogBase
+class CExportDialog : public KPageDialog
 {
   Q_OBJECT
 
--- trunk/KDE/kdeutils/khexedit/fileinfodialog.cc #551302:551303
@@ -71,14 +71,21 @@
 
 
 CFileInfoDialog::CFileInfoDialog( QWidget *parent,const char *name,bool modal)
-  :KDialogBase( Plain, i18n("Statistics"), Help|User1|Cancel, User1,
-		parent, name, modal, true, i18n("&Update") ),
+  :KDialog( parent),
    mBusy(false), mDirty(false)
 {
+    setCaption( i18n("Statistics") );
+    setButtons( Help|User1|Cancel );
+    setDefaultButton( User1 );
+    setButtonText( User1, i18n("&Update") );
+    setModal( true );
+    enableButtonSeparator( true );
   setHelp( "khexedit/khexedit.html", QString::null );
 
   QString text;
-  QVBoxLayout *topLayout = new QVBoxLayout( plainPage() );
+  QFrame *frame = new QFrame( this );
+  setMainWidget( frame );
+  QVBoxLayout *topLayout = new QVBoxLayout( frame );
   topLayout->setSpacing( spacingHint() );
   topLayout->setMargin( 0 );
 
@@ -88,19 +95,19 @@
   gbox->setColumnStretch( 1, 10 );
 
   text = i18n("File name: ");
-  QLabel *label = new QLabel( text, plainPage() );
+  QLabel *label = new QLabel( text, frame );
   gbox->addWidget( label, 0, 0 );
 
   text = i18n("Size [bytes]: ");
-  label = new QLabel( text, plainPage() );
+  label = new QLabel( text, frame );
   gbox->addWidget( label, 1, 0 );
 
-  mFileNameLabel = new QLabel( plainPage() );
-  mFileSizeLabel = new QLabel( plainPage() );
+  mFileNameLabel = new QLabel( frame );
+  mFileSizeLabel = new QLabel(frame );
   gbox->addWidget( mFileNameLabel, 0, 1 );
   gbox->addWidget( mFileSizeLabel, 1, 1 );
 
-  mFrequencyList = new CListView( plainPage() );
+  mFrequencyList = new CListView( frame );
   mFrequencyList->setObjectName( "stringList" );
   mFrequencyList->setFont( KGlobalSettings::fixedFont() );
 
--- trunk/KDE/kdeutils/khexedit/fileinfodialog.h #551302:551303
@@ -33,12 +33,12 @@
 
 class QLabel;
 
-#include <kdialogbase.h>
+#include <kdialog.h>
 
 class CListView;
 #include "hexbuffer.h"
 
-class CFileInfoDialog : public KDialogBase
+class CFileInfoDialog : public KDialog
 {
   Q_OBJECT
   
--- trunk/KDE/kdeutils/khexedit/optiondialog.h #551302:551303
@@ -42,7 +42,7 @@
 class KFontChooser;
 
 
-#include <kdialogbase.h>
+#include <kdialog.h>
 #include <klistbox.h> 
 #include "hexeditstate.h"
 
[prev in list] [next in list] [prev in thread] [next in thread]