diff --git a/ChangeLog b/ChangeLog
index c7a3f390..ccb3902c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
diff --git a/gfceu b/gfceu
index 1fba8701..95cce395 100644
--- a/gfceu
+++ b/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__)
diff --git a/gfceu.glade b/gfceu.glade
index f342ed07..7d6240fa 100644
--- a/gfceu.glade
+++ b/gfceu.glade
@@ -52,6 +52,7 @@
True
_Browse...
True
+ 0
@@ -72,6 +73,7 @@
True
Enable _Sound
True
+ 0
True
True
@@ -82,9 +84,6 @@
-
- False
-
@@ -93,7 +92,6 @@
tab
- False
False
@@ -142,28 +140,17 @@
5
5
-
+
True
True
- Gamepad _1
+ Gamepad _3
True
+ 0
-
-
-
-
-
- True
- True
- Gamepad _2
- True
-
-
-
- 1
- 2
+ 1
+ 2
@@ -173,6 +160,7 @@
True
Gamepad _4
True
+ 0
@@ -184,16 +172,30 @@
-
+
True
True
- Gamepad _3
+ Gamepad _2
True
+ 0
+
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ Gamepad _1
+ True
+ 0
- 1
- 2
@@ -210,6 +212,7 @@
True
gtk-help
True
+ 0
@@ -221,7 +224,6 @@
1
- False
@@ -232,7 +234,6 @@
tab
1
- False
False
@@ -247,6 +248,7 @@
True
Enable _OpenGL Rendering
True
+ 0
True
@@ -260,6 +262,7 @@
True
Enable _Full Screen
True
+ 0
True
@@ -284,7 +287,6 @@
2
- False
@@ -295,7 +297,6 @@
tab
2
- False
False
@@ -372,7 +373,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
3
- False
@@ -383,7 +383,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
tab
3
- False
False
@@ -398,6 +397,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
True
_Host Game
True
+ 0
True
@@ -424,26 +424,15 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
5
5
-
+
True
- 0
- Port:
-
-
- GTK_FILL
-
-
-
-
-
- True
- 0
- Password:
+ True
+ 1
+ 2
1
2
- GTK_FILL
@@ -461,15 +450,26 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
-
+
True
- True
+ 0
+ Password:
- 1
- 2
1
2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Port:
+
+
+ GTK_FILL
@@ -490,6 +490,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
True
_Join Game
True
+ 0
True
host_radio
@@ -520,13 +521,54 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
3
5
-
+
True
True
+ 4046 1 65536 1 10 10
+ 1
1
2
+ 1
+ 2
+
+
+
+
+
+ True
+ 0
+ Password:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Server Port:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Server Address:
+
+
+ GTK_FILL
@@ -546,54 +588,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
-
- True
- 0
- Server Address:
-
-
- GTK_FILL
-
-
-
-
-
- True
- 0
- Server Port:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- 0
- Password:
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
+
True
True
- 4046 1 65536 1 10 10
- 1
1
2
- 1
- 2
@@ -614,6 +615,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
True
_No Network
True
+ 0
True
True
host_radio
@@ -628,7 +630,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
4
- False
@@ -639,7 +640,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
tab
4
- False
False
@@ -665,6 +665,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
True
gtk-execute
True
+ 0
@@ -677,6 +678,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
True
gtk-about
True
+ 0
@@ -691,6 +693,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
True
gtk-quit
True
+ 0
@@ -711,9 +714,10 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
+ GDK_WINDOW_TYPE_HINT_NORMAL
(C) Copyright 2006
A GNOME front-end end for the FCE Ultra Nintendo Entertainment System emulator
- http://gfceu.thepiratecove.org/
+ http://dietschnitzel.com/gfceu/
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.
Lukas Sabota
-<punkrockguy318@comcast.net>
+<ltsmooth42@gmail.comt>
-Patch Writers:
+Patch writers:
Scott Brown
translator-credits
Sketching: