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

List:       kde-commits
Subject:    koffice/kspread
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2006-05-20 15:21:37
Message-ID: 1148138497.149659.8695.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 542912 by nikolaus:

- fix Style Manager Dialog


 M  +2 -2      dialogs/kspread_dlg_layout.cc  
 M  +27 -22    dialogs/kspread_dlg_styles.cc  
 M  +5 -6      dialogs/kspread_dlg_styles.h  
 M  +2 -2      kspread_style_manager.h  
 M  +2 -2      kspread_view.cc  


--- trunk/koffice/kspread/dialogs/kspread_dlg_layout.cc #542911:542912
@@ -164,11 +164,11 @@
 
   QGroupBox * groupBox = new QGroupBox( this );
   groupBox->setTitle( i18n( "Style" ) );
-  groupBox->layout()->setSpacing( KDialog::spacingHint() );
-  groupBox->layout()->setMargin( KDialog::marginHint() );
 
   QGridLayout * groupBoxLayout = new QGridLayout( groupBox );
   groupBoxLayout->setAlignment( Qt::AlignTop );
+  groupBoxLayout->setSpacing( KDialog::spacingHint() );
+  groupBoxLayout->setMargin( KDialog::marginHint() );
 
   QLabel * label1 = new QLabel( groupBox );
   label1->setText( i18n( "Name:" ) );
--- trunk/koffice/kspread/dialogs/kspread_dlg_styles.cc #542911:542912
@@ -40,12 +40,10 @@
 
 using namespace KSpread;
 
-StyleWidget::StyleWidget( QWidget * parent, const char * name, Qt::WFlags fl )
-  : QWidget( parent, name, fl )
+StyleWidget::StyleWidget( QWidget * parent, Qt::WFlags fl )
+  : QWidget( parent, fl )
 {
   QVBoxLayout * layout = new QVBoxLayout( this );
-  layout->setMargin(11);
-  layout->setSpacing(6);
 
   m_styleList = new K3ListView( this);
   m_styleList->addColumn( i18n( "Styles" ) );
@@ -53,7 +51,6 @@
   layout->addWidget( m_styleList );
 
   m_displayBox = new KComboBox( false, this );
-  m_displayBox->setObjectName( "m_displayBox" );
   layout->addWidget( m_displayBox );
 
   m_styleList->header()->setLabel( 0, i18n( "Styles" ) );
@@ -72,16 +69,16 @@
 
 
 
-StyleDlg::StyleDlg( View * parent, StyleManager * manager,
-                                  const char * name )
-  : KDialogBase( KDialogBase::Plain, Qt::Dialog, parent, name, true, "",
-                 KDialogBase::Ok | KDialogBase::User1 | KDialogBase::User2 | \
                KDialogBase::User3 | KDialogBase::Close,
-                 KDialogBase::Ok, false, KGuiItem( i18n( "&New..." ) ), KGuiItem( \
i18n( "&Modify..." ) ), KGuiItem( i18n( "&Delete" ) ) ), +StyleDialog::StyleDialog( \
View * parent, StyleManager * manager ) +  : KDialog( parent, i18n( "Style Manager" \
), +             Ok|User1|User2|User3|Close, 0,
+             KGuiItem( i18n( "&New..." ) ),
+             KGuiItem( i18n( "&Modify..." ) ),
+             KGuiItem( i18n( "&Delete" ) ) ),
     m_view( parent ),
     m_styleManager( manager ),
     m_dlg( new StyleWidget( this ) )
 {
-  setWindowTitle( i18n( "Style Manager" ) );
   setButtonBoxOrientation( Qt::Vertical );
   setMainWidget( m_dlg );
 
@@ -92,16 +89,23 @@
 
   connect( m_dlg->m_styleList, SIGNAL( selectionChanged( Q3ListViewItem * ) ),
            this, SLOT( slotSelectionChanged( Q3ListViewItem * ) ) );
-  connect( m_dlg->m_displayBox, SIGNAL( activated( int ) ), this, SLOT( \
                slotDisplayMode( int ) ) );
-  connect( this, SIGNAL( user3Clicked() ), this, SLOT( slotUser3() ) );
-  connect( m_dlg, SIGNAL( modifyStyle() ), this, SLOT( slotUser2()));
+  connect( m_dlg->m_displayBox, SIGNAL( activated( int ) ),
+           this, SLOT( slotDisplayMode( int ) ) );
+  connect( this, SIGNAL( user1Clicked() ),
+           this, SLOT( slotUser1() ) );
+  connect( this, SIGNAL( user2Clicked() ),
+           this, SLOT( slotUser2() ) );
+  connect( this, SIGNAL( user3Clicked() ),
+           this, SLOT( slotUser3() ) );
+  connect( m_dlg, SIGNAL( modifyStyle() ),
+           this, SLOT( slotUser2()));
 }
 
-StyleDlg::~StyleDlg()
+StyleDialog::~StyleDialog()
 {
 }
 
-void StyleDlg::fillComboBox()
+void StyleDialog::fillComboBox()
 {
   class Map : public QMap<CustomStyle *, K3ListViewItem *> {};
   Map entries;
@@ -133,7 +137,7 @@
   entries.clear();
 }
 
-void StyleDlg::slotDisplayMode( int mode )
+void StyleDialog::slotDisplayMode( int mode )
 {
   m_dlg->m_styleList->clear();
 
@@ -178,7 +182,7 @@
   }
 }
 
