Merge branch '#103_objects_doubleclick' into develop

This commit is contained in:
Kolan Sh 2016-02-26 16:15:32 +03:00
commit 6efa22c4c8
2 changed files with 15 additions and 4 deletions

View File

@ -161,16 +161,26 @@ namespace LAview.Desktop {
return indices; return indices;
} }
[CCode (instance_pos = -1)] void compose_object () {
public void action_compose_activate (Gtk.Action action) {
var t_indices = get_template_indices (); var t_indices = get_template_indices ();
var o_indices = get_objects_indices (); var o_indices = get_objects_indices ();
if (t_indices.length != 0 && o_indices.length != 0) { if (t_indices.length != 0 && o_indices.length != 0)
AppCore.core.compose_object (t_indices[0], o_indices[0]); AppCore.core.compose_object (t_indices[0], o_indices[0]);
}
statusbar_show (_("After composing all objects print the document.")); statusbar_show (_("After composing all objects print the document."));
} }
[CCode (instance_pos = -1)]
public void action_compose_activate (Gtk.Action action) {
compose_object();
}
[CCode (instance_pos = -1)]
public void objects_activated (Gtk.TreeView treeview,
Gtk.TreePath path,
Gtk.TreeViewColumn column) {
compose_object();
}
[CCode (instance_pos = -1)] [CCode (instance_pos = -1)]
public void action_edit_result_activate (Gtk.Action action) { public void action_edit_result_activate (Gtk.Action action) {
var indices = get_template_indices(); var indices = get_template_indices();

View File

@ -988,6 +988,7 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="model">liststore_objects</property> <property name="model">liststore_objects</property>
<signal name="cursor-changed" handler="laview_desktop_main_window_objects_cursor_changed" swapped="no"/> <signal name="cursor-changed" handler="laview_desktop_main_window_objects_cursor_changed" swapped="no"/>
<signal name="row-activated" handler="laview_desktop_main_window_objects_activated" swapped="no"/>
<child internal-child="selection"> <child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection_objects"/> <object class="GtkTreeSelection" id="treeview-selection_objects"/>
</child> </child>