diff --git a/gfceux b/gfceux index 4b771152..8c7003e5 100755 --- a/gfceux +++ b/gfceux @@ -415,7 +415,7 @@ class GfceuApp: self.launch('"'+ options.romfile +'"') def about_button_clicked(self, menuitem, data=None): - widgets.get_object("about_dialog").set_name('GNOME FCE Ultra '+version) + widgets.get_object("about_dialog").set_name('GFCE UltraX '+version) widgets.get_object("about_dialog").run() widgets.get_object("about_dialog").hide() diff --git a/gfceux.glade b/gfceux.glade index 21620750..e637986e 100644 --- a/gfceux.glade +++ b/gfceux.glade @@ -1,6 +1,6 @@ - + @@ -36,27 +36,16 @@ - + True True True - Up - 0 - - - 1 - 2 - - - - - True - True - True - Left + Right 0 + 2 + 3 1 2 @@ -77,20 +66,31 @@ - + True True True - Right + Left 0 - 2 - 3 1 2 + + + True + True + True + Up + 0 + + + 1 + 2 + + @@ -214,57 +214,6 @@ - - GDK_WINDOW_TYPE_HINT_NORMAL - (C) Copyright 2006 - A GNOME front-end end for the FCE Ultra Nintendo Entertainment System emulator - 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 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 -<ltsmooth42@gmail.comt> - -Patch writers: -Scott Brown - translator-credits - Sketching: - J. Sammer -Digital Manipulation: - C. Kontros - -Artwork for old versions (< 0.2.7): - Jimmy Angelakos - <vyruss000@gmail.com> - gfceux_big.png - - - True - - - - - - True - - - False - GTK_PACK_END - - - - - True GFCE UltraX @@ -479,17 +428,30 @@ Artwork for old versions (< 0.2.7): 5 5 - + True True - Gamepad _3 + Gamepad _1 True 0 - 1 - 2 + + + + + + True + True + Gamepad _2 + True + 0 + + + + 1 + 2 @@ -511,30 +473,17 @@ Artwork for old versions (< 0.2.7): - + True True - Gamepad _2 - True - 0 - - - - 1 - 2 - - - - - - True - True - Gamepad _1 + Gamepad _3 True 0 + 1 + 2 @@ -644,7 +593,7 @@ Artwork for old versions (< 0.2.7): True True - -5 1 5 0.5 1 10 + 1 1 5 0.5 1 10 1 True @@ -676,7 +625,7 @@ Artwork for old versions (< 0.2.7): True True - 0 1 10 0.5 1 10 + 1 1 10 0.5 1 10 1 True GTK_UPDATE_IF_VALID @@ -991,28 +940,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly. 5 5 - + True - True + 0 + Port: - 1 - 2 - 1 - 2 - - - - - - True - True - 4046 1 65536 1 10 10 - 1 - - - 1 - 2 + GTK_FILL @@ -1030,13 +964,28 @@ Invalid options may cause GFCE Ultra to perform incorrectly. - + True - 0 - Port: + True + 4046 1 65536 1 10 10 + 1 - GTK_FILL + 1 + 2 + + + + + + True + True + + + 1 + 2 + 1 + 2 @@ -1087,54 +1036,13 @@ 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 @@ -1154,13 +1062,54 @@ 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 @@ -1280,4 +1229,55 @@ Invalid options may cause GFCE Ultra to perform incorrectly. + + GDK_WINDOW_TYPE_HINT_NORMAL + (C) Copyright 2006 + A GTK2 front-end end for the fceux Nintendo Entertainment System emulator. + 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 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +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 +<ltsmooth42@gmail.comt> + +Patch writers: +Scott Brown + translator-credits + Sketching: + J. Sammer +Digital Manipulation: + C. Kontros + +Artwork for old versions (< 0.2.7): + Jimmy Angelakos + <vyruss000@gmail.com> + gfceux_big.png + + + True + + + + + + True + + + False + GTK_PACK_END + + + + + diff --git a/gfceux.xml b/gfceux.xml index 5a643bba..71174be6 100644 --- a/gfceux.xml +++ b/gfceux.xml @@ -1,5 +1,5 @@ - + 5 @@ -7,7 +7,7 @@ 1 0.5 10 - -5 + 1 10 @@ -15,7 +15,7 @@ 1 0.5 10 - 0 + 1 65536 @@ -67,25 +67,15 @@ - + True True True - Up - - - 1 - 2 - - - - - True - True - True - Left + Right + 2 + 3 1 2 @@ -105,19 +95,29 @@ - + True True True - Right + Left - 2 - 3 1 2 + + + True + True + True + Up + + + 1 + 2 + + @@ -228,57 +228,6 @@ - - GDK_WINDOW_TYPE_HINT_NORMAL - (C) Copyright 2006 - A GNOME front-end end for the FCE Ultra Nintendo Entertainment System emulator - 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 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 -<ltsmooth42@gmail.comt> - -Patch writers: -Scott Brown - translator-credits - Sketching: - J. Sammer -Digital Manipulation: - C. Kontros - -Artwork for old versions (< 0.2.7): - Jimmy Angelakos - <vyruss000@gmail.com> - gfceux_big.png - - - True - - - - - - True - - - False - GTK_PACK_END - - - - - True GFCE UltraX @@ -489,16 +438,28 @@ Artwork for old versions (< 0.2.7): 5 5 - + True True - Gamepad _3 + Gamepad _1 True - 1 - 2 + + + + + + True + True + Gamepad _2 + True + + + + 1 + 2 @@ -519,28 +480,16 @@ Artwork for old versions (< 0.2.7): - + True True - Gamepad _2 - True - - - - 1 - 2 - - - - - - True - True - Gamepad _1 + Gamepad _3 True + 1 + 2 @@ -977,28 +926,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly. 5 5 - + True - True + 0 + Port: - 1 - 2 - 1 - 2 - - - - - - True - True - adjustment3 - 1 - - - 1 - 2 + GTK_FILL @@ -1016,13 +950,28 @@ Invalid options may cause GFCE Ultra to perform incorrectly. - + True - 0 - Port: + True + adjustment3 + 1 - GTK_FILL + 1 + 2 + + + + + + True + True + + + 1 + 2 + 1 + 2 @@ -1072,54 +1021,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly. 3 5 - + True True - adjustment4 - 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 @@ -1139,13 +1047,54 @@ 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 + adjustment4 + 1 1 2 + 1 + 2 @@ -1257,4 +1206,55 @@ Invalid options may cause GFCE Ultra to perform incorrectly. + + GDK_WINDOW_TYPE_HINT_NORMAL + (C) Copyright 2006 + A GTK2 front-end end for the fceux Nintendo Entertainment System emulator. + 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 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +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 +<ltsmooth42@gmail.comt> + +Patch writers: +Scott Brown + translator-credits + Sketching: + J. Sammer +Digital Manipulation: + C. Kontros + +Artwork for old versions (< 0.2.7): + Jimmy Angelakos + <vyruss000@gmail.com> + gfceux_big.png + + + True + + + + + + True + + + False + GTK_PACK_END + + + + +