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

List:       kde-commits
Subject:    KDE/kdesdk/kbabel/kbabel
From:       Daniel Laidig <d.laidig () gmx ! de>
Date:       2007-04-01 18:43:20
Message-ID: 1175453000.401560.25142.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 648950 by laidig:

Port to the new API of KCharSelect (r648943).


 M  +14 -22    charselectview.cpp  
 M  +2 -5      charselectview.h  


--- trunk/KDE/kdesdk/kbabel/kbabel/charselectview.cpp #648949:648950
@@ -64,28 +64,25 @@
     bar->setSpacing( KDialog::spacingHint() );
     layout->addWidget (bar);
     
-    QLabel *lTable = new QLabel( i18n( "Table:" ), bar );
-    _tableNum = new QSpinBox( bar );
-    _tableNum->setRange( 0, 255 );
-    _tableNum->setSingleStep( 1 );
-    lTable->setBuddy( _tableNum );
+//     QLabel *lTable = new QLabel( i18n( "Table:" ), bar );
+//     _tableNum = new QSpinBox( bar );
+//     _tableNum->setRange( 0, 255 );
+//     _tableNum->setSingleStep( 1 );
+//     lTable->setBuddy( _tableNum );
     bar->setStretchFactor( _tableNum, 1 );
     
     Q3ScrollView* scroll = new Q3ScrollView( this );    
-    // ### TODO: we should use the default font of KDE, not "helvetica"
-    _table = new KCharSelectTable(scroll,"helvetica",' ',0);
+
+    _table = new KCharSelect(scroll, 0x0, QFont(), \
KCharSelect::BlockCombos|KCharSelect::CharacterTable);  #ifdef __GNUC__
-# warning "How to set the KCharSelectTable to 16x16 format"
-#elif 0
-    _table->setNumCols(16);
-    _table->setNumRows(16);
+# warning "How to best integrate KCharSelect?"
 #endif
     
     scroll->addChild(_table);
     layout->addWidget (scroll);
     
-    connect( _table, SIGNAL( doubleClicked() ), this, SLOT( emitChar() ) );
-    connect( _tableNum, SIGNAL( valueChanged(int) ), this, SLOT( setTab(int) ));
+    connect( _table, SIGNAL( charSelected(QChar) ), this, SIGNAL( \
characterDoubleClicked(QChar) ) ); +//     connect( _tableNum, SIGNAL( \
valueChanged(int) ), this, SLOT( setTab(int) ));  
     connect( _catalog, SIGNAL( signalFileOpened(bool) ), this, SLOT (setDisabled \
                (bool)));
     connect( _catalog, SIGNAL( signalFileOpened(bool) ), _table, SLOT (setDisabled \
(bool))); @@ -96,29 +93,24 @@
          "double click.</p></qt>"));
 }
 
-void CharacterSelectorView::emitChar()
-{
-    emit characterDoubleClicked( _table->chr() );
-}
-
 void CharacterSelectorView::setTab(int value)
 {
-    _table->setTableNum( value );
+//     _table->setTableNum( value );
 }
 
 void CharacterSelectorView::saveSettings(KConfig* config)
 {
     KConfigGroup group(config, "KBCharSelector" );
 	
-    group.writeEntry( "TableNum", _tableNum->value() );
-    group.writeEntry( "SelectedChar", QString(_table->chr()) );
+//     group.writeEntry( "TableNum", _tableNum->value() );
+    group.writeEntry( "SelectedChar", QString(_table->currentChar()) );
 }
 
 void CharacterSelectorView::restoreSettings(KConfig* config)
 {
     KConfigGroup group(config, "KBCharSelector" );
     
-    _tableNum->setValue( group.readEntry("TableNum", 0 ));
+//     _tableNum->setValue( group.readEntry("TableNum", 0 ));
     _table->setChar( group.readEntry("SelectedChar"," ").at(0));
 }
 
--- trunk/KDE/kdesdk/kbabel/kbabel/charselectview.h #648949:648950
@@ -35,7 +35,7 @@
 
 #include "kbcatalogview.h"
 
-class KCharSelectTable;
+class KCharSelect;
 class QSpinBox;
 
 class CharacterSelectorView : public KBCatalogView
@@ -57,14 +57,11 @@
 signals:
    void characterDoubleClicked( QChar ch );
 
-public slots:
-   void emitChar();
-
 private slots:
    void setTab( int value);
    
 private:
-   KCharSelectTable* _table;
+   KCharSelect* _table;
    QSpinBox* _tableNum;
 };
 


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