Moved a few menu items to prepare for the upcoming config dialogs.
This commit is contained in:
bgk 2008-09-26 17:38:45 +00:00
parent 2af55d0f0b
commit 9f89bfd42d
2 changed files with 17 additions and 22 deletions

View File

@ -94,6 +94,15 @@
<accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="VideoFullscreen">
<property name="visible">True</property>
<property name="label" translatable="yes">gtk-fullscreen</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="F11" signal="activate"/>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separator3">
<property name="visible">True</property>
@ -450,20 +459,6 @@
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="VideoMenu_menu">
<child>
<widget class="GtkImageMenuItem" id="VideoFullscreen">
<property name="visible">True</property>
<property name="label" translatable="yes">gtk-fullscreen</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="F11" signal="activate"/>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkRadioMenuItem" id="VideoOpenGL">
<property name="visible">True</property>
@ -558,13 +553,6 @@
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="EmulatorMenu_menu">
<child>
<widget class="GtkMenuItem" id="EmulatorDirectories">
<property name="visible">True</property>
<property name="label" translatable="yes">Directories...</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkCheckMenuItem" id="EmulatorPauseWhenInactive">
<property name="visible">True</property>
@ -1030,6 +1018,13 @@
</child>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="DirectoriesConfigure">
<property name="visible">True</property>
<property name="label" translatable="yes">_Directories ...</property>
<property name="use_underline">True</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="JoypadConfigure">
<property name="visible">True</property>

View File

@ -337,7 +337,7 @@ Window::Window(GtkWindow * _pstWindow, const Glib::RefPtr<Xml> & _poXml) :
// Emulator menu
//
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("EmulatorDirectories"));
poMI = dynamic_cast<Gtk::MenuItem *>(_poXml->get_widget("DirectoriesConfigure"));
poMI->signal_activate().connect(sigc::mem_fun(*this, &Window::vOnDirectories));
poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget("EmulatorPauseWhenInactive"));