diff --git a/ChangeLog b/ChangeLog
index 8e18e970..fb8d00d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+* Changed glade filename from gfceux.xml -> gfceux.glade
+* Removed the need of running ./generate.ui after every glade change
+* Got rid of some silly glade errors
+* Changed the installation instructions to avoid breakage
* Gfceux now runs properly from the source directory without
being installed
================= version 2.1 ====================== ============
diff --git a/INSTALL b/INSTALL
index e5bc51bb..0aaa8676 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,18 +1,18 @@
You can install gfceux with setup.py:
-$ sudo python setup.py install --prefix=/usr/local
+$ sudo python setup.py install
-You can change the prefix to whatever you like.
+NOTE: The --prefix option of setup.py may be temporarily broken.
+We believe this is a python issue, so just install to the default
+path of /usr or just run the script out of the source directory.
Requirements:
-Python (tested with 2.5); (Ubuntu package name: python)
+Python (tested with 2.6); (Ubuntu package name: python2.6)
NOTE: gfceux is not yet compatible with python 3.x
-PyGTK and GTK; (Ubuntu package name: (python-gtk2 libgtk2.0-0)
+PyGTK (Ubuntu package name: python-gtk2)
Fceux 2.x
NOTE: fceu 1.x is no longer supported in the gfceu 2.x series.
If you still want/need a front-end for gfceu use gfceu 0.x
-ALSO NOTE: you can no longer run gfceux from the source directory.
- You need to run the install script and then run the app.
diff --git a/data/generate_ui.sh b/data/generate_ui.sh
deleted file mode 100755
index 908db51c..00000000
--- a/data/generate_ui.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-gtk-builder-convert gfceux.glade gfceux.xml
-
diff --git a/data/gfceux.glade b/data/gfceux.glade
index 016e1847..53ec388e 100644
--- a/data/gfceux.glade
+++ b/data/gfceux.glade
@@ -1,93 +1,103 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
False
False
+ 0
-
+
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
1
-
+
+
+ 0
+
-
+
+
+ 0
+
-
+
+
1
-
+
1
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
2
-
+
1
-
+
-
-
+
+
False
False
+ 0
-
+
False
False
+ 0
-
+
+
1
-
+
+
False
False
2
-
+
False
False
@@ -401,87 +417,88 @@
-
+
False
False
+ 0
-
+
+
1
-
+
+
False
False
2
-
+
False
False
2
-
+
-
-
+
+
+
- tab
False
-
+
False
False
@@ -489,41 +506,42 @@
1
-
+
False
False
+ 0
-
+
-
- True
- True
+
+
1
2
@@ -531,14 +549,14 @@
-
- True
- True
+
+
1
2
@@ -548,21 +566,21 @@
-
+
+
1
2
-
+
False
False
@@ -570,66 +588,66 @@
-
+
+
False
False
5
- GTK_PACK_END
+ end
2
-
+
1
-
-
+
+
+
- tab
1
False
-
+
False
False
+ 0
-
+
+
False
False
@@ -637,12 +655,12 @@
-
+
+
False
False
@@ -650,197 +668,198 @@
-
+
+
False
3
-
+
False
+ 0
-
+
False
5
+ 0
-
+
+ if-valid
+
False
1
-
+
False
1
-
+
-
+
-
-
+
+
-
- label_item
-
+
-
+
4
-
+
False
5
+ 0
-
+
+
False
False
1
-
+
False
False
5
-
+
2
False
-
-
+
+
+
- tab
2
False
-
+
False
5
+ 0
-
+
+
False
5
@@ -848,33 +867,34 @@
-
+
False
False
5
+ 0
-
+
+
False
False
1
-
+
False
5
@@ -882,194 +902,197 @@
-
+
False
False
5
+ 0
-
+
+
False
False
1
-
+
False
3
-
+
3
-
-
+
+
+
- tab
3
False
-
+
False
False
1
-
+
False
False
5
+ 0
-
+
False
False
5
+ 0
-
+
5
1
-
+
False
1
-
+
4
-
-
+
+
+
- tab
4
False
-
+
False
False
+ 0
-
+
1
2
@@ -1091,10 +1114,10 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
+
1
2
@@ -1103,11 +1126,11 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
-
+
-
+
False
False
@@ -1115,16 +1138,16 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
+
False
False
@@ -1132,17 +1155,17 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
GTK_FILL
-
+
+
1
2
@@ -1200,11 +1222,11 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
+
2
3
@@ -1213,12 +1235,12 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
+
1
2
@@ -1227,11 +1249,11 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
-
+
-
+
False
False
@@ -1239,77 +1261,78 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
+
False
False
4
-
+
5
-
-
+
+
+
- tab
5
False
-
+
10
+ 0
-
+
False
False
@@ -1317,33 +1340,36 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
-
+
+
False
2
-
+
+
+ 0
+
-
+
False
False
1
-
+
-
-
- GDK_WINDOW_TYPE_HINT_NORMAL
+
+
4
-
+
+
False
- GTK_PACK_END
+ end
+ 0
-
+
-
-
+
+
diff --git a/data/gfceux.xml b/data/gfceux.xml
index 7e65b051..53ec388e 100644
--- a/data/gfceux.xml
+++ b/data/gfceux.xml
@@ -1,43 +1,40 @@
-
+
+
@@ -1220,14 +1262,15 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
False
@@ -1236,6 +1279,9 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
+
+ 5
+
10
+ 0
@@ -1262,26 +1309,29 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
3
False
+ 0
False
@@ -1291,11 +1341,12 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
False
@@ -1303,6 +1354,9 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
+
+ 0
+
@@ -1315,7 +1369,7 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
False
- GTK_PACK_END
+ end
+ 0
diff --git a/gfceux b/gfceux
index 8f73b985..9c8291c9 100755
--- a/gfceux
+++ b/gfceux
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.6
#
# GTK2 GUI for FCE UltraX
#
diff --git a/setup.py b/setup.py
index 2240d81c..005b70df 100755
--- a/setup.py
+++ b/setup.py
@@ -3,13 +3,13 @@
from distutils.core import setup
setup(name="gfceux",
- version="2.1",
+ version="2.2svn",
scripts = ['gfceux'],
packages = ['gfceux'],
package_dir = {'gfceux': 'src'},
data_files=[
('share/gfceux/',
- ['data/gfceux.xml', 'data/gfceux_big.png', 'data/gfceux.png',
+ ['data/gfceux.glade', 'data/gfceux_big.png', 'data/gfceux.png',
'COPYING']),
('share/pixmaps/',
['data/gfceux.png']),
diff --git a/src/main.py b/src/main.py
index 0710e7e1..0a6e03b0 100755
--- a/src/main.py
+++ b/src/main.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
# gfceux - Graphical launcher for fceux.
# Designed on Ubuntu, with platfrom independence in mind.
-version = "2.1"
+version = "2.2svn"
title = "gfceux"
# Copyright (C) 2008 Lukas Sabota
##
@@ -280,11 +280,11 @@ class GfceuxApp:
global widgets
""" Search for the glade XML file and load it """
# Check first in the directory of this script.
- if os.path.isfile('data/gfceux.xml'):
- glade_file = 'data/gfceux.xml'
+ if os.path.isfile('data/gfceux.glade'):
+ glade_file = 'data/gfceux.glade'
# Then check to see if its installed on a *nix system
- elif os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), '../share/gfceux/gfceux.xml')):
- glade_file = os.path.join(os.path.dirname(sys.argv[0]), '../share/gfceux/gfceux.xml')
+ elif os.path.isfile(os.path.join(os.path.dirname(sys.argv[0]), '../share/gfceux/gfceux.glade')):
+ glade_file = os.path.join(os.path.dirname(sys.argv[0]), '../share/gfceux/gfceux.glade')
else:
print 'ERROR.'
print 'Could not find the glade UI file.'