Menu
▾
▴
crossfire-cvs — List for CVS update messages only.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(187) |
Dec
(318) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(268) |
Feb
(231) |
Mar
(251) |
Apr
(372) |
May
(258) |
Jun
(197) |
Jul
(85) |
Aug
(175) |
Sep
(77) |
Oct
(213) |
Nov
(108) |
Dec
(53) |
| 2002 |
Jan
(38) |
Feb
(50) |
Mar
(32) |
Apr
(30) |
May
(34) |
Jun
(24) |
Jul
(42) |
Aug
(29) |
Sep
(58) |
Oct
(57) |
Nov
(73) |
Dec
(51) |
| 2003 |
Jan
(98) |
Feb
(64) |
Mar
(39) |
Apr
(38) |
May
(67) |
Jun
(39) |
Jul
(80) |
Aug
(21) |
Sep
(82) |
Oct
(85) |
Nov
(48) |
Dec
(30) |
| 2004 |
Jan
(29) |
Feb
(82) |
Mar
(43) |
Apr
(54) |
May
(60) |
Jun
(41) |
Jul
(23) |
Aug
(35) |
Sep
(55) |
Oct
(53) |
Nov
(18) |
Dec
(22) |
| 2005 |
Jan
(49) |
Feb
(28) |
Mar
(112) |
Apr
(60) |
May
(120) |
Jun
(67) |
Jul
(129) |
Aug
(67) |
Sep
(173) |
Oct
(221) |
Nov
(126) |
Dec
(198) |
| 2006 |
Jan
(172) |
Feb
(141) |
Mar
(54) |
Apr
(15) |
May
(60) |
Jun
(50) |
Jul
(79) |
Aug
(118) |
Sep
(114) |
Oct
(78) |
Nov
(56) |
Dec
(106) |
| 2007 |
Jan
(80) |
Feb
(268) |
Mar
(238) |
Apr
(222) |
May
(198) |
Jun
(178) |
Jul
(114) |
Aug
(234) |
Sep
(202) |
Oct
(141) |
Nov
(182) |
Dec
(446) |
| 2008 |
Jan
(260) |
Feb
(143) |
Mar
(210) |
Apr
(158) |
May
(342) |
Jun
(195) |
Jul
(309) |
Aug
(99) |
Sep
(154) |
Oct
(279) |
Nov
(555) |
Dec
(327) |
| 2009 |
Jan
(182) |
Feb
(289) |
Mar
(30) |
Apr
(51) |
May
(59) |
Jun
(304) |
Jul
(95) |
Aug
(50) |
Sep
(16) |
Oct
(44) |
Nov
(57) |
Dec
(27) |
| 2010 |
Jan
(59) |
Feb
(178) |
Mar
(220) |
Apr
(272) |
May
(297) |
Jun
(75) |
Jul
(104) |
Aug
(157) |
Sep
(247) |
Oct
(105) |
Nov
(100) |
Dec
(75) |
| 2011 |
Jan
(61) |
Feb
(32) |
Mar
(47) |
Apr
(79) |
May
(68) |
Jun
(247) |
Jul
(174) |
Aug
(98) |
Sep
(127) |
Oct
(198) |
Nov
(627) |
Dec
(421) |
| 2012 |
Jan
(521) |
Feb
(372) |
Mar
(489) |
Apr
(256) |
May
(143) |
Jun
(132) |
Jul
(74) |
Aug
(38) |
Sep
(42) |
Oct
(18) |
Nov
(58) |
Dec
(21) |
| 2013 |
Jan
(10) |
Feb
(10) |
Mar
(68) |
Apr
(50) |
May
(33) |
Jun
(17) |
Jul
(100) |
Aug
(111) |
Sep
(107) |
Oct
(21) |
Nov
(63) |
Dec
(53) |
| 2014 |
Jan
(29) |
Feb
(20) |
Mar
(39) |
Apr
(86) |
May
(122) |
Jun
(87) |
Jul
(7) |
Aug
(35) |
Sep
(40) |
Oct
(39) |
Nov
(21) |
Dec
(18) |
| 2015 |
Jan
(6) |
Feb
(56) |
Mar
(67) |
Apr
(24) |
May
(86) |
Jun
(5) |
Jul
(2) |
Aug
(17) |
Sep
(2) |
Oct
(14) |
Nov
(80) |
Dec
(97) |
| 2016 |
Jan
(9) |
Feb
(14) |
Mar
(3) |
Apr
(2) |
May
(45) |
Jun
(9) |
Jul
(5) |
Aug
(21) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2017 |
Jan
(9) |
Feb
|
Mar
(7) |
Apr
|
May
(24) |
Jun
(35) |
Jul
(60) |
Aug
(44) |
Sep
(22) |
Oct
(1) |
Nov
(2) |
Dec
(2) |
| 2018 |
Jan
(21) |
Feb
(6) |
Mar
(1) |
Apr
(1) |
May
(11) |
Jun
(2) |
Jul
(1) |
Aug
(5) |
Sep
(11) |
Oct
(15) |
Nov
(4) |
Dec
(55) |
| 2019 |
Jan
(41) |
Feb
(9) |
Mar
(23) |
Apr
(25) |
May
(55) |
Jun
(82) |
Jul
(19) |
Aug
(81) |
Sep
(15) |
Oct
(11) |
Nov
(12) |
Dec
(37) |
| 2020 |
Jan
(11) |
Feb
(34) |
Mar
(77) |
Apr
(24) |
May
(6) |
Jun
(14) |
Jul
(4) |
Aug
(76) |
Sep
(141) |
Oct
(62) |
Nov
(46) |
Dec
(116) |
| 2021 |
Jan
(188) |
Feb
(134) |
Mar
(38) |
Apr
(55) |
May
(12) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
|
2
|
|
3
(2) |
4
|
5
|
6
|
7
|
8
|
9
(8) |
|
10
(1) |
11
|
12
|
13
|
14
(3) |
15
(3) |
16
(3) |
|
17
(2) |
18
(1) |
19
(3) |
20
|
21
(4) |
22
(3) |
23
(13) |
|
24
(3) |
25
(6) |
26
(3) |
27
(1) |
28
|
29
|
30
|
|
31
|
|
|
|
|
|
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-27 21:05:43
|
Revision: 11727
http://crossfire.svn.sourceforge.net/crossfire/?rev=11727&view=rev
Author: akirschbaum
Date: 2009-05-27 21:05:05 +0000 (Wed, 27 May 2009)
Log Message:
-----------
Disable more per-dialog key bindings of cursor keys in inventory dialog.
Modified Paths:
--------------
jxclient/trunk/skins/ragnorok/inventory.skin
Modified: jxclient/trunk/skins/ragnorok/inventory.skin
===================================================================
--- jxclient/trunk/skins/ragnorok/inventory.skin 2009-05-26 17:35:46 UTC (rev 11726)
+++ jxclient/trunk/skins/ragnorok/inventory.skin 2009-05-27 21:05:05 UTC (rev 11727)
@@ -41,8 +41,8 @@
#key code KP_LEFT 0 exec command_inventory_prev
#key code RIGHT 0 exec command_inventory_next
#key code KP_RIGHT 0 exec command_inventory_next
-key code PAGE_UP 0 exec command_inventory_pageup
-key code PAGE_DOWN 0 exec command_inventory_pagedown
+#key code PAGE_UP 0 exec command_inventory_pageup
+#key code PAGE_DOWN 0 exec command_inventory_pagedown
key char 10 exec command_inventory_apply
key char 13 exec command_inventory_apply
key char 97 exec command_inventory_apply
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-26 17:35:56
|
Revision: 11726
http://crossfire.svn.sourceforge.net/crossfire/?rev=11726&view=rev
Author: akirschbaum
Date: 2009-05-26 17:35:46 +0000 (Tue, 26 May 2009)
Log Message:
-----------
Remove unneeded final modifier.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ConnectionListener.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ConnectionListener.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ConnectionListener.java 2009-05-26 05:39:08 UTC (rev 11725)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ConnectionListener.java 2009-05-26 17:35:46 UTC (rev 11726)
@@ -30,7 +30,7 @@
* This function will be called when the connection has been established.
* @param clientSocketState the client socket state
*/
- void connected(final ClientSocketState clientSocketState);
+ void connected(ClientSocketState clientSocketState);
/**
* This function will be called when the connection has been broken.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-26 05:39:11
|
Revision: 11725
http://crossfire.svn.sourceforge.net/crossfire/?rev=11725&view=rev
Author: akirschbaum
Date: 2009-05-26 05:39:08 +0000 (Tue, 26 May 2009)
Log Message:
-----------
Make field final.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-26 05:38:03 UTC (rev 11724)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-26 05:39:08 UTC (rev 11725)
@@ -57,7 +57,7 @@
/**
* The {@link Macros} instance to use.
*/
- private Macros macros;
+ private final Macros macros;
/**
* The active key bindings.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-26 05:38:11
|
Revision: 11724
http://crossfire.svn.sourceforge.net/crossfire/?rev=11724&view=rev
Author: akirschbaum
Date: 2009-05-26 05:38:03 +0000 (Tue, 26 May 2009)
Log Message:
-----------
Update comments.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUIMessageLog.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java 2009-05-25 22:28:08 UTC (rev 11723)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java 2009-05-26 05:38:03 UTC (rev 11724)
@@ -22,13 +22,16 @@
import com.realtime.crossfire.jxclient.window.GUICommandList;
/**
- *
- * @version 1.0
+ * Abstract base class for key bindings. A key binding consists of information
+ * about the bound key and an associated {@link GUICommandList}.
* @author Lauwenmark
- * @since 1.0
+ * @author Andreas Kirschbaum
*/
public abstract class KeyBinding
{
+ /**
+ * The associated {@link GUICommandList}.
+ */
private final GUICommandList commands;
/**
@@ -37,18 +40,20 @@
*/
private final boolean isDefault;
+ /**
+ * Returns the associated {@link GUICommandList}.
+ * @return the associated command list
+ */
public GUICommandList getCommands()
{
return commands;
}
/**
- * Create a new instance.
- *
- * @param commands The commands to execute.
- *
- * @param isDefault Whether the key binding is a "default" binding which
- * should not be saved.
+ * Creates a new instance.
+ * @param commands the commands to execute
+ * @param isDefault whether the key binding is a "default" binding which
+ * should not be saved
*/
protected KeyBinding(final GUICommandList commands, final boolean isDefault)
{
@@ -65,29 +70,23 @@
public abstract int hashCode();
/**
- * Check whether this key binding matches a key code/modifiers pair.
- *
- * @param keyCode The key code to check.
- *
- * @param modifiers The modifiers to check.
- *
- * @return Whether the key binding matches the parameters.
+ * Checks whether this key binding matches a key code/modifiers pair.
+ * @param keyCode the key code to check
+ * @param modifiers the modifiers to check
+ * @return whether the key binding matches the parameters
*/
public abstract boolean matchesKeyCode(final int keyCode, final int modifiers);
/**
* Check whether this key binding matches a key character.
- *
- * @param keyChar The key character to check.
- *
- * @return Whether the key binding matches the parameters.
+ * @param keyChar the key character to check
+ * @return whether the key binding matches the parameters
*/
public abstract boolean matchesKeyChar(final char keyChar);
/**
- * Return the commands as a string.
- *
- * @return The commands as a string.
+ * Returns the commands as a string.
+ * @return the commands as a string
*/
public String getCommandString()
{
@@ -95,9 +94,8 @@
}
/**
- * Return whether the key binding is a "default" binding which should not
+ * Returns whether the key binding is a "default" binding which should not
* be saved.
- *
* @return <code>true</code>=do not save
*/
public boolean isDefault()
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUIMessageLog.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUIMessageLog.java 2009-05-25 22:28:08 UTC (rev 11723)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/GUIMessageLog.java 2009-05-26 05:38:03 UTC (rev 11724)
@@ -82,7 +82,7 @@
}
/**
- * Set the message types to show.
+ * Sets the message types to show.
* @param types the types to show
*/
public void setTypes(final int types)
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java 2009-05-25 22:28:08 UTC (rev 11723)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java 2009-05-26 05:38:03 UTC (rev 11724)
@@ -28,7 +28,6 @@
/**
* Adds drawinfo, drawextinfo, and query messages to a {@link Buffer} instance.
- *
* @author Andreas Kirschbaum
*/
public class MessageBufferUpdater
@@ -158,14 +157,11 @@
};
/**
- * Create a new instance.
- *
+ * Creates a new instance.
* @param crossfireServerConnection the connection instance
- *
- * @param buffer The buffer to update.
- *
- * @param defaultColor The default color to use for undefined colors
- * indices.
+ * @param buffer the buffer to update
+ * @param defaultColor the default color to use for undefined colors
+ * indices
*/
public MessageBufferUpdater(final CrossfireServerConnection crossfireServerConnection, final Buffer buffer, final Color defaultColor)
{
@@ -186,11 +182,9 @@
}
/**
- * Convert a Crossfire color index to a {@link Color} instance.
- *
- * @param index The color index to look up.
- *
- * @return The color.
+ * Converts a Crossfire color index to a {@link Color} instance.
+ * @param index the color index to look up
+ * @return the color
*/
private Color findColor(final int index)
{
@@ -205,11 +199,9 @@
}
/**
- * Set a color mapping.
- *
- * @param index The color index to change.
- *
- * @param color The color to map to.
+ * Sets a color mapping.
+ * @param index the color index to change
+ * @param color the color to map to
*/
public void setColor(final int index, final Color color)
{
@@ -217,9 +209,8 @@
}
/**
- * Set the message types to show.
- *
- * @param types The types to show.
+ * Sets the message types to show.
+ * @param types the types to show
*/
public void setTypes(final int types)
{
@@ -227,11 +218,9 @@
}
/**
- * Return whether a message type should be shown.
- *
- * @param type The message type.
- *
- * @return Whether the message type should be shown.
+ * Returns whether a message type should be shown.
+ * @param type the message type
+ * @return whether the message type should be shown
*/
private boolean isTypeShown(final int type)
{
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java 2009-05-25 22:28:08 UTC (rev 11723)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java 2009-05-26 05:38:03 UTC (rev 11724)
@@ -25,7 +25,7 @@
import java.util.regex.Pattern;
/**
- * Parser to parse drawextinfo messages received from a Crossfire server and
+ * Parser for parsing drawextinfo messages received from a Crossfire server to
* update a {@link Buffer} instance.
* @author Andreas Kirschbaum
*/
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java 2009-05-25 22:28:08 UTC (rev 11723)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java 2009-05-26 05:38:03 UTC (rev 11724)
@@ -303,6 +303,7 @@
* @param tooltipManager the tooltip manager to update
* @param settings the settings to use
* @param server the crossfire server connection to monitor
+ * @param macros the macros instance to use
*/
public GuiManager(final JXCWindow window, final boolean debugGui, final Object semaphoreDrawing, final Object semaphoreRedraw, final TooltipManager tooltipManager, final Settings settings, final CrossfireServerConnection server, final Macros macros)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-25 22:28:27
|
Revision: 11723
http://crossfire.svn.sourceforge.net/crossfire/?rev=11723&view=rev
Author: kbulgrien
Date: 2009-05-25 22:28:08 +0000 (Mon, 25 May 2009)
Log Message:
-----------
- GTK-V2 sixforty layout rework that started out as a general fix for the new
stat.c and pickup.c code, but became a general improvement effort. The
layout still has some issues as saving windows position seems unreliable -
possibly due to a need for constraining containers (viewport?) in the vpaned
widgets. To debug, experimentation with scrolled windows can show when
widgets might be have a size that subverts sizing. The default layout with
no sixforty.pos is sane.
- The stats panel is changed the most with scroll bars added so the wide stats
can be viewed in a small client.
- Both message panels are not in a notebook anymore to support recent chat,
tell, say changes.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/gtk-v2/glade/sixforty.glade
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2009-05-25 20:09:19 UTC (rev 11722)
+++ client/trunk/ChangeLog 2009-05-25 22:28:08 UTC (rev 11723)
@@ -1,6 +1,17 @@
"$Id$"
Top of SVN tree:
------------------------------------------------------------------------------
+gtk-v2/glade/sixforty.glade: This started out as a rework for the new stat.c
+ and pickup.c code, but became a general improvement effort. The layout has
+ some issues in that saving windows position seems unreliable - possibly due
+ to a need for constraining containers (viewport?) in the vpaned widgets. To
+ debug, experimentation with scrolled windows can show when widgets might be
+ have a size that subverts sizing. The default layout with no sixforty.pos
+ is sane. The stats panel is changed the most with scroll bars added so the
+ wide stats can be viewed in a small client. Both message panels are not in
+ a notebook anymore to support recent chat/tell/say changes.
+Kevin Bulgrien 2009/05/25
+
gtk-v2/glade/lobotomy.glade
gtk-v2/glade/oroboros.glade
gtk-v2/glade/gtk-v1.glade
@@ -13,7 +24,7 @@
gtk-v2/glade/sixforty.glade
gtk-v2/glade/chthonic.glade: Fix an omitted change in the menubar edits made
prior to support changes in pickup.c.
-Kevin Bulgrien 2009/05/23
+Kevin Bulgrien 2009/05/24
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
Modified: client/trunk/gtk-v2/glade/sixforty.glade
===================================================================
--- client/trunk/gtk-v2/glade/sixforty.glade 2009-05-25 20:09:19 UTC (rev 11722)
+++ client/trunk/gtk-v2/glade/sixforty.glade 2009-05-25 22:28:08 UTC (rev 11723)
@@ -328,7 +328,6 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
@@ -337,7 +336,6 @@
<property name="label" translatable="yes">Ratio >= 10</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
<child>
@@ -346,7 +344,6 @@
<property name="label" translatable="yes">Ratio >= 15</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
<child>
@@ -355,7 +352,6 @@
<property name="label" translatable="yes">Ratio >= 20</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
<child>
@@ -364,7 +360,6 @@
<property name="label" translatable="yes">Ratio >= 25</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
<child>
@@ -373,7 +368,6 @@
<property name="label" translatable="yes">Ratio >= 30</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
<child>
@@ -382,7 +376,6 @@
<property name="label" translatable="yes">Ratio >= 35</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
<child>
@@ -391,7 +384,6 @@
<property name="label" translatable="yes">Ratio >= 40</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
<child>
@@ -400,7 +392,6 @@
<property name="label" translatable="yes">Ratio >= 45</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
<child>
@@ -409,7 +400,6 @@
<property name="label" translatable="yes">Ratio >= 50</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
</widget>
</child>
</widget>
@@ -452,7 +442,7 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkHBox" id="hbox_run_fire">
<property name="visible">True</property>
<child>
<widget class="GtkLabel" id="run_label">
@@ -460,10 +450,6 @@
<property name="xalign">0</property>
<property name="xpad">2</property>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
<child>
<widget class="GtkLabel" id="fire_label">
@@ -472,16 +458,11 @@
<property name="xpad">2</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="fill">False</property>
- <property name="padding">8</property>
<property name="position">1</property>
</packing>
</child>
@@ -493,31 +474,29 @@
<property name="label" translatable="yes">Player:</property>
</widget>
<packing>
- <property name="expand">False</property>
<property name="padding">8</property>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_exp">
+ <widget class="GtkLabel" id="label_level">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">2</property>
- <property name="label" translatable="yes">Experience:</property>
+ <property name="label" translatable="yes">Lvl:</property>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_level">
+ <widget class="GtkLabel" id="label_exp">
<property name="visible">True</property>
+ <property name="xalign">0</property>
<property name="xpad">2</property>
- <property name="label" translatable="yes">Lvl:</property>
+ <property name="label" translatable="yes">Experience:</property>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">4</property>
</packing>
</child>
@@ -531,12 +510,12 @@
<widget class="GtkHPaned" id="hpaned_client">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="position">340</property>
+ <property name="position">356</property>
<child>
<widget class="GtkVPaned" id="vpaned_map_stats">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="position">290</property>
+ <property name="position">296</property>
<child>
<widget class="GtkNotebook" id="map_notebook">
<property name="visible">True</property>
@@ -591,392 +570,108 @@
<property name="can_focus">True</property>
<property name="border_width">2</property>
<child>
- <widget class="GtkTable" id="table_statbars">
+ <widget class="GtkScrolledWindow" id="scrolledwindow_stats">
<property name="visible">True</property>
- <property name="n_rows">7</property>
- <property name="n_columns">4</property>
- <property name="row_spacing">4</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
<child>
- <widget class="GtkProgressBar" id="progressbar_food">
- <property name="height_request">12</property>
+ <widget class="GtkViewport" id="viewport_statbars">
<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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stats_food">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Food: 0/0</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="GtkProgressBar" id="progressbar_grace">
- <property name="height_request">12</property>
- <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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stats_grace">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Grace: 0/0</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="GtkProgressBar" id="progressbar_sp">
- <property name="height_request">12</property>
- <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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stats_sp">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Mana: 0/0</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="GtkProgressBar" id="progressbar_hp">
- <property name="height_request">12</property>
- <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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stats_hp">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">HP: 0/0</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_weapon">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">WSp</property>
- </widget>
- <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_weapon_speed">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">0</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_movement">
- <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="left_attach">2</property>
- <property name="right_attach">3</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="GtkLabel" id="label_speed">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">0</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_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="GtkLabel" id="label_weaponclass">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">WC</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <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_wc">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">0</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <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_damage">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Dam</property>
- </widget>
- <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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_dam">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">0</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</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>
- </child>
- <child>
- <widget class="GtkLabel" id="label_armorclass">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">AC</property>
- </widget>
- <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="GtkLabel" id="label_ac">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">0</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</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="GtkLabel" id="label_defense">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Arm</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <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="GtkLabel" id="label_armor">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">0</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</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="GtkLabel" id="label_range">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Range:</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_stats_exp">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">Exp: 0/0</property>
- </widget>
- <packing>
- <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_exp">
- <property name="height_request">12</property>
- <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">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="GtkHBox" id="hbox1">
- <property name="visible">True</property>
+ <property name="resize_mode">GTK_RESIZE_QUEUE</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkLabel" id="label_weight">
+ <widget class="GtkTable" id="table_statbars">
<property name="visible">True</property>
- <property name="label" translatable="yes">Weigh:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_inv_weight">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">2</property>
- <property name="label" translatable="yes">0/0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_corestats">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkHBox" id="hbox_strength">
- <property name="visible">True</property>
+ <property name="border_width">2</property>
+ <property name="n_rows">7</property>
+ <property name="n_columns">8</property>
+ <property name="column_spacing">5</property>
<child>
+ <widget class="GtkHBox" id="hbox_encumbrance">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label_stat_encumbrance_name">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes"> Encumbrance: </property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_encumbrance_current">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_ratio_encumbrance">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">/</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_encumbrance_max">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">8</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator_stat_col5">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options"></property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVSeparator" id="vseparator_stat_col2">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options"></property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel" id="label_strength">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -984,8 +679,8 @@
<property name="label" translatable="yes">Str</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
@@ -995,19 +690,12 @@
<property name="label" translatable="yes">0</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox_dexterity">
- <property name="visible">True</property>
<child>
<widget class="GtkLabel" id="label_dexterity">
<property name="visible">True</property>
@@ -1016,204 +704,689 @@
<property name="label" translatable="yes">Dex</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</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="GtkLabel" id="label_constitution">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">Con</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_intelligence">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">Int</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_wisdom">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">Wis</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_power">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">2</property>
+ <property name="label" translatable="yes">Pow</property>
+ </widget>
+ <packing>
+ <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="GtkHBox" id="hbox_stat_hp">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label_stat_current_hp">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_ratio_hp">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">/</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_max_hp">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">7</property>
+ <property name="right_attach">8</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_stat_sp">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label_stat_current_sp">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_ratio_sp">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">/</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_max_sp">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">7</property>
+ <property name="right_attach">8</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_stat_grace">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label_stat_current_grace">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_ratio_grace">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">/</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_max_grace">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">7</property>
+ <property name="right_attach">8</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox_stat_food">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label_stat_current_food">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_ratio_food">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">/</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_stat_max_food">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">7</property>
+ <property name="right_attach">8</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ ...
[truncated message content] |
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-25 20:09:30
|
Revision: 11722
http://crossfire.svn.sourceforge.net/crossfire/?rev=11722&view=rev
Author: akirschbaum
Date: 2009-05-25 20:09:19 +0000 (Mon, 25 May 2009)
Log Message:
-----------
Disable per-dialog key bindings of cursor keys in inventory dialog. Now the character may move around while the inventory dialog is open.
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/skins/ragnorok/inventory.skin
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2009-05-25 20:03:51 UTC (rev 11721)
+++ jxclient/trunk/ChangeLog 2009-05-25 20:09:19 UTC (rev 11722)
@@ -1,5 +1,8 @@
2009-05-25 Andreas Kirschbaum
+ * Disable per-dialog key bindings of cursor keys in inventory dialog. Now the
+ character may move around while the inventory dialog is open.
+
* Make login/logout messages darker to improve readability.
* Do not write invalid keybindings files.
Modified: jxclient/trunk/skins/ragnorok/inventory.skin
===================================================================
--- jxclient/trunk/skins/ragnorok/inventory.skin 2009-05-25 20:03:51 UTC (rev 11721)
+++ jxclient/trunk/skins/ragnorok/inventory.skin 2009-05-25 20:09:19 UTC (rev 11722)
@@ -31,14 +31,16 @@
label_text label_weight_sep 99 30+136 6 16 font_label BLACK /
label_stat label_weight_limit 105 30+136 45 16 font_label BLACK WEIGHT_LIMIT LEFT
-key code UP 0 exec command_inventory_up
-key code KP_UP 0 exec command_inventory_up
-key code DOWN 0 exec command_inventory_down
-key code KP_DOWN 0 exec command_inventory_down
-key code LEFT 0 exec command_inventory_prev
-key code KP_LEFT 0 exec command_inventory_prev
-key code RIGHT 0 exec command_inventory_next
-key code KP_RIGHT 0 exec command_inventory_next
+# Cursor keys disabled for now because players want to move around while
+# inventory is open.
+#key code UP 0 exec command_inventory_up
+#key code KP_UP 0 exec command_inventory_up
+#key code DOWN 0 exec command_inventory_down
+#key code KP_DOWN 0 exec command_inventory_down
+#key code LEFT 0 exec command_inventory_prev
+#key code KP_LEFT 0 exec command_inventory_prev
+#key code RIGHT 0 exec command_inventory_next
+#key code KP_RIGHT 0 exec command_inventory_next
key code PAGE_UP 0 exec command_inventory_pageup
key code PAGE_DOWN 0 exec command_inventory_pagedown
key char 10 exec command_inventory_apply
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-25 20:03:59
|
Revision: 11721
http://crossfire.svn.sourceforge.net/crossfire/?rev=11721&view=rev
Author: akirschbaum
Date: 2009-05-25 20:03:51 +0000 (Mon, 25 May 2009)
Log Message:
-----------
Make login/logout messages darker to improve readability.
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/skins/ragnorok/messages.skin
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2009-05-25 19:49:20 UTC (rev 11720)
+++ jxclient/trunk/ChangeLog 2009-05-25 20:03:51 UTC (rev 11721)
@@ -1,5 +1,7 @@
2009-05-25 Andreas Kirschbaum
+ * Make login/logout messages darker to improve readability.
+
* Do not write invalid keybindings files.
2009-05-24 Andreas Kirschbaum
Modified: jxclient/trunk/skins/ragnorok/messages.skin
===================================================================
--- jxclient/trunk/skins/ragnorok/messages.skin 2009-05-25 19:49:20 UTC (rev 11720)
+++ jxclient/trunk/skins/ragnorok/messages.skin 2009-05-25 20:03:51 UTC (rev 11721)
@@ -12,7 +12,7 @@
log_color log_all 1 #000000
log_color log_all 4 #896800
log_color log_all 5 #4040ff
-log_color log_all 6 #d0a000
+log_color log_all 6 #aa6600
log_color log_all 7 #00c000
log_color log_all 11 #909000
log_color log_all 12 #959054
@@ -27,7 +27,7 @@
log_color log_msg 1 #000000
log_color log_msg 4 #896800
log_color log_msg 5 #8080ff
-log_color log_msg 6 #d0a000
+log_color log_msg 6 #aa6600
log_color log_msg 7 #00c000
log_color log_msg 11 #909000
log_color log_msg 12 #959054
@@ -43,7 +43,7 @@
log_color log_chat 1 #000000
log_color log_chat 4 #896800
log_color log_chat 5 #8080ff
-log_color log_chat 6 #d0a000
+log_color log_chat 6 #aa6600
log_color log_chat 7 #00c000
log_color log_chat 11 #909000
log_color log_chat 12 #959054
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-25 19:49:28
|
Revision: 11720
http://crossfire.svn.sourceforge.net/crossfire/?rev=11720&view=rev
Author: akirschbaum
Date: 2009-05-25 19:49:20 +0000 (Mon, 25 May 2009)
Log Message:
-----------
Rename field names.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java 2009-05-25 19:34:14 UTC (rev 11719)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/Parser.java 2009-05-25 19:49:20 UTC (rev 11720)
@@ -60,12 +60,12 @@
/**
* The pattern to split a string into words.
*/
- private static final Pattern wordSeparatorPattern = Pattern.compile(" ");
+ private static final Pattern WORD_SEPARATOR_PATTERN = Pattern.compile(" ");
/**
* Pattern to match line breaks.
*/
- private static final Pattern endOfLinePattern = Pattern.compile(" *\n");
+ private static final Pattern END_OF_LINE_PATTERN = Pattern.compile(" *\n");
/**
* Whether bold face is enabled.
@@ -124,7 +124,7 @@
}
resetAttributes(defaultColor);
- for (final String line : endOfLinePattern.split(text, -1))
+ for (final String line : END_OF_LINE_PATTERN.split(text, -1))
{
parseLine(line, defaultColor, buffer);
}
@@ -148,7 +148,7 @@
}
resetAttributes(color);
- for (final String line : endOfLinePattern.split(text, -1))
+ for (final String line : END_OF_LINE_PATTERN.split(text, -1))
{
parseLineWithoutMediaTags(line, buffer);
}
@@ -357,7 +357,7 @@
newText = text;
}
- final String[] words = wordSeparatorPattern.split(newText, -1);
+ final String[] words = WORD_SEPARATOR_PATTERN.split(newText, -1);
for (int i = 0; i < words.length-1; i++)
{
line.addSegment(words[i]+" ", bold, italic, underline, font, color);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-25 19:34:28
|
Revision: 11719
http://crossfire.svn.sourceforge.net/crossfire/?rev=11719&view=rev
Author: akirschbaum
Date: 2009-05-25 19:34:14 +0000 (Mon, 25 May 2009)
Log Message:
-----------
Do not write invalid keybindings files.
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/ChangeLog 2009-05-25 19:34:14 UTC (rev 11719)
@@ -1,3 +1,7 @@
+2009-05-25 Andreas Kirschbaum
+
+ * Do not write invalid keybindings files.
+
2009-05-24 Andreas Kirschbaum
* Add "def item" skin command. Move recurring parameters from "item"
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java 2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBinding.java 2009-05-25 19:34:14 UTC (rev 11719)
@@ -60,6 +60,10 @@
@Override
public abstract boolean equals(final Object obj);
+ /** {@inheritDoc} */
+ @Override
+ public abstract int hashCode();
+
/**
* Check whether this key binding matches a key code/modifiers pair.
*
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-25 19:34:14 UTC (rev 11719)
@@ -296,7 +296,7 @@
{
final KeyCharKeyBinding keyCharKeyBinding = (KeyCharKeyBinding)keyBinding;
bw.write("char ");
- bw.write(Character.toString(keyCharKeyBinding.getKeyChar()));
+ bw.write(Integer.toString(keyCharKeyBinding.getKeyChar()));
bw.write(' ');
bw.write(GUICommandFactory.encode(keyCharKeyBinding.getCommandString()));
bw.newLine();
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-25 19:34:14 UTC (rev 11719)
@@ -69,6 +69,13 @@
/** {@inheritDoc} */
@Override
+ public int hashCode()
+ {
+ return keyChar;
+ }
+
+ /** {@inheritDoc} */
+ @Override
public boolean matchesKeyCode(final int keyCode, final int modifiers)
{
return false;
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java 2009-05-25 13:59:36 UTC (rev 11718)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java 2009-05-25 19:34:14 UTC (rev 11719)
@@ -92,6 +92,13 @@
/** {@inheritDoc} */
@Override
+ public int hashCode()
+ {
+ return keyCode^(modifiers<<16);
+ }
+
+ /** {@inheritDoc} */
+ @Override
public boolean matchesKeyCode(final int keyCode, final int modifiers)
{
return this.keyCode == keyCode && this.modifiers == modifiers;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-25 14:04:20
|
Revision: 11718
http://crossfire.svn.sourceforge.net/crossfire/?rev=11718&view=rev
Author: kbulgrien
Date: 2009-05-25 13:59:36 +0000 (Mon, 25 May 2009)
Log Message:
-----------
- Fix an omitted change in the menubar edits made prior to support changes in
pickup.c to restore functionality and remove a warning during client start.
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
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/ChangeLog 2009-05-25 13:59:36 UTC (rev 11718)
@@ -1,6 +1,20 @@
"$Id$"
Top of SVN tree:
------------------------------------------------------------------------------
+gtk-v2/glade/lobotomy.glade
+gtk-v2/glade/oroboros.glade
+gtk-v2/glade/gtk-v1.glade
+gtk-v2/glade/gtk-v2.glade
+gtk-v2/glade/meflin.glade
+gtk-v2/glade/v1-redux.glade
+gtk-v2/glade/eureka.glade
+gtk-v2/glade/caelestis.glade
+gtk-v2/glade/un-deux.glade
+gtk-v2/glade/sixforty.glade
+gtk-v2/glade/chthonic.glade: Fix an omitted change in the menubar edits made
+ prior to support changes in pickup.c.
+Kevin Bulgrien 2009/05/23
+
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
Modified: client/trunk/gtk-v2/glade/caelestis.glade
===================================================================
--- client/trunk/gtk-v2/glade/caelestis.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/caelestis.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -330,7 +330,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/chthonic.glade
===================================================================
--- client/trunk/gtk-v2/glade/chthonic.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/chthonic.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -328,7 +328,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/eureka.glade
===================================================================
--- client/trunk/gtk-v2/glade/eureka.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/eureka.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -328,7 +328,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/gtk-v1.glade
===================================================================
--- client/trunk/gtk-v2/glade/gtk-v1.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/gtk-v1.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -330,7 +330,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/gtk-v2.glade
===================================================================
--- client/trunk/gtk-v2/glade/gtk-v2.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/gtk-v2.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -328,7 +328,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/lobotomy.glade
===================================================================
--- client/trunk/gtk-v2/glade/lobotomy.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/lobotomy.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -359,7 +359,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
<signal name="activate" handler="on_menu_ratio_5_activate"/>
</widget>
</child>
Modified: client/trunk/gtk-v2/glade/meflin.glade
===================================================================
--- client/trunk/gtk-v2/glade/meflin.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/meflin.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -328,7 +328,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/oroboros.glade
===================================================================
--- client/trunk/gtk-v2/glade/oroboros.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/oroboros.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -328,7 +328,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/sixforty.glade
===================================================================
--- client/trunk/gtk-v2/glade/sixforty.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/sixforty.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -328,7 +328,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/un-deux.glade
===================================================================
--- client/trunk/gtk-v2/glade/un-deux.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/un-deux.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -330,7 +330,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
Modified: client/trunk/gtk-v2/glade/v1-redux.glade
===================================================================
--- client/trunk/gtk-v2/glade/v1-redux.glade 2009-05-24 06:37:42 UTC (rev 11717)
+++ client/trunk/gtk-v2/glade/v1-redux.glade 2009-05-25 13:59:36 UTC (rev 11718)
@@ -330,7 +330,7 @@
<property name="label" translatable="yes">Ratio >= 5</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <property name="group">ratio_pickup_off1</property>
+ <property name="group">ratio_pickup_off</property>
</widget>
</child>
<child>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-24 06:37:50
|
Revision: 11717
http://crossfire.svn.sourceforge.net/crossfire/?rev=11717&view=rev
Author: akirschbaum
Date: 2009-05-24 06:37:42 +0000 (Sun, 24 May 2009)
Log Message:
-----------
Add "def item" skin command. Move recurring parameters from "item" and "inventory_list" commands to "def item" parameters.
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/skins/prelude/global.skin
jxclient/trunk/skins/prelude/ma...@10...
jxclient/trunk/skins/ragnorok/global.skin
jxclient/trunk/skins/ragnorok/gr...@10...
jxclient/trunk/skins/ragnorok/gr...@12...
jxclient/trunk/skins/ragnorok/gr...@12...
jxclient/trunk/skins/ragnorok/gr...@14...
jxclient/trunk/skins/ragnorok/gr...@14...
jxclient/trunk/skins/ragnorok/gr...@14...
jxclient/trunk/skins/ragnorok/gr...@16...
jxclient/trunk/skins/ragnorok/gr...@16...
jxclient/trunk/skins/ragnorok/gr...@19...
jxclient/trunk/skins/ragnorok/gr...@25...
jxclient/trunk/skins/ragnorok/inventory.skin
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/item/ItemPainter.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinLoader.java
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/ChangeLog 2009-05-24 06:37:42 UTC (rev 11717)
@@ -1,3 +1,8 @@
+2009-05-24 Andreas Kirschbaum
+
+ * Add "def item" skin command. Move recurring parameters from "item"
+ and "inventory_list" commands to "def item" parameters.
+
2009-05-23 Andreas Kirschbaum
* Make /tell messages darker to improve readability.
Modified: jxclient/trunk/skins/prelude/global.skin
===================================================================
--- jxclient/trunk/skins/prelude/global.skin 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/prelude/global.skin 2009-05-24 06:37:42 UTC (rev 11717)
@@ -19,6 +19,7 @@
font font_types squealer 12
def dialog dialog font_stats12 BLACK GRAY 0.9
+def item marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
commandlist command_disconnect AND null GUI_META
commandlist command_resume_disconnect AND null DIALOG_CLOSE disconnect
Modified: jxclient/trunk/skins/prelude/ma...@10...
===================================================================
--- jxclient/trunk/skins/prelude/ma...@10... 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/prelude/ma...@10... 2009-05-24 06:37:42 UTC (rev 11717)
@@ -108,26 +108,26 @@
# RInventory (973, 53)
picture inv_right_back 8+973 0+53 43 715 inventory 0.9
-item inventory rinv0 0+973+14 0+53+9 32 32 0 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv1 0+973+14 35+53+9 32 32 1 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv2 0+973+14 70+53+9 32 32 2 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv3 0+973+14 105+53+9 32 32 3 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv4 0+973+14 140+53+9 32 32 4 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv5 0+973+14 175+53+9 32 32 5 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv6 0+973+14 210+53+9 32 32 6 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv7 0+973+14 245+53+9 32 32 7 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv8 0+973+14 280+53+9 32 32 8 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinv9 0+973+14 315+53+9 32 32 9 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvA 0+973+14 350+53+9 32 32 10 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvB 0+973+14 385+53+9 32 32 11 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvC 0+973+14 420+53+9 32 32 12 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvD 0+973+14 455+53+9 32 32 13 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvE 0+973+14 490+53+9 32 32 14 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvF 0+973+14 525+53+9 32 32 15 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvG 0+973+14 560+53+9 32 32 16 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvH 0+973+14 595+53+9 32 32 17 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvI 0+973+14 630+53+9 32 32 18 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item inventory rinvJ 0+973+14 665+53+9 32 32 19 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
+item inventory rinv0 0+973+14 0+53+9 32 32 0
+item inventory rinv1 0+973+14 35+53+9 32 32 1
+item inventory rinv2 0+973+14 70+53+9 32 32 2
+item inventory rinv3 0+973+14 105+53+9 32 32 3
+item inventory rinv4 0+973+14 140+53+9 32 32 4
+item inventory rinv5 0+973+14 175+53+9 32 32 5
+item inventory rinv6 0+973+14 210+53+9 32 32 6
+item inventory rinv7 0+973+14 245+53+9 32 32 7
+item inventory rinv8 0+973+14 280+53+9 32 32 8
+item inventory rinv9 0+973+14 315+53+9 32 32 9
+item inventory rinvA 0+973+14 350+53+9 32 32 10
+item inventory rinvB 0+973+14 385+53+9 32 32 11
+item inventory rinvC 0+973+14 420+53+9 32 32 12
+item inventory rinvD 0+973+14 455+53+9 32 32 13
+item inventory rinvE 0+973+14 490+53+9 32 32 14
+item inventory rinvF 0+973+14 525+53+9 32 32 15
+item inventory rinvG 0+973+14 560+53+9 32 32 16
+item inventory rinvH 0+973+14 595+53+9 32 32 17
+item inventory rinvI 0+973+14 630+53+9 32 32 18
+item inventory rinvJ 0+973+14 665+53+9 32 32 19
item spelllist rsp0 0+973+14 0+53+9 32 32 0 #F7FBA6/0.6
item spelllist rsp1 0+973+14 35+53+9 32 32 1 #F7FBA6/0.6
@@ -291,17 +291,17 @@
set_invisible label_panel_spells_description
set_num_look_objects 11
-item floor floor0 0+199+9 0+551+165 32 32 0 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor1 0+199+9+34 0+551+165 32 32 1 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor2 0+199+9+68 0+551+165 32 32 2 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor3 0+199+9+102 0+551+165 32 32 3 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor4 0+199+9+136 0+551+165 32 32 4 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor5 0+199+9+170 0+551+165 32 32 5 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor6 0+199+9+204 0+551+165 32 32 6 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor7 0+199+9+238 0+551+165 32 32 7 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor8 0+199+9+272 0+551+165 32 32 8 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floor9 0+199+9+306 0+551+165 32 32 9 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
-item floor floorA 0+199+9+340 0+551+165 32 32 10 marker_cursed marker_cursed marker_magic marker_magic marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_default_small WHITE
+item floor floor0 0+199+9 0+551+165 32 32 0
+item floor floor1 0+199+9+34 0+551+165 32 32 1
+item floor floor2 0+199+9+68 0+551+165 32 32 2
+item floor floor3 0+199+9+102 0+551+165 32 32 3
+item floor floor4 0+199+9+136 0+551+165 32 32 4
+item floor floor5 0+199+9+170 0+551+165 32 32 5
+item floor floor6 0+199+9+204 0+551+165 32 32 6
+item floor floor7 0+199+9+238 0+551+165 32 32 7
+item floor floor8 0+199+9+272 0+551+165 32 32 8
+item floor floor9 0+199+9+306 0+551+165 32 32 9
+item floor floorA 0+199+9+340 0+551+165 32 32 10
# Resistances (630, 628)
picture gr0_back 0+630 0+628 29 11 res_gauge_empty 0.9
Modified: jxclient/trunk/skins/ragnorok/global.skin
===================================================================
--- jxclient/trunk/skins/ragnorok/global.skin 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/ragnorok/global.skin 2009-05-24 06:37:42 UTC (rev 11717)
@@ -16,6 +16,7 @@
def checkbox checked unchecked font_button BLACK
def dialog dialog font_title #801010 #e0e0e0 0.9
def textbutton button_up button_down font_button BLACK
+def item #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
commandlist command_newchar_close AND null DIALOG_CLOSE newchar
Modified: jxclient/trunk/skins/ragnorok/gr...@10...
===================================================================
--- jxclient/trunk/skins/ragnorok/gr...@10... 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/ragnorok/gr...@10... 2009-05-24 06:37:42 UTC (rev 11717)
@@ -4,38 +4,38 @@
set_num_look_objects 32
-item floor floor0 5 5 32 32 0 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor1 37 5 32 32 1 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor2 69 5 32 32 2 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor3 101 5 32 32 3 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor4 133 5 32 32 4 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor5 165 5 32 32 5 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor6 197 5 32 32 6 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor7 229 5 32 32 7 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor8 261 5 32 32 8 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor9 293 5 32 32 9 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor10 325 5 32 32 10 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor11 357 5 32 32 11 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor12 389 5 32 32 12 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor13 421 5 32 32 13 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor14 453 5 32 32 14 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor15 485 5 32 32 15 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor16 517 5 32 32 16 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor17 549 5 32 32 17 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor18 581 5 32 32 18 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor19 613 5 32 32 19 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor20 645 5 32 32 20 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor21 677 5 32 32 21 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor22 709 5 32 32 22 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor23 741 5 32 32 23 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor24 773 5 32 32 24 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor25 805 5 32 32 25 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor26 837 5 32 32 26 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor27 869 5 32 32 27 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor28 901 5 32 32 28 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor29 933 5 32 32 29 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor30 965 5 32 32 30 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor31 997 5 32 32 31 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
+item floor floor0 5 5 32 32 0
+item floor floor1 37 5 32 32 1
+item floor floor2 69 5 32 32 2
+item floor floor3 101 5 32 32 3
+item floor floor4 133 5 32 32 4
+item floor floor5 165 5 32 32 5
+item floor floor6 197 5 32 32 6
+item floor floor7 229 5 32 32 7
+item floor floor8 261 5 32 32 8
+item floor floor9 293 5 32 32 9
+item floor floor10 325 5 32 32 10
+item floor floor11 357 5 32 32 11
+item floor floor12 389 5 32 32 12
+item floor floor13 421 5 32 32 13
+item floor floor14 453 5 32 32 14
+item floor floor15 485 5 32 32 15
+item floor floor16 517 5 32 32 16
+item floor floor17 549 5 32 32 17
+item floor floor18 581 5 32 32 18
+item floor floor19 613 5 32 32 19
+item floor floor20 645 5 32 32 20
+item floor floor21 677 5 32 32 21
+item floor floor22 709 5 32 32 22
+item floor floor23 741 5 32 32 23
+item floor floor24 773 5 32 32 24
+item floor floor25 805 5 32 32 25
+item floor floor26 837 5 32 32 26
+item floor floor27 869 5 32 32 27
+item floor floor28 901 5 32 32 28
+item floor floor29 933 5 32 32 29
+item floor floor30 965 5 32 32 30
+item floor floor31 997 5 32 32 31
set_invisible border_nw
set_invisible border_n
Modified: jxclient/trunk/skins/ragnorok/gr...@12...
===================================================================
--- jxclient/trunk/skins/ragnorok/gr...@12... 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/ragnorok/gr...@12... 2009-05-24 06:37:42 UTC (rev 11717)
@@ -4,46 +4,46 @@
set_num_look_objects 40
-item floor floor0 5 5 32 32 0 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor1 37 5 32 32 1 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor2 69 5 32 32 2 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor3 101 5 32 32 3 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor4 133 5 32 32 4 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor5 165 5 32 32 5 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor6 197 5 32 32 6 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor7 229 5 32 32 7 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor8 261 5 32 32 8 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor9 293 5 32 32 9 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor10 325 5 32 32 10 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor11 357 5 32 32 11 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor12 389 5 32 32 12 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor13 421 5 32 32 13 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor14 453 5 32 32 14 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor15 485 5 32 32 15 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor16 517 5 32 32 16 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor17 549 5 32 32 17 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor18 581 5 32 32 18 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor19 613 5 32 32 19 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor20 645 5 32 32 20 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor21 677 5 32 32 21 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor22 709 5 32 32 22 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor23 741 5 32 32 23 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor24 773 5 32 32 24 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor25 805 5 32 32 25 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor26 837 5 32 32 26 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor27 869 5 32 32 27 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor28 901 5 32 32 28 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor29 933 5 32 32 29 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor30 965 5 32 32 30 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor31 997 5 32 32 31 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor32 1029 5 32 32 32 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor33 1061 5 32 32 33 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor34 1093 5 32 32 34 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor35 1125 5 32 32 35 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor36 1157 5 32 32 36 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor37 1189 5 32 32 37 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor38 1221 5 32 32 38 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor39 1253 5 32 32 39 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
+item floor floor0 5 5 32 32 0
+item floor floor1 37 5 32 32 1
+item floor floor2 69 5 32 32 2
+item floor floor3 101 5 32 32 3
+item floor floor4 133 5 32 32 4
+item floor floor5 165 5 32 32 5
+item floor floor6 197 5 32 32 6
+item floor floor7 229 5 32 32 7
+item floor floor8 261 5 32 32 8
+item floor floor9 293 5 32 32 9
+item floor floor10 325 5 32 32 10
+item floor floor11 357 5 32 32 11
+item floor floor12 389 5 32 32 12
+item floor floor13 421 5 32 32 13
+item floor floor14 453 5 32 32 14
+item floor floor15 485 5 32 32 15
+item floor floor16 517 5 32 32 16
+item floor floor17 549 5 32 32 17
+item floor floor18 581 5 32 32 18
+item floor floor19 613 5 32 32 19
+item floor floor20 645 5 32 32 20
+item floor floor21 677 5 32 32 21
+item floor floor22 709 5 32 32 22
+item floor floor23 741 5 32 32 23
+item floor floor24 773 5 32 32 24
+item floor floor25 805 5 32 32 25
+item floor floor26 837 5 32 32 26
+item floor floor27 869 5 32 32 27
+item floor floor28 901 5 32 32 28
+item floor floor29 933 5 32 32 29
+item floor floor30 965 5 32 32 30
+item floor floor31 997 5 32 32 31
+item floor floor32 1029 5 32 32 32
+item floor floor33 1061 5 32 32 33
+item floor floor34 1093 5 32 32 34
+item floor floor35 1125 5 32 32 35
+item floor floor36 1157 5 32 32 36
+item floor floor37 1189 5 32 32 37
+item floor floor38 1221 5 32 32 38
+item floor floor39 1253 5 32 32 39
set_invisible border_nw
set_invisible border_n
Modified: jxclient/trunk/skins/ragnorok/gr...@12...
===================================================================
--- jxclient/trunk/skins/ragnorok/gr...@12... 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/ragnorok/gr...@12... 2009-05-24 06:37:42 UTC (rev 11717)
@@ -4,46 +4,46 @@
set_num_look_objects 40
-item floor floor0 5 5 32 32 0 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor1 37 5 32 32 1 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor2 69 5 32 32 2 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor3 101 5 32 32 3 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor4 133 5 32 32 4 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor5 165 5 32 32 5 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor6 197 5 32 32 6 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor7 229 5 32 32 7 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor8 261 5 32 32 8 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor9 293 5 32 32 9 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor10 325 5 32 32 10 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor11 357 5 32 32 11 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor12 389 5 32 32 12 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor13 421 5 32 32 13 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor14 453 5 32 32 14 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor15 485 5 32 32 15 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor16 517 5 32 32 16 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor17 549 5 32 32 17 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor18 581 5 32 32 18 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor19 613 5 32 32 19 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor20 645 5 32 32 20 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor21 677 5 32 32 21 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor22 709 5 32 32 22 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor23 741 5 32 32 23 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor24 773 5 32 32 24 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor25 805 5 32 32 25 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor26 837 5 32 32 26 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor27 869 5 32 32 27 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor28 901 5 32 32 28 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor29 933 5 32 32 29 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor30 965 5 32 32 30 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor31 997 5 32 32 31 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor32 1029 5 32 32 32 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor33 1061 5 32 32 33 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor34 1093 5 32 32 34 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor35 1125 5 32 32 35 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor36 1157 5 32 32 36 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor37 1189 5 32 32 37 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor38 1221 5 32 32 38 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor39 1253 5 32 32 39 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
+item floor floor0 5 5 32 32 0
+item floor floor1 37 5 32 32 1
+item floor floor2 69 5 32 32 2
+item floor floor3 101 5 32 32 3
+item floor floor4 133 5 32 32 4
+item floor floor5 165 5 32 32 5
+item floor floor6 197 5 32 32 6
+item floor floor7 229 5 32 32 7
+item floor floor8 261 5 32 32 8
+item floor floor9 293 5 32 32 9
+item floor floor10 325 5 32 32 10
+item floor floor11 357 5 32 32 11
+item floor floor12 389 5 32 32 12
+item floor floor13 421 5 32 32 13
+item floor floor14 453 5 32 32 14
+item floor floor15 485 5 32 32 15
+item floor floor16 517 5 32 32 16
+item floor floor17 549 5 32 32 17
+item floor floor18 581 5 32 32 18
+item floor floor19 613 5 32 32 19
+item floor floor20 645 5 32 32 20
+item floor floor21 677 5 32 32 21
+item floor floor22 709 5 32 32 22
+item floor floor23 741 5 32 32 23
+item floor floor24 773 5 32 32 24
+item floor floor25 805 5 32 32 25
+item floor floor26 837 5 32 32 26
+item floor floor27 869 5 32 32 27
+item floor floor28 901 5 32 32 28
+item floor floor29 933 5 32 32 29
+item floor floor30 965 5 32 32 30
+item floor floor31 997 5 32 32 31
+item floor floor32 1029 5 32 32 32
+item floor floor33 1061 5 32 32 33
+item floor floor34 1093 5 32 32 34
+item floor floor35 1125 5 32 32 35
+item floor floor36 1157 5 32 32 36
+item floor floor37 1189 5 32 32 37
+item floor floor38 1221 5 32 32 38
+item floor floor39 1253 5 32 32 39
set_invisible border_nw
set_invisible border_n
Modified: jxclient/trunk/skins/ragnorok/gr...@14...
===================================================================
--- jxclient/trunk/skins/ragnorok/gr...@14... 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/ragnorok/gr...@14... 2009-05-24 06:37:42 UTC (rev 11717)
@@ -4,49 +4,49 @@
set_num_look_objects 43
-item floor floor0 5+12 5 32 32 0 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor1 37+12 5 32 32 1 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor2 69+12 5 32 32 2 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor3 101+12 5 32 32 3 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor4 133+12 5 32 32 4 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor5 165+12 5 32 32 5 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor6 197+12 5 32 32 6 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor7 229+12 5 32 32 7 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor8 261+12 5 32 32 8 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor9 293+12 5 32 32 9 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor10 325+12 5 32 32 10 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor11 357+12 5 32 32 11 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor12 389+12 5 32 32 12 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor13 421+12 5 32 32 13 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor14 453+12 5 32 32 14 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor15 485+12 5 32 32 15 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor16 517+12 5 32 32 16 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor17 549+12 5 32 32 17 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor18 581+12 5 32 32 18 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor19 613+12 5 32 32 19 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor20 645+12 5 32 32 20 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor21 677+12 5 32 32 21 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor22 709+12 5 32 32 22 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor23 741+12 5 32 32 23 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor24 773+12 5 32 32 24 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor25 805+12 5 32 32 25 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor26 837+12 5 32 32 26 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor27 869+12 5 32 32 27 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor28 901+12 5 32 32 28 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor29 933+12 5 32 32 29 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor30 965+12 5 32 32 30 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor31 997+12 5 32 32 31 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor32 1029+12 5 32 32 32 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor33 1061+12 5 32 32 33 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor34 1093+12 5 32 32 34 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor35 1125+12 5 32 32 35 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor36 1157+12 5 32 32 36 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor37 1189+12 5 32 32 37 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor38 1221+12 5 32 32 38 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor39 1253+12 5 32 32 39 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor40 1285+12 5 32 32 40 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor41 1317+12 5 32 32 41 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor42 1349+12 5 32 32 42 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
+item floor floor0 5+12 5 32 32 0
+item floor floor1 37+12 5 32 32 1
+item floor floor2 69+12 5 32 32 2
+item floor floor3 101+12 5 32 32 3
+item floor floor4 133+12 5 32 32 4
+item floor floor5 165+12 5 32 32 5
+item floor floor6 197+12 5 32 32 6
+item floor floor7 229+12 5 32 32 7
+item floor floor8 261+12 5 32 32 8
+item floor floor9 293+12 5 32 32 9
+item floor floor10 325+12 5 32 32 10
+item floor floor11 357+12 5 32 32 11
+item floor floor12 389+12 5 32 32 12
+item floor floor13 421+12 5 32 32 13
+item floor floor14 453+12 5 32 32 14
+item floor floor15 485+12 5 32 32 15
+item floor floor16 517+12 5 32 32 16
+item floor floor17 549+12 5 32 32 17
+item floor floor18 581+12 5 32 32 18
+item floor floor19 613+12 5 32 32 19
+item floor floor20 645+12 5 32 32 20
+item floor floor21 677+12 5 32 32 21
+item floor floor22 709+12 5 32 32 22
+item floor floor23 741+12 5 32 32 23
+item floor floor24 773+12 5 32 32 24
+item floor floor25 805+12 5 32 32 25
+item floor floor26 837+12 5 32 32 26
+item floor floor27 869+12 5 32 32 27
+item floor floor28 901+12 5 32 32 28
+item floor floor29 933+12 5 32 32 29
+item floor floor30 965+12 5 32 32 30
+item floor floor31 997+12 5 32 32 31
+item floor floor32 1029+12 5 32 32 32
+item floor floor33 1061+12 5 32 32 33
+item floor floor34 1093+12 5 32 32 34
+item floor floor35 1125+12 5 32 32 35
+item floor floor36 1157+12 5 32 32 36
+item floor floor37 1189+12 5 32 32 37
+item floor floor38 1221+12 5 32 32 38
+item floor floor39 1253+12 5 32 32 39
+item floor floor40 1285+12 5 32 32 40
+item floor floor41 1317+12 5 32 32 41
+item floor floor42 1349+12 5 32 32 42
set_invisible border_nw
set_invisible border_n
Modified: jxclient/trunk/skins/ragnorok/gr...@14...
===================================================================
--- jxclient/trunk/skins/ragnorok/gr...@14... 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/ragnorok/gr...@14... 2009-05-24 06:37:42 UTC (rev 11717)
@@ -4,49 +4,49 @@
set_num_look_objects 43
-item floor floor0 5+12 5 32 32 0 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor1 37+12 5 32 32 1 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor2 69+12 5 32 32 2 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor3 101+12 5 32 32 3 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor4 133+12 5 32 32 4 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor5 165+12 5 32 32 5 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor6 197+12 5 32 32 6 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor7 229+12 5 32 32 7 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor8 261+12 5 32 32 8 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor9 293+12 5 32 32 9 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor10 325+12 5 32 32 10 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor11 357+12 5 32 32 11 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor12 389+12 5 32 32 12 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor13 421+12 5 32 32 13 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor14 453+12 5 32 32 14 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor15 485+12 5 32 32 15 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor16 517+12 5 32 32 16 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor17 549+12 5 32 32 17 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor18 581+12 5 32 32 18 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor19 613+12 5 32 32 19 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor20 645+12 5 32 32 20 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor21 677+12 5 32 32 21 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor22 709+12 5 32 32 22 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor23 741+12 5 32 32 23 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor24 773+12 5 32 32 24 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor25 805+12 5 32 32 25 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor26 837+12 5 32 32 26 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor27 869+12 5 32 32 27 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor28 901+12 5 32 32 28 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor29 933+12 5 32 32 29 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor30 965+12 5 32 32 30 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor31 997+12 5 32 32 31 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor32 1029+12 5 32 32 32 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor33 1061+12 5 32 32 33 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor34 1093+12 5 32 32 34 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor35 1125+12 5 32 32 35 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor36 1157+12 5 32 32 36 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor37 1189+12 5 32 32 37 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor38 1221+12 5 32 32 38 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor39 1253+12 5 32 32 39 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor40 1285+12 5 32 32 40 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor41 1317+12 5 32 32 41 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor42 1349+12 5 32 32 42 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
+item floor floor0 5+12 5 32 32 0
+item floor floor1 37+12 5 32 32 1
+item floor floor2 69+12 5 32 32 2
+item floor floor3 101+12 5 32 32 3
+item floor floor4 133+12 5 32 32 4
+item floor floor5 165+12 5 32 32 5
+item floor floor6 197+12 5 32 32 6
+item floor floor7 229+12 5 32 32 7
+item floor floor8 261+12 5 32 32 8
+item floor floor9 293+12 5 32 32 9
+item floor floor10 325+12 5 32 32 10
+item floor floor11 357+12 5 32 32 11
+item floor floor12 389+12 5 32 32 12
+item floor floor13 421+12 5 32 32 13
+item floor floor14 453+12 5 32 32 14
+item floor floor15 485+12 5 32 32 15
+item floor floor16 517+12 5 32 32 16
+item floor floor17 549+12 5 32 32 17
+item floor floor18 581+12 5 32 32 18
+item floor floor19 613+12 5 32 32 19
+item floor floor20 645+12 5 32 32 20
+item floor floor21 677+12 5 32 32 21
+item floor floor22 709+12 5 32 32 22
+item floor floor23 741+12 5 32 32 23
+item floor floor24 773+12 5 32 32 24
+item floor floor25 805+12 5 32 32 25
+item floor floor26 837+12 5 32 32 26
+item floor floor27 869+12 5 32 32 27
+item floor floor28 901+12 5 32 32 28
+item floor floor29 933+12 5 32 32 29
+item floor floor30 965+12 5 32 32 30
+item floor floor31 997+12 5 32 32 31
+item floor floor32 1029+12 5 32 32 32
+item floor floor33 1061+12 5 32 32 33
+item floor floor34 1093+12 5 32 32 34
+item floor floor35 1125+12 5 32 32 35
+item floor floor36 1157+12 5 32 32 36
+item floor floor37 1189+12 5 32 32 37
+item floor floor38 1221+12 5 32 32 38
+item floor floor39 1253+12 5 32 32 39
+item floor floor40 1285+12 5 32 32 40
+item floor floor41 1317+12 5 32 32 41
+item floor floor42 1349+12 5 32 32 42
set_invisible border_nw
set_invisible border_n
Modified: jxclient/trunk/skins/ragnorok/gr...@14...
===================================================================
--- jxclient/trunk/skins/ragnorok/gr...@14... 2009-05-24 03:30:25 UTC (rev 11716)
+++ jxclient/trunk/skins/ragnorok/gr...@14... 2009-05-24 06:37:42 UTC (rev 11717)
@@ -4,51 +4,51 @@
set_num_look_objects 45
-item floor floor0 5 5 32 32 0 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor1 37 5 32 32 1 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor2 69 5 32 32 2 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor3 101 5 32 32 3 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor4 133 5 32 32 4 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor5 165 5 32 32 5 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor6 197 5 32 32 6 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor7 229 5 32 32 7 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor8 261 5 32 32 8 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor9 293 5 32 32 9 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor10 325 5 32 32 10 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor11 357 5 32 32 11 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor12 389 5 32 32 12 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor13 421 5 32 32 13 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor14 453 5 32 32 14 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor15 485 5 32 32 15 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor16 517 5 32 32 16 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor17 549 5 32 32 17 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor18 581 5 32 32 18 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor19 613 5 32 32 19 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor20 645 5 32 32 20 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor21 677 5 32 32 21 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor22 709 5 32 32 22 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor23 741 5 32 32 23 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor24 773 5 32 32 24 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor25 805 5 32 32 25 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor26 837 5 32 32 26 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor27 869 5 32 32 27 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor28 901 5 32 32 28 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor29 933 5 32 32 29 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor30 965 5 32 32 30 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor31 997 5 32 32 31 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor32 1029 5 32 32 32 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor33 1061 5 32 32 33 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor34 1093 5 32 32 34 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor35 1125 5 32 32 35 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor36 1157 5 32 32 36 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor37 1189 5 32 32 37 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor38 1221 5 32 32 38 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor39 1253 5 32 32 39 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor40 1285 5 32 32 40 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor41 1317 5 32 32 41 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor42 1349 5 32 32 42 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor43 1381 5 32 32 43 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
-item floor floor44 1413 5 32 32 44 #FF0000/0.5 #FF8000/0.5 #0000FF/0.5 #0080FF/0.5 marker_applied #F7FBA6/0.6 marker_locked marker_unpaid font_item BLACK
+item floor floor0 5 5 32 32 0
+item floor floor1 37 5 32 32 1
+item floor floor2 69 5 32 32 2
+item floor floor3 101 5 32 32 3
+item floor floor4 133 5 32 32 4
+item floor floor5 165 5 32 32 5
+item floor floor6 197 5 32 32 6
+item floor floor7 229 5 32 32 7
+item floor floor8 261 5 32 32 8
+item floor floor9 293 5 32 32 9
+item floor floor10 325 5 32 32 10
+item floor floor11 357 5 32 32 11
+item floor floor12 389 5 32 32 12
+item floor floor13 421 5 32 32 13
+item floor floor14 453 5 32 32 14
+item floor floor15 485 5 32 32 15
+item floor floor16 517 5 32 32 16
+item floor floor17 549 5 32 32 17
+item floor floor18 581 5 32 32 18
+item floor floor19 613 5 32 32 19
+item floor floor20 645 5 32 32 20
+item floor floor21 677 5 32 32 21
+item floor floor22 709 5 32 32 22
+item floor floor23 741 5 32 32 23
+item floor floor24 773 5 32 32 24
+item floor floor25 805 5 32 32 25
+item floor floor26 837 5 32 32 26
+item floor floor27 869 5 32 32 27
+item floor floor28 901 5 32 32 28
+item floor floor29 933 5 32 32 29
+item floor floor30 965 5 32 32 30
+item floor floor31 997 5 32 32 31
+item floor floor32 1029 5 32 32 32
+item floor floor33 1061 5 32 32 33
+item floor floor34 1093 5 32 32 34
+item floor floor35 1125 5 32 32 35
+item floor floor36 1157 5 32 32 36
+item floor floor37 1189 5 32 32 37
+item floor floor38 1221 5 32 32 38
+item floor floor39 1253 5 32 32 39
+item floor floor40 1285 5...
[truncated message content] |
|
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] |
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-24 01:03:04
|
Revision: 11715
http://crossfire.svn.sourceforge.net/crossfire/?rev=11715&view=rev
Author: kbulgrien
Date: 2009-05-24 01:02:56 +0000 (Sun, 24 May 2009)
Log Message:
-----------
- 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 bar numeric data has
been moved to the left of the bars.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/gtk-v2/glade/oroboros.glade
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2009-05-23 22:10:46 UTC (rev 11714)
+++ client/trunk/ChangeLog 2009-05-24 01:02:56 UTC (rev 11715)
@@ -1,6 +1,12 @@
"$Id$"
Top of SVN tree:
------------------------------------------------------------------------------
+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
+ bar numeric data has been moved to the left of the bars.
+Kevin Bulgrien 2009/05/23
+
gtk-v2/glade/eureka.glade: This update supports recent client code changes.
The stat bar display is moderately reorganized to allow very long experience
data to be covered by the neighboring hpane panel as needed. The critical
Modified: client/trunk/gtk-v2/glade/oroboros.glade
===================================================================
--- client/trunk/gtk-v2/glade/oroboros.glade 2009-05-23 22:10:46 UTC (rev 11714)
+++ client/trunk/gtk-v2/glade/oroboros.glade 2009-05-24 01:02:56 UTC (rev 11715)
@@ -1,2741 +1,2483 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0"?>
<glade-interface>
-
-<widget class="GtkWindow" id="window_root">
- <property name="title" translatable="yes">Crossfire Client - GTK v2</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">1019</property>
- <property name="default_height">690</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <signal name="key_press_event" handler="keyfunc" object="window_root" last_modification_time="Wed, 16 Feb 2005 08:21:55 GMT"/>
- <signal name="key_release_event" handler="keyrelfunc" object="window_root" last_modification_time="Wed, 16 Feb 2005 08:25:13 GMT"/>
- <signal name="destroy" handler="on_window_destroy_event" last_modification_time="Mon, 21 Aug 2006 07:42:55 GMT"/>
-
- <child>
- <widget class="GtkVBox" id="vbox_all">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox_menubar">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
- <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
- <child>
- <widget class="GtkMenuItem" id="menuitem1">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="quit_character1">
- <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" last_modification_time="Tue, 17 Feb 2004 07:38:57 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="quit2">
- <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" last_modification_time="Sun, 27 Feb 2005 06:56:16 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="client1">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="configure1">
- <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" last_modification_time="Mon, 27 Feb 2006 06:36:42 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="disconnect">
- <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" last_modification_time="Sun, 19 Feb 2006 03:54:57 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="keybindings">
- <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" last_modification_time="Sun, 19 Feb 2006 03:55:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="save_window_position">
- <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" last_modification_time="Sat, 11 Mar 2006 08:03:20 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="menu_player">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Player</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="menu_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" last_modification_time="Tue, 21 Feb 2006 06:32:21 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="pickup1">
- <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">
-
- <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>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_dont_pickup_activate" last_modification_time="Sun, 17 Apr 2005 05:04:52 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="stop_before_pickup1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Stop Before Pickup</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_stop_before_pickup_activate" last_modification_time="Sun, 17 Apr 2005 05:04:52 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="armor1">
- <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">
-
- <child>
- <widget class="GtkCheckMenuItem" id="body_armor1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Body Armor</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_body_armor_activate" last_modification_time="Sun, 17 Apr 2005 05:21:18 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="boots1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Boots</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_boots_activate" last_modification_time="Sun, 17 Apr 2005 05:22:10 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="cloaks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Cloaks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_cloaks_activate" last_modification_time="Sun, 17 Apr 2005 05:22:10 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="gloves1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Gloves</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_gloves_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="helmets1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Helmets</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_helmets_activate" last_modification_time="Sun, 17 Apr 2005 05:20:39 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="shields1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Shields</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_shields_activate" last_modification_time="Sun, 17 Apr 2005 05:21:18 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="books1">
- <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">
-
- <child>
- <widget class="GtkCheckMenuItem" id="skillscrolls1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Skillscrolls</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_skillscrolls_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="normal_book_scrolls1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Normal Books & Scrolls</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_normal_book_scrolls_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="spellbooks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Spellbooks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_spellbooks_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="drinks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Drinks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_drinks_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="food1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Food</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_food_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="flesh1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Flesh</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_flesh_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="keys1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Keys</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_keys_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="magical_items">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Magical Items</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_magical_items_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="potions">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Potions</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_potions_activate" last_modification_time="Sun, 17 Apr 2005 06:08:54 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="valuables">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Valuables (Money & Gems)</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_valuables_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="wands_rods_horns">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Wands/Rods/Horns</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_wands_rods_horns_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="jewels1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Jewels</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_jewels_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="weapons1">
- <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">
-
- <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>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_all_weapons_activate" last_modification_time="Sun, 17 Apr 2005 05:14:33 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="missile_weapons1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Missile Weapons</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_missile_weapons_activate" last_modification_time="Sun, 17 Apr 2005 05:14:33 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="bows1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bows</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_bows_activate" last_modification_time="Sun, 17 Apr 2005 05:19:16 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="arrows1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Arrows</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_arrows_activate" last_modification_time="Sun, 17 Apr 2005 05:19:31 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="weight/value_1">
- <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">
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_pickup_off1">
- <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" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 5</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 10</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_15">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 15</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_20">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 20</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_25">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 25</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_30">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 30</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_35">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 35</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_40">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 40</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_45">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 45</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_50">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 50</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="not_cursed1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ignore cursed</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_not_cursed_activate" last_modification_time="Tue, 01 Nov 2005 12:47:52 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="menuitem4">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="about1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_About</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="menu_about" last_modification_time="Tue, 17 Feb 2004 07:42:22 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="fire_on">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="run_on">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="filler">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHPaned" id="hpaned_invnmsgs_charmaps">
- <property name="width_request">1019</property>
- <property name="height_request">600</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">350</property>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_msgsinvn_floor">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">540</property>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_msgs_invn">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">175</property>
-
- <child>
- <widget class="GtkVBox" id="vbox_info_entry">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkNotebook" id="notebook_prot_core">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_textview1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview_info1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">False</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_msgs">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Messages</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">3</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_textview2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview_info2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">False</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_critmsgs">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Critical Messages</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">3</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_commands">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- <signal name="activate" handler="on_entry_commands_activate" last_modification_time="Tue, 15 Feb 2005 08:26:01 GMT"/>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox_inv">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox_inv_header">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Inventory:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">10</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_inv_weight">
- <property name="visible">True</property>
- <property name="label" translatable="yes">0/0</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">15</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Count</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="spinbutton_count">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">0 0 1000000 1 0 0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkNotebook" id="notebook_inv">
- <property name="visible">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
- <signal name="switch_page" handler="on_notebook_switch_page" last_modification_time="Sat, 26 Feb 2005 08:20:46 GMT"/>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow6">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkTable" id="inv_table">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="n_rows">11</property>
- <property name="n_columns">10</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
- <signal name="expose_event" handler="on_inv_table_expose_event" last_modification_time="Mon, 28 Feb 2005 00:38:27 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label80">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Icons</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox_floor">
- <property name="border_width">3</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label_yousee">
- <property name="visible">True</property>
- <property name="label" translatable="yes">You see:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="treeview_look">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal name="row_collapsed" handler="list_row_collapse" last_modification_time="Sun, 27 Feb 2005 09:03:02 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_statsmsgs_mapsmsgs">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">175</property>
-
- <child>
- <widget class="GtkNotebook" id="notebook_character">
- <property name="border_width">2</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
-
- <child>
- <widget class="GtkHPaned" id="hpaned_character_statbar">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">200</property>
-
- <child>
- <widget class="GtkTable" id="table_character">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">1</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox_firerun">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="fire_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">5</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="run_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">5</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox34">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label_playername">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Player:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_level">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Level:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">10</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox33">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label_range">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Skill</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox31">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label64">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Speed</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">6</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_speed">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packin...
[truncated message content] |
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 22:10:47
|
Revision: 11714
http://crossfire.svn.sourceforge.net/crossfire/?rev=11714&view=rev
Author: akirschbaum
Date: 2009-05-23 22:10:46 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Make /tell messages darker to improve readability.
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/skins/ragnorok/messages.skin
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2009-05-23 22:02:56 UTC (rev 11713)
+++ jxclient/trunk/ChangeLog 2009-05-23 22:10:46 UTC (rev 11714)
@@ -1,5 +1,7 @@
2009-05-23 Andreas Kirschbaum
+ * Make /tell messages darker to improve readability.
+
* Add 'R' keybinding: reply to last player that has sent a /tell command.
2009-05-21 Andreas Kirschbaum
Modified: jxclient/trunk/skins/ragnorok/messages.skin
===================================================================
--- jxclient/trunk/skins/ragnorok/messages.skin 2009-05-23 22:02:56 UTC (rev 11713)
+++ jxclient/trunk/skins/ragnorok/messages.skin 2009-05-23 22:10:46 UTC (rev 11714)
@@ -10,7 +10,7 @@
# "all" tab
log_message log_all 4 25 562 190-25-16-4 empty font_log_print font_log_fixed font_log_fixed_bold font_log_arcane BLACK
log_color log_all 1 #000000
-log_color log_all 4 #b78b00
+log_color log_all 4 #896800
log_color log_all 5 #4040ff
log_color log_all 6 #d0a000
log_color log_all 7 #00c000
@@ -25,7 +25,7 @@
# "important" tab
log_message log_msg 4 25 562 190-30-16-4 empty font_log_print font_log_fixed font_log_fixed_bold font_log_arcane BLACK
log_color log_msg 1 #000000
-log_color log_msg 4 #b78b00
+log_color log_msg 4 #896800
log_color log_msg 5 #8080ff
log_color log_msg 6 #d0a000
log_color log_msg 7 #00c000
@@ -41,7 +41,7 @@
# "chat" tab
log_message log_chat 4 25 562 190-30-16-4 empty font_log_print font_log_fixed font_log_fixed_bold font_log_arcane BLACK
log_color log_chat 1 #000000
-log_color log_chat 4 #b78b00
+log_color log_chat 4 #896800
log_color log_chat 5 #8080ff
log_color log_chat 6 #d0a000
log_color log_chat 7 #00c000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 22:03:05
|
Revision: 11713
http://crossfire.svn.sourceforge.net/crossfire/?rev=11713&view=rev
Author: akirschbaum
Date: 2009-05-23 22:02:56 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Simplify code.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java 2009-05-23 21:03:09 UTC (rev 11712)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/log/MessageBufferUpdater.java 2009-05-23 22:02:56 UTC (rev 11713)
@@ -41,7 +41,7 @@
/**
* Maps color index to color.
*/
- private final Color[] colors = new Color[]
+ private final Color[] colors =
{
Color.BLACK, // black
Color.WHITE, // white
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 21:03:18
|
Revision: 11712
http://crossfire.svn.sourceforge.net/crossfire/?rev=11712&view=rev
Author: akirschbaum
Date: 2009-05-23 21:03:09 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Add 'R' keybinding: reply to last player that has sent a /tell command.
Modified Paths:
--------------
jxclient/trunk/ChangeLog
jxclient/trunk/skins/prelude/global.skin
jxclient/trunk/skins/ragnorok/global.skin
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ActivateCommandInputCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecuteCommandCommand.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/GUICommandFactory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/Gui.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GuiFactory.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/MessageTypes.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/CommandParser.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/DefaultJXCSkin.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinLoader.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/KeybindingsManager.java
Added Paths:
-----------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java
Modified: jxclient/trunk/ChangeLog
===================================================================
--- jxclient/trunk/ChangeLog 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/ChangeLog 2009-05-23 21:03:09 UTC (rev 11712)
@@ -1,3 +1,7 @@
+2009-05-23 Andreas Kirschbaum
+
+ * Add 'R' keybinding: reply to last player that has sent a /tell command.
+
2009-05-21 Andreas Kirschbaum
* Fix display issues when the character is running.
Modified: jxclient/trunk/skins/prelude/global.skin
===================================================================
--- jxclient/trunk/skins/prelude/global.skin 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/skins/prelude/global.skin 2009-05-23 21:03:09 UTC (rev 11712)
@@ -55,6 +55,7 @@
key code F11 0 exec command_shortcutA
key code F12 0 exec command_shortcutB
+key char 82 -e tell <<reply_to>> -
key char 97 apply
key char 100 use_skill disarm traps
key char 101 examine
Modified: jxclient/trunk/skins/ragnorok/global.skin
===================================================================
--- jxclient/trunk/skins/ragnorok/global.skin 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/skins/ragnorok/global.skin 2009-05-23 21:03:09 UTC (rev 11712)
@@ -89,6 +89,7 @@
key code F9 0 exec command_map
key code F10 0 exec command_setup
+key char 82 -e tell <<reply_to>> -
key char 97 apply
key char 100 use_skill disarm traps
key char 101 examine
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/BindCommand.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -49,6 +49,11 @@
private final GuiManager guiManager;
/**
+ * The {@link Macros} instance to use.
+ */
+ private Macros macros;
+
+ /**
* Create a new instance.
*
* @param window The window to execute in.
@@ -58,13 +63,16 @@
* @param commands the commands instance for executing commands
*
* @param guiManager the gui manager to use
+ *
+ * @param macros the macros instance to use
*/
- protected BindCommand(final JXCWindow window, final CrossfireServerConnection crossfireServerConnection, final Commands commands, final GuiManager guiManager)
+ protected BindCommand(final JXCWindow window, final CrossfireServerConnection crossfireServerConnection, final Commands commands, final GuiManager guiManager, final Macros macros)
{
super(crossfireServerConnection);
this.window = window;
this.commands = commands;
this.guiManager = guiManager;
+ this.macros = macros;
}
/** {@inheritDoc} */
@@ -103,7 +111,7 @@
}
final GUICommandList commandList2 = new GUICommandList(GUICommandList.CommandType.AND);
- commandList2.add(GUICommandFactory.createCommand(commandList, guiManager, commands));
+ commandList2.add(GUICommandFactory.createCommand(commandList, guiManager, commands, macros));
if (!window.createKeyBinding(perCharacterBinding, commandList2))
{
drawInfoError("Cannot use bind -c since no character is logged in.");
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Commands.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -57,11 +57,12 @@
* @param scriptManager the script manager instance
* @param optionManager the option manager instance
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
*/
- public Commands(final JXCWindow window, final JXCWindowRenderer windowRenderer, final CommandQueue commandQueue, final CrossfireServerConnection crossfireServerConnection, final ScriptManager scriptManager, final OptionManager optionManager, final GuiManager guiManager)
+ public Commands(final JXCWindow window, final JXCWindowRenderer windowRenderer, final CommandQueue commandQueue, final CrossfireServerConnection crossfireServerConnection, final ScriptManager scriptManager, final OptionManager optionManager, final GuiManager guiManager, final Macros macros)
{
this.commandQueue = commandQueue;
- commands.put("bind", new BindCommand(window, crossfireServerConnection, this, guiManager));
+ commands.put("bind", new BindCommand(window, crossfireServerConnection, this, guiManager, macros));
commands.put("unbind", new UnbindCommand(window, crossfireServerConnection));
commands.put("screenshot", new ScreenshotCommand(window, windowRenderer, crossfireServerConnection));
commands.put("script", new ScriptCommand(scriptManager, crossfireServerConnection));
Added: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java (rev 0)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -0,0 +1,144 @@
+//
+// This file is part of JXClient, the Fullscreen Java Crossfire Client.
+//
+// JXClient 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.
+//
+// JXClient 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 JXClient; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+// JXClient is (C)2005 by Yann Chachkoff.
+//
+package com.realtime.crossfire.jxclient.commands;
+
+import com.realtime.crossfire.jxclient.server.CrossfireDrawextinfoListener;
+import com.realtime.crossfire.jxclient.server.CrossfireServerConnection;
+import com.realtime.crossfire.jxclient.server.MessageTypes;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Manages macro expansion in command strings.
+ * @author Andreas Kirschbaum
+ */
+public class Macros
+{
+ /**
+ * The "reply_to" macro name.
+ */
+ private static final String REPLY_TO = "reply_to";
+
+ /**
+ * The {@link Pattern} matching macro names.
+ */
+ private final Pattern macroPattern = Pattern.compile("<<([a-z_]+)>>");
+
+ /**
+ * The macro expansions. Maps macro name to macro expansion.
+ */
+ private final Map<String, String> expansions = new HashMap<String, String>();
+
+ /**
+ * The {@link CrossfireDrawextinfoListener} for tracking tells.
+ */
+ private final CrossfireDrawextinfoListener crossfireDrawextinfoListener = new CrossfireDrawextinfoListener()
+ {
+ /** {@inheritDoc} */
+ @Override
+ public void commandDrawextinfoReceived(final int color, final int type, final int subtype, final String message)
+ {
+ switch (type)
+ {
+ case MessageTypes.MSG_TYPE_BOOK:
+ case MessageTypes.MSG_TYPE_CARD:
+ case MessageTypes.MSG_TYPE_PAPER:
+ case MessageTypes.MSG_TYPE_SIGN:
+ case MessageTypes.MSG_TYPE_MONUMENT:
+ case MessageTypes.MSG_TYPE_DIALOG:
+ case MessageTypes.MSG_TYPE_MOTD:
+ case MessageTypes.MSG_TYPE_ADMIN:
+ case MessageTypes.MSG_TYPE_SHOP:
+ case MessageTypes.MSG_TYPE_COMMAND:
+ case MessageTypes.MSG_TYPE_ATTRIBUTE:
+ case MessageTypes.MSG_TYPE_SKILL:
+ case MessageTypes.MSG_TYPE_APPLY:
+ case MessageTypes.MSG_TYPE_ATTACK:
+ break;
+
+ case MessageTypes.MSG_TYPE_COMMUNICATION:
+ if (subtype == MessageTypes.MSG_TYPE_COMMUNICATION_TELL)
+ {
+ final int index = message.indexOf(" tells you:");
+ if (index != -1)
+ {
+ final String name = message.substring(0, index);
+ expansions.put(REPLY_TO, name);
+ }
+ }
+ break;
+
+ case MessageTypes.MSG_TYPE_SPELL:
+ case MessageTypes.MSG_TYPE_ITEM:
+ case MessageTypes.MSG_TYPE_MISC:
+ case MessageTypes.MSG_TYPE_VICTIM:
+ default:
+ break;
+ }
+ }
+ };
+
+ /**
+ * Creates a new instance.
+ * @param crossfireServerConnection the crossfire server connection to
+ * track
+ */
+ public Macros(final CrossfireServerConnection crossfireServerConnection)
+ {
+ expansions.put(REPLY_TO, "");
+ crossfireServerConnection.addCrossfireDrawextinfoListener(crossfireDrawextinfoListener);
+ }
+
+ /**
+ * Expands all macro references.
+ * @param string the string to expand
+ * @return the expanded string
+ */
+ public String expandMacros(final String string)
+ {
+ StringBuilder result = null;
+ int index = 0;
+ final Matcher macroMatcher = macroPattern.matcher(string);
+ while (macroMatcher.find())
+ {
+ if (result == null)
+ {
+ result = new StringBuilder();
+ }
+
+ final String name = macroMatcher.group(1);
+ String expansion = expansions.get(name);
+ if (expansion == null)
+ {
+ expansion = macroMatcher.group(); // do not expand unknown macro names
+ }
+ result.append(string.substring(index, macroMatcher.start()));
+ result.append(expansion);
+ index = macroMatcher.end();
+ }
+ if (result != null)
+ {
+ result.append(string.substring(index, string.length()));
+ }
+ return result == null ? string : result.toString();
+ }
+}
Property changes on: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/commands/Macros.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ActivateCommandInputCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ActivateCommandInputCommand.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ActivateCommandInputCommand.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -19,6 +19,7 @@
//
package com.realtime.crossfire.jxclient.gui.commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.window.GuiManager;
/**
@@ -36,14 +37,21 @@
private final String commandText;
/**
+ * The {@link Macros} instance to use.
+ */
+ private final Macros macros;
+
+ /**
* Creates a new instance.
* @param commandText the command text to set
* @param guiManager the gui manager to affect
+ * @param macros the macros instance to use
*/
- public ActivateCommandInputCommand(final String commandText, final GuiManager guiManager)
+ public ActivateCommandInputCommand(final String commandText, final GuiManager guiManager, final Macros macros)
{
this.commandText = commandText;
this.guiManager = guiManager;
+ this.macros = macros;
}
/** {@inheritDoc} */
@@ -57,7 +65,7 @@
@Override
public void execute()
{
- guiManager.activateCommandInput(commandText);
+ guiManager.activateCommandInput(macros.expandMacros(commandText));
}
/**
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecuteCommandCommand.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecuteCommandCommand.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/ExecuteCommandCommand.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.gui.commands;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
/**
* A {@link GUICommand} which executes a Crossfire command.
@@ -34,14 +35,21 @@
private final String command;
/**
+ * The {@link Macros} instance to use.
+ */
+ private final Macros macros;
+
+ /**
* Creates a new instance.
* @param commands the commands instance for executing the command
* @param command the command to execute
+ * @param macros the macros instance to use
*/
- public ExecuteCommandCommand(final Commands commands, final String command)
+ public ExecuteCommandCommand(final Commands commands, final String command, final Macros macros)
{
this.commands = commands;
this.command = command;
+ this.macros = macros;
}
/** {@inheritDoc} */
@@ -55,7 +63,7 @@
@Override
public void execute()
{
- commands.executeCommand(command);
+ commands.executeCommand(macros.expandMacros(command));
}
/**
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/GUICommandFactory.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/GUICommandFactory.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/commands/GUICommandFactory.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.gui.commands;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.util.StringUtils;
import com.realtime.crossfire.jxclient.window.GuiManager;
import java.util.regex.Pattern;
@@ -52,11 +53,12 @@
* @param encodedCommandString the command string representation
* @param guiManager the gui manager to use
* @param commands the commands instance to use
+ * @param macros the macros instance to use
* @return the new command instance
*/
- public static GUICommand createCommandDecode(final String encodedCommandString, final GuiManager guiManager, final Commands commands)
+ public static GUICommand createCommandDecode(final String encodedCommandString, final GuiManager guiManager, final Commands commands, final Macros macros)
{
- return createCommand(decode(encodedCommandString), guiManager, commands);
+ return createCommand(decode(encodedCommandString), guiManager, commands, macros);
}
/**
@@ -64,21 +66,22 @@
* @param commandString the command string representation
* @param guiManager the gui manager to use
* @param commands the commands instance to use
+ * @param macros the macros instance to use
* @return the new command instance
*/
- public static GUICommand createCommand(final String commandString, final GuiManager guiManager, final Commands commands)
+ public static GUICommand createCommand(final String commandString, final GuiManager guiManager, final Commands commands, final Macros macros)
{
if (commandString.equals("-e"))
{
- return new ActivateCommandInputCommand("", guiManager);
+ return new ActivateCommandInputCommand("", guiManager, macros);
}
else if (commandString.startsWith("-e "))
{
- return new ActivateCommandInputCommand(StringUtils.trimLeading(commandString.substring(3)), guiManager);
+ return new ActivateCommandInputCommand(StringUtils.trimLeading(commandString.substring(3)), guiManager, macros);
}
else
{
- return new ExecuteCommandCommand(commands, commandString);
+ return new ExecuteCommandCommand(commands, commandString, macros);
}
}
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/Gui.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/Gui.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/Gui.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.gui.gui;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.gui.button.AbstractButton;
import com.realtime.crossfire.jxclient.gui.keybindings.KeyBindings;
import com.realtime.crossfire.jxclient.gui.textinput.GUIText;
@@ -130,11 +131,12 @@
* <code>null</code> otherwise
* @param commands the commands instance for executing commands
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
*/
- public Gui(final MouseTracker mouseTracker, final Commands commands, final GuiManager guiManager)
+ public Gui(final MouseTracker mouseTracker, final Commands commands, final GuiManager guiManager, final Macros macros)
{
this.mouseTracker = mouseTracker;
- keyBindings = new KeyBindings(null, commands, guiManager);
+ keyBindings = new KeyBindings(null, commands, guiManager, macros);
}
/**
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GuiFactory.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GuiFactory.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/gui/GuiFactory.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.gui.gui;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.window.GuiManager;
import com.realtime.crossfire.jxclient.window.MouseTracker;
@@ -45,17 +46,24 @@
private final GuiManager guiManager;
/**
+ * The {@link Macros} instance to use.
+ */
+ private final Macros macros;
+
+ /**
* Creates a new instance.
* @param mouseTracker the mouse tracker when in debug GUI mode or
* <code>null</code> otherwise
* @param commands the commands instance for executing commands
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
*/
- public GuiFactory(final MouseTracker mouseTracker, final Commands commands, final GuiManager guiManager)
+ public GuiFactory(final MouseTracker mouseTracker, final Commands commands, final GuiManager guiManager, final Macros macros)
{
this.mouseTracker = mouseTracker;
this.commands = commands;
this.guiManager = guiManager;
+ this.macros = macros;
}
/**
@@ -64,6 +72,6 @@
*/
public Gui newGui()
{
- return new Gui(mouseTracker, commands, guiManager);
+ return new Gui(mouseTracker, commands, guiManager, macros);
}
}
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -21,6 +21,7 @@
package com.realtime.crossfire.jxclient.gui.keybindings;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.gui.commands.GUICommandFactory;
import com.realtime.crossfire.jxclient.window.GUICommandList;
import com.realtime.crossfire.jxclient.window.GuiManager;
@@ -54,6 +55,11 @@
private final GuiManager guiManager;
/**
+ * The {@link Macros} instance to use.
+ */
+ private Macros macros;
+
+ /**
* The active key bindings.
*/
private final Set<KeyBinding> keybindings = new HashSet<KeyBinding>();
@@ -80,12 +86,14 @@
* save
* @param commands the commands instance for executing commands
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
*/
- public KeyBindings(final File file, final Commands commands, final GuiManager guiManager)
+ public KeyBindings(final File file, final Commands commands, final GuiManager guiManager, final Macros macros)
{
this.file = file;
this.commands = commands;
this.guiManager = guiManager;
+ this.macros = macros;
}
/**
@@ -375,7 +383,7 @@
{
final char keyChar = (char)Integer.parseInt(tmp[0]);
final GUICommandList commandList = new GUICommandList(GUICommandList.CommandType.AND);
- commandList.add(GUICommandFactory.createCommandDecode(tmp[1], guiManager, commands));
+ commandList.add(GUICommandFactory.createCommandDecode(tmp[1], guiManager, commands, macros));
addKeyBindingAsKeyChar(keyChar, commandList, isDefault);
}
catch (final NumberFormatException ex)
@@ -417,7 +425,7 @@
}
final GUICommandList commandList = new GUICommandList(GUICommandList.CommandType.AND);
- commandList.add(GUICommandFactory.createCommandDecode(tmp[2], guiManager, commands));
+ commandList.add(GUICommandFactory.createCommandDecode(tmp[2], guiManager, commands, macros));
addKeyBindingAsKeyCode(keyCode, modifiers, commandList, isDefault);
}
else
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/MessageTypes.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/MessageTypes.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/MessageTypes.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -81,6 +81,15 @@
public static final int MSG_TYPE_BOOK_SPELL_SORCERER = 11;
public static final int MSG_TYPE_BOOK_SPELL_SUMMONER = 12;
+ public static final int MSG_TYPE_COMMUNICATION_RANDOM = 1; // random event (coin toss)
+ public static final int MSG_TYPE_COMMUNICATION_SAY = 2; // player says something
+ public static final int MSG_TYPE_COMMUNICATION_ME = 3; // player me's a message
+ public static final int MSG_TYPE_COMMUNICATION_TELL = 4; // player tells something
+ public static final int MSG_TYPE_COMMUNICATION_EMOTE = 5; // player emotes
+ public static final int MSG_TYPE_COMMUNICATION_PARTY = 6; // party message
+ public static final int MSG_TYPE_COMMUNICATION_SHOUT = 7; // shout message
+ public static final int MSG_TYPE_COMMUNICATION_chat = 8; // chat message
+
/**
* Private constructor to prevent instantiation.
*/
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/CommandParser.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/CommandParser.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/CommandParser.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.skin;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.gui.commands.ConnectCommand;
import com.realtime.crossfire.jxclient.gui.commands.DialogCloseCommand;
import com.realtime.crossfire.jxclient.gui.commands.DialogOpenCommand;
@@ -112,11 +113,12 @@
* @param commandQueue the command queue for executing commands
* @param crossfireServerConnection the server connection to use
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
* @return the command arguments
* @throws IOException if a syntax error occurs
* @throws JXCSkinException if an element cannot be found
*/
- public GUICommand parseCommandArgs(final String[] args, final int argc, final GUIElement element, final String command, final JXCWindow window, final Commands commands, final LineNumberReader lnr, final CommandQueue commandQueue, final CrossfireServerConnection crossfireServerConnection, final GuiManager guiManager) throws IOException, JXCSkinException
+ public GUICommand parseCommandArgs(final String[] args, final int argc, final GUIElement element, final String command, final JXCWindow window, final Commands commands, final LineNumberReader lnr, final CommandQueue commandQueue, final CrossfireServerConnection crossfireServerConnection, final GuiManager guiManager, final Macros macros) throws IOException, JXCSkinException
{
if (command.equals("SHOW"))
{
@@ -253,7 +255,7 @@
}
final String commandString = ParseUtils.parseText(args, argc, lnr);
- return new ExecuteCommandCommand(commands, commandString);
+ return new ExecuteCommandCommand(commands, commandString, macros);
}
else if (command.equals("EXEC_SELECTION"))
{
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/DefaultJXCSkin.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/DefaultJXCSkin.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/DefaultJXCSkin.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.skin;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.experience.ExperienceTable;
import com.realtime.crossfire.jxclient.gui.gauge.GaugeUpdater;
import com.realtime.crossfire.jxclient.gui.gui.GUIElement;
@@ -383,13 +384,14 @@
* @param commandQueue the command queue for executing commands
* @param crossfireServerConnection the server connection to use
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
* @throws IOException if a syntax error occurs
* @throws JXCSkinException if an element cannot be found
*/
- public void addCommand(final String listName, final String[] args, final int argc, final GUIElement element, final String command, final JXCWindow window, final Commands commands, final LineNumberReader lnr, final CommandQueue commandQueue, final CrossfireServerConnection crossfireServerConnection, final GuiManager guiManager ) throws IOException, JXCSkinException
+ public void addCommand(final String listName, final String[] args, final int argc, final GUIElement element, final String command, final JXCWindow window, final Commands commands, final LineNumberReader lnr, final CommandQueue commandQueue, final CrossfireServerConnection crossfireServerConnection, final GuiManager guiManager, final Macros macros) throws IOException, JXCSkinException
{
final GUICommandList commandList = getCommandList(listName);
- commandList.add(commandParser.parseCommandArgs(args, argc, element, command, window, commands, lnr, commandQueue, crossfireServerConnection, guiManager));
+ commandList.add(commandParser.parseCommandArgs(args, argc, element, command, window, commands, lnr, commandQueue, crossfireServerConnection, guiManager, macros));
}
/** {@inheritDoc} */
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinLoader.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinLoader.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/skin/JXCSkinLoader.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.skin;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.experience.ExperienceTable;
import com.realtime.crossfire.jxclient.faces.FacesManager;
import com.realtime.crossfire.jxclient.gui.GUIMagicMap;
@@ -247,10 +248,11 @@
* @param currentSpellManager the current spell manager to use
* @param guiManager the gui manager to use
* @param debugGui whether gui debugging is active
+ * @param macros the macros instance to use
* @return the loaded skin
* @throws JXCSkinException if the skin cannot be loaded
*/
- public JXCSkin load(final JXCSkinSource skinSource, final CrossfireServerConnection crossfireServerConnection, final JXCWindow window, final TooltipManager tooltipManager, final JXCWindowRenderer windowRenderer, final MouseTracker mouseTracker, final MetaserverModel metaserverModel, final CommandQueue commandQueue, final Resolution resolution, final Shortcuts shortcuts, final Commands commands, final CurrentSpellManager currentSpellManager, final GuiManager guiManager, final boolean debugGui) throws JXCSkinException
+ public JXCSkin load(final JXCSkinSource skinSource, final CrossfireServerConnection crossfireServerConnection, final JXCWindow window, final TooltipManager tooltipManager, final JXCWindowRenderer windowRenderer, final MouseTracker mouseTracker, final MetaserverModel metaserverModel, final CommandQueue commandQueue, final Resolution resolution, final Shortcuts shortcuts, final Commands commands, final CurrentSpellManager currentSpellManager, final GuiManager guiManager, final boolean debugGui, final Macros macros) throws JXCSkinException
{
imageParser = new ImageParser(skinSource);
fontParser = new FontParser(skinSource);
@@ -301,7 +303,7 @@
}
expressionParser = new ExpressionParser(selectedResolution);
- final GuiFactory guiFactory = new GuiFactory(debugGui ? mouseTracker : null, commands, guiManager);
+ final GuiFactory guiFactory = new GuiFactory(debugGui ? mouseTracker : null, commands, guiManager, macros);
skin = new DefaultJXCSkin(defaultKeyBindings, optionManager, stats, itemsManager, experienceTable, skillSet, expressionParser, selectedResolution, guiFactory);
JXCSkin skinToDetach = skin;
try
@@ -323,7 +325,7 @@
checkBoxFactory = null;
try
{
- load(skinSource, "global", crossfireServerConnection, window, tooltipManager, windowRenderer, metaserverModel, commandQueue, null, shortcuts, commands, currentSpellManager, guiManager);
+ load(skinSource, "global", crossfireServerConnection, window, tooltipManager, windowRenderer, metaserverModel, commandQueue, null, shortcuts, commands, currentSpellManager, guiManager, macros);
for (;;)
{
final String name = skin.getDialogToLoad();
@@ -332,7 +334,7 @@
break;
}
final Gui gui = skin.getDialog(name);
- load(skinSource, name, crossfireServerConnection, window, tooltipManager, windowRenderer, metaserverModel, commandQueue, gui, shortcuts, commands, currentSpellManager, guiManager);
+ load(skinSource, name, crossfireServerConnection, window, tooltipManager, windowRenderer, metaserverModel, commandQueue, gui, shortcuts, commands, currentSpellManager, guiManager, macros);
gui.setStateChanged(false);
}
}
@@ -378,9 +380,10 @@
* @param commands the commands instance for executing commands
* @param currentSpellManager the current spell manager to use
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
* @throws JXCSkinException if the file cannot be loaded
*/
- private void load(final JXCSkinSource skinSource, final String dialogName, final CrossfireServerConnection server, final JXCWindow window, final TooltipManager tooltipManager, final JXCWindowRenderer windowRenderer, final MetaserverModel metaserverModel, final CommandQueue commandQueue, final Gui gui, final Shortcuts shortcuts, final Commands commands, final CurrentSpellManager currentSpellManager, final GuiManager guiManager) throws JXCSkinException
+ private void load(final JXCSkinSource skinSource, final String dialogName, final CrossfireServerConnection server, final JXCWindow window, final TooltipManager tooltipManager, final JXCWindowRenderer windowRenderer, final MetaserverModel metaserverModel, final CommandQueue commandQueue, final Gui gui, final Shortcuts shortcuts, final Commands commands, final CurrentSpellManager currentSpellManager, final GuiManager guiManager, final Macros macros) throws JXCSkinException
{
String resourceName = dialogName+"@"+skin.getSelectedResolution()+".skin";
@@ -399,7 +402,7 @@
}
try
{
- load(skinSource, dialogName, resourceName, inputStream, server, window, tooltipManager, windowRenderer, metaserverModel, commandQueue, gui, shortcuts, commands, currentSpellManager, guiManager);
+ load(skinSource, dialogName, resourceName, inputStream, server, window, tooltipManager, windowRenderer, metaserverModel, commandQueue, gui, shortcuts, commands, currentSpellManager, guiManager, macros);
}
finally
{
@@ -438,9 +441,10 @@
* @param commands the commands instance for executing commands
* @param currentSpellManager the current spell manager to use
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
* @throws JXCSkinException if the file cannot be loaded
*/
- private void load(final JXCSkinSource skinSource, final String dialogName, final String resourceName, final InputStream inputStream, final CrossfireServerConnection server, final JXCWindow window, final TooltipManager tooltipManager, final JXCWindowRenderer windowRenderer, final MetaserverModel metaserverModel, final CommandQueue commandQueue, final Gui gui, final Shortcuts shortcuts, final Commands commands, final CurrentSpellManager currentSpellManager, final GuiManager guiManager) throws JXCSkinException
+ private void load(final JXCSkinSource skinSource, final String dialogName, final String resourceName, final InputStream inputStream, final CrossfireServerConnection server, final JXCWindow window, final TooltipManager tooltipManager, final JXCWindowRenderer windowRenderer, final MetaserverModel metaserverModel, final CommandQueue commandQueue, final Gui gui, final Shortcuts shortcuts, final Commands commands, final CurrentSpellManager currentSpellManager, final GuiManager guiManager, final Macros macros) throws JXCSkinException
{
final List<GUIElement> addedElements = new ArrayList<GUIElement>();
boolean addedElementsContainsWildcard = false;
@@ -494,11 +498,11 @@
}
else if (args[0].equals("commandlist"))
{
- parseCommandList(args, window, lnr, commands, commandQueue, server, guiManager);
+ parseCommandList(args, window, lnr, commands, commandQueue, server, guiManager, macros);
}
else if (args[0].equals("commandlist_add"))
{
- parseCommandListAdd(args, window, lnr, commands, commandQueue, server, guiManager);
+ parseCommandListAdd(args, window, lnr, commands, commandQueue, server, guiManager, macros);
}
else if (gui != null && args[0].equals("command_text"))
{
@@ -837,7 +841,7 @@
* @throws IOException if the command cannot be parsed
* @throws JXCSkinException if the command cannot be parsed
*/
- private void parseCommandList(final String[] args, final JXCWindow window, final LineNumberReader lnr, final Commands commands, final CommandQueue commandQueue, final CrossfireServerConnection server, final GuiManager guiManager) throws IOException, JXCSkinException
+ private void parseCommandList(final String[] args, final JXCWindow window, final LineNumberReader lnr, final Commands commands, final CommandQueue commandQueue, final CrossfireServerConnection server, final GuiManager guiManager, final Macros macros) throws IOException, JXCSkinException
{
if (args.length != 3 && args.length < 5)
{
@@ -850,7 +854,7 @@
if (args.length >= 5)
{
final GUIElement element = args[3].equals("null") ? null : skin.lookupGuiElement(args[3]);
- skin.addCommand(commandListName, args, 5, element, args[4], window, commands, lnr, commandQueue, server, guiManager);
+ skin.addCommand(commandListName, args, 5, element, args[4], window, commands, lnr, commandQueue, server, guiManager, macros);
}
}
@@ -863,10 +867,11 @@
* @param commandQueue the command queue to use
* @param server the server to use
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
* @throws IOException if the command cannot be parsed
* @throws JXCSkinException if the command cannot be parsed
*/
- private void parseCommandListAdd(final String[] args, final JXCWindow window, final LineNumberReader lnr, final Commands commands, final CommandQueue commandQueue, final CrossfireServerConnection server, final GuiManager guiManager) throws IOException, JXCSkinException
+ private void parseCommandListAdd(final String[] args, final JXCWindow window, final LineNumberReader lnr, final Commands commands, final CommandQueue commandQueue, final CrossfireServerConnection server, final GuiManager guiManager, final Macros macros) throws IOException, JXCSkinException
{
if (args.length < 4)
{
@@ -874,7 +879,7 @@
}
final GUIElement element = args[2].equals("null") ? null : skin.lookupGuiElement(args[2]);
- skin.addCommand(args[1], args, 4, element, args[3], window, commands, lnr, commandQueue, server, guiManager);
+ skin.addCommand(args[1], args, 4, element, args[3], window, commands, lnr, commandQueue, server, guiManager, macros);
}
/**
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/GuiManager.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -1,6 +1,7 @@
package com.realtime.crossfire.jxclient.window;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.gui.gui.Gui;
import com.realtime.crossfire.jxclient.gui.gui.GuiFactory;
import com.realtime.crossfire.jxclient.gui.gui.TooltipManager;
@@ -130,6 +131,11 @@
private final CrossfireServerConnection server;
/**
+ * The {@link Macros} instance to use.
+ */
+ private final Macros macros;
+
+ /**
* Called periodically to update the display contents.
*/
private final ActionListener actionListener = new ActionListener()
@@ -298,7 +304,7 @@
* @param settings the settings to use
* @param server the crossfire server connection to monitor
*/
- public GuiManager(final JXCWindow window, final boolean debugGui, final Object semaphoreDrawing, final Object semaphoreRedraw, final TooltipManager tooltipManager, final Settings settings, final CrossfireServerConnection server)
+ public GuiManager(final JXCWindow window, final boolean debugGui, final Object semaphoreDrawing, final Object semaphoreRedraw, final TooltipManager tooltipManager, final Settings settings, final CrossfireServerConnection server, final Macros macros)
{
this.debugGui = debugGui;
this.semaphoreDrawing = semaphoreDrawing;
@@ -306,6 +312,7 @@
this.tooltipManager = tooltipManager;
this.settings = settings;
this.server = server;
+ this.macros = macros;
mouseTracker = new MouseTracker(debugGui);
windowRenderer = new JXCWindowRenderer(window, mouseTracker, semaphoreRedraw, server);
window.addConnectionStateListener(guiStateListener);
@@ -315,8 +322,8 @@
@Deprecated
public void init(final ScriptManager scriptManager, final CommandQueue commandQueue, final CrossfireServerConnection server, final OptionManager optionManager)
{
- commands = new Commands(window, windowRenderer, commandQueue, server, scriptManager, optionManager, this);
- guiFactory = new GuiFactory(debugGui ? mouseTracker : null, commands, this);
+ commands = new Commands(window, windowRenderer, commandQueue, server, scriptManager, optionManager, this, macros);
+ guiFactory = new GuiFactory(debugGui ? mouseTracker : null, commands, this, macros);
windowRenderer.setCurrentGui(guiFactory.newGui());
queryDialog = guiFactory.newGui();
keybindDialog = guiFactory.newGui();
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/JXCWindow.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.window;
import com.realtime.crossfire.jxclient.animations.Animations;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.experience.ExperienceTable;
import com.realtime.crossfire.jxclient.faces.FaceCache;
import com.realtime.crossfire.jxclient.faces.FacesManager;
@@ -214,6 +215,11 @@
private final Object semaphoreStatus = new Object();
/**
+ * The {@link Macros} instance.
+ */
+ private final Macros macros;
+
+ /**
* The {@link WindowFocusListener} registered for this window. It resets
* the keyboard modifier state when the window loses the focus. The idea is
* to prevent the following: user switches from jxclient to another window
@@ -484,6 +490,7 @@
this.optionManager = optionManager;
this.metaserverModel = metaserverModel;
this.resolution = resolution;
+ macros = new Macros(server);
final FaceCache faceCache = new FaceCache(server);
experienceTable = new ExperienceTable(server);
skillSet = new SkillSet(server, this);
@@ -496,10 +503,10 @@
new PoisonWatcher(stats, server);
new ActiveSkillWatcher(stats, server);
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
- guiManager = new GuiManager(this, debugGui, semaphoreDrawing, semaphoreRedraw, new TooltipManager(this), settings, server);
+ guiManager = new GuiManager(this, debugGui, semaphoreDrawing, semaphoreRedraw, new TooltipManager(this), settings, server, macros);
final ScriptManager scriptManager = new ScriptManager(commandQueue, server, stats, itemsManager, spellsManager, mapUpdater, skillSet);
guiManager.init(scriptManager, commandQueue, server, optionManager);
- keybindingsManager = new KeybindingsManager(guiManager.getCommands(), guiManager);
+ keybindingsManager = new KeybindingsManager(guiManager.getCommands(), guiManager, macros);
shortcutsManager = new ShortcutsManager(commandQueue, spellsManager);
keyHandler = new KeyHandler(debugKeyboard, keybindingsManager, commandQueue, guiManager.getWindowRenderer(), keyHandlerListener);
try
@@ -693,7 +700,7 @@
{
// check for skin in directory
final File dir = new File(skinName);
- final KeyBindings defaultKeyBindings = new KeyBindings(null, guiManager.getCommands(), guiManager);
+ final KeyBindings defaultKeyBindings = new KeyBindings(null, guiManager.getCommands(), guiManager, macros);
final JXCSkinSource skinSource;
if (dir.exists() && dir.isDirectory())
{
@@ -705,7 +712,7 @@
skinSource = new JXCSkinClassSource("com/realtime/crossfire/jxclient/skins/"+skinName);
}
final JXCSkinLoader newSkin = new JXCSkinLoader(itemsManager, spellsManager, facesManager, stats, mapUpdater, defaultKeyBindings, optionManager, experienceTable, skillSet);
- return newSkin.load(skinSource, server, this, guiManager.getTooltipManager(), guiManager.getWindowRenderer(), guiManager.mouseTracker, metaserverModel, commandQueue, resolution, shortcutsManager.getShortcuts(), guiManager.getCommands(), currentSpellManager, guiManager, debugGui);
+ return newSkin.load(skinSource, server, this, guiManager.getTooltipManager(), guiManager.getWindowRenderer(), guiManager.mouseTracker, metaserverModel, commandQueue, resolution, shortcutsManager.getShortcuts(), guiManager.getCommands(), currentSpellManager, guiManager, debugGui, macros);
}
/**
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/KeybindingsManager.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/KeybindingsManager.java 2009-05-23 19:18:19 UTC (rev 11711)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/window/KeybindingsManager.java 2009-05-23 21:03:09 UTC (rev 11712)
@@ -20,6 +20,7 @@
package com.realtime.crossfire.jxclient.window;
import com.realtime.crossfire.jxclient.commands.Commands;
+import com.realtime.crossfire.jxclient.commands.Macros;
import com.realtime.crossfire.jxclient.gui.keybindings.KeyBindingState;
import com.realtime.crossfire.jxclient.gui.keybindings.KeyBindings;
import com.realtime.crossfire.jxclient.settings.Filenames;
@@ -43,6 +44,11 @@
private final GuiManager guiManager;
/**
+ * The {@link Macros} instance to use.
+ */
+ private final Macros macros;
+
+ /**
* The global key bindings.
*/
private final KeyBindings keyBindings;
@@ -63,12 +69,14 @@
* Creates a new instance.
* @param commands the commands instance to use
* @param guiManager the gui manager to use
+ * @param macros the macros instance to use
*/
- public KeybindingsManager(final Commands commands, final GuiManager guiManager)
+ public KeybindingsManager(final Commands commands, final GuiManager guiManager, final Macros macros)
{
this.commands = commands;
this.guiManager = guiManager;
- keyBindings = new KeyBindings(Filenames.getKeybindingsFile(null, null), commands, guiManager);
+ this.macros = macros;
+ keyBindings = new KeyBindings(Filenames.getKeybindingsFile(null, null), commands, guiManager, macros);
}
/**
@@ -142,7 +150,7 @@
*/
public void loadPerCharacterBindings(final String hostname, final String character)
{
- characterKeyBindings = new KeyBindings(Filenames.getKeybindingsFile(hostname, character), commands, guiManager);
+ characterKeyBindings = new KeyBindings(Filenames.getKeybindingsFile(hostname, character), commands, guiManager, macros);
try
{
characterKeyBindings.loadKeyBindings();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 19:18:20
|
Revision: 11711
http://crossfire.svn.sourceforge.net/crossfire/?rev=11711&view=rev
Author: akirschbaum
Date: 2009-05-23 19:18:19 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Do not store 'char' type keybindings as 'int's.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-23 19:15:28 UTC (rev 11710)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-23 19:18:19 UTC (rev 11711)
@@ -288,7 +288,7 @@
{
final KeyCharKeyBinding keyCharKeyBinding = (KeyCharKeyBinding)keyBinding;
bw.write("char ");
- bw.write(Integer.toString(keyCharKeyBinding.getKeyChar()));
+ bw.write(Character.toString(keyCharKeyBinding.getKeyChar()));
bw.write(' ');
bw.write(GUICommandFactory.encode(keyCharKeyBinding.getCommandString()));
bw.newLine();
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-23 19:15:28 UTC (rev 11710)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-23 19:18:19 UTC (rev 11711)
@@ -30,7 +30,7 @@
/**
* The key character to match.
*/
- private final int keyChar;
+ private final char keyChar;
/**
* Creates a {@link KeyBinding} that matches by key character.
@@ -49,7 +49,7 @@
* Returns the key character to match.
* @return the key character to match
*/
- public int getKeyChar()
+ public char getKeyChar()
{
return keyChar;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 19:15:36
|
Revision: 11710
http://crossfire.svn.sourceforge.net/crossfire/?rev=11710&view=rev
Author: akirschbaum
Date: 2009-05-23 19:15:28 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Update comments.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindingState.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindingState.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindingState.java 2009-05-23 19:09:07 UTC (rev 11709)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindingState.java 2009-05-23 19:15:28 UTC (rev 11710)
@@ -22,8 +22,7 @@
import com.realtime.crossfire.jxclient.window.GUICommandList;
/**
- * Manage the state for the key binding dialog.
- *
+ * Manages the state for the key binding dialog.
* @author Andreas Kirschbaum
*/
public class KeyBindingState
@@ -71,15 +70,12 @@
private char keyChar = '\0';
/**
- * Create a new instance.
- *
- * @param keyBindings The <code>KeyBindings</code> to modify; may be
- * <code>null</code> when removing bindings.
- *
- * @param keyBindings2 The <code>KeyBindings</code> to modify; only used
- * when removing bindings; may be <code>null</code> when removing bindings.
- *
- * @param commands The commands to bind, or <code>null</code> to unbind.
+ * Creates a new instance.
+ * @param keyBindings the <code>KeyBindings</code> to modify; may be
+ * <code>null</code> when removing bindings
+ * @param keyBindings2 the <code>KeyBindings</code> to modify; only used
+ * when removing bindings; may be <code>null</code> when removing bindings
+ * @param commands the commands to bind, or <code>null</code> to unbind
*/
public KeyBindingState(final KeyBindings keyBindings, final KeyBindings keyBindings2, final GUICommandList commands)
{
@@ -89,11 +85,9 @@
}
/**
- * Record a binding by key code.
- *
- * @param keyCode The key code that was pressed.
- *
- * @param modifiers The bindings that are active.
+ * Records a binding by key code.
+ * @param keyCode the key code that was pressed
+ * @param modifiers the bindings that are active
*/
public void keyPressed(final int keyCode, final int modifiers)
{
@@ -104,9 +98,8 @@
}
/**
- * Record a binding by key character.
- *
- * @param keyChar The key character that was typed.
+ * Records a binding by key character.
+ * @param keyChar the key character that was typed
*/
public void keyTyped(final char keyChar)
{
@@ -118,10 +111,9 @@
}
/**
- * Record a key released event.
- *
+ * Records a key released event.
* @return <code>true</code> if the dialog has finished, or
- * <code>false</code> if the dialog is still active.
+ * <code>false</code> if the dialog is still active
*/
public boolean keyReleased()
{
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-23 19:09:07 UTC (rev 11709)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-23 19:15:28 UTC (rev 11710)
@@ -23,7 +23,6 @@
/**
* A {@link KeyBinding} that matches by key character.
- *
* @author Andreas Kirschbaum
*/
public class KeyCharKeyBinding extends KeyBinding
@@ -34,14 +33,11 @@
private final int keyChar;
/**
- * Create a {@link KeyBinding} that matches by key character.
- *
- * @param keyChar The key character to match.
- *
- * @param commands The commands to associate with this binding.
- *
- * @param isDefault Whether the key binding is a "default" binding which
- * should not be saved.
+ * Creates a {@link KeyBinding} that matches by key character.
+ * @param keyChar the key character to match
+ * @param commands the commands to associate with this binding
+ * @param isDefault whether the key binding is a "default" binding which
+ * should not be saved
*/
public KeyCharKeyBinding(final char keyChar, final GUICommandList commands, final boolean isDefault)
{
@@ -50,9 +46,8 @@
}
/**
- * Return the key character to match.
- *
- * @return The key character to match.
+ * Returns the key character to match.
+ * @return the key character to match
*/
public int getKeyChar()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 19:09:16
|
Revision: 11709
http://crossfire.svn.sourceforge.net/crossfire/?rev=11709&view=rev
Author: akirschbaum
Date: 2009-05-23 19:09:07 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Update comments.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-23 19:02:34 UTC (rev 11708)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-23 19:09:07 UTC (rev 11709)
@@ -39,7 +39,6 @@
/**
* Manages a set of key bindings.
- *
* @author Andreas Kirschbaum
*/
public class KeyBindings
@@ -54,6 +53,9 @@
*/
private final GuiManager guiManager;
+ /**
+ * The active key bindings.
+ */
private final Set<KeyBinding> keybindings = new HashSet<KeyBinding>();
/**
@@ -87,9 +89,8 @@
}
/**
- * Return the file for saving the bindings; <code>null</code> to not save.
- *
- * @return The file.
+ * Returns the file for saving the bindings; <code>null</code> to not save.
+ * @return the file
*/
public File getFile()
{
@@ -97,16 +98,12 @@
}
/**
- * Add a key binding for a key code/modifiers pair.
- *
- * @param keyCode The key code for the key binding.
- *
- * @param modifiers The modifiers for the key binding.
- *
- * @param cmdlist The commands to associate to the key binding.
- *
- * @param isDefault Whether the key binding is a "default" binding which
- * should not be saved.
+ * Adds a key binding for a key code/modifiers pair.
+ * @param keyCode the key code for the key binding
+ * @param modifiers the modifiers for the key binding
+ * @param cmdlist the commands to associate to the key binding
+ * @param isDefault whether the key binding is a "default" binding which
+ * should not be saved
*/
public void addKeyBindingAsKeyCode(final int keyCode, final int modifiers, final GUICommandList cmdlist, final boolean isDefault)
{
@@ -114,14 +111,11 @@
}
/**
- * Add a key binding for a key character.
- *
- * @param keyChar The key character for the key binding.
- *
- * @param cmdlist The commands to associate to the key binding.
- *
- * @param isDefault Whether the key binding is a "default" binding which
- * should not be saved.
+ * Adds a key binding for a key character.
+ * @param keyChar the key character for the key binding
+ * @param cmdlist the commands to associate to the key binding
+ * @param isDefault whether the key binding is a "default" binding which
+ * should not be saved
*/
public void addKeyBindingAsKeyChar(final char keyChar, final GUICommandList cmdlist, final boolean isDefault)
{
@@ -129,7 +123,7 @@
}
/**
- * Add (or replace) a key binding.
+ * Adds (or replace) a key binding.
* @param keyBinding the key binding
*/
private void addKeyBinding(final KeyBinding keyBinding)
@@ -139,11 +133,9 @@
}
/**
- * Remove a key binding for a key code/modifiers pair.
- *
- * @param keyCode The key code of the key binding.
- *
- * @param modifiers The modifiers of the key binding.
+ * Removes a key binding for a key code/modifiers pair.
+ * @param keyCode the key code of the key binding
+ * @param modifiers the modifiers of the key binding
*/
public void deleteKeyBindingAsKeyCode(final int keyCode, final int modifiers)
{
@@ -151,9 +143,8 @@
}
/**
- * Remove a key binding for a key character.
- *
- * @param keyChar The key character of the key binding.
+ * Removes a key binding for a key character.
+ * @param keyChar the key character of the key binding
*/
public void deleteKeyBindingAsKeyChar(final char keyChar)
{
@@ -174,8 +165,8 @@
}
/**
- * Load the key bindings from the given file.
- * @throws IOException If the file cannot be read.
+ * Loads the key bindings from the given file.
+ * @throws IOException if the file cannot be read
*/
public void loadKeyBindings() throws IOException
{
@@ -246,9 +237,8 @@
}
/**
- * Save the key bindings to the given file.
- *
- * @throws IOException If the file cannot be written.
+ * Saves the key bindings to the given file.
+ * @throws IOException if the file cannot be written
*/
public void saveKeyBindings() throws IOException
{
@@ -326,14 +316,11 @@
}
/**
- * Find a key binding associated to a key code/modifiers pair.
- *
- * @param keyCode The key code to look up.
- *
- * @param modifiers The modifiers to look up.
- *
- * @return The key binding, or <code>null</code> if no key binding is
- * associated.
+ * Finds a key binding associated to a key code/modifiers pair.
+ * @param keyCode the key code to look up
+ * @param modifiers the modifiers to look up
+ * @return the key binding, or <code>null</code> if no key binding is
+ * associated
*/
private KeyBinding getKeyBindingAsKeyCode(final int keyCode, final int modifiers)
{
@@ -349,12 +336,10 @@
}
/**
- * Find a key binding associated to a key character.
- *
- * @param keyChar The key character to look up.
- *
- * @return The key binding, or <code>null</code> if no key binding is
- * associated.
+ * Finds a key binding associated to a key character.
+ * @param keyChar the key character to look up
+ * @return the key binding, or <code>null</code> if no key binding is
+ * associated
*/
private KeyBinding getKeyBindingAsKeyChar(final char keyChar)
{
@@ -370,14 +355,11 @@
}
/**
- * Parse and add a key binding.
- *
- * @param line The key binding to parse.
- *
- * @param isDefault Whether the key binding is a "default" binding which
- * should not be saved.
- *
- * @throws InvalidKeyBindingException If the key binding is invalid.
+ * Parses and add a key binding.
+ * @param line the key binding to parse
+ * @param isDefault whether the key binding is a "default" binding which
+ * should not be saved
+ * @throws InvalidKeyBindingException if the key binding is invalid
*/
public void parseKeyBinding(final String line, final boolean isDefault) throws InvalidKeyBindingException
{
@@ -445,11 +427,9 @@
}
/**
- * Execute a "key press" event.
- *
- * @param e The event to execute.
- *
- * @return Whether a matching key binding was found.
+ * Executes a "key press" event.
+ * @param e the event to execute
+ * @return whether a matching key binding was found
*/
public boolean handleKeyPress(final KeyEvent e)
{
@@ -457,11 +437,9 @@
}
/**
- * Execute a "key typed" event.
- *
- * @param e The event to execute.
- *
- * @return Whether a matching key binding was found.
+ * Executes a "key typed" event.
+ * @param e the event to execute
+ * @return whether a matching key binding was found
*/
public boolean handleKeyTyped(final KeyEvent e)
{
@@ -469,7 +447,7 @@
}
/**
- * Execute a {@link KeyBinding} instance.
+ * Executes a {@link KeyBinding} instance.
* @param keyBinding the key binding to execute; may be <code>null</code>
* @return whether <code>keyBinding</code> is not <code>null</code>
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 19:02:42
|
Revision: 11708
http://crossfire.svn.sourceforge.net/crossfire/?rev=11708&view=rev
Author: akirschbaum
Date: 2009-05-23 19:02:34 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Accelerate keybindings management.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-23 18:51:14 UTC (rev 11707)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyBindings.java 2009-05-23 19:02:34 UTC (rev 11708)
@@ -34,8 +34,8 @@
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
/**
* Manages a set of key bindings.
@@ -54,7 +54,7 @@
*/
private final GuiManager guiManager;
- private final List<KeyBinding> keybindings = new ArrayList<KeyBinding>();
+ private final Set<KeyBinding> keybindings = new HashSet<KeyBinding>();
/**
* Whether the contents of {@link #keybindings} have been modified from the
@@ -134,18 +134,6 @@
*/
private void addKeyBinding(final KeyBinding keyBinding)
{
- KeyBinding elected = null;
- for (final KeyBinding ok : keybindings)
- {
- if (ok.equals(keyBinding))
- {
- elected = ok;
- }
- }
- if (elected != null)
- {
- keybindings.remove(elected);
- }
keybindings.add(keyBinding);
modified = true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 18:51:22
|
Revision: 11707
http://crossfire.svn.sourceforge.net/crossfire/?rev=11707&view=rev
Author: akirschbaum
Date: 2009-05-23 18:51:14 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Fix equals().
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-23 18:50:18 UTC (rev 11706)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-23 18:51:14 UTC (rev 11707)
@@ -63,7 +63,7 @@
@Override
public boolean equals(final Object obj)
{
- if (!(obj instanceof KeyCharKeyBinding))
+ if (obj == null || !(obj instanceof KeyCharKeyBinding))
{
return false;
}
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java 2009-05-23 18:50:18 UTC (rev 11706)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java 2009-05-23 18:51:14 UTC (rev 11707)
@@ -81,7 +81,7 @@
@Override
public boolean equals(final Object obj)
{
- if (!(obj instanceof KeyCodeKeyBinding))
+ if (obj == null || !(obj instanceof KeyCodeKeyBinding))
{
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 18:50:27
|
Revision: 11706
http://crossfire.svn.sourceforge.net/crossfire/?rev=11706&view=rev
Author: akirschbaum
Date: 2009-05-23 18:50:18 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Simplify code.
Modified Paths:
--------------
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-23 04:30:59 UTC (rev 11705)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCharKeyBinding.java 2009-05-23 18:50:18 UTC (rev 11706)
@@ -63,15 +63,13 @@
@Override
public boolean equals(final Object obj)
{
- if (obj instanceof KeyCharKeyBinding)
+ if (!(obj instanceof KeyCharKeyBinding))
{
- final KeyCharKeyBinding keyBinding = (KeyCharKeyBinding)obj;
- return keyBinding.getKeyChar() == keyChar;
- }
- else
- {
return false;
}
+
+ final KeyCharKeyBinding keyBinding = (KeyCharKeyBinding)obj;
+ return keyBinding.getKeyChar() == keyChar;
}
/** {@inheritDoc} */
Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java 2009-05-23 04:30:59 UTC (rev 11705)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/gui/keybindings/KeyCodeKeyBinding.java 2009-05-23 18:50:18 UTC (rev 11706)
@@ -81,15 +81,13 @@
@Override
public boolean equals(final Object obj)
{
- if (obj instanceof KeyCodeKeyBinding)
+ if (!(obj instanceof KeyCodeKeyBinding))
{
- final KeyCodeKeyBinding keyBinding = (KeyCodeKeyBinding)obj;
- return keyBinding.getKeyCode() == keyCode && keyBinding.getModifiers() == modifiers;
- }
- else
- {
return false;
}
+
+ final KeyCodeKeyBinding keyBinding = (KeyCodeKeyBinding)obj;
+ return keyBinding.getKeyCode() == keyCode && keyBinding.getModifiers() == modifiers;
}
/** {@inheritDoc} */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 04:31:16
|
Revision: 11705
http://crossfire.svn.sourceforge.net/crossfire/?rev=11705&view=rev
Author: kbulgrien
Date: 2009-05-23 04:30:59 +0000 (Sat, 23 May 2009)
Log Message:
-----------
- Update lobotomy, caelestis, and chthonic notes to mention the swapping of
critical and normal message panel positions due to chat, tell, and say
message routing to the critical panel.
Modified Paths:
--------------
client/trunk/ChangeLog
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2009-05-23 04:26:25 UTC (rev 11704)
+++ client/trunk/ChangeLog 2009-05-23 04:30:59 UTC (rev 11705)
@@ -18,12 +18,16 @@
related stat bars in a small area, while tending to avoid the width problems
that can so easily crop up with the stat bar numeric data. Another notable
change is that all notebooks except the map/magic map notebook are gone.
+ The critical and normal message panels have swapped positions to put chat,
+ tell, and say messages closer to the command entry box.
gtk-v2/glade/AUTHORS: The lobotomy.glade section has been updated to match the
changes made to the layout.
gtk-v2/glade/caelestis.glade
gtk-v2/glade/chthonic.glade: Glade3 Designer apparently does not work well
with single column tables, so a vbox was substituted to avoid misbehavior in
- the designer. The presentation to the player is basically unchanged.
+ the designer. The presentation to the player is basically unchanged except
+ the critical and normal message panels have swapped positions to put chat,
+ tell, and say messages closer to the command entry box.
Kevin Bulgrien 2009/05/22
gtk-v2/glade/caelestis.glade
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 04:26:56
|
Revision: 11704
http://crossfire.svn.sourceforge.net/crossfire/?rev=11704&view=rev
Author: kbulgrien
Date: 2009-05-23 04:26:25 +0000 (Sat, 23 May 2009)
Log Message:
-----------
- This update supports recent client code changes to widget count and names.
- The stat bar display is moderately reorganized to allow very long experience
data to be covered by the neighboring hpane panel as needed.
- The critical and normal message panels have swapped positions due to recent
use of the critical panel for chat, tell, and say messages (placed nearer
the command entry control).
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/gtk-v2/glade/eureka.glade
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2009-05-23 03:59:15 UTC (rev 11703)
+++ client/trunk/ChangeLog 2009-05-23 04:26:25 UTC (rev 11704)
@@ -1,6 +1,12 @@
"$Id$"
Top of SVN tree:
------------------------------------------------------------------------------
+gtk-v2/glade/eureka.glade: This update supports recent client code changes.
+ The stat bar display is moderately reorganized to allow very long experience
+ data to be covered by the neighboring hpane panel as needed. The critical
+ and normal message panels have swapped positions due to recent use of the
+ critical panel for chat, tell, and say messages (placed nearer the command
+ entry control).
gtk-v2/glade/lobotomy.glade: This update includes both stylistic changes and
updates to support recent client code changes. Though the lobotomy layout
was unique in certain respects, the notorious skills and stats carry-overs
Modified: client/trunk/gtk-v2/glade/eureka.glade
===================================================================
--- client/trunk/gtk-v2/glade/eureka.glade 2009-05-23 03:59:15 UTC (rev 11703)
+++ client/trunk/gtk-v2/glade/eureka.glade 2009-05-23 04:26:25 UTC (rev 11704)
@@ -1,2626 +1,2379 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0"?>
<glade-interface>
-
-<widget class="GtkWindow" id="window_root">
- <property name="width_request">1180</property>
- <property name="height_request">925</property>
- <property name="title" translatable="yes">Crossfire Client - GTK v2</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <signal name="key_press_event" handler="keyfunc" object="window_root" last_modification_time="Wed, 16 Feb 2005 08:21:55 GMT"/>
- <signal name="key_release_event" handler="keyrelfunc" object="window_root" last_modification_time="Wed, 16 Feb 2005 08:25:13 GMT"/>
- <signal name="destroy" handler="on_window_destroy_event" last_modification_time="Mon, 21 Aug 2006 07:42:55 GMT"/>
-
- <child>
- <widget class="GtkVBox" id="vbox_all">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox_menubar">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
- <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
- <child>
- <widget class="GtkMenuItem" id="menuitem1">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="quit_character1">
- <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" last_modification_time="Tue, 17 Feb 2004 07:38:57 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="quit2">
- <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" last_modification_time="Sun, 27 Feb 2005 06:56:16 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="client1">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="configure1">
- <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" last_modification_time="Mon, 27 Feb 2006 06:36:42 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="disconnect">
- <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" last_modification_time="Sun, 19 Feb 2006 03:54:57 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="keybindings">
- <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" last_modification_time="Sun, 19 Feb 2006 03:55:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="save_window_position">
- <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" last_modification_time="Sat, 11 Mar 2006 08:03:20 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="menu_player">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Player</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="menu_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" last_modification_time="Tue, 21 Feb 2006 06:32:21 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="pickup1">
- <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">
-
- <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>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_dont_pickup_activate" last_modification_time="Sun, 17 Apr 2005 05:04:52 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="stop_before_pickup1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Stop Before Pickup</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_stop_before_pickup_activate" last_modification_time="Sun, 17 Apr 2005 05:04:52 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="armor1">
- <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">
-
- <child>
- <widget class="GtkCheckMenuItem" id="body_armor1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Body Armor</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_body_armor_activate" last_modification_time="Sun, 17 Apr 2005 05:21:18 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="boots1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Boots</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_boots_activate" last_modification_time="Sun, 17 Apr 2005 05:22:10 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="cloaks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Cloaks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_cloaks_activate" last_modification_time="Sun, 17 Apr 2005 05:22:10 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="gloves1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Gloves</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_gloves_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="helmets1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Helmets</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_helmets_activate" last_modification_time="Sun, 17 Apr 2005 05:20:39 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="shields1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Shields</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_shields_activate" last_modification_time="Sun, 17 Apr 2005 05:21:18 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="books1">
- <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">
-
- <child>
- <widget class="GtkCheckMenuItem" id="skillscrolls1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Skillscrolls</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_skillscrolls_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="normal_book_scrolls1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Normal Books & Scrolls</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_normal_book_scrolls_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="spellbooks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Spellbooks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_spellbooks_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="drinks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Drinks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_drinks_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="food1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Food</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_food_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="flesh1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Flesh</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_flesh_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="keys1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Keys</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_keys_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="magical_items">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Magical Items</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_magical_items_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="potions">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Potions</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_potions_activate" last_modification_time="Sun, 17 Apr 2005 06:08:54 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="valuables">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Valuables (Money & Gems)</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_valuables_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="wands_rods_horns">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Wands/Rods/Horns</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_wands_rods_horns_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="jewels1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Jewels</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_jewels_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="weapons1">
- <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">
-
- <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>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_all_weapons_activate" last_modification_time="Sun, 17 Apr 2005 05:14:33 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="missile_weapons1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Missile Weapons</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_missile_weapons_activate" last_modification_time="Sun, 17 Apr 2005 05:14:33 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="bows1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bows</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_bows_activate" last_modification_time="Sun, 17 Apr 2005 05:19:16 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="arrows1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Arrows</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_arrows_activate" last_modification_time="Sun, 17 Apr 2005 05:19:31 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="weight/value_1">
- <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">
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_pickup_off1">
- <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" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 5</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 10</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_15">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 15</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_20">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 20</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_25">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 25</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_30">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 30</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_35">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 35</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_40">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 40</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_45">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 45</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_50">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 50</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="not_cursed1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ignore cursed</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_not_cursed_activate" last_modification_time="Tue, 01 Nov 2005 12:47:52 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="menuitem4">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="about1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_About</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="menu_about" last_modification_time="Tue, 17 Feb 2004 07:42:22 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="fire_on">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="run_on">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="filler">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_main_stats">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">750</property>
-
- <child>
- <widget class="GtkHPaned" id="hpaned_inv_other">
- <property name="width_request">1275</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">320</property>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_inv_floor">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">550</property>
-
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Inventory:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">10</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_inv_weight">
- <property name="visible">True</property>
- <property name="label" translatable="yes">0/0</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">15</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Count</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="spinbutton_count">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">0 0 1000000 1 0 0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkNotebook" id="notebook_inv">
- <property name="visible">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
- <signal name="switch_page" handler="on_notebook_switch_page" last_modification_time="Sat, 26 Feb 2005 08:20:46 GMT"/>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow6">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkTable" id="inv_table">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="n_rows">11</property>
- <property name="n_columns">10</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
- <signal name="expose_event" handler="on_inv_table_expose_event" last_modification_time="Mon, 28 Feb 2005 00:38:27 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label80">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Icons</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="border_width">3</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">You see:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="treeview_look">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal name="row_collapsed" handler="list_row_collapse" last_modification_time="Sun, 27 Feb 2005 09:03:02 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHPaned" id="hpaned_map_msg">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">570</property>
-
- <child>
- <widget class="GtkNotebook" id="map_notebook">
- <property name="border_width">2</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">False</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
-
- <child>
- <widget class="GtkTable" id="table_map">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
-
- <child>
- <widget class="GtkDrawingArea" id="drawingarea_map">
- <property name="width_request">550</property>
- <property name="height_request">600</property>
- <property name="visible">True</property>
- <signal name="expose_event" handler="on_drawingarea_map_expose_event" last_modification_time="Thu, 17 Feb 2005 07:13:46 GMT"/>
- <signal name="button_press_event" handler="on_drawingarea_map_button_press_event" last_modification_time="Mon, 28 Feb 2005 06:06:11 GMT"/>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_map_recenter">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</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="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVScrollbar" id="vscrollbar_map">
- <property name="visible">True</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">50 0 100 0 0 0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHScrollbar" id="hscrollbar_map">
- <property name="visible">True</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">50 0 100 1 0 0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label46">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Map</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkDrawingArea" id="drawingarea_magic_map">
- <property name="visible">True</property>
- <signal name="expose_event" handler="on_drawingarea_magic_map_expose_event" last_modification_time="Wed, 06 Apr 2005 06:35:33 GMT"/>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label47">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Magic Map</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox_info_entry">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_msg_cmd">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">200</property>
-
- <child>
- <widget class="GtkFrame" id="frame_critical_messages">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_textview2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview_info2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">False</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_critical_messages">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Critical Messages</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">3</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame_messages">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_textview1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview_info1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">False</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label107">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Messages</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">3</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_commands">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- <signal name="activate" handler="on_entry_commands_activate" last_modification_time="Tue, 15 Feb 2005 08:26:01 GMT"/>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHPaned" id="hpaned_statbar_stats">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">450</property>
-
- <child>
- <widget class="GtkTable" id="table4">
- <property name="visible">True</property>
- <property name="n_rows">6</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">4</property>
- <property name="column_spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label_stats_hp">
- <property name="visible">True</property>
- <property name="label" translatable="yes">HP: 0/0</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">expand|shrink</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_stats_sp">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Spell Points: 0/0</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property...
[truncated message content] |
|
From: Crossfire C. r. messages.
<cro...@li...> - 2009-05-23 03:59:28
|
Revision: 11703
http://crossfire.svn.sourceforge.net/crossfire/?rev=11703&view=rev
Author: kbulgrien
Date: 2009-05-23 03:59:15 +0000 (Sat, 23 May 2009)
Log Message:
-----------
- This update includes both stylistic changes to lobotomy.glade and updates to
support recent client code changes. Though the lobotomy layout was unique
in certain respects, the notorious skills and stats carry-overs from the
original gtk-v2 layout were ugly. This commit introduces statistic panels
that are completely unique. The skills and protections areas still take up
the bulk of the bottom row, but they are designed to better avoid the
overlap that so easily occurs in gtk-v2. A stats cluster in the bottom
right corner explores a new method of organizing all character stats and any
related stat bars in a small area, while tending to avoid the width problems
that can so easily crop up with the stat bar numeric data. Another notable
change is that all notebooks except the map/magic map notebook are gone.
- The AUTHORS file is updated to describe the changes above.
Modified Paths:
--------------
client/trunk/ChangeLog
client/trunk/gtk-v2/glade/AUTHORS
client/trunk/gtk-v2/glade/lobotomy.glade
Modified: client/trunk/ChangeLog
===================================================================
--- client/trunk/ChangeLog 2009-05-23 02:16:07 UTC (rev 11702)
+++ client/trunk/ChangeLog 2009-05-23 03:59:15 UTC (rev 11703)
@@ -1,6 +1,24 @@
"$Id$"
Top of SVN tree:
------------------------------------------------------------------------------
+gtk-v2/glade/lobotomy.glade: This update includes both stylistic changes and
+ updates to support recent client code changes. Though the lobotomy layout
+ was unique in certain respects, the notorious skills and stats carry-overs
+ from the original gtk-v2 layout were ugly. This commit introduces statistic
+ panels that are completely unique. The skills and protections areas still
+ take up the bulk of the bottom row, but they are designed to better avoid
+ the overlap that so easily occurs in gtk-v2. A stats cluster in the bottom
+ right corner explores a new method of organizing all character stats and any
+ related stat bars in a small area, while tending to avoid the width problems
+ that can so easily crop up with the stat bar numeric data. Another notable
+ change is that all notebooks except the map/magic map notebook are gone.
+gtk-v2/glade/AUTHORS: The lobotomy.glade section has been updated to match the
+ changes made to the layout.
+gtk-v2/glade/caelestis.glade
+gtk-v2/glade/chthonic.glade: Glade3 Designer apparently does not work well
+ with single column tables, so a vbox was substituted to avoid misbehavior in
+ the designer. The presentation to the player is basically unchanged.
+Kevin Bulgrien 2009/05/22
gtk-v2/glade/caelestis.glade
gtk-v2/glade/chthonic.glade
Modified: client/trunk/gtk-v2/glade/AUTHORS
===================================================================
--- client/trunk/gtk-v2/glade/AUTHORS 2009-05-23 02:16:07 UTC (rev 11702)
+++ client/trunk/gtk-v2/glade/AUTHORS 2009-05-23 03:59:15 UTC (rev 11703)
@@ -74,10 +74,16 @@
- lobotomy.glade A layout of a slightly different persuasion. This one
sports a map layout on the left. To the right sit the
inventory/ground view and message panes. Underscoring
- this unconventional view sit the stat bars and tabbed
- notebook common to many of these layouts. The window
- defaults are set at 1280x925, and sport a map pane of
- 19x22.
+ this unconventional view is a unique cluster of stats
+ and stat bars not seen in other client layouts. Too
+ round out the uniqueness of this layout, the skill and
+ protections data is laid out below the map in a manner
+ that tends to allow the oversized skills data table to
+ expand naturally while the narrower protections panel
+ shrinks to the data it contains. Unlike many of the
+ other layouts, tabbed notebooks are avoided except in
+ the map panel. Window defaults are set at 1280x925,
+ and sport a map pane of 19x22.
- meflin.glade A player-suggested modification of an experimental
layout. Send in a suggestion, and you might have a
Modified: client/trunk/gtk-v2/glade/lobotomy.glade
===================================================================
--- client/trunk/gtk-v2/glade/lobotomy.glade 2009-05-23 02:16:07 UTC (rev 11702)
+++ client/trunk/gtk-v2/glade/lobotomy.glade 2009-05-23 03:59:15 UTC (rev 11703)
@@ -1,2630 +1,2636 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0"?>
<glade-interface>
-
-<widget class="GtkWindow" id="window_root">
- <property name="width_request">1280</property>
- <property name="height_request">925</property>
- <property name="title" translatable="yes">Crossfire Client - GTK v2</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">1280</property>
- <property name="default_height">925</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <signal name="key_press_event" handler="keyfunc" object="window_root" last_modification_time="Wed, 16 Feb 2005 08:21:55 GMT"/>
- <signal name="key_release_event" handler="keyrelfunc" object="window_root" last_modification_time="Wed, 16 Feb 2005 08:25:13 GMT"/>
- <signal name="destroy" handler="on_window_destroy_event" last_modification_time="Mon, 21 Aug 2006 07:42:55 GMT"/>
-
- <child>
- <widget class="GtkVBox" id="vbox_all">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox_menubar">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
- <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
- <child>
- <widget class="GtkMenuItem" id="menuitem1">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="quit_character1">
- <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" last_modification_time="Tue, 17 Feb 2004 07:38:57 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="quit2">
- <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" last_modification_time="Sun, 27 Feb 2005 06:56:16 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="client1">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="configure1">
- <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" last_modification_time="Mon, 27 Feb 2006 06:36:42 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="disconnect">
- <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" last_modification_time="Sun, 19 Feb 2006 03:54:57 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="keybindings">
- <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" last_modification_time="Sun, 19 Feb 2006 03:55:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="save_window_position">
- <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" last_modification_time="Sat, 11 Mar 2006 08:03:20 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="menu_player">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Player</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="menu_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" last_modification_time="Tue, 21 Feb 2006 06:32:21 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="pickup1">
- <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">
-
- <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>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_dont_pickup_activate" last_modification_time="Sun, 17 Apr 2005 05:04:52 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="stop_before_pickup1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Stop Before Pickup</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_stop_before_pickup_activate" last_modification_time="Sun, 17 Apr 2005 05:04:52 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="armor1">
- <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">
-
- <child>
- <widget class="GtkCheckMenuItem" id="body_armor1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Body Armor</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_body_armor_activate" last_modification_time="Sun, 17 Apr 2005 05:21:18 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="boots1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Boots</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_boots_activate" last_modification_time="Sun, 17 Apr 2005 05:22:10 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="cloaks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Cloaks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_cloaks_activate" last_modification_time="Sun, 17 Apr 2005 05:22:10 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="gloves1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Gloves</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_gloves_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="helmets1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Helmets</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_helmets_activate" last_modification_time="Sun, 17 Apr 2005 05:20:39 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="shields1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Shields</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_shields_activate" last_modification_time="Sun, 17 Apr 2005 05:21:18 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="books1">
- <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">
-
- <child>
- <widget class="GtkCheckMenuItem" id="skillscrolls1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Skillscrolls</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_skillscrolls_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="normal_book_scrolls1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Normal Books & Scrolls</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_normal_book_scrolls_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="spellbooks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Spellbooks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_spellbooks_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="drinks1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Drinks</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_drinks_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="food1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Food</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_food_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="flesh1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Flesh</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_flesh_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="keys1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Keys</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_keys_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="magical_items">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Magical Items</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_magical_items_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="potions">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Potions</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_potions_activate" last_modification_time="Sun, 17 Apr 2005 06:08:54 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="valuables">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Valuables (Money & Gems)</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_valuables_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="wands_rods_horns">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Wands/Rods/Horns</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_wands_rods_horns_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="jewels1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Jewels</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_jewels_activate" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="weapons1">
- <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">
-
- <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>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_all_weapons_activate" last_modification_time="Sun, 17 Apr 2005 05:14:33 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="missile_weapons1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Missile Weapons</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_missile_weapons_activate" last_modification_time="Sun, 17 Apr 2005 05:14:33 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="bows1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bows</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_bows_activate" last_modification_time="Sun, 17 Apr 2005 05:19:16 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="arrows1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Arrows</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_arrows_activate" last_modification_time="Sun, 17 Apr 2005 05:19:31 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="weight/value_1">
- <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">
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_pickup_off1">
- <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" last_modification_time="Sun, 17 Apr 2005 05:34:34 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 5</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 10</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_15">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 15</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_20">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 20</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_25">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 25</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_30">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 30</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_35">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 35</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_40">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 40</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_45">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 45</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkRadioMenuItem" id="ratio_50">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ratio >= 50</property>
- <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" last_modification_time="Sun, 17 Apr 2005 05:08:21 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkCheckMenuItem" id="not_cursed1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ignore cursed</property>
- <property name="use_underline">True</property>
- <property name="active">False</property>
- <signal name="activate" handler="on_menu_not_cursed_activate" last_modification_time="Tue, 01 Nov 2005 12:47:52 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="menuitem4">
- <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">
-
- <child>
- <widget class="GtkMenuItem" id="about1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_About</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="menu_about" last_modification_time="Tue, 17 Feb 2004 07:42:22 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="fire_on">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="run_on">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="filler">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_main_stats">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">740</property>
-
- <child>
- <widget class="GtkHPaned" id="hpaned_map_other">
- <property name="width_request">1601</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">620</property>
-
- <child>
- <widget class="GtkNotebook" id="map_notebook">
- <property name="border_width">2</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">False</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
-
- <child>
- <widget class="GtkTable" id="table_map">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
-
- <child>
- <widget class="GtkDrawingArea" id="drawingarea_map">
- <property name="width_request">600</property>
- <property name="height_request">600</property>
- <property name="visible">True</property>
- <signal name="expose_event" handler="on_drawingarea_map_expose_event" last_modification_time="Thu, 17 Feb 2005 07:13:46 GMT"/>
- <signal name="button_press_event" handler="on_drawingarea_map_button_press_event" last_modification_time="Mon, 28 Feb 2005 06:06:11 GMT"/>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_map_recenter">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</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="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVScrollbar" id="vscrollbar_map">
- <property name="visible">True</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">50 0 100 0 0 0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHScrollbar" id="hscrollbar_map">
- <property name="visible">True</property>
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="inverted">False</property>
- <property name="adjustment">50 0 100 1 0 0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label46">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Map</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkDrawingArea" id="drawingarea_magic_map">
- <property name="visible">True</property>
- <signal name="expose_event" handler="on_drawingarea_magic_map_expose_event" last_modification_time="Wed, 06 Apr 2005 06:35:33 GMT"/>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label47">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Magic Map</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHPaned" id="hpaned_inv_msg">
- <property name="border_width">3</property>
- <property name="width_request">0</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">335</property>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_inv_floor">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">550</property>
-
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Inventory:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">10</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_inv_weight">
- <property name="visible">True</property>
- <property name="label" translatable="yes">0/0</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">15</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Count</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkSpinButton" id="spinbutton_count">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">True</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">0 0 1000000 1 0 0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkNotebook" id="notebook_inv">
- <property name="visible">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
- <signal name="switch_page" handler="on_notebook_switch_page" last_modification_time="Sat, 26 Feb 2005 08:20:46 GMT"/>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow6">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkTable" id="inv_table">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="n_rows">11</property>
- <property name="n_columns">10</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
- <signal name="expose_event" handler="on_inv_table_expose_event" last_modification_time="Mon, 28 Feb 2005 00:38:27 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label80">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Icons</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="border_width">3</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes">You see:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="treeview_look">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- <signal name="row_collapsed" handler="list_row_collapse" last_modification_time="Sun, 27 Feb 2005 09:03:02 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox_info_entry">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVPaned" id="vpaned_msg_cmd">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">200</property>
-
- <child>
- <widget class="GtkFrame" id="frame_critical_messages">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_textview2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview_info2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">False</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_critical_messages">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Critical Messages</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">3</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame_messages">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_textview1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview_info1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">False</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label107">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Messages</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">3</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_commands">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- <signal name="activate" handler="on_entry_commands_activate" last_modification_time="Tue, 15 Feb 2005 08:26:01 GMT"/>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
- </packing>
- </child>
- </widget>
- <p...
[truncated message content] |