-void StyleDlg::slotOk()
+void StyleDialog::slotOk()
 {
   K3ListViewItem * item = (K3ListViewItem *) m_dlg->m_styleList->currentItem();
 
@@ -217,7 +221,7 @@
   accept();
 }
 
-void StyleDlg::slotUser1()
+void StyleDialog::slotUser1()
 {
   CustomStyle * s = 0;
 
@@ -246,6 +250,7 @@
   style->setType( Style::TENTATIVE );
 
   CellFormatDialog dlg( m_view, style, m_styleManager, m_view->doc() );
+  dlg.exec();
 
   if ( style->type() == Style::TENTATIVE )
   {
@@ -258,7 +263,7 @@
   slotDisplayMode( m_dlg->m_displayBox->currentIndex() );
 }
 
-void StyleDlg::slotUser2()
+void StyleDialog::slotUser2()
 {
   K3ListViewItem * item = (K3ListViewItem *) m_dlg->m_styleList->currentItem();
 
@@ -280,7 +285,7 @@
   slotDisplayMode( m_dlg->m_displayBox->currentIndex() );
 }
 
-void StyleDlg::slotUser3()
+void StyleDialog::slotUser3()
 {
   K3ListViewItem * item = (K3ListViewItem *) m_dlg->m_styleList->currentItem();
 
@@ -307,7 +312,7 @@
   slotDisplayMode( m_dlg->m_displayBox->currentIndex() );
 }
 
-void StyleDlg::slotSelectionChanged( Q3ListViewItem * item )
+void StyleDialog::slotSelectionChanged( Q3ListViewItem * item )
 {
   if ( !item )
     return;
--- trunk/koffice/kspread/dialogs/kspread_dlg_styles.h #542911:542912
@@ -1,6 +1,6 @@
 /* This file is part of the KDE project
    Copyright (C) 2003 Laurent Montel <montel@kde.org>
-             (C) 2003 Norbert Andres <nandres@web.de>  
+             (C) 2003 Norbert Andres <nandres@web.de>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -39,7 +39,7 @@
   Q_OBJECT
 
  public:
-  StyleWidget( QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0 );
+  StyleWidget( QWidget* parent = 0, Qt::WFlags fl = 0 );
   ~StyleWidget();
 
   K3ListView * m_styleList;
@@ -48,13 +48,12 @@
     void modifyStyle();
 };
 
-class StyleDlg : public KDialogBase
+class StyleDialog : public KDialog
 {
   Q_OBJECT
  public:
-  StyleDlg( View * parent, StyleManager * manager,
-                   const char * name = "StyleDlg" );
-  ~StyleDlg();
+  StyleDialog( View * parent, StyleManager * manager );
+  ~StyleDialog();
 
  protected slots:
   void slotOk();
--- trunk/koffice/kspread/kspread_style_manager.h #542911:542912
@@ -34,7 +34,7 @@
 namespace KSpread
 {
 class Sheet;
-class StyleDlg;
+class StyleDialog;
 class View;
 
 class KSPREAD_EXPORT StyleManager
@@ -85,7 +85,7 @@
   static void releaseUnusedAutoStyles( Styles autoStyles );
 
  private:
-  friend class StyleDlg;
+  friend class StyleDialog;
   friend class View;
 
   CustomStyle * m_defaultStyle;
--- trunk/koffice/kspread/kspread_view.cc #542911:542912
@@ -6112,8 +6112,8 @@
 
 void View::styleDialog()
 {
-  StyleDlg dlg( this, doc()->styleManager() );
-  dlg.exec();
+  StyleDialog dialog( this, doc()->styleManager() );
+  dialog.exec();
 
   d->actions->selectStyle->setItems( doc()->styleManager()->styleNames() );
   if ( d->activeSheet )


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