| -rw-r--r-- | microkde/kresources/configpage.cpp | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp index 912c62e..2fe021d 100644 --- a/microkde/kresources/configpage.cpp +++ b/microkde/kresources/configpage.cpp @@ -73,89 +73,99 @@ class ConfigViewItem : public QCheckListItem } void setStandard( bool value ) { setText( 2, ( value ? i18n( "Yes" ) : QString::null ) ); mIsStandard = value; } bool standard() const { return mIsStandard; } bool readOnly() const { return mResource->readOnly(); } Resource *resource() { return mResource; } private: Resource* mResource; bool mIsStandard; }; ConfigPage::ConfigPage( QWidget *parent, const char *name ) : QWidget( parent, name ), mCurrentManager( 0 ), mCurrentConfig( 0 ) { setCaption( i18n( "Resource Configuration" ) ); QVBoxLayout *mainLayout = new QVBoxLayout( this ); QGroupBox *groupBox = new QGroupBox( i18n( "Resources" ), this ); groupBox->setColumnLayout(0, Qt::Vertical ); groupBox->layout()->setSpacing( 6 ); groupBox->layout()->setMargin( 11 ); - QGridLayout *groupBoxLayout = new QGridLayout( groupBox->layout(), 2, 2 ); + QGridLayout *groupBoxLayout = new QGridLayout( groupBox->layout(), 4, 2 ); //US mFamilyCombo = new KComboBox( false, groupBox ); mFamilyCombo = new KComboBox( groupBox ); groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 ); mListView = new KListView( groupBox ); mListView->setAllColumnsShowFocus( true ); mListView->addColumn( i18n( "Name" ) ); mListView->addColumn( i18n( "Type" ) ); mListView->addColumn( i18n( "Standard" ) ); - groupBoxLayout->addWidget( mListView, 1, 0 ); +//US groupBoxLayout->addWidget( mListView, 1, 0 ); + groupBoxLayout->addMultiCellWidget( mListView, 1, 1, 0, 1 ); + + + mAddButton = new QPushButton( i18n( "&Add..." ), this ); + groupBoxLayout->addWidget( mAddButton, 2, 0 ); + mRemoveButton = new QPushButton( i18n( "&Remove" ), this ); + groupBoxLayout->addWidget( mRemoveButton, 2, 1 ); + mEditButton = new QPushButton( i18n( "&Edit..." ), this ); + groupBoxLayout->addWidget( mEditButton, 3, 0 ); + mStandardButton = new QPushButton( i18n( "&Use as Standard" ), this ); + groupBoxLayout->addWidget( mStandardButton, 3, 1 ); - KButtonBox *buttonBox = new KButtonBox( groupBox, Vertical ); - mAddButton = buttonBox->addButton( i18n( "&Add..." ), this, SLOT(slotAdd()) ); - mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, SLOT(slotRemove()) ); mRemoveButton->setEnabled( false ); - mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, SLOT(slotEdit()) ); mEditButton->setEnabled( false ); - mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, SLOT(slotStandard()) ); mStandardButton->setEnabled( false ); - buttonBox->layout(); - groupBoxLayout->addWidget( buttonBox, 1, 1 ); + + connect( mAddButton, SIGNAL( clicked() ), SLOT(slotAdd()) ); + connect( mRemoveButton, SIGNAL( clicked() ), SLOT(slotRemove()) ); + connect( mEditButton, SIGNAL( clicked() ), SLOT(slotEdit()) ); + connect( mStandardButton, SIGNAL( clicked() ), SLOT(slotStandard()) ); + mainLayout->addWidget( groupBox ); connect( mFamilyCombo, SIGNAL( activated( int ) ), SLOT( slotFamilyChanged( int ) ) ); connect( mListView, SIGNAL( selectionChanged() ), SLOT( slotSelectionChanged() ) ); connect( mListView, SIGNAL( clicked( QListViewItem * ) ), SLOT( slotItemClicked( QListViewItem * ) ) ); mLastItem = 0; //US mConfig = new KConfig( "kcmkresourcesrc" ); mConfig = new KConfig( locateLocal( "config", "kcmkresourcesrc") ); mConfig->setGroup( "General" ); load(); } ConfigPage::~ConfigPage() { QValueList<ResourcePageInfo>::Iterator it; for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) { (*it).mManager->removeListener( this ); delete (*it).mManager; delete (*it).mConfig; } mConfig->writeEntry( "CurrentFamily", mFamilyCombo->currentItem() ); delete mConfig; mConfig = 0; } |