From 22b5d4ebbc406a584316eca65f2575fa1cf989cc Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Sat, 13 Jul 2002 02:34:13 +0000 Subject: [PATCH] make mouseOptions compare case insensitive in case some screws up the capitalization in the config file (e.g. by messing with the kcm) ... svn path=/trunk/kdebase/kwin/; revision=166360 --- kcmkwin/kwinoptions/mouse.cpp | 4 ++-- options.cpp | 27 ++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp index 2a128ac6fd..3f6b076ac5 100644 --- a/kcmkwin/kwinoptions/mouse.cpp +++ b/kcmkwin/kwinoptions/mouse.cpp @@ -387,8 +387,8 @@ const char* KActionsConfig::functionTiAc(int i) switch (i){ case 0: return "Raise"; break; case 1: return "Lower"; break; - case 2: return "Operations Menu"; break; - case 3: return "Toggle Raise and Lower"; break; + case 2: return "Operations menu"; break; + case 3: return "Toggle raise and lower"; break; case 4: return "Nothing"; break; case 5: return "Shade"; break; } diff --git a/options.cpp b/options.cpp index d608ac3ad0..22404355b9 100644 --- a/options.cpp +++ b/options.cpp @@ -303,19 +303,20 @@ Options::WindowOperation Options::windowOperation(const QString &name){ Options::MouseCommand Options::mouseCommand(const QString &name) { - if (name == "Raise") return MouseRaise; - if (name == "Lower") return MouseLower; - if (name == "Operations menu") return MouseOperationsMenu; - if (name == "Toggle raise and lower") return MouseToggleRaiseAndLower; - if (name == "Activate and raise") return MouseActivateAndRaise; - if (name == "Activate and lower") return MouseActivateAndLower; - if (name == "Activate") return MouseActivate; - if (name == "Activate, raise and pass click") return MouseActivateRaiseAndPassClick; - if (name == "Activate and pass click") return MouseActivateAndPassClick; - if (name == "Move") return MouseMove; - if (name == "Resize") return MouseResize; - if (name == "Shade") return MouseShade; - if (name == "Nothing") return MouseNothing; + QString lowerName = name.lower(); + if (lowerName == "rise") return MouseRaise; + if (lowerName == "lower") return MouseLower; + if (lowerName == "operations menu") return MouseOperationsMenu; + if (lowerName == "toggle raise and lower") return MouseToggleRaiseAndLower; + if (lowerName == "activate and raise") return MouseActivateAndRaise; + if (lowerName == "activate and lower") return MouseActivateAndLower; + if (lowerName == "activate") return MouseActivate; + if (lowerName == "activate, raise and pass click") return MouseActivateRaiseAndPassClick; + if (lowerName == "activate and pass click") return MouseActivateAndPassClick; + if (lowerName == "move") return MouseMove; + if (lowerName == "resize") return MouseResize; + if (lowerName == "shade") return MouseShade; + if (lowerName == "nothing") return MouseNothing; return MouseNothing; }