yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix margins and QGroupBox usage.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=218726
This commit is contained in:
Nadeem Hasan 2003-04-06 21:32:24 +00:00
parent c8d9137692
commit f4385b9b0c
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kcmkwin/kwinoptions/main.cpp
View file

@ -27,6 +27,7 @@
#include <kconfig.h>
#include <kgenericfactory.h>
#include <kaboutdata.h>
#include <kdialog.h>
#include "mouse.h"
#include "windows.h"
@ -85,18 +86,22 @@ KWinOptions::KWinOptions(QWidget *parent, const char *name)
layout->addWidget(tab);
mFocus = new KFocusConfig(false, mConfig, this, "KWin Focus Config");
mFocus->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mFocus, i18n("&Focus"));
connect(mFocus, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
mActions = new KActionsConfig(false, mConfig, this, "KWin Actions");
mActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mActions, i18n("Actio&ns"));
connect(mActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
mMoving = new KMovingConfig(false, mConfig, this, "KWin Moving");
mMoving->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mMoving, i18n("&Moving"));
connect(mMoving, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
mAdvanced = new KAdvancedConfig(false, mConfig, this, "KWin Advanced");
mAdvanced->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mAdvanced, i18n("Ad&vanced"));
connect(mAdvanced, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
}

2
kcmkwin/kwinoptions/mouse.cpp
View file

@ -47,7 +47,7 @@ KActionsConfig::KActionsConfig (bool _standAlone, KConfig *_config, QWidget * pa
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
QString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3;
QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint());
QGrid *grid;
QGroupBox *box;
QLabel *label;

23
kcmkwin/kwinoptions/windows.cpp
View file

@ -93,7 +93,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
QString wtstr;
QBoxLayout *lay = new QVBoxLayout (this, KDialog::marginHint(),KDialog::spacingHint());
QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint());
//iTLabel = new QLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
@ -110,9 +110,10 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
// focus policy
fcsBox = new QButtonGroup(i18n("Focus"),this);
fcsBox->setColumnLayout( 0, Qt::Horizontal );
QBoxLayout *fLay = new QVBoxLayout(fcsBox, KDialog::marginHint(), KDialog::spacingHint());
fLay->addSpacing(fontMetrics().lineSpacing());
QBoxLayout *fLay = new QVBoxLayout(fcsBox->layout(),
KDialog::spacingHint());
QBoxLayout *cLay = new QHBoxLayout(fLay);
QLabel *fLabel = new QLabel(i18n("&Policy:"), fcsBox);
@ -179,10 +180,9 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent
lay->addWidget(fcsBox);
kbdBox = new QButtonGroup(i18n("Navigation"), this);
QGridLayout *kLay = new QGridLayout(kbdBox, 4, 4,
KDialog::marginHint(),
kbdBox->setColumnLayout( 0, Qt::Horizontal );
QGridLayout *kLay = new QGridLayout(kbdBox->layout(), 4, 4,
KDialog::spacingHint());
kLay->addRowSpacing(0,fontMetrics().lineSpacing());
QLabel *altTabLabel = new QLabel( i18n("Walk through windows mode:"), kbdBox);
kLay->addWidget(altTabLabel, 1, 0);
kdeMode = new QRadioButton(i18n("&KDE"), kbdBox);
@ -438,8 +438,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *p
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
QString wtstr;
QBoxLayout *lay = new QVBoxLayout (this, KDialog::marginHint(),
KDialog::spacingHint());
QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint());
//iTLabel = new QLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
@ -630,14 +629,12 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
QString wtstr;
QBoxLayout *lay = new QVBoxLayout (this, KDialog::marginHint(),
KDialog::spacingHint());
QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint());
windowsBox = new QButtonGroup(i18n("Windows"), this);
windowsBox->setColumnLayout( 0, Qt::Horizontal );
QBoxLayout *wLay = new QVBoxLayout (windowsBox,KDialog::marginHint(),
KDialog::spacingHint());
wLay->addSpacing(fontMetrics().lineSpacing());
QBoxLayout *wLay = new QVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
QBoxLayout *bLay = new QVBoxLayout;
wLay->addLayout(bLay);