Ticket #5420: Shortcuts-HIG-Update.patch

src/preferences/shortcuts/ResizableButton.h

@@ -1 @@
-/*
- * Copyright 1999-2009 Haiku Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- */
-#ifndef ResizableButton_h
-#define ResizableButton_h
-
-
-#include <Button.h>
-
-
-class ResizableButton : public BButton {
-public:
-                            ResizableButton(BRect parentFrame, BRect frame, 
-                                const char* name, const char* label, 
-                                BMessage* message);
-
-    virtual void            ChangeToNewSize(float newWidth, float newHeight);
-private:
-            BRect           fPercentages;
-};
-
-
-#endif
-

src/preferences/shortcuts/Jamfile

@@ -6 +6 @@
 Preference Shortcuts :
     main.cpp
     MetaKeyStateMap.cpp
-    ResizableButton.cpp
     ShortcutsApp.cpp
     ShortcutsSpec.cpp
     ShortcutsWindow.cpp
@@ -19 +18 @@
     MouseWatcher.cpp
     PrefilledBitmap.cpp
     ScrollViewCorner.cpp
-    
+
     : be $(HAIKU_LOCALE_LIBS) tracker libshortcuts_shared.a $(TARGET_LIBSTDC++)
     : Shortcuts.rdef
 ;

src/preferences/shortcuts/ShortcutsWindow.cpp

@@ -15 +15 @@
 
 #include <Alert.h>
 #include <Application.h>
+#include <Button.h>
 #include <Catalog.h>
 #include <Clipboard.h>
 #include <File.h>
+#include <FilePanel.h>
 #include <FindDirectory.h>
 #include <Input.h>
 #include <Locale.h>
+#include <Message.h>
 #include <Menu.h>
 #include <MenuBar.h>
 #include <MenuItem.h>
 #include <MessageFilter.h>
 #include <Path.h>
 #include <PopUpMenu.h>
+#include <Screen.h>
 #include <ScrollBar.h>
 #include <ScrollView.h>
 #include <String.h>
+#include <SupportDefs.h>
 
 #include "ColumnListView.h"
 
@@ -39 +44 @@
 #include "ShortcutsFilterConstants.h"
 #include "ShortcutsSpec.h"
 
+#define MAX_WIDTH 10000
+#define MAX_HEIGHT 10000
+    // SetSizeLimits does not provide a mechanism for specifying an
+    // unrestricted maximum.  10,000 seems to be the most common value used
+    // in other Haiku system applications.
+#define SPACING 5
+    // Vertical and horizontal spacing between GUI components.
 
-// Window sizing constraints
-#define MIN_WIDTH   600
-#define MIN_HEIGHT  130
-#define MAX_WIDTH   65535
-#define MAX_HEIGHT  65535
-
-// Default window position
-#define WINDOW_START_X 30
-#define WINDOW_START_Y 100
-
 #undef B_TRANSLATE_CONTEXT
 #define B_TRANSLATE_CONTEXT "ShortcutsWindow"
 
 #define ERROR "Shortcuts error"
 #define WARNING "Shortcuts warning"
 
-// Global constants for Shortcuts
-#define V_SPACING 5 // vertical spacing between GUI components
+#define WINDOW_SETTINGS_FILE_NAME "Shortcuts_window_settings"
+    // Because the "shortcuts_settings" file (SHORTCUTS_SETTING_FILE_NAME) is
+    // already used as a communications method between this configurator and
+    // the "shortcut_catcher" input_server filter, it should not be overloaded
+    // with window position information.  Instead, a separate file is used.
 
-
-// Creates a pop-up-menu that reflects the possible states of the specified 
+// Creates a pop-up-menu that reflects the possible states of the specified
 // meta-key.
 static BPopUpMenu*
 CreateMetaPopUp(int col)
@@ -68 +72 @@
     MetaKeyStateMap& map = GetNthKeyMap(col);
     BPopUpMenu * popup = new BPopUpMenu(NULL, false);
     int numStates = map.GetNumStates();
-    
-    for (int i = 0; i < numStates; i++) 
+
+    for (int i = 0; i < numStates; i++)
         popup->AddItem(new BMenuItem(map.GetNthStateDesc(i), NULL));
-    
+
     return popup;
 }
 
@@ -84 +88 @@
     int numKeys = GetNumKeyIndices();
     for (int i = 0; i < numKeys; i++) {
         const char* next = GetKeyName(i);
-        
-        if (next) 
+
+        if (next)
             popup->AddItem(new BMenuItem(next, NULL));
     }
     return popup;
@@ -94 +98 @@
 
 ShortcutsWindow::ShortcutsWindow()
     :
