3 files changed, 16 insertions, 2 deletions

diff --git a/uisimulator/sdl/UI-gigabeatf.bmp b/uisimulator/sdl/UI-gigabeatf.bmp
new file mode 100644
index 0000000000..3f4104407c
--- /dev/null
+++ b/uisimulator/sdl/UI-gigabeatf.bmp
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 72224315a2..9571beac5e 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -86,14 +86,18 @@ void button_event(int key, bool pressed)
         new_btn = BUTTON_ON;
 #elif defined(BUTTON_SELECT) && defined(BUTTON_PLAY)
         new_btn = BUTTON_PLAY;
+#elif defined BUTTON_POWER
+        new_btn = BUTTON_POWER;
 #endif
         break;
 
+    case SDLK_KP_ENTER:
 #ifdef BUTTON_OFF
-    case SDLK_RETURN:
         new_btn = BUTTON_OFF;
-        break;
+#elif defined BUTTON_A
+        new_btn = BUTTON_A;
 #endif
+        break;
 
 #ifdef BUTTON_F1
     case SDLK_KP_DIVIDE:
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index 800a7f8ab6..70b8e18bd1 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -180,6 +180,16 @@
 
 #define UI_REMOTE_BGCOLORLIGHT      250, 180, 130 // bkgnd of remote lcd (bklight)
 #define UI_REMOTE_BGCOLOR           90, 145, 90 // bkgnd of remote lcd (no bklight)
+
+#elif defined(GIGABEAT_F)
+#define UI_TITLE                    "Toshiba Gigabeat"
+#define UI_WIDTH                    401 // width of GUI window
+#define UI_HEIGHT                   655 // height of GUI window
+/* high-colour */
+#define UI_LCD_POSX                 48 // x position of lcd
+#define UI_LCD_POSY                 60 // y position of lcd
+#define UI_LCD_WIDTH                240
+#define UI_LCD_HEIGHT               320
 #endif
 
 extern SDL_Surface *gui_surface;