Commit d8606a56 authored by Murray Cumming's avatar Murray Cumming
Browse files

Remove GtkHandleBox from the .glade file too.

* ui/developer/window_print_layout_edit.glade:
* glom/mode_design/print_layouts/window_print_layout_edit.[h|cc]:
Use a GtkBox instead of a GtkHandleBox.
parent 6e78d9b2
2011-10-27 Murray Cumming <murrayc@murrayc.com>
Remove GtkHandleBox from the .glade file too.
* ui/developer/window_print_layout_edit.glade:
* glom/mode_design/print_layouts/window_print_layout_edit.[h|cc]:
Use a GtkBox instead of a GtkHandleBox.
2011-10-26 Murray Cumming <murrayc@murrayc.com>
Add and move #includes for the latest glibmm.
......
......@@ -139,7 +139,7 @@ AS_IF([test "x$glom_host_win32" != xyes],
[REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.4.0"])
# Libraries used by Glom:
REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-3.0 >= 3.0.0 goocanvasmm-2.0 >= 1.90.6 evince-view-3.0"
REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-3.0 >= 3.0.0 goocanvasmm-2.0 >= 1.90.8 evince-view-3.0"
# Do not require iso-codes in client-only mode, or on Windows:
# TODO: Package iso-codes for Windows?
......
......@@ -132,7 +132,7 @@ Window_PrintLayout_Edit::Window_PrintLayout_Edit(BaseObjectType* cobject, const
gimp_ruler_set_unit(m_hruler, GIMP_UNIT_MM);
gimp_ruler_set_unit(m_vruler, GIMP_UNIT_MM);
builder->get_widget("handle_box", m_palette_handle_box);
builder->get_widget("toolpalette_box", m_palette_box);
builder->get_widget("button_close", m_button_close);
......@@ -163,7 +163,7 @@ Window_PrintLayout_Edit::Window_PrintLayout_Edit(BaseObjectType* cobject, const
init_menu();
m_palette_handle_box->add(m_toolbar);
m_palette_box->add(m_toolbar); //TODO: Just put the GtkToolPalette in the glade file and use get_widget_derived()?
m_toolbar.show();
m_scrolled_window.get_hadjustment()->signal_changed().connect(
......
......@@ -197,7 +197,7 @@ private:
m_action_align_left, m_action_align_right;
//Toolbar:
Gtk::Bin* m_palette_handle_box; //TODO: The toolbar is already a HandleBox. //TODO: Remove the HandleBox from the .glade file.
Gtk::Box* m_palette_box;
std::vector<Gtk::TargetEntry> m_drag_targets_all;
PrintLayoutToolbar m_toolbar;
......
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="window_print_layout_edit">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Print Layout Editor</property>
......@@ -262,6 +262,7 @@
<child>
<object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
......@@ -290,13 +291,14 @@
</packing>
</child>
<child>
<object class="GtkHandleBox" id="handle_box">
<object class="GtkBox" id="toolpalette_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="handle_position">right</property>
<property name="snap_edge">right</property>
<property name="snap_edge_set">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment