Menu
▾
▴
[Crossfire-cvs] SF.net SVN: crossfire:[11716] client/trunk
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-24 03:30:32
|
Revision: 11716
http://crossfire.svn.sourceforge.net/crossfire/?rev=11716&view=rev
Author: kbulgrien
Date: 2009-05-24 03:30:25 +0000 (Sun, 24 May 2009)
Log Message:
-----------
- GTK-V2 lobotomy layout has undergone a significant dress-up of the layout
and general reduction of various container widgets that are not necessary
for one reason or another. An issue with chat panels was discovered and
fixed. Under some circumstances, the vertical scroll bar would disappear
due to the horizontal scroll bar policy being set to never. The policy is
now set to automatic to prevent the issue. Unused menu bar widgets are
removed, and the menu widgets names are made more consistent.
- GTK-V2 menubar widgets are renamed to remove numeric suffixes & improve
uniformity.
- All GTK-V2 .glade files have had their menubars replaced with the new one
developed for lobotomy.glade to correspond with the changes in menubar.c and
pickup.c.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/gtk-v2/glade/caelestis.glade
client/trunk/gtk-v2/glade/chthonic.glade
client/trunk/gtk-v2/glade/eureka.glade
client/trunk/gtk-v2/glade/gtk-v1.glade
client/trunk/gtk-v2/glade/gtk-v2.glade
client/trunk/gtk-v2/glade/lobotomy.glade
client/trunk/gtk-v2/glade/meflin.glade
client/trunk/gtk-v2/glade/oroboros.glade
client/trunk/gtk-v2/glade/sixforty.glade
client/trunk/gtk-v2/glade/un-deux.glade
client/trunk/gtk-v2/glade/v1-redux.glade
client/trunk/gtk-v2/src/menubar.c
client/trunk/gtk-v2/src/pickup.c
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2009-05-24 01:02:56 UTC (rev 11715)
+++ client/trunk/ChangeLog 2009-05-24 03:30:25 UTC (rev 11716)
@@ -1,6 +1,31 @@
"$Id$"
Top of SVN tree:
------------------------------------------------------------------------------
+gtk-v2/glade/lobotomy.glade: A significant dress-up of the layout and general
+ reduction of various container widgets that are not necessary for one reason
+ or another. An issue with chat panels was discovered and fixed. Under some
+ circumstances, the vertical scroll bar would disappear due to the horizontal
+ scroll bar policy being set to never. The policy is now set to automatic to
+ prevent the issue. Unused menu bar widgets are removed, and the menu widgets
+ names are made more consistent. This drove widget name changes in menubar.c
+ and pickup.c.
+gtk-v2/src/pickup.c
+gtk-v2/src/menubar.c: Menubar widgets are renamed to remove numeric suffixes
+ and improve uniformity.
+gtk-v2/glade/oroboros.glade
+gtk-v2/glade/gtk-v1.glade
+gtk-v2/glade/meflin.glade
+gtk-v2/glade/gtk-v2.glade
+gtk-v2/glade/v1-redux.glade
+gtk-v2/glade/caelestis.glade
+gtk-v2/glade/eureka.glade
+gtk-v2/glade/un-deux.glade
+gtk-v2/glade/sixforty.glade
+gtk-v2/glade/chthonic.glade: All of the .glade files have the same menubar as
+ made for lobotomy.glade to correspond with the above changes in menubar.c
+ and pickup.c
+Kevin Bulgrien 2009/05/23
+
gtk-v2/glade/oroboros.glade: This update supports recent client code changes.
The layout is basically the same as before the the update but viewports are
added in a number of places to improve the aesthetics of the UI. The stat
Modified: client/trunk/gtk-v2/glade/caelestis.glade
===================================================================
--- client/trunk/gtk-v2/glade/caelestis.glade 2009-05-24 01:02:56 UTC (rev 11715)
+++ client/trunk/gtk-v2/glade/caelestis.glade 2009-05-24 03:30:25 UTC (rev 11716)
@@ -17,29 +17,27 @@
<widget class="GtkHBox" id="hbox_menubar">
<property name="visible">True</property>
<child>
- <widget class="GtkMenuBar" id="menubar1">
+ <widget class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
<child>
- <widget class="GtkMenuItem" id="menuitem1">
+ <widget class="GtkMenuItem" id="menu_file">
<property name="visible">True</property>
<property name="label" translatable="yes">_File</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="menuitem1_menu">
+ <widget class="GtkMenu" id="file_menu">
<child>
- <widget class="GtkMenuItem" id="quit_character1">
+ <widget class="GtkMenuItem" id="quit_character">
<property name="visible">True</property>
<property name="label" translatable="yes">Quit Character</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="menu_quit_character"/>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="quit2">
+ <widget class="GtkMenuItem" id="quit">
<property name="visible">True</property>
<property name="label" translatable="yes">_Quit</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="menu_quit_program"/>
</widget>
</child>
</widget>
@@ -47,18 +45,17 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="client1">
+ <widget class="GtkMenuItem" id="menu_client">
<property name="visible">True</property>
<property name="label" translatable="yes">_Client</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="client1_menu">
+ <widget class="GtkMenu" id="client_menu">
<child>
- <widget class="GtkMenuItem" id="configure1">
+ <widget class="GtkMenuItem" id="configure">
<property name="visible">True</property>
<property name="label" translatable="yes">Configure</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_configure_activate"/>
</widget>
</child>
<child>
@@ -66,7 +63,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Disconnect</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_disconnect_activate"/>
</widget>
</child>
<child>
@@ -74,7 +70,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Keybindings</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_keybindings_activate"/>
</widget>
</child>
<child>
@@ -82,7 +77,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Save Window Position</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_save_window_position_activate"/>
</widget>
</child>
</widget>
@@ -95,13 +89,12 @@
<property name="label" translatable="yes">Player</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="menu_player_menu">
+ <widget class="GtkMenu" id="player_menu">
<child>
<widget class="GtkMenuItem" id="spells">
<property name="visible">True</property>
<property name="label" translatable="yes">Spells</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_spells_activate"/>
</widget>
</child>
</widget>
@@ -109,81 +102,73 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="pickup1">
+ <widget class="GtkMenuItem" id="menu_pickup">
<property name="visible">True</property>
<property name="label" translatable="yes">Pickup</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="pickup1_menu">
+ <widget class="GtkMenu" id="pickup_menu">
<child>
<widget class="GtkCheckMenuItem" id="do_not_pickup">
<property name="visible">True</property>
<property name="label" translatable="yes">Don't Pickup</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_dont_pickup_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="stop_before_pickup1">
+ <widget class="GtkCheckMenuItem" id="stop_before_pickup">
<property name="visible">True</property>
<property name="label" translatable="yes">Stop Before Pickup</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_stop_before_pickup_activate"/>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="armor1">
+ <widget class="GtkMenuItem" id="armor">
<property name="visible">True</property>
<property name="label" translatable="yes">Armor</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="armor1_menu">
+ <widget class="GtkMenu" id="armor_menu">
<child>
- <widget class="GtkCheckMenuItem" id="body_armor1">
+ <widget class="GtkCheckMenuItem" id="body_armor">
<property name="visible">True</property>
<property name="label" translatable="yes">Body Armor</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_body_armor_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="boots1">
+ <widget class="GtkCheckMenuItem" id="boots">
<property name="visible">True</property>
<property name="label" translatable="yes">Boots</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_boots_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="cloaks1">
+ <widget class="GtkCheckMenuItem" id="cloaks">
<property name="visible">True</property>
<property name="label" translatable="yes">Cloaks</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_cloaks_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="gloves1">
+ <widget class="GtkCheckMenuItem" id="gloves">
<property name="visible">True</property>
<property name="label" translatable="yes">Gloves</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_gloves_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="helmets1">
+ <widget class="GtkCheckMenuItem" id="helmets">
<property name="visible">True</property>
<property name="label" translatable="yes">Helmets</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_helmets_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="shields1">
+ <widget class="GtkCheckMenuItem" id="shields">
<property name="visible">True</property>
<property name="label" translatable="yes">Shields</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_shields_activate"/>
</widget>
</child>
</widget>
@@ -191,34 +176,31 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="books1">
+ <widget class="GtkMenuItem" id="books">
<property name="visible">True</property>
<property name="label" translatable="yes">Books</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="books1_menu">
+ <widget class="GtkMenu" id="books_menu">
<child>
- <widget class="GtkCheckMenuItem" id="skillscrolls1">
+ <widget class="GtkCheckMenuItem" id="skillscrolls">
<property name="visible">True</property>
<property name="label" translatable="yes">Skillscrolls</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_skillscrolls_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="normal_book_scrolls1">
+ <widget class="GtkCheckMenuItem" id="normal_book_scrolls">
<property name="visible">True</property>
<property name="label" translatable="yes">Normal Books & Scrolls</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_normal_book_scrolls_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="spellbooks1">
+ <widget class="GtkCheckMenuItem" id="spellbooks">
<property name="visible">True</property>
<property name="label" translatable="yes">Spellbooks</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_spellbooks_activate"/>
</widget>
</child>
</widget>
@@ -226,35 +208,31 @@
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="drinks1">
+ <widget class="GtkCheckMenuItem" id="drinks">
<property name="visible">True</property>
<property name="label" translatable="yes">Drinks</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_drinks_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="food1">
+ <widget class="GtkCheckMenuItem" id="food">
<property name="visible">True</property>
<property name="label" translatable="yes">Food</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_food_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="flesh1">
+ <widget class="GtkCheckMenuItem" id="flesh">
<property name="visible">True</property>
<property name="label" translatable="yes">Flesh</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_flesh_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="keys1">
+ <widget class="GtkCheckMenuItem" id="keys">
<property name="visible">True</property>
<property name="label" translatable="yes">Keys</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_keys_activate"/>
</widget>
</child>
<child>
@@ -262,7 +240,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Magical Items</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_magical_items_activate"/>
</widget>
</child>
<child>
@@ -270,7 +247,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Potions</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_potions_activate"/>
</widget>
</child>
<child>
@@ -278,7 +254,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Valuables (Money & Gems)</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_valuables_activate"/>
</widget>
</child>
<child>
@@ -286,54 +261,48 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Wands/Rods/Horns</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_wands_rods_horns_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="jewels1">
+ <widget class="GtkCheckMenuItem" id="jewels">
<property name="visible">True</property>
<property name="label" translatable="yes">Jewels</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_jewels_activate"/>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="weapons1">
+ <widget class="GtkMenuItem" id="weapons">
<property name="visible">True</property>
<property name="label" translatable="yes">Weapons</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="weapons1_menu">
+ <widget class="GtkMenu" id="weapons_menu">
<child>
<widget class="GtkCheckMenuItem" id="all_weapons">
<property name="visible">True</property>
<property name="label" translatable="yes">All Weapons</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_all_weapons_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="missile_weapons1">
+ <widget class="GtkCheckMenuItem" id="missile_weapons">
<property name="visible">True</property>
<property name="label" translatable="yes">Missile Weapons</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_missile_weapons_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="bows1">
+ <widget class="GtkCheckMenuItem" id="bows">
<property name="visible">True</property>
<property name="label" translatable="yes">Bows</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_bows_activate"/>
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="arrows1">
+ <widget class="GtkCheckMenuItem" id="arrows">
<property name="visible">True</property>
<property name="label" translatable="yes">Arrows</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_arrows_activate"/>
</widget>
</child>
</widget>
@@ -341,19 +310,18 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="weight/value_1">
+ <widget class="GtkMenuItem" id="weight/value">
<property name="visible">True</property>
<property name="label" translatable="yes">Weight/Value </property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="weight/value_1_menu">
+ <widget class="GtkMenu" id="weight/value_menu">
<child>
- <widget class="GtkRadioMenuItem" id="ratio_pickup_off1">
+ <widget class="GtkRadioMenuItem" id="ratio_pickup_off">
<property name="visible">True</property>
<property name="label" translatable="yes">Ratio Pickup Off</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <signal name="activate" handler="on_menu_ratio_pickup_off_activate"/>
</widget>
</child>
<child>
@@ -363,7 +331,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_5_activate"/>
</widget>
</child>
<child>
@@ -373,7 +340,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_10_activate"/>
</widget>
</child>
<child>
@@ -383,7 +349,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_15_activate"/>
</widget>
</child>
<child>
@@ -393,7 +358,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_20_activate"/>
</widget>
</child>
<child>
@@ -403,7 +367,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_25_activate"/>
</widget>
</child>
<child>
@@ -413,7 +376,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_35_activate"/>
</widget>
</child>
<child>
@@ -423,7 +385,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_35_activate"/>
</widget>
</child>
<child>
@@ -433,7 +394,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_40_activate"/>
</widget>
</child>
<child>
@@ -443,7 +403,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_45_activate"/>
</widget>
</child>
<child>
@@ -453,7 +412,6 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="group">ratio_pickup_off1</property>
- <signal name="activate" handler="on_menu_ratio_50_activate"/>
</widget>
</child>
</widget>
@@ -461,11 +419,10 @@
</widget>
</child>
<child>
- <widget class="GtkCheckMenuItem" id="not_cursed1">
+ <widget class="GtkCheckMenuItem" id="not_cursed">
<property name="visible">True</property>
<property name="label" translatable="yes">Ignore cursed</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_not_cursed_activate"/>
</widget>
</child>
</widget>
@@ -473,18 +430,17 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem4">
+ <widget class="GtkMenuItem" id="menu_help">
<property name="visible">True</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="menuitem4_menu">
+ <widget class="GtkMenu" id="help_menu">
<child>
- <widget class="GtkMenuItem" id="about1">
+ <widget class="GtkMenuItem" id="about">
<property name="visible">True</property>
<property name="label" translatable="yes">_About</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="menu_about"/>
</widget>
</child>
</widget>
@@ -1284,159 +1240,10 @@
<property name="n_columns">3</property>
<property name="row_spacing">4</property>
<child>
- <widget class="GtkLabel" id="label_barfiller">
+ <widget class="GtkHBox" id="hbox_stat_exp">
<property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="progressbar_hp">
- <property name="visible">True</property>
- <property name="pulse_step">0.10000000149</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- <property name="x_padding">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="progressbar_sp">
- <property name="visible">True</property>
- <property name="pulse_step">0.10000000149</property>
- </widget>
- <packing>
- <property name="left_attach">1</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="x_padding">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="progressbar_grace">
- <property name="visible">True</property>
- <property name="pulse_step">0.10000000149</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- <property name="x_padding">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="progressbar_food">
- <property name="visible">True</property>
- <property name="pulse_step">0.10000000149</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- <property name="x_padding">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="progressbar_exp">
- <property name="visible">True</property>
- <property name="pulse_step">0.10000000149</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
- <property name="x_padding">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stat_name_hp">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">HP:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stat_name_sp">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">SP:</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="label_stat_name_grace">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Grace:</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="label_stat_name_food">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Food:</property>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stat_name_exp">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Exp:</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_stat_hp">
- <property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label_stat_current_hp">
+ <widget class="GtkLabel" id="label_stat_current_exp">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</widget>
@@ -1446,7 +1253,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stat_ratio_hp">
+ <widget class="GtkLabel" id="label_stat_ratio_exp">
<property name="visible">True</property>
<property name="label" translatable="yes">/</property>
</widget>
@@ -1457,7 +1264,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stat_max_hp">
+ <widget class="GtkLabel" id="label_stat_max_exp">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</widget>
@@ -1471,15 +1278,17 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_stat_sp">
+ <widget class="GtkHBox" id="hbox_stat_food">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label_stat_current_sp">
+ <widget class="GtkLabel" id="label_stat_current_food">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</widget>
@@ -1489,7 +1298,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stat_ratio_sp">
+ <widget class="GtkLabel" id="label_stat_ratio_food">
<property name="visible">True</property>
<property name="label" translatable="yes">/</property>
</widget>
@@ -1500,7 +1309,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stat_max_sp">
+ <widget class="GtkLabel" id="label_stat_max_food">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</widget>
@@ -1514,8 +1323,8 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -1567,10 +1376,10 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_stat_food">
+ <widget class="GtkHBox" id="hbox_stat_sp">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label_stat_current_food">
+ <widget class="GtkLabel" id="label_stat_current_sp">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</widget>
@@ -1580,7 +1389,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stat_ratio_food">
+ <widget class="GtkLabel" id="label_stat_ratio_sp">
<property name="visible">True</property>
<property name="label" translatable="yes">/</property>
</widget>
@@ -1591,7 +1400,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stat_max_food">
+ <widget class="GtkLabel" id="label_stat_max_sp">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</widget>
@@ -1605,17 +1414,17 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <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="GtkHBox" id="hbox_stat_exp">
+ <widget class="GtkHBox" id="hbox_stat_hp">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label_stat_current_exp">
+ <widget class="GtkLabel" id="label_stat_current_hp">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</widget>
@@ -1625,7 +1434,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stat_ratio_exp">
+ <widget class="GtkLabel" id="label_stat_ratio_hp">
<property name="visible">True</property>
<property name="label" translatable="yes">/</property>
</widget>
@@ -1636,7 +1445,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_stat_max_exp">
+ <widget class="GtkLabel" id="label_stat_max_hp">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</widget>
@@ -1650,12 +1459,159 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_name_exp">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">Exp:</property>
+ </widget>
+ <packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_name_food">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">Food:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_name_grace">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">Grace:</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="label_stat_name_sp">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">SP:</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="label_stat_name_hp">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">HP:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ ...
[truncated message content] |