-    BWindow(BRect(WINDOW_START_X, WINDOW_START_Y, WINDOW_START_X + MIN_WIDTH, 
-        WINDOW_START_Y + MIN_HEIGHT * 2), B_TRANSLATE_SYSTEM_NAME("Shortcuts"),
-        B_DOCUMENT_WINDOW, 0L), 
-    fSavePanel(NULL), 
-    fOpenPanel(NULL), 
-    fSelectPanel(NULL), 
-    fKeySetModified(false),         
+    BWindow(BRect(0, 0, 0, 0), B_TRANSLATE_SYSTEM_NAME("Shortcuts"),
+        B_TITLED_WINDOW, 0L),
+    fSavePanel(NULL),
+    fOpenPanel(NULL),
+    fSelectPanel(NULL),
+    fKeySetModified(false),
     fLastOpenWasAppend(false)
 {
     ShortcutsSpec::InitializeMetaMaps();
 
-    SetSizeLimits(MIN_WIDTH, MAX_WIDTH, MIN_HEIGHT, MAX_HEIGHT);
+    BView* top = new BView(Bounds(), NULL, B_FOLLOW_ALL_SIDES, 0);
+    top->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+    AddChild(top);
+
     BMenuBar* menuBar = new BMenuBar(BRect(0, 0, 0, 0), "Menu Bar");
 
     BMenu* fileMenu = new BMenu(B_TRANSLATE("File"));
-    fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Open KeySet" B_UTF8_ELLIPSIS), 
+    fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Open KeySet" B_UTF8_ELLIPSIS),
         new BMessage(OPEN_KEYSET), 'O'));
     fileMenu->AddItem(new BMenuItem(
-        B_TRANSLATE("Append KeySet" B_UTF8_ELLIPSIS), 
+        B_TRANSLATE("Append KeySet" B_UTF8_ELLIPSIS),
         new BMessage(APPEND_KEYSET), 'A'));
-    fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Revert to saved"), 
+    fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Revert to saved"),
         new BMessage(REVERT_KEYSET), 'A'));
     fileMenu->AddItem(new BSeparatorItem);
     fileMenu->AddItem(new BMenuItem(
-        B_TRANSLATE("Save KeySet as" B_UTF8_ELLIPSIS), 
+        B_TRANSLATE("Save KeySet as" B_UTF8_ELLIPSIS),
         new BMessage(SAVE_KEYSET_AS), 'S'));
     fileMenu->AddItem(new BSeparatorItem);
     fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
         new BMessage(B_QUIT_REQUESTED), 'Q'));
     menuBar->AddItem(fileMenu);
 
-    AddChild(menuBar);
+    top->AddChild(menuBar);
 
-    font_height fh;
-    be_plain_font->GetHeight(&fh);
-    float vButtonHeight = ceil(fh.ascent) + ceil(fh.descent) + 5.0f;
-
     BRect tableBounds = Bounds();
     tableBounds.top = menuBar->Bounds().bottom + 1;
     tableBounds.right -= B_V_SCROLL_BAR_WIDTH;
-    tableBounds.bottom -= (B_H_SCROLL_BAR_HEIGHT + V_SPACING + vButtonHeight + 
-        V_SPACING * 2);
-    
+    tableBounds.bottom -= B_H_SCROLL_BAR_HEIGHT;
+
     BScrollView* containerView;
