Always default to Alt for Alt+left mouse window moving.

svn path=/trunk/kdebase/kwin/; revision=140165
This commit is contained in:
Luboš Luňák 2002-03-02 13:50:26 +00:00
parent 05129f3b19
commit efca85b42a
2 changed files with 3 additions and 5 deletions

View file

@ -31,7 +31,6 @@
#include <kdialog.h>
#include <kglobalsettings.h>
#include <kseparator.h>
#include <kkeynative.h> // For KKeyNative::keyboardHasWinKey()
#include <X11/X.h>
#include <X11/Xlib.h>
@ -455,7 +454,7 @@ void KActionsConfig::load()
setComboText(coWin1,config->readEntry("CommandWindow1","Activate, raise and pass click").ascii());
setComboText(coWin2,config->readEntry("CommandWindow2","Activate and pass click").ascii());
setComboText(coWin3,config->readEntry("CommandWindow3","Activate and pass click").ascii());
setComboText(coAllKey,config->readEntry("CommandAllKey",KKeyNative::keyboardHasWinKey() ? "Meta" : "Alt").ascii());
setComboText(coAllKey,config->readEntry("CommandAllKey","Alt").ascii());
setComboText(coAll1,config->readEntry("CommandAll1","Move").ascii());
setComboText(coAll2,config->readEntry("CommandAll2","Toggle raise and lower").ascii());
setComboText(coAll3,config->readEntry("CommandAll3","Resize").ascii());
@ -499,7 +498,7 @@ void KActionsConfig::defaults()
setComboText(coWin1,"Activate, raise and pass click");
setComboText(coWin2,"Activate and pass click");
setComboText(coWin3,"Activate and pass click");
setComboText(coAllKey, KKeyNative::keyboardHasWinKey() ? "Meta" : "Alt");
setComboText(coAllKey,"Alt");
setComboText (coAll1,"Move");
setComboText(coAll2,"Toggle raise and lower");
setComboText(coAll3,"Resize");

View file

@ -10,7 +10,6 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
#include <kconfig.h>
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kkeynative.h> // for KKeyNative::keyboardHasWinKey()
using namespace KWinInternal;
@ -243,7 +242,7 @@ void Options::reload()
CmdWindow1 = mouseCommand(config->readEntry("CommandWindow1","Activate, raise and pass click"));
CmdWindow2 = mouseCommand(config->readEntry("CommandWindow2","Activate and pass click"));
CmdWindow3 = mouseCommand(config->readEntry("CommandWindow3","Activate and pass click"));
CmdAllModKey = (config->readEntry("CommandAllKey", KKeyNative::keyboardHasWinKey() ? "Meta" : "Alt") == "Meta") ? Qt::Key_Meta : Qt::Key_Alt;
CmdAllModKey = (config->readEntry("CommandAllKey","Alt") == "Meta") ? Qt::Key_Meta : Qt::Key_Alt;
CmdAll1 = mouseCommand(config->readEntry("CommandAll1","Move"));
CmdAll2 = mouseCommand(config->readEntry("CommandAll2","Toggle raise and lower"));
CmdAll3 = mouseCommand(config->readEntry("CommandAll3","Resize"));