diff --git a/clients/b2/config/config.cpp b/clients/b2/config/config.cpp index 75464bc004..5748e94ff4 100644 --- a/clients/b2/config/config.cpp +++ b/clients/b2/config/config.cpp @@ -1,4 +1,4 @@ -/* +/* * This file contains the B2 configuration widget * * Copyright (c) 2001 @@ -22,7 +22,7 @@ extern "C" } -/* NOTE: +/* NOTE: * 'conf' is a pointer to the kwindecoration modules open kwin config, * and is by default set to the "Style" group. * @@ -36,45 +36,45 @@ B2Config::B2Config( KConfig* conf, QWidget* parent ) KGlobal::locale()->insertCatalogue("kwin_b2_config"); b2Config = new KConfig("kwinb2rc"); gb = new QVBox(parent); - - cbColorBorder = new QCheckBox( + + cbColorBorder = new QCheckBox( i18n("Draw window frames using &titlebar colors"), gb); - QWhatsThis::add(cbColorBorder, - i18n("When selected, the window borders " - "are drawn using the titlebar colors. Otherwise, they are " + QWhatsThis::add(cbColorBorder, + i18n("When selected, the window borders " + "are drawn using the titlebar colors. Otherwise, they are " "drawn using normal border colors instead.")); - + // Grab Handle showGrabHandleCb = new QCheckBox( i18n("Draw &resize handle"), gb); - QWhatsThis::add(showGrabHandleCb, - i18n("When selected, decorations are drawn with a \"grab handle\" " + QWhatsThis::add(showGrabHandleCb, + i18n("When selected, decorations are drawn with a \"grab handle\" " "in the bottom left corner of the windows; " "otherwise, no grab handle is drawn.")); - + // Double click menu option support actionsGB = new QHGroupBox(i18n("Actions Settings"), gb); QLabel *menuDblClickLabel = new QLabel(actionsGB); - menuDblClickLabel->setText(i18n("Double Click on Menu Button:")); + menuDblClickLabel->setText(i18n("Double click on menu button:")); menuDblClickOp = new QComboBox(actionsGB); menuDblClickOp->insertItem(i18n("Do Nothing")); menuDblClickOp->insertItem(i18n("Minimize Window")); menuDblClickOp->insertItem(i18n("Shade Window")); menuDblClickOp->insertItem(i18n("Close Window")); - - QWhatsThis::add(menuDblClickOp, - i18n("An action can be associated to a double click " + + QWhatsThis::add(menuDblClickOp, + i18n("An action can be associated to a double click " "of the menu button. Leave it to none if in doubt.")); // Load configuration options load(conf); // Ensure we track user changes properly - connect(cbColorBorder, SIGNAL(clicked()), + connect(cbColorBorder, SIGNAL(clicked()), this, SLOT(slotSelectionChanged())); - connect(showGrabHandleCb, SIGNAL(clicked()), + connect(showGrabHandleCb, SIGNAL(clicked()), this, SLOT(slotSelectionChanged())); - connect(menuDblClickOp, SIGNAL(activated(int)), + connect(menuDblClickOp, SIGNAL(activated(int)), this, SLOT(slotSelectionChanged())); // Make the widgets visible in kwindecoration gb->show(); @@ -99,16 +99,16 @@ void B2Config::slotSelectionChanged() void B2Config::load(KConfig * /*conf*/) { b2Config->setGroup("General"); - + bool override = b2Config->readBoolEntry("UseTitleBarBorderColors", false); cbColorBorder->setChecked(override); - + override = b2Config->readBoolEntry( "DrawGrabHandle", true ); showGrabHandleCb->setChecked(override); QString returnString = b2Config->readEntry( "MenuButtonDoubleClickOperation", "NoOp"); - + int op; if (returnString == "Close") { op = 3; @@ -124,7 +124,7 @@ void B2Config::load(KConfig * /*conf*/) } -static QString opToString(int op) +static QString opToString(int op) { switch (op) { case 1: @@ -146,7 +146,7 @@ void B2Config::save(KConfig * /*conf*/) b2Config->setGroup("General"); b2Config->writeEntry("UseTitleBarBorderColors", cbColorBorder->isChecked()); b2Config->writeEntry("DrawGrabHandle", showGrabHandleCb->isChecked()); - b2Config->writeEntry("MenuButtonDoubleClickOperation", + b2Config->writeEntry("MenuButtonDoubleClickOperation", opToString(menuDblClickOp->currentItem())); // Ensure others trying to read this config get updated b2Config->sync(); diff --git a/kcmkwin/kwinrules/ruleslistbase.ui b/kcmkwin/kwinrules/ruleslistbase.ui index 6bcde83781..6a75803b19 100644 --- a/kcmkwin/kwinrules/ruleslistbase.ui +++ b/kcmkwin/kwinrules/ruleslistbase.ui @@ -12,9 +12,6 @@ 480 - - Form1 - unnamed @@ -47,9 +44,6 @@ &New... - - Alt+N - @@ -58,9 +52,6 @@ &Modify... - - Alt+M - @@ -80,9 +71,6 @@ Move &Up - - Alt+U - @@ -91,9 +79,6 @@ Move &Down - - Alt+D - diff --git a/kcmkwin/kwinrules/ruleswidgetbase.ui b/kcmkwin/kwinrules/ruleswidgetbase.ui index fa8ee64045..51ec528dee 100644 --- a/kcmkwin/kwinrules/ruleswidgetbase.ui +++ b/kcmkwin/kwinrules/ruleswidgetbase.ui @@ -12,9 +12,6 @@ 477 - - Form1 - unnamed