-    fColumnListView = new ColumnListView(tableBounds, &containerView, NULL, 
-        B_FOLLOW_ALL_SIDES, B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE, 
+    fColumnListView = new ColumnListView(tableBounds, &containerView, NULL,
+        B_FOLLOW_ALL_SIDES, B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE,
         B_SINGLE_SELECTION_LIST, true, true, true, B_NO_BORDER);
-    
-    fColumnListView->SetEditMessage(new BMessage(HOTKEY_ITEM_MODIFIED), 
+
+    fColumnListView->SetEditMessage(new BMessage(HOTKEY_ITEM_MODIFIED),
         BMessenger(this));
-    
-    const float metaWidth = 50.0f;
 
+    float minListWidth = 0;
+        // A running total is kept as the columns are created.
+    float cellWidth = be_plain_font->StringWidth("Either") + 20;
+        // ShortcutsSpec does not seem to translate the string "Either".
+
     for (int i = 0; i < ShortcutsSpec::NUM_META_COLUMNS; i++) {
+        const char* name = ShortcutsSpec::GetColumnName(i);
+        float headerWidth = be_plain_font->StringWidth(name) + 20;
+        float width = max_c(headerWidth, cellWidth);
+        minListWidth += width + 1;
+
         fColumnListView->AddColumn(
-            new CLVColumn(ShortcutsSpec::GetColumnName(i), CreateMetaPopUp(i), 
-            metaWidth, CLV_SORT_KEYABLE));
+            new CLVColumn(name, CreateMetaPopUp(i), width, CLV_SORT_KEYABLE));
     }
 
+    float keyCellWidth = be_plain_font->StringWidth("Caps Lock") + 20;
     fColumnListView->AddColumn(new CLVColumn(B_TRANSLATE("Key"),
-        CreateKeysPopUp(), 60, CLV_SORT_KEYABLE));
+        CreateKeysPopUp(), keyCellWidth, CLV_SORT_KEYABLE));
+    minListWidth += keyCellWidth + 1;
 
     BPopUpMenu* popup = new BPopUpMenu(NULL, false);
     popup->AddItem(new BMenuItem(
@@ -177 +187 @@
     popup->AddItem(new BMenuItem(B_TRANSLATE("*Beep"), NULL));
     fColumnListView->AddColumn(new CLVColumn(B_TRANSLATE("Application"), popup,
         323.0, CLV_SORT_KEYABLE));
+    minListWidth += 323.0 + 1;
+    minListWidth += B_V_SCROLL_BAR_WIDTH;
 
     fColumnListView->SetSortFunction(ShortcutsSpec::MyCompare);
-    AddChild(containerView);
+    top->AddChild(containerView);
 
     fColumnListView->SetSelectionMessage(new BMessage(HOTKEY_ITEM_SELECTED));
     fColumnListView->SetTarget(this);
 
-    BRect buttonBounds = Bounds();
-    buttonBounds.left += V_SPACING;
-    buttonBounds.right = ((buttonBounds.right - buttonBounds.left) / 2.0f)
-        + buttonBounds.left;
-    buttonBounds.bottom -= V_SPACING * 2;
-    buttonBounds.top = buttonBounds.bottom - vButtonHeight;
-    buttonBounds.right -= B_V_SCROLL_BAR_WIDTH;
-    float origRight = buttonBounds.right;
-    buttonBounds.right = (buttonBounds.left + origRight) * 0.40f - 
-        (V_SPACING / 2);
-    AddChild(fAddButton = new ResizableButton(Bounds(), buttonBounds, "add", 
-        B_TRANSLATE("Add new shortcut"), new BMessage(ADD_HOTKEY_ITEM)));
-    buttonBounds.left = buttonBounds.right + V_SPACING;
-    buttonBounds.right = origRight;
-    AddChild(fRemoveButton = new ResizableButton(Bounds(), buttonBounds, 
-        "remove", B_TRANSLATE("Remove selected shortcut"), 
-        new BMessage(REMOVE_HOTKEY_ITEM)));
-    
+    fAddButton = new BButton(BRect(0, 0, 0, 0), "add",
+        B_TRANSLATE("Add new shortcut"), new BMessage(ADD_HOTKEY_ITEM),
+        B_FOLLOW_BOTTOM);
+    fAddButton->ResizeToPreferred();
+    fAddButton->MoveBy(SPACING,
+        Bounds().bottom - fAddButton->Bounds().bottom - SPACING);
+    top->AddChild(fAddButton);
+
+    fRemoveButton = new BButton(BRect(0, 0, 0, 0), "remove",
+        B_TRANSLATE("Remove selected shortcut"),
+        new BMessage(REMOVE_HOTKEY_ITEM), B_FOLLOW_BOTTOM);
+    fRemoveButton->ResizeToPreferred();
+    fRemoveButton->MoveBy(fAddButton->Frame().right + SPACING,
+        Bounds().bottom - fRemoveButton->Bounds().bottom - SPACING);
+    top->AddChild(fRemoveButton);
+
     fRemoveButton->SetEnabled(false);
 
-    float offset = (buttonBounds.right - buttonBounds.left) / 2.0f;
-    BRect saveButtonBounds = buttonBounds;
-    saveButtonBounds.right = Bounds().right - B_V_SCROLL_BAR_WIDTH - offset;
-    saveButtonBounds.left = buttonBounds.right + V_SPACING + offset;
-    AddChild(fSaveButton = new ResizableButton(Bounds(), saveButtonBounds, 
-        "save", B_TRANSLATE("Save & apply"), new BMessage(SAVE_KEYSET)));
-    
+    fSaveButton = new BButton(BRect(0, 0, 0, 0), "save",
+        B_TRANSLATE("Save & apply"), new BMessage(SAVE_KEYSET),
+        B_FOLLOW_BOTTOM | B_FOLLOW_RIGHT);
+    fSaveButton->ResizeToPreferred();
+    fSaveButton->MoveBy(Bounds().right - fSaveButton->Bounds().right - SPACING,
+        Bounds().bottom - fSaveButton->Bounds().bottom - SPACING);
+    top->AddChild(fSaveButton);
+
     fSaveButton->SetEnabled(false);
 
-    entry_ref ref;  
-    if (_GetSettingsFile(&ref)) {
+    containerView->ResizeBy(0,
+        -(fAddButton->Bounds().bottom + 2 * SPACING + 2));
+
+    float minButtonBarWidth = fRemoveButton->Frame().right
+        + fSaveButton->Bounds().right + 2 * SPACING;
+    float minWidth = max_c(minListWidth, minButtonBarWidth);
+
+    float menuBarHeight = menuBar->Bounds().bottom;
+    float buttonBarHeight = Bounds().bottom - containerView->Frame().bottom;
+    float minHeight = menuBarHeight + 200 + buttonBarHeight;
+
+    SetSizeLimits(minWidth, MAX_WIDTH, minHeight, MAX_HEIGHT);
+        // SetSizeLimits() will resize the window to the minimum size.
+
+    CenterOnScreen();
+
+    entry_ref windowSettingsRef;
+    if (_GetWindowSettingsFile(&windowSettingsRef)) {
+        // The window settings file is not accepted via B_REFS_RECEIVED; this
+        // is a behind-the-scenes file that the user will never see or
+        // interact with.
+        BFile windowSettingsFile(&windowSettingsRef, B_READ_ONLY);
+        BMessage loadMsg;
+        if (loadMsg.Unflatten(&windowSettingsFile) == B_OK)
+            _LoadWindowSettings(loadMsg);
+    }
+
+    entry_ref keySetRef;
+    if (_GetSettingsFile(&keySetRef)) {
         BMessage msg(B_REFS_RECEIVED);
-        msg.AddRef("refs", &ref);
+        msg.AddRef("refs", &keySetRef);
         msg.AddString("startupRef", "please");
-        PostMessage(&msg); // Tell ourself to load this file if it exists.
+        PostMessage(&msg);
+            // Tell ourselves to load this file if it exists.
     }
     Show();
 }
@@ -239 +278 @@
     bool ret = true;
 
     if (fKeySetModified) {
-        BAlert* alert = new BAlert(WARNING, 
+        BAlert* alert = new BAlert(WARNING,
             B_TRANSLATE("Really quit without saving your changes?"),
             B_TRANSLATE("Don't save"), B_TRANSLATE("Cancel"),
             B_TRANSLATE("Save"));
@@ -253 +292 @@
                 // up the file requester
                 if (fLastSaved.InitCheck() == B_OK) {
                     if (_SaveKeySet(fLastSaved) == false) {
-                        (new BAlert(ERROR, 
+                        (new BAlert(ERROR,
                             B_TRANSLATE("Shortcuts was unable to save your "
-                                "KeySet file!"), 
+                                "KeySet file!"),
                             B_TRANSLATE("Oh no")))->Go();
                         ret = true; //quit anyway
                     }
@@ -270 +309 @@
         }
     }
 
-    if (ret)
+    if (ret) {
         fColumnListView->DeselectAll();
+
+        // Save the window position.
+        entry_ref ref;
+        if (_GetWindowSettingsFile(&ref)) {
+            BEntry entry(&ref);
+            _SaveWindowSettings(entry);
+        }
+    }
+
     return ret;
 }
 
@@ -282 +330 @@
     BPath path;
     if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK)
         return false;
-    else 
+    else
         path.Append(SHORTCUTS_SETTING_FILE_NAME);
 
     if (BEntry(path.Path(), true).GetRef(eref) == B_OK)
@@ -303 +351 @@
     BMessage saveMsg;
     for (int i = 0; i < fColumnListView->CountItems(); i++) {
         BMessage next;
-        if (((ShortcutsSpec*)fColumnListView->ItemAt(i))->Archive(&next) 
+        if (((ShortcutsSpec*)fColumnListView->ItemAt(i))->Archive(&next)
             == B_OK)
             saveMsg.AddMessage("spec", &next);
         else
             printf("Error archiving ShortcutsSpec #%i!\n", i);
     }
-    
+
     bool ret = (saveMsg.Flatten(&saveTo) == B_OK);
-    
+
     if (ret) {
         fKeySetModified = false;
         fSaveButton->SetEnabled(false);
@@ -321 +369 @@
 }
 
 
-// Appends new entries from the file specified in the "spec" entry of 
+// Appends new entries from the file specified in the "spec" entry of
 // (loadMsg). Returns true iff successful.
 bool
 ShortcutsWindow::_LoadKeySet(const BMessage& loadMsg)
@@ -330 +378 @@
     BMessage msg;
     while (loadMsg.FindMessage("spec", i++, &msg) == B_OK) {
         ShortcutsSpec* spec = (ShortcutsSpec*)ShortcutsSpec::Instantiate(&msg);
-        if (spec != NULL) 
+        if (spec != NULL)
             fColumnListView->AddItem(spec);
-        else 
+        else
             printf("_LoadKeySet: Error parsing spec!\n");
     }
     return true;
 }
 
 
-// Creates a new entry and adds it to the GUI. (defaultCommand) will be the 
+bool
+ShortcutsWindow::_GetWindowSettingsFile(entry_ref* eref)
+{
+    BPath path;
+    if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK)
+        return false;
+    else
+        path.Append(WINDOW_SETTINGS_FILE_NAME);
+
+    return BEntry(path.Path(), true).GetRef(eref) == B_OK;
+}
+
+
+// Saves the application settings file to (saveEntry).  Because this is a
+// non-essential file, we ignore errors when writing the settings.
+void
+ShortcutsWindow::_SaveWindowSettings(BEntry& saveEntry)
+{
+    BFile saveTo(&saveEntry, B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE);
+    if (saveTo.InitCheck() != B_OK)
+        return;
+
+    BMessage saveMsg;
+    saveMsg.AddRect("window frame", Frame());
+
+    for (int i = 0; i < fColumnListView->CountColumns(); i++) {
+        CLVColumn* column = fColumnListView->ColumnAt(i);
+        saveMsg.AddFloat("column width", column->Width());
+    }
+
+    saveMsg.Flatten(&saveTo);
+}
+
+
+// Loads the application settings file from (loadMsg) and resizes the interface
+// to match the previously saved settings.  Because this is a non-essential
+// file, we ignore errors when loading the settings.
+void
+ShortcutsWindow::_LoadWindowSettings(const BMessage& loadMsg)
+{
+    BRect frame;
+    if (loadMsg.FindRect("window frame", &frame) == B_OK) {
+        // Ensure the frame does not resize below the computed minimum.
+        float width = max_c(Bounds().right, frame.right - frame.left);
+        float height = max_c(Bounds().bottom, frame.bottom - frame.top);
+        ResizeTo(width, height);
+
+        // Ensure the frame is not placed outside of the screen.
+        BScreen screen(this);
+        float left = min_c(screen.Frame().right - width, frame.left);
+        float top = min_c(screen.Frame().bottom - height, frame.top);
+        MoveTo(left, top);
+    }
+
+    for (int i = 0; i < fColumnListView->CountColumns(); i++) {
+        CLVColumn* column = fColumnListView->ColumnAt(i);
+        float columnWidth;
+        if (loadMsg.FindFloat("column width", i, &columnWidth) == B_OK)
+            column->SetWidth(max_c(column->Width(), columnWidth));
+    }
+}
+
+
+// Creates a new entry and adds it to the GUI. (defaultCommand) will be the
 // text in the entry, or NULL if no text is desired.
 void
 ShortcutsWindow::_AddNewSpec(const char* defaultCommand)
@@ -354 +465 @@
 
         if (defaultCommand)
             spec->SetCommand(defaultCommand);
-    } else 
+    } else
         spec = new ShortcutsSpec(defaultCommand ? defaultCommand : "");
 
     fColumnListView->AddItem(spec);
