fixed some glade loading issues and updated some strings in the glade file
This commit is contained in:
punkrockguy318
parent
00a47173b4
commit
89ad67e441
|
|
@ -1,3 +1,5 @@
|
|||
* Changed some strings to reflect new email and website
|
||||
* Fixed and cleaned some stuff with the glade loading
|
||||
========================== version 0.6.0 ========================
|
||||
* Fixed evil no ROM problem.
|
||||
* Added ALSA support (sort of)
|
||||
|
|
|
|||
13
gfceu
13
gfceu
|
|
@ -489,7 +489,6 @@ optionsfile = appconfigdir + 'gfceu_options.dat'
|
|||
fceu_binary = None
|
||||
aoss_binary = None
|
||||
fceu_server_binary = None
|
||||
glade_file = None
|
||||
#version is defined earlier in the code
|
||||
#have_vfs is defined earlier in the code
|
||||
|
||||
|
|
@ -497,16 +496,16 @@ class WidgetsWrapper:
|
|||
def __init__(self):
|
||||
# Search for the glade file
|
||||
# Check first in the directory of this script.
|
||||
if os.path.isfile(os.path.dirname(sys.argv[0])+'gfceu.glade'):
|
||||
glade_file = os.path.dirname(sys.argv[0]) + 'gfceu.glade'
|
||||
# Then check in the share directory (installed)
|
||||
elif os.path.isfile(os.path.dirname(sys.argv[0]) +\
|
||||
'../share/gfceu/gfceu.glade'):
|
||||
glade_file = os.path.dirname(sys.argv[0])+'../share/gfceu/gfceu.glade'
|
||||
if os.path.isfile('gfceu.glade'):
|
||||
glade_file = 'gfceu.glade'
|
||||
# Then check to see if its installed on a *nix system
|
||||
elif os.path.isfile(os.path.join(os.path.dirname(sys.executable), '../share/gfceu/gfceu.glade')):
|
||||
glade_file = os.path.join(os.path.dirname(sys.executable), '../share/gfceu/gfceu.glade')
|
||||
else:
|
||||
print 'ERROR.'
|
||||
print 'Could not find the glade interface file.'
|
||||
print 'Try reinstalling the application.'
|
||||
sys.exit(1)
|
||||
|
||||
self.widgets = gtk.glade.XML(glade_file)
|
||||
self.widgets.signal_autoconnect(GladeHandlers.__dict__)
|
||||
|
|
|
|||
198
gfceu.glade
198
gfceu.glade
|
|
@ -52,6 +52,7 @@
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">_Browse...</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="browse_button_clicked"/>
|
||||
</widget>
|
||||
<packing>
|
||||
|
|
@ -72,6 +73,7 @@
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Enable _Sound</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<property name="active">True</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
</widget>
|
||||
|
|
@ -82,9 +84,6 @@
|
|||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="tab_expand">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label9">
|
||||
|
|
@ -93,7 +92,6 @@
|
|||
</widget>
|
||||
<packing>
|
||||
<property name="type">tab</property>
|
||||
<property name="tab_expand">False</property>
|
||||
<property name="tab_fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -142,28 +140,17 @@
|
|||
<property name="column_spacing">5</property>
|
||||
<property name="row_spacing">5</property>
|
||||
<child>
|
||||
<widget class="GtkButton" id="gp1_button">
|
||||
<widget class="GtkButton" id="gp3_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Gamepad _1</property>
|
||||
<property name="label" translatable="yes">Gamepad _3</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="gamepad_clicked" after="yes"/>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkButton" id="gp2_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Gamepad _2</property>
|
||||
<property name="use_underline">True</property>
|
||||
<signal name="clicked" handler="gamepad_clicked" after="yes"/>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -173,6 +160,7 @@
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Gamepad _4</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="gamepad_clicked" after="yes"/>
|
||||
</widget>
|
||||
<packing>
|
||||
|
|
@ -184,16 +172,30 @@
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkButton" id="gp3_button">
|
||||
<widget class="GtkButton" id="gp2_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Gamepad _3</property>
|
||||
<property name="label" translatable="yes">Gamepad _2</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="gamepad_clicked" after="yes"/>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkButton" id="gp1_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Gamepad _1</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="gamepad_clicked" after="yes"/>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -210,6 +212,7 @@
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-help</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="config_help_button_clicked"/>
|
||||
</widget>
|
||||
<packing>
|
||||
|
|
@ -221,7 +224,6 @@
|
|||
</widget>
|
||||
<packing>
|
||||
<property name="position">1</property>
|
||||
<property name="tab_expand">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -232,7 +234,6 @@
|
|||
<packing>
|
||||
<property name="type">tab</property>
|
||||
<property name="position">1</property>
|
||||
<property name="tab_expand">False</property>
|
||||
<property name="tab_fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -247,6 +248,7 @@
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Enable _OpenGL Rendering</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
|
|
@ -260,6 +262,7 @@
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Enable _Full Screen</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
|
|
@ -284,7 +287,6 @@
|
|||
</widget>
|
||||
<packing>
|
||||
<property name="position">2</property>
|
||||
<property name="tab_expand">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -295,7 +297,6 @@
|
|||
<packing>
|
||||
<property name="type">tab</property>
|
||||
<property name="position">2</property>
|
||||
<property name="tab_expand">False</property>
|
||||
<property name="tab_fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -372,7 +373,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
</widget>
|
||||
<packing>
|
||||
<property name="position">3</property>
|
||||
<property name="tab_expand">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -383,7 +383,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<packing>
|
||||
<property name="type">tab</property>
|
||||
<property name="position">3</property>
|
||||
<property name="tab_expand">False</property>
|
||||
<property name="tab_fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -398,6 +397,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">_Host Game</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="host_radio_clicked"/>
|
||||
</widget>
|
||||
|
|
@ -424,26 +424,15 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<property name="column_spacing">5</property>
|
||||
<property name="row_spacing">5</property>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label19">
|
||||
<widget class="GtkEntry" id="host_pass">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Port:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label20">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Password:</property>
|
||||
<property name="can_focus">True</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -461,15 +450,26 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkEntry" id="host_pass">
|
||||
<widget class="GtkLabel" id="label20">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Password:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label19">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Port:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -490,6 +490,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">_Join Game</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<property name="group">host_radio</property>
|
||||
<signal name="toggled" handler="join_radio_clicked"/>
|
||||
|
|
@ -520,13 +521,54 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<property name="column_spacing">3</property>
|
||||
<property name="row_spacing">5</property>
|
||||
<child>
|
||||
<widget class="GtkEntry" id="join_add">
|
||||
<widget class="GtkSpinButton" id="join_port">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="adjustment">4046 1 65536 1 10 10</property>
|
||||
<property name="climb_rate">1</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label17">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Password:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label16">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Server Port:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label15">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Server Address:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -546,54 +588,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label15">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Server Address:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label16">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Server Port:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label17">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Password:</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="top_attach">2</property>
|
||||
<property name="bottom_attach">3</property>
|
||||
<property name="x_options">GTK_FILL</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<widget class="GtkSpinButton" id="join_port">
|
||||
<widget class="GtkEntry" id="join_add">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="adjustment">4046 1 65536 1 10 10</property>
|
||||
<property name="climb_rate">1</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="right_attach">2</property>
|
||||
<property name="top_attach">1</property>
|
||||
<property name="bottom_attach">2</property>
|
||||
<property name="y_options"></property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -614,6 +615,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">_No Network</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<property name="active">True</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<property name="group">host_radio</property>
|
||||
|
|
@ -628,7 +630,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
</widget>
|
||||
<packing>
|
||||
<property name="position">4</property>
|
||||
<property name="tab_expand">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -639,7 +640,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<packing>
|
||||
<property name="type">tab</property>
|
||||
<property name="position">4</property>
|
||||
<property name="tab_expand">False</property>
|
||||
<property name="tab_fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
|
@ -665,6 +665,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<property name="has_default">True</property>
|
||||
<property name="label">gtk-execute</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="launch_button_clicked"/>
|
||||
</widget>
|
||||
<packing>
|
||||
|
|
@ -677,6 +678,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-about</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="about_button_clicked"/>
|
||||
</widget>
|
||||
<packing>
|
||||
|
|
@ -691,6 +693,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-quit</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="response_id">0</property>
|
||||
<signal name="clicked" handler="end"/>
|
||||
</widget>
|
||||
<packing>
|
||||
|
|
@ -711,9 +714,10 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
|
|||
</child>
|
||||
</widget>
|
||||
<widget class="GtkAboutDialog" id="about_dialog">
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
|
||||
<property name="copyright" translatable="yes">(C) Copyright 2006</property>
|
||||
<property name="comments" translatable="yes">A GNOME front-end end for the FCE Ultra Nintendo Entertainment System emulator</property>
|
||||
<property name="website">http://gfceu.thepiratecove.org/</property>
|
||||
<property name="website">http://dietschnitzel.com/gfceu/</property>
|
||||
<property name="license" translatable="yes">This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
|
|
@ -728,9 +732,9 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</property>
|
||||
<property name="authors">Lukas Sabota
|
||||
<punkrockguy318@comcast.net>
|
||||
<ltsmooth42@gmail.comt>
|
||||
|
||||
Patch Writers:
|
||||
Patch writers:
|
||||
Scott Brown</property>
|
||||
<property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
|
||||
<property name="artists">Sketching:
|
||||
|
|
|
|||
Loading…
Reference in New Issue