Fix the layout of the KeyConfig Dialog.

The label with 'Default: %1' is now added as MultiCellWidget and now larger keys
don't make the 'configure key' button go out of display dimnesion

1 files changed, 2 insertions, 2 deletions

diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp
index 1991381..56f4746 100644
--- a/libopie2/opieui/okeyconfigwidget.cpp
+++ b/libopie2/opieui/okeyconfigwidget.cpp
@@ -151,68 +151,68 @@ void OKeyConfigWidget::initUi() {
     layout->addWidget( box, 1 );
 
     gridLay = new QGridLayout( box, 3, 4 );
     gridLay->addRowSpacing( 0, fontMetrics().lineSpacing() );
     gridLay->setMargin( 4 );
 
     QButtonGroup *gr = new QButtonGroup( box );
     gr->hide();
     gr->setExclusive( true );
 
     QRadioButton *rad = new QRadioButton( tr( "&None" ), box );
     connect( rad, SIGNAL(clicked()),
              this, SLOT(slotNoKey()) );
     gr->insert( rad, 10 );
     gridLay->addWidget( rad, 1, 0 );
     m_none = rad;
 
     rad = new QRadioButton( tr("&Default" ), box );
     connect( rad, SIGNAL(clicked()),
              this, SLOT(slotDefaultKey()) );
     gr->insert( rad, 11 );
     gridLay->addWidget( rad, 1, 1 );
     m_def = rad;
 
     rad = new QRadioButton( tr("C&ustom"), box );
     connect( rad, SIGNAL(clicked()),
              this, SLOT(slotCustomKey()) );
     gr->insert( rad, 12 );
     gridLay->addWidget( rad, 1, 2 );
     m_cus = rad;
 
     m_btn = new QPushButton( tr("Configure Key"), box );
-    gridLay->addWidget( m_btn, 1, 4 );
+    gridLay->addWidget( m_btn, 1, 3 );
 
     m_lbl= new QLabel( tr( "Default: " ), box );
-    gridLay->addWidget( m_lbl, 2, 0 );
+    gridLay->addMultiCellWidget( m_lbl, 2, 2, 0, 3 );
 
     connect(m_btn, SIGNAL(clicked()),
             this, SLOT(slotConfigure()));
 
     m_box = box;
 }
 
 /**
  * Set the ChangeMode.
  * You need to call this function prior to load
  * If you call this function past load the behaviour is undefined
  * But caling load again is safe
  */
 void OKeyConfigWidget::setChangeMode( enum ChangeMode mode) {
     m_mode = mode;
 }
 
 
 /**
  * return the current mode
  */
 OKeyConfigWidget::ChangeMode OKeyConfigWidget::changeMode()const {
     return m_mode;
 }
 
 
 /**
  * insert these items before calling load
  */
 void OKeyConfigWidget::insert( const QString& str, OKeyConfigManager* man ) {
     Opie::Ui::Internal::OKeyConfigWidgetPrivate root( str, man );
     m_list.append(root);