From 6be10e281f6e162f8b4008c6003ef4d81dbbd8de Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 12 May 2009 19:41:14 +0000 Subject: [PATCH] * Removed the 'Use' button from the keymap preflet, since several people have mentioned that they tend to forget pressing it (including me, of course), in effect losing all changes. The way the code currently works, having it didn't really make sense IMO, as any change will only ever be applied to the "current" keymap. If you want to keep your keymap more persistently, you need to save it into a named file, anyway. Please give it a try and shout if this is unacceptable. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30723 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/keymap/KeymapWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/preferences/keymap/KeymapWindow.cpp b/src/preferences/keymap/KeymapWindow.cpp index 0618edf1d7..424994722b 100644 --- a/src/preferences/keymap/KeymapWindow.cpp +++ b/src/preferences/keymap/KeymapWindow.cpp @@ -75,7 +75,6 @@ KeymapWindow::KeymapWindow() fSwitchShortcutsButton = new BButton("switch", "", new BMessage(kMsgSwitchShortcuts)); - fUseButton = new BButton("useButton", "Use", new BMessage(kMsgUseKeymap)); fRevertButton = new BButton("revertButton", "Revert", new BMessage(kMsgRevertKeymap)); @@ -95,7 +94,6 @@ KeymapWindow::KeymapWindow() .AddGlue(0.0) .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10) .AddGlue(0.0) - .Add(fUseButton) .Add(fRevertButton))) .SetInsets(10, 10, 10, 10))); @@ -635,7 +633,9 @@ KeymapWindow::_UpdateDeadKeyMenu() void KeymapWindow::_UpdateButtons() { - fUseButton->SetEnabled(!fCurrentMap.Equals(fAppliedMap)); + if (!fCurrentMap.Equals(fAppliedMap)) + _UseKeymap(); + fRevertButton->SetEnabled(!fCurrentMap.Equals(fPreviousMap)); _UpdateDeadKeyMenu();