creates new config file, to be seperate from stable gfceu

also mocked up some video options in the glade
This commit is contained in:
punkrockguy318 2008-06-06 00:23:26 +00:00
parent 742fa86e3b
commit dfacf938e9
2 changed files with 135 additions and 41 deletions

23
gfceu
View File

@ -2,6 +2,7 @@
# gfceu - Graphical launcher for FCE Ultra.
# Designed on Ubuntu, with platfrom independence in mind.
version = "0.6.1svn"
title = "gfceux"
# Copyright (C) 2006 Lukas Sabota <punkrockguy318@comcast.net>
##
"""
@ -40,7 +41,7 @@ def gfceu_message(message, use_gtk=False):
messages. However, it can be used for important messages as well. If a
GTK message_box is requried, the use_gtk flag can be enabled
"""
print 'gfceu message: '+message
print title + ' message: '+message
if use_gtk:
msgbox = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_INFO,
buttons=gtk.BUTTONS_CLOSE)
@ -56,13 +57,13 @@ def gfceu_error(message, code, use_gtk=True, fatal=True):
in the standard python language. One of these days...
"""
print '# # # #'
print 'gfceu ERROR code '+str(code)+':'
print title + ' ERROR code '+str(code)+':'
print message
print '# # # #'
if use_gtk:
msgbox = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_ERROR,
buttons=gtk.BUTTONS_CLOSE)
msgbox.set_markup('gfceu ERROR Code '+str(code)+':\n'+message)
msgbox.set_markup(title + ' ERROR Code '+str(code)+':\n'+message)
msgbox.run()
msgbox.destroy()
if fatal:
@ -225,7 +226,7 @@ def set_options():
def launch(passed, local=False):
global xml, options, fceu_server_binary, fceu_binary
global xml, options, fceu_server_binary, fceux_binary
set_options()
if options.sound_check:
@ -265,7 +266,7 @@ def launch(passed, local=False):
else:
opengl = '--opengl 0 '
command = fceu_binary +' '+ sound + fullscreen +\
command = fceux_binary +' '+ sound + fullscreen +\
network + opengl + options.extra_entry + ' '+ passed
gfceu_message('Command: ' + command)
@ -484,10 +485,10 @@ class GladeHandlers:
##############################################################################
# Globals
options = None
appconfigdir = os.getenv('HOME') + '/.gfceu'
old_optionsfile = os.getenv('HOME')+'/.gfceu_options'
appconfigdir = os.getenv('HOME') + '/.'+ title
old_optionsfile = os.getenv('HOME')+'/.' + title + '_options'
optionsfile = appconfigdir + 'gfceu_options.dat'
fceu_binary = None
fceux_binary = None
fceu_server_binary = None
#version is defined earlier in the code
#have_vfs is defined earlier in the code
@ -521,14 +522,14 @@ if __name__ == '__main__':
parser = OptionParser(version='%prog '+ version)
parser.parse_args()
fceu_binary = find_binary('fceux')
if fceu_binary == None:
fceux_binary = find_binary('fceux')
if fceux_binary == None:
gfceu_error('Could not find the fceu binary.\n\
Ensure that FCE Ultra is installed and in the $PATH.\n\
On Debian based systems (like Ubuntu), try the following command:\n\
sudo apt-get install fceu', 4, True)
else:
gfceu_message('Using: '+fceu_binary)
gfceu_message('Using: '+fceux_binary)
widgets = WidgetsWrapper()
widgets['main_window'].show_all()

View File

@ -67,9 +67,6 @@
<property name="fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</widget>
</child>
<child>
@ -258,6 +255,102 @@
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="xscale_box">
<property name="visible">True</property>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">X scale:</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="xscale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">1 1 10 0.5 2 2</property>
<property name="numeric">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="yscale_box">
<property name="visible">True</property>
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes">Y scale:</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
</packing>
</child>
<child>
<widget class="GtkSpinButton" id="yscale">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="adjustment">1 1 10 0.5 1 10</property>
<property name="numeric">True</property>
<property name="update_policy">GTK_UPDATE_IF_VALID</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="bpp_box">
<property name="visible">True</property>
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="label" translatable="yes">Bits per pixel:</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="bpp">
<property name="visible">True</property>
<property name="active">3</property>
<property name="items" translatable="yes">8
16
32</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">4</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="screentip">
<property name="visible">True</property>
@ -268,7 +361,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
<property name="position">5</property>
</packing>
</child>
</widget>
@ -373,6 +466,31 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="sound_check">
<property name="visible">True</property>
<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>
<packing>
<property name="position">4</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Sound</property>
</widget>
<packing>
<property name="type">tab</property>
<property name="position">4</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="network_vbox">
<property name="visible">True</property>
@ -615,7 +733,7 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
</child>
</widget>
<packing>
<property name="position">4</property>
<property name="position">5</property>
</packing>
</child>
<child>
@ -624,31 +742,6 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
<property name="sensitive">False</property>
<property name="label" translatable="yes">Network</property>
</widget>
<packing>
<property name="type">tab</property>
<property name="position">4</property>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="sound_check">
<property name="visible">True</property>
<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>
<packing>
<property name="position">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Sound</property>
</widget>
<packing>
<property name="type">tab</property>
<property name="position">5</property>