ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

initiual GUI for gamepad config (currently only works with keyboards, joystick support to come)

This commit is contained in:
punkrockguy318 2008-12-02 20:40:23 +00:00
parent ab899d720e
commit b0d4eb7035
4 changed files with 231 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,3 +1,4 @@
* Added initial support for a graphical UI for configuring gamepads
* Moved gfceu options data file into .fceux instead of .fceultra * Moved gfceu options data file into .fceux instead of .fceultra
================= version 2.0.3 ================================= ================= version 2.0.3 =================================
* Updated UI slightly. Moved sound and advanced tabs; made autoscaling * Updated UI slightly. Moved sound and advanced tabs; made autoscaling

26
gfceux
View File

@ -29,6 +29,8 @@ import os
import pickle import pickle
import shutil import shutil
from optparse import OptionParser from optparse import OptionParser
from config_parse import FceuxConfigParser
from get_key import KeyGrabber
#from subprocess import Popen #from subprocess import Popen
try: try:
@ -210,6 +212,7 @@ def find_binary(file):
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Globals # Globals
options = None options = None
configfile = os.getenv('HOME') + '/.fceux/fceux.cfg'
optionsfile = os.getenv('HOME') + '/.fceux/gfceux_options.dat' optionsfile = os.getenv('HOME') + '/.fceux/gfceux_options.dat'
widgets = None widgets = None
@ -292,6 +295,7 @@ class GfceuxApp:
widgets.get_object("main_window").show_all() widgets.get_object("main_window").show_all()
def launch(self, rom_name, local=False): def launch(self, rom_name, local=False):
global options global options
set_options() set_options()
@ -546,22 +550,16 @@ class GfceuxApp:
# fix this global its ugly # fix this global its ugly
gamepad_config = "0" gamepad_config = "0"
def gamepad_clicked_new(self, widget, data=None): def gamepad_clicked(self, widget, data=None):
widgets.get_object("gamepad_config_window").show_all() widgets.get_object("gamepad_config_window").show_all()
d = {'gp1_button' : "0", d = {'gp1_button' : "0",
'gp2_button' : "1", 'gp2_button' : "1",
'gp3_button' : "2", 'gp3_button' : "2",
'gp4_button' : "3"} 'gp4_button' : "3"}
self.gamepad_config = d[widget.name] self.gamepad_config = d[widget.name]
def right_button_clicked(self, widget, data=None):
print "right!"
def left_button_clicked(self, widget, data=None):
print "left!"
def down_button_clicked(self, widget, data=None):
print "down!"
def up_button_clicked(self, widget, data=None):
print "up!"
def button_clicked(self, widget, data=None): def button_clicked(self, widget, data=None):
d = {'right_button' : "SDL.Input.GamePad." + self.gamepad_config + "Right", d = {'right_button' : "SDL.Input.GamePad." + self.gamepad_config + "Right",
'left_button' : "SDL.Input.GamePad." + self.gamepad_config + "Left", 'left_button' : "SDL.Input.GamePad." + self.gamepad_config + "Left",
@ -571,10 +569,14 @@ class GfceuxApp:
'start_button' : "SDL.Input.GamePad." + self.gamepad_config + "Start", 'start_button' : "SDL.Input.GamePad." + self.gamepad_config + "Start",
'a_button' : "SDL.Input.GamePad." + self.gamepad_config + "A", 'a_button' : "SDL.Input.GamePad." + self.gamepad_config + "A",
'b_button' : "SDL.Input.GamePad." + self.gamepad_config + "B"} 'b_button' : "SDL.Input.GamePad." + self.gamepad_config + "B"}
kg = KeyGrabber()
key = kg.get_key()
cp = FceuxConfigParser(configfile)
cp.writeKey(d[widget.name], key)
print d[widget.name] print d[widget.name]
def gamepad_clicked(self, widget, data=None): def gamepad_clicked_old(self, widget, data=None):
d = {'gp1_button' : '1', d = {'gp1_button' : '1',
'gp2_button' : '2', 'gp2_button' : '2',
@ -583,6 +585,10 @@ class GfceuxApp:
command = '-inputcfg gamepad' + d[widget.name] + ' /dev/null' command = '-inputcfg gamepad' + d[widget.name] + ' /dev/null'
self.launch(command, True) self.launch(command, True)
def gamepad_window_close(self, widget, data=None):
widgets.get_object("gamepad_config_window").hide()
return True
def config_help_button_clicked(self, menuitem, data=None): def config_help_button_clicked(self, menuitem, data=None):
msgbox = gtk.MessageDialog(parent=None, flags=0, msgbox = gtk.MessageDialog(parent=None, flags=0,
type=gtk.MESSAGE_INFO, buttons=gtk.BUTTONS_CLOSE) type=gtk.MESSAGE_INFO, buttons=gtk.BUTTONS_CLOSE)

213
gfceux.glade
View File

@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<!--Generated with glade3 3.4.5 on Mon Sep 22 04:14:45 2008 --> <!--Generated with glade3 3.4.5 on Tue Dec 2 15:32:04 2008 -->
<glade-interface> <glade-interface>
<widget class="GtkWindow" id="gamepad_config_window"> <widget class="GtkWindow" id="gamepad_config_window">
<signal name="destroy" handler="gamepad_window_close"/>
<signal name="delete_event" handler="gamepad_window_close"/>
<signal name="destroy_event" handler="gamepad_window_close"/>
<child> <child>
<widget class="GtkHBox" id="hbox3"> <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property> <property name="visible">True</property>
@ -36,17 +39,29 @@
<placeholder/> <placeholder/>
</child> </child>
<child> <child>
<widget class="GtkButton" id="right_button"> <widget class="GtkButton" id="up_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="label" translatable="yes">Right</property> <property name="label" translatable="yes">Up</property>
<property name="response_id">0</property>
<signal name="clicked" handler="button_clicked"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="left_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label" translatable="yes">Left</property>
<property name="response_id">0</property> <property name="response_id">0</property>
<signal name="clicked" handler="button_clicked"/> <signal name="clicked" handler="button_clicked"/>
</widget> </widget>
<packing> <packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
</packing> </packing>
@ -68,33 +83,21 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkButton" id="left_button"> <widget class="GtkButton" id="right_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="label" translatable="yes">Left</property> <property name="label" translatable="yes">Right</property>
<property name="response_id">0</property> <property name="response_id">0</property>
<signal name="clicked" handler="button_clicked"/> <signal name="clicked" handler="button_clicked"/>
</widget> </widget>
<packing> <packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkButton" id="up_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label" translatable="yes">Up</property>
<property name="response_id">0</property>
<signal name="clicked" handler="button_clicked"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>
@ -446,30 +449,17 @@
<property name="column_spacing">5</property> <property name="column_spacing">5</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
<child> <child>
<widget class="GtkButton" id="gp1_button"> <widget class="GtkButton" id="gp3_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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="use_underline">True</property>
<property name="response_id">0</property> <property name="response_id">0</property>
<signal name="clicked" handler="gamepad_clicked" after="yes"/> <signal name="clicked" handler="gamepad_clicked" after="yes"/>
</widget> </widget>
<packing> <packing>
<property name="y_options"></property> <property name="top_attach">1</property>
</packing> <property name="bottom_attach">2</property>
</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>
<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> <property name="y_options"></property>
</packing> </packing>
</child> </child>
@ -491,17 +481,30 @@
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkButton" id="gp3_button"> <widget class="GtkButton" id="gp2_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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="use_underline">True</property>
<property name="response_id">0</property> <property name="response_id">0</property>
<signal name="clicked" handler="gamepad_clicked_new" after="yes"/> <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> </widget>
<packing> <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
</child> </child>
@ -995,26 +998,15 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
<property name="column_spacing">5</property> <property name="column_spacing">5</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
<child> <child>
<widget class="GtkLabel" id="label19"> <widget class="GtkEntry" id="host_pass">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="can_focus">True</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>
</widget> </widget>
<packing> <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
</child> </child>
@ -1032,15 +1024,26 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkEntry" id="host_pass"> <widget class="GtkLabel" id="label20">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Password:</property>
</widget> </widget>
<packing> <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</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> <property name="y_options"></property>
</packing> </packing>
</child> </child>
@ -1091,13 +1094,54 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
<property name="column_spacing">3</property> <property name="column_spacing">3</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
<child> <child>
<widget class="GtkEntry" id="join_add"> <widget class="GtkSpinButton" id="join_port">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> </widget>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</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> <property name="y_options"></property>
</packing> </packing>
</child> </child>
@ -1117,54 +1161,13 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="label15"> <widget class="GtkEntry" id="join_add">
<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">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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> </widget>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"></property> <property name="y_options"></property>
</packing> </packing>
</child> </child>

209
gfceux.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!--Generated with glade3 3.4.5 on Mon Sep 22 04:14:45 2008 --> <!--Generated with glade3 3.4.5 on Tue Dec 2 15:32:04 2008 -->
<interface> <interface>
<object class="GtkAdjustment" id="adjustment1"> <object class="GtkAdjustment" id="adjustment1">
<property name="upper">5</property> <property name="upper">5</property>
@ -34,6 +34,9 @@
<property name="value">4046</property> <property name="value">4046</property>
</object> </object>
<object class="GtkWindow" id="gamepad_config_window"> <object class="GtkWindow" id="gamepad_config_window">
<signal handler="gamepad_window_close" name="destroy"/>
<signal handler="gamepad_window_close" name="delete_event"/>
<signal handler="gamepad_window_close" name="destroy_event"/>
<child> <child>
<object class="GtkHBox" id="hbox3"> <object class="GtkHBox" id="hbox3">
<property name="visible">True</property> <property name="visible">True</property>
@ -67,16 +70,27 @@
<placeholder/> <placeholder/>
</child> </child>
<child> <child>
<object class="GtkButton" id="right_button"> <object class="GtkButton" id="up_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="label" translatable="yes">Right</property> <property name="label" translatable="yes">Up</property>
<signal handler="button_clicked" name="clicked"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="left_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label" translatable="yes">Left</property>
<signal handler="button_clicked" name="clicked"/> <signal handler="button_clicked" name="clicked"/>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
</packing> </packing>
@ -97,31 +111,20 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="left_button"> <object class="GtkButton" id="right_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="label" translatable="yes">Left</property> <property name="label" translatable="yes">Right</property>
<signal handler="button_clicked" name="clicked"/> <signal handler="button_clicked" name="clicked"/>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButton" id="up_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label" translatable="yes">Up</property>
<signal handler="button_clicked" name="clicked"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -456,28 +459,16 @@
<property name="column_spacing">5</property> <property name="column_spacing">5</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
<child> <child>
<object class="GtkButton" id="gp1_button"> <object class="GtkButton" id="gp3_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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="use_underline">True</property>
<signal after="yes" handler="gamepad_clicked" name="clicked"/> <signal after="yes" handler="gamepad_clicked" name="clicked"/>
</object> </object>
<packing> <packing>
<property name="y_options"/> <property name="top_attach">1</property>
</packing> <property name="bottom_attach">2</property>
</child>
<child>
<object 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 after="yes" handler="gamepad_clicked" name="clicked"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
@ -498,16 +489,28 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="gp3_button"> <object class="GtkButton" id="gp2_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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="use_underline">True</property>
<signal after="yes" handler="gamepad_clicked_new" name="clicked"/> <signal after="yes" handler="gamepad_clicked" name="clicked"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object 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>
<signal after="yes" handler="gamepad_clicked" name="clicked"/>
</object> </object>
<packing> <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
@ -978,26 +981,15 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
<property name="column_spacing">5</property> <property name="column_spacing">5</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
<child> <child>
<object class="GtkLabel" id="label19"> <object class="GtkEntry" id="host_pass">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="can_focus">True</property>
<property name="label" translatable="yes">Port:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Password:</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
@ -1015,15 +1007,26 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry" id="host_pass"> <object class="GtkLabel" id="label20">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Password:</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Port:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
@ -1073,13 +1076,54 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
<property name="column_spacing">3</property> <property name="column_spacing">3</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
<child> <child>
<object class="GtkEntry" id="join_add"> <object class="GtkSpinButton" id="join_port">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="adjustment">adjustment4</property>
<property name="climb_rate">1</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Password:</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Server Port:</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Server Address:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
@ -1099,54 +1143,13 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="label15"> <object class="GtkEntry" id="join_add">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Server Address:</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Server Port:</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Password:</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="join_port">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="adjustment">adjustment4</property>
<property name="climb_rate">1</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>