Skip to content

Commit

Permalink
ADDED logic to object action GUI
Browse files Browse the repository at this point in the history
  • Loading branch information
@ksterker
ksterker committed Jul 25, 2010
1 parent 13ca701 commit 550b632
Show file tree
Hide file tree
Showing 6 changed files with 840 additions and 350 deletions.
2 changes: 2 additions & 0 deletions src/mapedit/Makefile.am
View file
Expand Up @@ -18,6 +18,7 @@ noinst_HEADERS = \
gui_mapedit_events.h \
gui_mapview.h \
gui_mapview_events.h \
gui_script_selector.h \
gui_renderheight.h \
gui_zone.h \
gui_zone_dialog.h \
Expand All @@ -38,6 +39,7 @@ mapedit_SOURCES = \
gui_mapedit_events.cc \
gui_mapview.cc \
gui_mapview_events.cc \
gui_script_selector.cc \
gui_renderheight.cc \
gui_zone.cc \
gui_zone_dialog.cc \
Expand Down
21 changes: 7 additions & 14 deletions src/mapedit/entity-properties.glade
View file
Expand Up @@ -356,9 +356,9 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkVBox" id="hbox3">
<property name="visible">True</property>
<property name="spacing">2</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
Expand All @@ -385,7 +385,7 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="lbl_args">
<object class="GtkLabel" id="lbl_args_0">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Arguments</property>
Expand All @@ -394,11 +394,10 @@
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_args">
<object class="GtkEntry" id="entry_args_0">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
Expand All @@ -408,7 +407,6 @@
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
Expand All @@ -425,8 +423,6 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
Expand All @@ -438,16 +434,14 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="combobox1">
<object class="GtkComboBox" id="cb_methods">
<property name="visible">True</property>
<property name="model">script_methods</property>
<child>
<object class="GtkCellRendererText" id="cb_schedule_rndr2"/>
<object class="GtkCellRendererText" id="cb_methods_rndr"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
Expand All @@ -458,8 +452,6 @@
<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">GTK_FILL</property>
</packing>
</child>
</object>
Expand All @@ -475,6 +467,7 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
Expand Down

0 comments on commit 550b632

Please sign in to comment.