pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Shutdown button in GUI

Browse source 
Added Shutdown button in GUI
Added defines for upcoming minimal GUI dimensions
This commit is contained in:
Dimitris Panokostas 2017-01-28 01:03:18 +01:00
parent 6a26873591
commit ab4afc3829
3 changed files with 44 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/osdep/gui/PanelROM.cpp
View file

@ -11,7 +11,7 @@
#include "sysdeps.h" #include "sysdeps.h"
#include "config.h" #include "config.h"
#include "options.h" #include "options.h"
#include "include/memory.h" #include "memory.h"
#include "rommgr.h" #include "rommgr.h"
#include "uae.h" #include "uae.h"
#include "gui.h" #include "gui.h"

4
src/osdep/gui/gui_handling.h
View file

@ -1,8 +1,10 @@
#ifndef _GUI_HANDLING_H #ifndef _GUI_HANDLING_H
#define _GUI_HANDLING_H #define _GUI_HANDLING_H
#define GUI_WIDTH 800 #define GUI_WIDTH 640
#define GUI_HEIGHT 480 #define GUI_HEIGHT 480
#define MIN_GUI_WIDTH 320
#define MIN_GUI_HEIGHT 240
#define DISTANCE_BORDER 15 #define DISTANCE_BORDER 15
#define DISTANCE_NEXT_X 15 #define DISTANCE_NEXT_X 15
#define DISTANCE_NEXT_Y 15 #define DISTANCE_NEXT_Y 15

45
src/osdep/gui/main_window.cpp
View file

@ -71,11 +71,12 @@ gcn::Color colSelectorActive;
namespace widgets namespace widgets
{ {
// Main buttons // Main buttons
gcn::Button* cmdQuit; gcn::Button* cmdQuit;
gcn::Button* cmdReset; gcn::Button* cmdReset;
gcn::Button* cmdRestart; gcn::Button* cmdRestart;
gcn::Button* cmdStart; gcn::Button* cmdStart;
gcn::Button* cmdShutdown;
} }
@ -223,27 +224,41 @@ namespace sdl
} }
break; break;
case SDLK_ESCAPE: case VK_ESCAPE:
case VK_R:
//-------------------------------------------------
// Reset Amiga
//-------------------------------------------------
uae_reset(1, 1); uae_reset(1, 1);
gui_running = false; gui_running = false;
break; break;
case SDLK_UP: case VK_X:
case VK_A:
//------------------------------------------------
// Simulate press of enter when 'X' pressed
//------------------------------------------------
event.key.keysym.sym = SDLK_RETURN;
gui_input->pushInput(event); // Fire key down
event.type = SDL_KEYUP; // and the key up
break;
case VK_UP:
if (HandleNavigation(DIRECTION_UP)) if (HandleNavigation(DIRECTION_UP))
continue; // Don't change value when enter ComboBox -> don't send event to control continue; // Don't change value when enter ComboBox -> don't send event to control
break; break;
case SDLK_DOWN: case VK_DOWN:
if (HandleNavigation(DIRECTION_DOWN)) if (HandleNavigation(DIRECTION_DOWN))
continue; // Don't change value when enter ComboBox -> don't send event to control continue; // Don't change value when enter ComboBox -> don't send event to control
break; break;
case SDLK_LEFT: case VK_LEFT:
if (HandleNavigation(DIRECTION_LEFT)) if (HandleNavigation(DIRECTION_LEFT))
continue; // Don't change value when enter Slider -> don't send event to control continue; // Don't change value when enter Slider -> don't send event to control
break; break;
case SDLK_RIGHT: case VK_RIGHT:
if (HandleNavigation(DIRECTION_RIGHT)) if (HandleNavigation(DIRECTION_RIGHT))
continue; // Don't change value when enter Slider -> don't send event to control continue; // Don't change value when enter Slider -> don't send event to control
break; break;
@ -309,6 +324,16 @@ namespace widgets
public: public:
void action(const gcn::ActionEvent& actionEvent) void action(const gcn::ActionEvent& actionEvent)
{ {
if (actionEvent.getSource() == cmdShutdown)
{
// ------------------------------------------------
// Shutdown the host (power off)
// ------------------------------------------------
uae_quit();
gui_running = false;
host_shutdown();
}
if (actionEvent.getSource() == cmdQuit) if (actionEvent.getSource() == cmdQuit)
{ {
//------------------------------------------------- //-------------------------------------------------
@ -439,6 +464,12 @@ void gui_init()
cmdQuit->setId("Quit"); cmdQuit->setId("Quit");
cmdQuit->addActionListener(mainButtonActionListener); cmdQuit->addActionListener(mainButtonActionListener);
cmdShutdown = new gcn::Button("Shutdown");
cmdShutdown->setSize(BUTTON_WIDTH, BUTTON_HEIGHT);
cmdShutdown->setBaseColor(gui_baseCol);
cmdShutdown->setId("Shutdown");
cmdShutdown->addActionListener(mainButtonActionListener);
cmdReset = new gcn::Button("Reset"); cmdReset = new gcn::Button("Reset");
cmdReset->setSize(BUTTON_WIDTH, BUTTON_HEIGHT); cmdReset->setSize(BUTTON_WIDTH, BUTTON_HEIGHT);
cmdReset->setBaseColor(gui_baseCol); cmdReset->setBaseColor(gui_baseCol);
@ -500,6 +531,7 @@ void gui_init()
//-------------------------------------------------- //--------------------------------------------------
gui_top->add(cmdReset, DISTANCE_BORDER, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT); gui_top->add(cmdReset, DISTANCE_BORDER, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdQuit, DISTANCE_BORDER + BUTTON_WIDTH + DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT); gui_top->add(cmdQuit, DISTANCE_BORDER + BUTTON_WIDTH + DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdShutdown, DISTANCE_BORDER + 2 * BUTTON_WIDTH + 2 * DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdStart, GUI_WIDTH - DISTANCE_BORDER - BUTTON_WIDTH, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT); gui_top->add(cmdStart, GUI_WIDTH - DISTANCE_BORDER - BUTTON_WIDTH, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(selectors, DISTANCE_BORDER + 1, DISTANCE_BORDER + 1); gui_top->add(selectors, DISTANCE_BORDER + 1, DISTANCE_BORDER + 1);
@ -532,6 +564,7 @@ void gui_halt()
delete selectors; delete selectors;
delete cmdQuit; delete cmdQuit;
delete cmdShutdown;
delete cmdReset; delete cmdReset;
delete cmdRestart; delete cmdRestart;
delete cmdStart; delete cmdStart;