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

List:       kde-commits
Subject:    koffice/lib/kofficeui
From:       Laurent Montel <montel () kde ! org>
Date:       2005-09-26 13:47:03
Message-ID: 1127742423.567853.3349.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 464202 by mlaurent:

Use "KoUnitDoubleSpinBox" 


 M  +8 -5      koPageLayoutDia.cc  
 M  +2 -1      koPageLayoutDia.h  


--- trunk/koffice/lib/kofficeui/koPageLayoutDia.cc #464201:464202
@@ -40,6 +40,7 @@
 
 #include <kiconloader.h>
 #include <kmessagebox.h>
+#include <koUnitWidgets.h>
 
 #include <qhbox.h>
 #include <qvgroupbox.h>
@@ -258,7 +259,7 @@
 const KoColumns& KoPageLayoutDia::columns()
 {
     m_cl.columns = nColumns->value();
-    m_cl.ptColumnSpacing = KoUnit::fromUserValue( nCSpacing->value(), m_unit  );
+    m_cl.ptColumnSpacing = nCSpacing->value();
     return m_cl;
 }
 
@@ -385,7 +386,7 @@
     marginsFrame->setColumnLayout( 0, Qt::Vertical );
     marginsFrame->setMargin( KDialog::marginHint() );
     grid1->addWidget( marginsFrame, 3, 0 );
-    
+
     QGridLayout *marginsLayout = new QGridLayout( marginsFrame->layout(), 3, 3,
        KDialog::spacingHint() );
 
@@ -577,14 +578,16 @@
 
     QString str = KoUnit::unitName( m_unit );
 
-    QLabel *lCSpacing = new QLabel( i18n("Column &spacing (%1):").arg(str), tab3 );
+
+    QLabel *lCSpacing = new QLabel( i18n("Column &spacing:").arg(str), tab3 );
     grid3->addWidget( lCSpacing, 2, 0 );
 
-    nCSpacing = new KDoubleNumInput( tab3, "" );
+    nCSpacing = new KoUnitDoubleSpinBox( tab3 );
+    nCSpacing->setValue(  m_cl.ptColumnSpacing );
+    nCSpacing->setUnit( m_unit );
     lCSpacing->setBuddy( nCSpacing );
     grid3->addWidget( nCSpacing, 3, 0 );
 
-    nCSpacing->setValue( KoUnit::toUserValue( m_cl.ptColumnSpacing, m_unit ) );
     connect( nCSpacing, SIGNAL( valueChanged(double) ),
              this, SLOT( nSpaceChanged( double ) ) );
 
--- trunk/koffice/lib/kofficeui/koPageLayoutDia.h #464201:464202
@@ -38,6 +38,7 @@
 class QRadioButton;
 class QCheckBox;
 class KDoubleNumInput;
+class KoUnitDoubleSpinBox;
 
 enum { FORMAT_AND_BORDERS = 1, HEADER_AND_FOOTER = 2, COLUMNS = 4, DISABLE_BORDERS = 8,
        KW_HEADER_AND_FOOTER = 16, DISABLE_UNIT = 32 };
@@ -200,7 +201,7 @@
     QLineEdit *eFootMid;
     QLineEdit *eFootRight;
     QSpinBox *nColumns;
-    KDoubleNumInput *nCSpacing;
+    KoUnitDoubleSpinBox *nCSpacing;
 
     KDoubleNumInput *nHSpacing;
     KDoubleNumInput *nFSpacing;
[prev in list] [next in list] [prev in thread] [next in thread]