@@ -367 +478 @@
 ShortcutsWindow::MessageReceived(BMessage* msg)
 {
     switch(msg->what) {
-        case OPEN_KEYSET: 
-        case APPEND_KEYSET: 
+        case OPEN_KEYSET:
+        case APPEND_KEYSET:
             fLastOpenWasAppend = (msg->what == APPEND_KEYSET);
-            if (fOpenPanel) 
+            if (fOpenPanel)
                 fOpenPanel->Show();
             else {
                 BMessenger m(this);
                 fOpenPanel = new BFilePanel(B_OPEN_PANEL, &m, NULL, 0, false);
                 fOpenPanel->Show();
             }
-            fOpenPanel->SetButtonLabel(B_DEFAULT_BUTTON, fLastOpenWasAppend ? 
+            fOpenPanel->SetButtonLabel(B_DEFAULT_BUTTON, fLastOpenWasAppend ?
                 B_TRANSLATE("Append") : B_TRANSLATE("Open"));
             break;
 
@@ -404 +515 @@
                 BEntry entry(&ref);
                 if (entry.InitCheck() == B_OK) {
                     BPath path(&entry);
-                    
+
                     if (path.InitCheck() == B_OK) {
                         // Add a new item with the given path.
                         BString str(path.Path());
@@ -427 +538 @@
                 BMessage fileMsg;
                 {
                     BFile file(&ref, B_READ_ONLY);
-                    if ((file.InitCheck() != B_OK) 
+                    if ((file.InitCheck() != B_OK)
                         || (fileMsg.Unflatten(&file) != B_OK)) {
                         if (isStartMsg) {
                             // use this to save to anyway
                             fLastSaved = BEntry(&ref);
                             break;
                         } else {
-                            (new BAlert(ERROR, 
+                            (new BAlert(ERROR,
                                 B_TRANSLATE("Shortcuts was couldn't open your "
                                 "KeySet file!"), B_TRANSLATE("OK")))->Go(NULL);
                             break;
                         }
                     }
                 }
- 
+
                 if (fLastOpenWasAppend == false) {
                     // Clear the menu...
                     while (ShortcutsSpec* item
@@ -454 +565 @@
                     if (isStartMsg) fLastSaved = BEntry(&ref);
                     fSaveButton->SetEnabled(isStartMsg == false);
 
-                    // If we just loaded in the Shortcuts settings file, then 
+                    // If we just loaded in the Shortcuts settings file, then
                     // no need to tell the user to save on exit.
                     entry_ref eref;
                     _GetSettingsFile(&eref);
                     if (ref == eref) fKeySetModified = false;
                 } else {
-                    (new BAlert(ERROR, 
+                    (new BAlert(ERROR,
                         B_TRANSLATE("Shortcuts was unable to parse your "
-                        "KeySet file!"), 
+                        "KeySet file!"),
                         B_TRANSLATE("OK")))->Go(NULL);
                     break;
                 }
@@ -480 +591 @@
                     BEntry ent(&aref);
                     if (ent.InitCheck() == B_OK) {
                         BPath path;
-                        if ((ent.GetPath(&path) == B_OK) 
+                        if ((ent.GetPath(&path) == B_OK)
                             && (((ShortcutsSpec *)
                             fColumnListView->ItemAt(csel))->
                             ProcessColumnTextString(ShortcutsSpec::
                             STRING_COLUMN_INDEX, path.Path()))) {
-                            
+
                             fColumnListView->InvalidateItem(csel);
                             _MarkKeySetModified();
                         }
@@ -501 +612 @@
 
             const char * name;
             entry_ref entry;
-            if ((msg->FindString("name", &name) == B_OK) 
+            if ((msg->FindString("name", &name) == B_OK)
                 && (msg->FindRef("directory", &entry) == B_OK)) {
                 BDirectory dir(&entry);
                 BEntry saveTo(&dir, name, true);
-                showSaveError = ((saveTo.InitCheck() != B_OK) 
+                showSaveError = ((saveTo.InitCheck() != B_OK)
                 || (_SaveKeySet(saveTo) == false));
             } else if (fLastSaved.InitCheck() == B_OK) {
                 // We've saved this before, save over previous file.
@@ -513 +624 @@
             } else PostMessage(SAVE_KEYSET_AS); // open the save requester...
 
             if (showSaveError) {
-                (new BAlert(ERROR, 
-                    B_TRANSLATE("Shortcuts wasn't able to save your keyset."), 
+                (new BAlert(ERROR,
+                    B_TRANSLATE("Shortcuts wasn't able to save your keyset."),
                     B_TRANSLATE("OK")))->Go(NULL);
             }
             break;
@@ -527 +638 @@
             else {
                 BMessage msg(SAVE_KEYSET);
                 BMessenger messenger(this);
-                fSavePanel = new BFilePanel(B_SAVE_PANEL, &messenger, NULL, 0, 
+                fSavePanel = new BFilePanel(B_SAVE_PANEL, &messenger, NULL, 0,
                     false, &msg);
                 fSavePanel->Show();
             }
@@ -542 +653 @@
         {
             int index = fColumnListView->CurrentSelection();
             if (index >= 0) {
-                CLVListItem* item = (CLVListItem*) 
+                CLVListItem* item = (CLVListItem*)
                     fColumnListView->ItemAt(index);
                 fColumnListView->RemoveItem(index);
                 delete item;
                 _MarkKeySetModified();
 
                 // Rules for new selection: If there is an item at (index),
-                // select it. Otherwise, if there is an item at (index-1), 
+                // select it. Otherwise, if there is an item at (index-1),
                 // select it. Otherwise, select nothing.
                 int num = fColumnListView->CountItems();
                 if (num > 0) {
@@ -558 +669 @@
                     else {
                         if (index > 0)
                             index--;
-                        if (index < num) 
+                        if (index < num)
                             fColumnListView->Select(index);
                     }
                 }
@@ -581 +692 @@
         {
             int32 row, column;
 
-            if ((msg->FindInt32("row", &row) == B_OK) 
+            if ((msg->FindInt32("row", &row) == B_OK)
                 && (msg->FindInt32("column", &column) == B_OK)) {
                 int32 key;
                 const char* bytes;
@@ -595 +706 @@
                         repaintNeeded = item->ProcessColumnMouseClick(column);
                     } else if ((msg->FindString("bytes", &bytes) == B_OK)
                         && (msg->FindInt32("key", &key) == B_OK)) {
-                        repaintNeeded = item->ProcessColumnKeyStroke(column, 
+                        repaintNeeded = item->ProcessColumnKeyStroke(column,
                             bytes, key);
-                    } else if (msg->FindInt32("unmappedkey", &key) == 
+                    } else if (msg->FindInt32("unmappedkey", &key) ==
                         B_OK) {
-                        repaintNeeded = ((column == item->KEY_COLUMN_INDEX) 
-                            && ((key > 0xFF) || (GetKeyName(key) != NULL)) 
-                            && (item->ProcessColumnKeyStroke(column, NULL, 
+                        repaintNeeded = ((column == item->KEY_COLUMN_INDEX)
+                            && ((key > 0xFF) || (GetKeyName(key) != NULL))
+                            && (item->ProcessColumnKeyStroke(column, NULL,
                             key)));
                     } else if (msg->FindString("text", &bytes) == B_OK) {
                         if ((bytes[0] == '(')&&(bytes[1] == 'C')) {
@@ -614 +725 @@
                                     NULL, 0, false, &msg);
                                 fSelectPanel->Show();
                             }
-                            fSelectPanel->SetButtonLabel(B_DEFAULT_BUTTON, 
+                            fSelectPanel->SetButtonLabel(B_DEFAULT_BUTTON,
                                 B_TRANSLATE("Select"));
                         } else {
                             repaintNeeded = item->ProcessColumnTextString(
                                 column, bytes);
                         }
                     }
-                    
+
                     if (repaintNeeded) {
                         fColumnListView->InvalidateItem(row);
                         _MarkKeySetModified();
@@ -660 +771 @@
 
 
 void
-ShortcutsWindow::FrameResized(float w, float h)
-{
-    fAddButton->ChangeToNewSize(w, h);
-    fRemoveButton->ChangeToNewSize(w, h);
-    fSaveButton->ChangeToNewSize(w, h);
-}
-
-
-void
 ShortcutsWindow::DispatchMessage(BMessage* msg, BHandler* handler)
 {
     switch(msg->what) {
         case B_COPY:
         case B_CUT:
             if (be_clipboard->Lock()) {
-                int32 row = fColumnListView->CurrentSelection(); 
+                int32 row = fColumnListView->CurrentSelection();
                 int32 column = fColumnListView->GetSelectedColumn();
-                if ((row >= 0) 
+                if ((row >= 0)
                     && (column == ShortcutsSpec::STRING_COLUMN_INDEX)) {
                     ShortcutsSpec* spec = (ShortcutsSpec*)
                         fColumnListView->ItemAt(row);
                     if (spec) {
                         BMessage* data = be_clipboard->Data();
                         data->RemoveName("text/plain");
-                        data->AddData("text/plain", B_MIME_TYPE, 
-                            spec->GetCellText(column), 
+                        data->AddData("text/plain", B_MIME_TYPE,
+                            spec->GetCellText(column),
                             strlen(spec->GetCellText(column)));
                         be_clipboard->Commit();
-                        
+
                         if (msg->what == B_CUT) {
                             spec->ProcessColumnTextString(column, "");
                             _MarkKeySetModified();
@@ -705 +807 @@
                 BMessage* data = be_clipboard->Data();
                 const char* text;
                 ssize_t textLen;
-                if (data->FindData("text/plain", B_MIME_TYPE, (const void**) 
+                if (data->FindData("text/plain", B_MIME_TYPE, (const void**)
                     &text, &textLen) == B_OK) {
-                    int32 row = fColumnListView->CurrentSelection(); 
+                    int32 row = fColumnListView->CurrentSelection();
                     int32 column = fColumnListView->GetSelectedColumn();
-                    if ((row >= 0) 
+                    if ((row >= 0)
                         && (column == ShortcutsSpec::STRING_COLUMN_INDEX)) {
-                        ShortcutsSpec* spec = (ShortcutsSpec*) 
+                        ShortcutsSpec* spec = (ShortcutsSpec*)
                             fColumnListView->ItemAt(row);
                         if (spec) {
                             for (ssize_t i = 0; i < textLen; i++) {
@@ -726 +828 @@
                 be_clipboard->Unlock();
             }
             break;
-        
+
         default:
             BWindow::DispatchMessage(msg, handler);
             break;

src/preferences/shortcuts/ShortcutsSpec.cpp

@@ -360 +360 @@
     if (text == NULL)
         return;
 
+    _CacheViewFont(owner);
+        // Ensure that sViewFont is configured before using it to calculate
+        // widths.  The lack of this call was causing the initial display of
+        // columns to be incorrect, with a "jump" as all the columns correct
+        // themselves upon the first column resize.
+
     float textWidth = sViewFont.StringWidth(text);
     BPoint point;
     rgb_color lowColor = color;

src/preferences/shortcuts/ShortcutsWindow.h

@@ -10 +10 @@
 
 
 #include <Entry.h>
-#include <FilePanel.h>
-#include <Message.h>
-#include <Point.h>
 #include <Window.h>
 
 #include "ColumnListView.h"
-#include "ResizableButton.h"
 
+class BButton;
+class BFilePanel;
+class BMessage;
 
+
 // This class defines our preferences/configuration window.
 class ShortcutsWindow : public BWindow {
 public:
@@ -27 +27 @@
 
     virtual void            DispatchMessage(BMessage* msg, BHandler* handler);
     virtual void            Quit();
-    virtual void            FrameResized(float w, float h);
-    virtual void            MessageReceived(BMessage * msg);
+    virtual void            MessageReceived(BMessage* msg);
     virtual bool            QuitRequested();
 
     // BMessage 'what' codes, representing commands understood by this Window.
     enum {
         ADD_HOTKEY_ITEM = 'SpKy',   // Add a new hotkey entry to the GUI list.
         REMOVE_HOTKEY_ITEM,         // Remove a hotkey entry from the GUI list.
-        HOTKEY_ITEM_SELECTED,       // Give the "focus bar" to the specified 
+        HOTKEY_ITEM_SELECTED,       // Give the "focus bar" to the specified
                                     // entry.
-        HOTKEY_ITEM_MODIFIED,       // Update the state of an entry to reflect 
+        HOTKEY_ITEM_MODIFIED,       // Update the state of an entry to reflect
                                     // user's changes.
-        OPEN_KEYSET,                // Bring up a File requester to load new 
+        OPEN_KEYSET,                // Bring up a File requester to load new
                                     // settings.
-        APPEND_KEYSET,              // Bring up a File requester to append 
+        APPEND_KEYSET,              // Bring up a File requester to append
                                     // settings.
-        REVERT_KEYSET,              // Dump the current state and re-read 
+        REVERT_KEYSET,              // Dump the current state and re-read
                                     // settings from disk.
         SAVE_KEYSET,                // Save the current settings to disk
-        SAVE_KEYSET_AS,             // Bring up a File requester to save 
+        SAVE_KEYSET_AS,             // Bring up a File requester to save
                                     // current settings.
-        SELECT_APPLICATION,         // Set the current entry to point to the 
+        SELECT_APPLICATION,         // Set the current entry to point to the
                                     // given file.
     };
 private:
@@ -57 +56 @@
             void                _AddNewSpec(const char* defaultCommand);
             void                _MarkKeySetModified();
             bool                _LoadKeySet(const BMessage& loadMsg);
-            bool                _SaveKeySet(BEntry & saveEntry);
+            bool                _SaveKeySet(BEntry& saveEntry);
             bool                _GetSettingsFile(entry_ref* ref);
+            void                _LoadWindowSettings(const BMessage& loadMsg);
+            void                _SaveWindowSettings(BEntry& saveEntry);
+            bool                _GetWindowSettingsFile(entry_ref* ref);
 
-            ResizableButton*    fAddButton;
-            ResizableButton*    fRemoveButton;
-            ResizableButton*    fSaveButton;
+            BButton*            fAddButton;
+            BButton*            fRemoveButton;
+            BButton*            fSaveButton;
             ColumnListView*     fColumnListView;
             BFilePanel*         fSavePanel;     // for saving settings
             BFilePanel*         fOpenPanel;     // for loading settings
             BFilePanel*         fSelectPanel;   // for selecting apps to launch
-            
+
             // Points to the settings file to save to
             BEntry              fLastSaved;
-            
+
             // true iff changes were made since last load or save
             bool                fKeySetModified;
-            
+
             // true iff the file-requester's ref should be appended to current
             bool                fLastOpenWasAppend;
 };

src/preferences/shortcuts/ResizableButton.cpp

@@ -1 @@
-/*
- * Copyright 1999-2009 Haiku Inc. All rights reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *      Jeremy Friesner
- */
- 
- 
-#include "ResizableButton.h"
-
-
-ResizableButton::ResizableButton(BRect parentFrame, BRect frame, 
-    const char* name, const char* label, BMessage* message)
-    :
-    BButton(frame, name, label, message, B_FOLLOW_BOTTOM)
-{
-    float width = parentFrame.right - parentFrame.left;
-    float height = parentFrame.bottom - parentFrame.top;
-    fPercentages.left = frame.left / width;
-    fPercentages.top = frame.top / height;
-    fPercentages.right = frame.right / width;
-    fPercentages.bottom = frame.bottom / height;
-}
- 
-
-void
-ResizableButton::ChangeToNewSize(float newWidth, float newHeight)
-{
-    float newX = fPercentages.left* newWidth;
-    float newW = (fPercentages.right* newWidth) - newX;
-    BRect b = Frame();
-    MoveBy(newX - b.left, 0);
-    ResizeTo(newW, b.bottom - b.top); 
-    Invalidate();
-}
-