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

List:       kde-commits
Subject:    koffice/kspread/dialogs
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2006-06-14 17:20:32
Message-ID: 1150305632.236173.23974.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 551464 by nikolaus:

- port to new API


 M  +5 -3      kspread_dlg_conditional.cc  
 M  +2 -2      kspread_dlg_cons.cc  
 M  +2 -2      kspread_dlg_csv.cc  
 M  +2 -1      kspread_dlg_goalseek.cc  
 M  +2 -1      kspread_dlg_paperlayout.cc  
 M  +1 -1      kspread_dlg_styles.cc  
 M  +1 -1      kspread_dlg_subtotal.cc  


--- trunk/koffice/kspread/dialogs/kspread_dlg_conditional.cc #551463:551464
@@ -271,19 +271,21 @@
  */
 ConditionalDialog::ConditionalDialog( View * parent, const char * name,
                                               const QRect & marker )
-  : KDialog( parent, i18n( "Conditional Cell Attributes" ),
-             KDialog::Ok|KDialog::Cancel ),
+  : KDialog( parent ),
     m_view( parent ),
     m_dlg( new ConditionalWidget( this ) ),
     m_marker( marker )
 {
+  setCaption(i18n( "Conditional Cell Attributes" ));
+  setButtons(KDialog::Ok|KDialog::Cancel);
+
   QStringList list( m_view->doc()->styleManager()->styleNames() );
 
   m_dlg->m_style_1->insertItems( 0, list );
   m_dlg->m_style_2->insertItems( 0, list );
   m_dlg->m_style_3->insertItems( 0, list );
 
-  setButtonBoxOrientation( Qt::Vertical );
+  setButtonsOrientation( Qt::Vertical );
   setMainWidget( m_dlg );
 
   init();
--- trunk/koffice/kspread/dialogs/kspread_dlg_cons.cc #551463:551464
@@ -622,7 +622,7 @@
   m_pRefs->removeItem( i );
 
   if ( m_pRefs->count() == 0 )
-    actionButton( Ok )->setEnabled( false );
+    enableButton( Ok, false );
 }
 
 QStringList ConsolidateDialog::refs()
@@ -663,7 +663,7 @@
   if ( !txt.isEmpty() )
   {
     m_pRefs->insertItem( txt );
-    actionButton( Ok )->setEnabled( true );
+    enableButton( Ok, true );
   }
 }
 
--- trunk/koffice/kspread/dialogs/kspread_dlg_csv.cc #551463:551464
@@ -216,7 +216,7 @@
     //cancel action !
     if ( file.isEmpty() )
     {
-        actionButton( Ok )->setEnabled( false );
+        enableButton( Ok, false );
         m_cancelled = true;
         return;
     }
@@ -225,7 +225,7 @@
     {
       KMessageBox::sorry( this, i18n("Cannot open input file.") );
       in.close();
-      actionButton( Ok )->setEnabled( false );
+      enableButton( Ok, false );
       m_cancelled = true;
       return;
     }
--- trunk/koffice/kspread/dialogs/kspread_dlg_goalseek.cc #551463:551464
@@ -61,7 +61,7 @@
 
 GoalSeekDialog::GoalSeekDialog( View * parent,  QPoint const & marker,
                                         const char * name, bool, Qt::WFlags fl )
-  : KDialog( parent, name, false, fl ),
+  : KDialog( parent, fl ),
     m_pView( parent ),
     m_maxIter( 1000 ),
     m_restored( true ),
@@ -70,6 +70,7 @@
     m_selection( m_pView->selectionInfo()->selection() )
 {
   //setWFlags( Qt::WDestructiveClose );
+  setModal( false );
 
   if ( !name )
     setObjectName( "GoalSeekDialog" );
--- trunk/koffice/kspread/dialogs/kspread_dlg_paperlayout.cc #551463:551464
@@ -73,7 +73,8 @@
 {
     SheetPrint* print = m_pSheet->print();
 
-    QWidget *tab = addPage(i18n( "Options" ));
+    QWidget* tab =  new QWidget(this);
+    addPage( tab, i18n( "Options" ) );
     QVBoxLayout *vbox = new QVBoxLayout( tab );
     vbox->setMargin(KDialog::marginHint());
     vbox->setSpacing(KDialog::spacingHint());
--- trunk/koffice/kspread/dialogs/kspread_dlg_styles.cc #551463:551464
@@ -79,7 +79,7 @@
     m_styleManager( manager ),
     m_dlg( new StyleWidget( this ) )
 {
-  setButtonBoxOrientation( Qt::Vertical );
+  setButtonsOrientation( Qt::Vertical );
   setMainWidget( m_dlg );
 
   slotDisplayMode( 0 );
--- trunk/koffice/kspread/dialogs/kspread_dlg_subtotal.cc #551463:551464
@@ -43,7 +43,7 @@
     m_pSheet( m_pView->activeSheet() ),
     m_selection( selection )
 {
-  setButtonBoxOrientation( Qt::Vertical );
+  setButtonsOrientation( Qt::Vertical );
 
   QWidget* widget = new QWidget( this );
   setupUi( widget );
[prev in list] [next in list] [prev in thread] [next in thread]