ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTK: Convert the remaining parts of the UI from Glade to GtkBuilder. Thanks to Rafał Mużyło for the patch. 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@977 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
bgk 2011-02-20 08:28:48 +00:00
parent 259aa4cdde
commit 33e95d70ee
5 changed files with 417 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -52,7 +52,6 @@ IF(NOT NO_GTK)
PKG_CHECK_MODULES ( GTKMM gtkmm-2.4 )
PKG_CHECK_MODULES ( GLIBMM glibmm-2.4 )
PKG_CHECK_MODULES ( GIOMM giomm-2.4 )
PKG_CHECK_MODULES ( GLADEMM libglademm-2.4 )
PKG_CHECK_MODULES ( GTKGLMM gtkglextmm-x11-1.2 )
ENDIF(NOT NO_GTK)
@ -70,9 +69,9 @@ ENDIF( WITH_LIRC )
# Check that the dependencies are met to build the GTK frontend
IF( NOT NO_GTK )
IF( GLIBMM_FOUND AND GTKMM_FOUND AND GLADEMM_FOUND AND SDL_FOUND )
IF( GLIBMM_FOUND AND GTKMM_FOUND AND SDL_FOUND )
SET( CAN_BUILD_GVBAM 1 )
ENDIF( GLIBMM_FOUND AND GTKMM_FOUND AND GLADEMM_FOUND AND SDL_FOUND )
ENDIF( GLIBMM_FOUND AND GTKMM_FOUND AND SDL_FOUND )
ENDIF( NOT NO_GTK )
# Set the default install dir
@ -286,7 +285,6 @@ IF( CAN_BUILD_GVBAM )
${GIOMM_INCLUDE_DIRS}
${GTKMM_INCLUDE_DIRS}
${GTKGLMM_INCLUDE_DIRS}
${GLADEMM_INCLUDE_DIRS}
)
LINK_DIRECTORIES(
@ -294,7 +292,6 @@ IF( CAN_BUILD_GVBAM )
${GIOMM_LIBRARY_DIRS}
${GTKMM_LIBRARY_DIRS}
${GTKGLMM_LIBRARY_DIRS}
${GLADEMM_LIBRARY_DIRS}
)
ENDIF( CAN_BUILD_GVBAM )
@ -363,7 +360,6 @@ IF( CAN_BUILD_GVBAM )
vbamcore
${ZLIB_LIBRARY}
${PNG_LIBRARY}
${GLADEMM_LIBRARIES}
${SDL_LIBRARY}
${GTKGLMM_LIBRARIES}
${SFML_LIBRARY}

11
src/gtk/main.cpp
View File

@ -19,7 +19,6 @@
#include <gtkmm/main.h>
#include <gtkmm/window.h>
#include <gtkmm/messagedialog.h>
#include <libglademm.h>
#ifdef USE_OPENGL
#include <gtkmm/gl/init.h>
@ -28,8 +27,6 @@
#include "window.h"
#include "intl.h"
using Gnome::Glade::Xml;
int main(int argc, char * argv[])
{
bool bShowVersion = false;
@ -90,12 +87,14 @@ int main(int argc, char * argv[])
std::string sGladeFile = VBA::Window::sGetUiFilePath("vbam.glade");
Glib::RefPtr<Xml> poXml;
Glib::RefPtr<Gtk::Builder> poXml;
try
{
poXml = Xml::create(sGladeFile, "MainWindow");
poXml = Gtk::Builder::create();
poXml->add_from_file(sGladeFile, "accelgroup1");
poXml->add_from_file(sGladeFile, "MainWindow");
}
catch (const Xml::Error & e)
catch (const Gtk::BuilderError & e)
{
Gtk::MessageDialog oDialog(e.what(),
false,

590
src/gtk/ui/vbam.glade
View File

@ -1,595 +1,753 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="MainWindow">
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="MainWindow">
<property name="can_focus">False</property>
<property name="title" translatable="yes">VBA</property>
<accel-groups>
<group name="accelgroup1"/>
</accel-groups>
<child>
<widget class="GtkVBox" id="vbox1">
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkMenuBar" id="MenuBar">
<object class="GtkMenuBar" id="MenuBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<widget class="GtkMenuItem" id="FileMenu">
<object class="GtkMenuItem" id="FileMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="FileMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="FileMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkImageMenuItem" id="FileOpen">
<object class="GtkImageMenuItem" id="FileOpen">
<property name="label">gtk-open</property>
<property name="visible">True</property>
<property name="label" translatable="yes">gtk-open</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</widget>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="RecentMenu">
<object class="GtkMenuItem" id="RecentMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Open rece_nt</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator4">
<object class="GtkSeparatorMenuItem" id="separator4">
<property name="visible">True</property>
</widget>
<property name="can_focus">False</property>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="FileScreenCapture">
<object class="GtkMenuItem" id="FileScreenCapture">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Screen capt_ure...</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator6">
<object class="GtkSeparatorMenuItem" id="separator6">
<property name="visible">True</property>
</widget>
<property name="can_focus">False</property>
</object>
</child>
<child>
<widget class="GtkImageMenuItem" id="FileClose">
<object class="GtkImageMenuItem" id="FileClose">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="label" translatable="yes">gtk-close</property>
<property name="use_stock">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</widget>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
</object>
</child>
<child>
<widget class="GtkImageMenuItem" id="FileExit">
<object class="GtkImageMenuItem" id="FileExit">
<property name="label">gtk-quit</property>
<property name="visible">True</property>
<property name="label" translatable="yes">gtk-quit</property>
<property name="use_stock">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<accelerator key="X" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<accelerator key="X" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="EmulationMenu">
<object class="GtkMenuItem" id="EmulationMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Emulation</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="EmulationMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="EmulationMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkCheckMenuItem" id="FilePause">
<object class="GtkCheckMenuItem" id="FilePause">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">gtk-media-pause</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
<accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="FileReset">
<object class="GtkMenuItem" id="FileReset">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Reset</property>
<property name="use_underline">True</property>
<accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
<accelerator key="R" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
<widget class="GtkImageMenuItem" id="VideoFullscreen">
<object class="GtkImageMenuItem" id="VideoFullscreen">
<property name="label">gtk-fullscreen</property>
<property name="visible">True</property>
<property name="label" translatable="yes">gtk-fullscreen</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">accelgroup1</property>
<accelerator key="F11" signal="activate"/>
</widget>
</object>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator3">
<object class="GtkSeparatorMenuItem" id="separator3">
<property name="visible">True</property>
</widget>
<property name="can_focus">False</property>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameMenu">
<object class="GtkMenuItem" id="LoadGameMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Loa_d state</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="LoadGameMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="LoadGameMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkMenuItem" id="LoadGameMostRecent">
<object class="GtkMenuItem" id="LoadGameMostRecent">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Most recent</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkCheckMenuItem" id="LoadGameAuto">
<object class="GtkCheckMenuItem" id="LoadGameAuto">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Auto load most recent</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator28">
<object class="GtkSeparatorMenuItem" id="separator28">
<property name="visible">True</property>
</widget>
<property name="can_focus">False</property>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot1">
<object class="GtkMenuItem" id="LoadGameSlot1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot1</property>
<property name="use_underline">True</property>
<accelerator key="F1" modifiers="" signal="activate"/>
</widget>
<accelerator key="F1" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot2">
<object class="GtkMenuItem" id="LoadGameSlot2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot2</property>
<property name="use_underline">True</property>
<accelerator key="F2" modifiers="" signal="activate"/>
</widget>
<accelerator key="F2" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot3">
<object class="GtkMenuItem" id="LoadGameSlot3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot3</property>
<property name="use_underline">True</property>
<accelerator key="F3" modifiers="" signal="activate"/>
</widget>
<accelerator key="F3" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot4">
<object class="GtkMenuItem" id="LoadGameSlot4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot4</property>
<property name="use_underline">True</property>
<accelerator key="F4" modifiers="" signal="activate"/>
</widget>
<accelerator key="F4" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot5">
<object class="GtkMenuItem" id="LoadGameSlot5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot5</property>
<property name="use_underline">True</property>
<accelerator key="F5" modifiers="" signal="activate"/>
</widget>
<accelerator key="F5" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot6">
<object class="GtkMenuItem" id="LoadGameSlot6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot6</property>
<property name="use_underline">True</property>
<accelerator key="F6" modifiers="" signal="activate"/>
</widget>
<accelerator key="F6" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot7">
<object class="GtkMenuItem" id="LoadGameSlot7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot7</property>
<property name="use_underline">True</property>
<accelerator key="F7" modifiers="" signal="activate"/>
</widget>
<accelerator key="F7" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot8">
<object class="GtkMenuItem" id="LoadGameSlot8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot8</property>
<property name="use_underline">True</property>
<accelerator key="F8" modifiers="" signal="activate"/>
</widget>
<accelerator key="F8" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot9">
<object class="GtkMenuItem" id="LoadGameSlot9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot9</property>
<property name="use_underline">True</property>
<accelerator key="F9" modifiers="" signal="activate"/>
</widget>
<accelerator key="F9" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="LoadGameSlot10">
<object class="GtkMenuItem" id="LoadGameSlot10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot10</property>
<property name="use_underline">True</property>
<accelerator key="F10" modifiers="" signal="activate"/>
</widget>
<accelerator key="F10" signal="activate"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="FileLoad">
<object class="GtkMenuItem" id="FileLoad">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">From _File ...</property>
<property name="use_underline">True</property>
<accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
<accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameMenu">
<object class="GtkMenuItem" id="SaveGameMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">S_ave state</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="SaveGameMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="SaveGameMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkMenuItem" id="SaveGameOldest">
<object class="GtkMenuItem" id="SaveGameOldest">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Oldest slot</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator27">
<object class="GtkSeparatorMenuItem" id="separator27">
<property name="visible">True</property>
</widget>
<property name="can_focus">False</property>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot1">
<object class="GtkMenuItem" id="SaveGameSlot1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot1</property>
<property name="use_underline">True</property>
<accelerator key="F1" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F1" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot2">
<object class="GtkMenuItem" id="SaveGameSlot2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot2</property>
<property name="use_underline">True</property>
<accelerator key="F2" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F2" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot3">
<object class="GtkMenuItem" id="SaveGameSlot3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot3</property>
<property name="use_underline">True</property>
<accelerator key="F3" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F3" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot4">
<object class="GtkMenuItem" id="SaveGameSlot4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot4</property>
<property name="use_underline">True</property>
<accelerator key="F4" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F4" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot5">
<object class="GtkMenuItem" id="SaveGameSlot5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot5</property>
<property name="use_underline">True</property>
<accelerator key="F5" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F5" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot6">
<object class="GtkMenuItem" id="SaveGameSlot6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot6</property>
<property name="use_underline">True</property>
<accelerator key="F6" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F6" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot7">
<object class="GtkMenuItem" id="SaveGameSlot7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot7</property>
<property name="use_underline">True</property>
<accelerator key="F7" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F7" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot8">
<object class="GtkMenuItem" id="SaveGameSlot8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot8</property>
<property name="use_underline">True</property>
<accelerator key="F8" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F8" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot9">
<object class="GtkMenuItem" id="SaveGameSlot9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot9</property>
<property name="use_underline">True</property>
<accelerator key="F9" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F9" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SaveGameSlot10">
<object class="GtkMenuItem" id="SaveGameSlot10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Slot10</property>
<property name="use_underline">True</property>
<accelerator key="F10" modifiers="GDK_SHIFT_MASK" signal="activate"/>
</widget>
<accelerator key="F10" signal="activate" modifiers="GDK_SHIFT_MASK"/>
</object>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator25">
<object class="GtkSeparatorMenuItem" id="separator25">
<property name="visible">True</property>
</widget>
<property name="can_focus">False</property>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="FileSave">
<object class="GtkMenuItem" id="FileSave">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">To _File ...</property>
<property name="use_underline">True</property>
<accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
<accelerator key="S" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="OptionsMenu">
<object class="GtkMenuItem" id="OptionsMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Options</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="OptionsMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="OptionsMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkMenuItem" id="FrameskipMenu">
<object class="GtkMenuItem" id="FrameskipMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Frameskip</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="FrameskipMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="FrameskipMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkRadioMenuItem" id="FrameskipAutomatic">
<object class="GtkRadioMenuItem" id="FrameskipAutomatic">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Automatic</property>
<property name="use_underline">True</property>
<property name="active">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip0">
<object class="GtkRadioMenuItem" id="Frameskip0">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_0</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip1">
<object class="GtkRadioMenuItem" id="Frameskip1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_1</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip2">
<object class="GtkRadioMenuItem" id="Frameskip2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_2</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip3">
<object class="GtkRadioMenuItem" id="Frameskip3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_3</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip4">
<object class="GtkRadioMenuItem" id="Frameskip4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_4</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip5">
<object class="GtkRadioMenuItem" id="Frameskip5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_5</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip6">
<object class="GtkRadioMenuItem" id="Frameskip6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_6</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip7">
<object class="GtkRadioMenuItem" id="Frameskip7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_7</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip8">
<object class="GtkRadioMenuItem" id="Frameskip8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_8</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="Frameskip9">
<object class="GtkRadioMenuItem" id="Frameskip9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_9</property>
<property name="use_underline">True</property>
<property name="group">FrameskipAutomatic</property>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="EmulatorMenu">
<object class="GtkMenuItem" id="EmulatorMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Emulator</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="EmulatorMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="EmulatorMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkCheckMenuItem" id="EmulatorPauseWhenInactive">
<object class="GtkCheckMenuItem" id="EmulatorPauseWhenInactive">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Pause when inactive window</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="ShowSpeedMenu">
<object class="GtkMenuItem" id="ShowSpeedMenu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Show speed</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="ShowSpeedMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="ShowSpeedMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkRadioMenuItem" id="ShowSpeedNone">
<object class="GtkRadioMenuItem" id="ShowSpeedNone">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">None</property>
<property name="use_underline">True</property>
<property name="active">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="ShowSpeedPercentage">
<object class="GtkRadioMenuItem" id="ShowSpeedPercentage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Percentage</property>
<property name="use_underline">True</property>
<property name="group">ShowSpeedNone</property>
</widget>
</object>
</child>
<child>
<widget class="GtkRadioMenuItem" id="ShowSpeedDetailed">
<object class="GtkRadioMenuItem" id="ShowSpeedDetailed">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Detailed</property>
<property name="use_underline">True</property>
<property name="group">ShowSpeedNone</property>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="GameBoyConfigure">
<object class="GtkMenuItem" id="GameBoyConfigure">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Game Boy ...</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="GameBoyAdvanceConfigure">
<object class="GtkMenuItem" id="GameBoyAdvanceConfigure">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Game Boy _Advance ...</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="DisplayConfigure">
<object class="GtkMenuItem" id="DisplayConfigure">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Display ...</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="SoundConfigure">
<object class="GtkMenuItem" id="SoundConfigure">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Sound ...</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="DirectoriesConfigure">
<object class="GtkMenuItem" id="DirectoriesConfigure">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">D_irectories ...</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="JoypadConfigure">
<object class="GtkMenuItem" id="JoypadConfigure">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Joypads ...</property>
<property name="use_underline">True</property>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkMenuItem" id="HelpMenu">
<object class="GtkMenuItem" id="HelpMenu">
<property name="visible">True</property>
<property name="label" translatable="yes">gtk-help</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="label" translatable="yes" context="gtk20">_Help</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<child>
<widget class="GtkMenu" id="HelpMenu_menu">
<child type="submenu">
<object class="GtkMenu" id="HelpMenu_menu">
<property name="can_focus">False</property>
<child>
<widget class="GtkImageMenuItem" id="HelpAbout">
<object class="GtkImageMenuItem" id="HelpAbout">
<property name="label">gtk-about</property>
<property name="visible">True</property>
<property name="label" translatable="yes">gtk-about</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</widget>
<property name="accel_group">accelgroup1</property>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkAlignment" id="ScreenContainer">
<object class="GtkAlignment" id="ScreenContainer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<placeholder/>
</child>
</widget>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</widget>
</object>
</child>
</widget>
</glade-interface>
</object>
<object class="GtkAccelGroup" id="accelgroup1"/>
</interface>

66
src/gtk/window.cpp
View File

@ -49,8 +49,6 @@ extern int RGB_LOW_BITS_MASK;
namespace VBA
{
using Gnome::Glade::Xml;
Window * Window::m_poInstance = NULL;
const Window::SJoypadKey Window::m_astJoypad[] =
@ -73,7 +71,7 @@ const Window::SJoypadKey Window::m_astJoypad[] =
{ "autoB", KEY_BUTTON_AUTO_B }
};
Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Gtk::Builder> & _poXml) :
Gtk::Window (_pstWindow),
m_iGBScreenWidth (160),
m_iGBScreenHeight (144),
@ -155,28 +153,28 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
Gtk::CheckMenuItem * poCMI;
// Menu bar
m_poMenuBar = dynamic_cast<Gtk::MenuBar *>(_poXml->get_widget("MenuBar"));
_poXml->get_widget("MenuBar", m_poMenuBar);
m_poMenuBar->signal_deactivate().connect(sigc::mem_fun(*this, &Window::vOnMenuExit));
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileMenu"));
_poXml->get_widget("FileMenu", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnMenuEnter));
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("EmulationMenu"));
_poXml->get_widget("EmulationMenu", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnMenuEnter));
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("OptionsMenu"));
_poXml->get_widget("OptionsMenu", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnMenuEnter));
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("HelpMenu"));
_poXml->get_widget("HelpMenu", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnMenuEnter));
// File menu
//
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileOpen"));
_poXml->get_widget("FileOpen", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnFileOpen));
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileLoad"));
_poXml->get_widget("FileLoad", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnFileLoad));
m_listSensitiveWhenPlaying.push_back(poMI);
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileSave"));
_poXml->get_widget("FileSave", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnFileSave));
m_listSensitiveWhenPlaying.push_back(poMI);
@ -184,9 +182,9 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
{
char csName[20];
snprintf(csName, 20, "LoadGameSlot%d", i + 1);
m_apoLoadGameItem[i] = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget(csName));
_poXml->get_widget(csName, m_apoLoadGameItem[i]);
snprintf(csName, 20, "SaveGameSlot%d", i + 1);
m_apoSaveGameItem[i] = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget(csName));
_poXml->get_widget(csName, m_apoSaveGameItem[i]);
m_apoLoadGameItem[i]->signal_activate().connect(sigc::bind(
sigc::mem_fun(*this, &Window::vOnLoadGame),
@ -197,22 +195,22 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
}
vUpdateGameSlots();
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("LoadGameMostRecent"));
_poXml->get_widget("LoadGameMostRecent", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnLoadGameMostRecent));
m_listSensitiveWhenPlaying.push_back(poMI);
poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget("LoadGameAuto"));
_poXml->get_widget("LoadGameAuto", poCMI);
poCMI->set_active(m_poCoreConfig->oGetKey<bool>("load_game_auto"));
vOnLoadGameAutoToggled(poCMI);
poCMI->signal_toggled().connect(sigc::bind(
sigc::mem_fun(*this, &Window::vOnLoadGameAutoToggled),
poCMI));
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("SaveGameOldest"));
_poXml->get_widget("SaveGameOldest", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnSaveGameOldest));
m_listSensitiveWhenPlaying.push_back(poMI);
m_poFilePauseItem = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget("FilePause"));
_poXml->get_widget("FilePause", m_poFilePauseItem);
m_poFilePauseItem->set_active(false);
vOnFilePauseToggled(m_poFilePauseItem);
m_poFilePauseItem->signal_toggled().connect(sigc::bind(
@ -220,19 +218,19 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
m_poFilePauseItem));
m_listSensitiveWhenPlaying.push_back(m_poFilePauseItem);
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileReset"));
_poXml->get_widget("FileReset", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnFileReset));
m_listSensitiveWhenPlaying.push_back(poMI);
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileScreenCapture"));
_poXml->get_widget("FileScreenCapture", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnFileScreenCapture));
m_listSensitiveWhenPlaying.push_back(poMI);
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileClose"));
_poXml->get_widget("FileClose", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnFileClose));
m_listSensitiveWhenPlaying.push_back(poMI);
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("FileExit"));
_poXml->get_widget("FileExit", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnFileExit));
// Recent menu
@ -251,7 +249,7 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
sigc::mem_fun(*this, &Window::vOnRecentFile));
m_poRecentMenu = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("RecentMenu"));
_poXml->get_widget("RecentMenu", m_poRecentMenu);
m_poRecentMenu->set_submenu(static_cast<Gtk::Menu &>(*m_poRecentChooserMenu));
// Frameskip menu
@ -286,7 +284,7 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
}
for (guint i = 0; i < G_N_ELEMENTS(astFrameskip); i++)
{
poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFrameskip[i].m_csName));
_poXml->get_widget(astFrameskip[i].m_csName, poCMI);
if (astFrameskip[i].m_iFrameskip == iDefaultFrameskip)
{
poCMI->set_active();
@ -299,10 +297,10 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
// Emulator menu
//
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("DirectoriesConfigure"));
_poXml->get_widget("DirectoriesConfigure", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnDirectories));
poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget("EmulatorPauseWhenInactive"));
_poXml->get_widget("EmulatorPauseWhenInactive", poCMI);
poCMI->set_active(m_poDisplayConfig->oGetKey<bool>("pause_when_inactive"));
vOnPauseWhenInactiveToggled(poCMI);
poCMI->signal_toggled().connect(sigc::bind(
@ -325,7 +323,7 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
EShowSpeed eDefaultShowSpeed = (EShowSpeed)m_poDisplayConfig->oGetKey<int>("show_speed");
for (guint i = 0; i < G_N_ELEMENTS(astShowSpeed); i++)
{
poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astShowSpeed[i].m_csName));
_poXml->get_widget(astShowSpeed[i].m_csName, poCMI);
if (astShowSpeed[i].m_eShowSpeed == eDefaultShowSpeed)
{
poCMI->set_active();
@ -337,24 +335,24 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
}
// Game Boy menu
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("GameBoyConfigure"));
_poXml->get_widget("GameBoyConfigure", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnGameBoyConfigure));
// Game Boy Advance menu
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("GameBoyAdvanceConfigure"));
_poXml->get_widget("GameBoyAdvanceConfigure", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnGameBoyAdvanceConfigure));
// Display menu
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("DisplayConfigure"));
_poXml->get_widget("DisplayConfigure", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnDisplayConfigure));
// Sound menu
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("SoundConfigure"));
_poXml->get_widget("SoundConfigure", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnSoundConfigure));
// Joypad menu
//
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("JoypadConfigure"));
_poXml->get_widget("JoypadConfigure", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnJoypadConfigure));
EPad eDefaultJoypad = (EPad)m_poInputConfig->oGetKey<int>("active_joypad");
@ -362,12 +360,12 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
// Fullscreen menu
//
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("VideoFullscreen"));
_poXml->get_widget("VideoFullscreen", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnVideoFullscreen));
// Help menu
//
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("HelpAbout"));
_poXml->get_widget("HelpAbout", poMI);
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnHelpAbout));
// Init widgets sensitivity
@ -459,7 +457,7 @@ void Window::vApplyConfigScreenArea()
Gtk::Alignment * poC;
poC = dynamic_cast<Gtk::Alignment *>(m_poXml->get_widget("ScreenContainer"));
m_poXml->get_widget("ScreenContainer", poC);
poC->remove();
poC->set(Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER, 1.0, 1.0);

8
src/gtk/window.h
View File

@ -25,7 +25,7 @@
#include <gtkmm/filechooserdialog.h>
#include <gtkmm/menubar.h>
#include <gtkmm/recentchoosermenu.h>
#include <libglademm.h>
#include <gtkmm/builder.h>
#include "../System.h"
#include "../sdl/inputSDL.h"
@ -39,7 +39,7 @@ namespace VBA
class Window : public Gtk::Window
{
friend class Gnome::Glade::Xml;
friend class Gtk::Builder;
public:
virtual ~Window();
@ -113,7 +113,7 @@ public:
protected:
Window(GtkWindow * _pstWindow,
const Glib::RefPtr<Gnome::Glade::Xml> & _poXml);
const Glib::RefPtr<Gtk::Builder> & _poXml);
enum EShowSpeed
{
@ -197,7 +197,7 @@ private:
static Window * m_poInstance;
Glib::RefPtr<Gnome::Glade::Xml> m_poXml;
Glib::RefPtr<Gtk::Builder> m_poXml;
std::string m_sUserDataDir;
std::string m_sConfigFile;