[Scummvm-cvs-logs] SF.net SVN: scummvm:[33888] scummvm/branches/gsoc2008-vkeybd

[kenny-d at users.sourceforge.net]

Revision: 33888
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33888&view=rev
Author:   kenny-d
Date:     2008-08-15 01:22:09 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Added close button on remap dialog

Modified Paths:
--------------
    scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.cpp
    scummvm/branches/gsoc2008-vkeybd/gui/theme-config.cpp

Modified: scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.cpp	2008-08-15 01:21:29 UTC (rev 33887)
+++ scummvm/branches/gsoc2008-vkeybd/backends/keymapper/remap-dialog.cpp	2008-08-15 01:22:09 UTC (rev 33888)
@@ -31,7 +31,8 @@
 namespace Common {
 
 enum {
-	kRemapCmd = 'REMP'
+	kRemapCmd = 'REMP',
+	kCloseCmd = 'CLOS'
 };
 
 RemapDialog::RemapDialog()
@@ -44,6 +45,8 @@
 	_kmPopUp = new GUI::PopUpWidget(this, "remap_popup", "Keymap: ", labelWidth);
 
 	_scrollBar = new GUI::ScrollBarWidget(this, 0, 0, 0, 0);
+
+	new GUI::ButtonWidget(this, "remap_close_button", "Close", kCloseCmd);
 }
 
 RemapDialog::~RemapDialog() {
@@ -181,6 +184,8 @@
 		loadKeymap();
 	} else if (cmd == GUI::kSetPositionCmd) {
 		refreshKeymap();
+	} else if (cmd == kCloseCmd) {
+		close();
 	} else {
 		GUI::Dialog::handleCommand(sender, cmd, data);
 	}

Modified: scummvm/branches/gsoc2008-vkeybd/gui/theme-config.cpp
===================================================================
--- scummvm/branches/gsoc2008-vkeybd/gui/theme-config.cpp	2008-08-15 01:21:29 UTC (rev 33887)
+++ scummvm/branches/gsoc2008-vkeybd/gui/theme-config.cpp	2008-08-15 01:22:09 UTC (rev 33888)
@@ -377,9 +377,10 @@
 "remap=(w / 4) (h / 4) (w / 2) (h / 2)\n"
 "remap_spacing=10\n"
 "remap_popup=remap_spacing remap_spacing (prev.w - remap_spacing * 2) (kLineHeight + 2)\n"
-"remap_popup_labelW=buttonWidth\n"
+"remap_popup_labelW=kButtonWidth\n"
 "remap_col_count=2\n"
-"remap_keymap_area=remap_spacing (remap_popup.y + remap_popup.h + remap_spacing) (remap.w - remap_spacing * 2) (remap.h - self.y - remap_spacing)\n"
+"remap_keymap_area=remap_spacing (remap_popup.y + remap_popup.h + remap_spacing) (remap.w - remap_spacing * 2) (remap.h - self.y - remap_spacing * 2 - kBigButtonHeight)\n"
+"remap_close_button=((remap.w - kButtonWidth) / 2) (prev.y + prev.h + remap_spacing) kButtonWidth kBigButtonHeight\n"
 "############################################\n"
 "[chooser]\n"
 "chooserW=(w - 2 * 8)\n"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.