From 47aa8306a659760d5967944af42da27a703dfc63 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Tue, 5 Jun 2012 22:40:25 +0200 Subject: various (bzr r11461) --- src/ui/dialog/xml-tree.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 03678d26d..1e5343d8b 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -450,7 +450,7 @@ void XmlTree::set_tree_select(Inkscape::XML::Node *repr) void XmlTree::propagate_tree_select(Inkscape::XML::Node *repr) { - if (repr && repr->type() == Inkscape::XML::ELEMENT_NODE) { + if (repr && (repr->type() == Inkscape::XML::ELEMENT_NODE)) { sp_xmlview_attr_list_set_repr(attributes, repr); } else { sp_xmlview_attr_list_set_repr(attributes, NULL); @@ -631,7 +631,7 @@ void XmlTree::on_tree_select_row_enable(GtkTreeIter *node) prev && prev->next() != repr ; prev = prev->next() ){}; - if (prev && prev->type() == Inkscape::XML::ELEMENT_NODE) { + if (prev && (prev->type() == Inkscape::XML::ELEMENT_NODE)) { indentable = TRUE; } } @@ -650,7 +650,7 @@ void XmlTree::on_tree_select_row_enable(GtkTreeIter *node) //on_tree_select_row_enable_if_not_last_child { - if ( parent && parent->parent() && repr->next() ) { + if ( parent && (parent->parent() && repr->next())) { lower_node_button.set_sensitive(true); } else { lower_node_button.set_sensitive(false); @@ -1030,7 +1030,7 @@ void XmlTree::cmd_raise_node() Inkscape::XML::Node *ref = NULL; Inkscape::XML::Node *before = parent->firstChild(); - while (before && before->next() != selected_repr) { + while (before && (before->next() != selected_repr)) { ref = before; before = before->next(); } @@ -1072,7 +1072,7 @@ void XmlTree::cmd_indent_node() g_return_if_fail(parent->firstChild() != repr); Inkscape::XML::Node* prev = parent->firstChild(); - while (prev && prev->next() != repr) { + while (prev && (prev->next() != repr)) { prev = prev->next(); } g_return_if_fail(prev != NULL); -- cgit v1.2.3 From a5482c29ed4d55ddf7e4f0b50bab02f5a5ac0685 Mon Sep 17 00:00:00 2001 From: John Smith Date: Tue, 12 Jun 2012 14:35:30 +0900 Subject: Fix for 1011726 : Performance regression with XML Editor (bzr r11488) --- src/ui/dialog/xml-tree.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 1e5343d8b..5cb0402b2 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -536,7 +536,7 @@ void XmlTree::on_tree_select_row(GtkTreeSelection *selection, gpointer data) return; } - Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(GTK_TREE_VIEW(self->tree), &iter); + Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(model, &iter); g_assert(repr != NULL); @@ -586,7 +586,7 @@ void XmlTree::on_tree_select_row_enable(GtkTreeIter *node) return; } - Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(GTK_TREE_VIEW(tree), node); + Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(GTK_TREE_MODEL(tree->store), node); Inkscape::XML::Node *parent=repr->parent(); //on_tree_select_row_enable_if_mutable @@ -690,7 +690,7 @@ gboolean XmlTree::xml_tree_node_mutable(GtkTreeIter *node) } Inkscape::XML::Node *repr; - repr = sp_xmlview_tree_node_get_repr(GTK_TREE_VIEW(tree), node); + repr = sp_xmlview_tree_node_get_repr(GTK_TREE_MODEL(tree->store), node); g_assert(repr); // don't let "defs" or "namedview" disappear @@ -958,8 +958,6 @@ void XmlTree::cmd_duplicate_node() if (sp_xmlview_tree_get_repr_node(SP_XMLVIEW_TREE(tree), dup, &node)) { GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)); gtk_tree_selection_select_iter(selection, &node); - } else { - } } -- cgit v1.2.3 From f943942ebb0639781b3bf6b3c3df3c1782597e6f Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 23 Jun 2012 14:13:45 +0100 Subject: Use orientable widgets in GTK+ 3 build (bzr r11512) --- src/ui/dialog/xml-tree.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 5cb0402b2..a54e04407 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -866,16 +866,32 @@ void XmlTree::cmd_new_element_node() g_signal_connect(G_OBJECT(new_window), "destroy", gtk_main_quit, NULL); g_signal_connect(G_OBJECT(new_window), "key-press-event", G_CALLBACK(quit_on_esc), new_window); +#if GTK_CHECK_VERSION(3,0,0) + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4); + gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE); +#else vbox = gtk_vbox_new(FALSE, 4); +#endif + gtk_container_add(GTK_CONTAINER(new_window), vbox); name_entry = new Gtk::Entry(); gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(name_entry->gobj()), FALSE, TRUE, 0); +#if GTK_CHECK_VERSION(3,0,0) + sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); +#else sep = gtk_hseparator_new(); +#endif + gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, TRUE, 0); +#if GTK_CHECK_VERSION(3,0,0) + bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); +#else bbox = gtk_hbutton_box_new(); +#endif + gtk_container_set_border_width(GTK_CONTAINER(bbox), 4); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, TRUE, 0); -- cgit v1.2.3 From 9abd33133650d77714fccf09d0c9ff27c9b75a78 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 5 Jul 2012 22:39:08 +0100 Subject: Drop GTK+ 2.20 support. Fixed bugs: - https://launchpad.net/bugs/1020494 (bzr r11529) --- src/ui/dialog/xml-tree.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index a54e04407..accf03586 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -48,10 +48,6 @@ #include "widgets/sp-xmlview-content.h" #include "widgets/sp-xmlview-tree.h" -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - namespace Inkscape { namespace UI { namespace Dialog { -- cgit v1.2.3 From 7f191edd068dbfc4a27b87235ad6dd289051cd29 Mon Sep 17 00:00:00 2001 From: John Smith Date: Sun, 2 Sep 2012 13:37:02 +0900 Subject: Fix for 306090 : XMl Editor, Return button to create new xml element (bzr r11641) --- src/ui/dialog/xml-tree.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index accf03586..b21932f99 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -842,6 +842,10 @@ gboolean XmlTree::quit_on_esc (GtkWidget *w, GdkEventKey *event, GObject */*tbl* case GDK_KEY_Escape: // defocus gtk_widget_destroy(w); return TRUE; + case GDK_KEY_Return: // create + case GDK_KEY_KP_Enter: + gtk_widget_destroy(w); + return TRUE; } return FALSE; } -- cgit v1.2.3 From a788114b417fec4eb9fe7645dd66f128db7ef9fc Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 16 Dec 2012 13:20:25 +0000 Subject: GTK+ 3: Switch to more orientable widgets (bzr r11960) --- src/ui/dialog/xml-tree.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index b21932f99..29dbc4b93 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -79,7 +79,11 @@ XmlTree::XmlTree (void) : xml_attribute_delete_button (_("Delete attribute")), text_container (), attr_container (), - attr_subpaned_container (), +#if WITH_GTKMM_3_0 + attr_subpaned_container(Gtk::ORIENTATION_VERTICAL), +#else + attr_subpaned_container(), +#endif set_attr (_("Set")), new_window(NULL) { -- cgit v1.2.3 From e042b14d47a3a32a4c5db204f7aff26183587161 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Sat, 20 Apr 2013 16:50:02 -0400 Subject: Group bbox update (Bug 1168979) Fixed bugs: - https://launchpad.net/bugs/1168979 (bzr r12285.1.2) --- src/ui/dialog/xml-tree.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 29dbc4b93..a537b7fca 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -986,6 +986,7 @@ void XmlTree::cmd_delete_node() g_assert(selected_repr != NULL); sp_repr_unparent(selected_repr); + reinterpret_cast(current_desktop->currentLayer())->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); DocumentUndo::done(current_document, SP_VERB_DIALOG_XML_EDITOR, Q_("nodeAsInXMLinHistoryDialog|Delete node")); } -- cgit v1.2.3 From 55b451bf382e0c3d5ed8728e42fbb535acfa8a33 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Thu, 7 Nov 2013 21:44:00 +0100 Subject: First step of moving tools into appropriate namespaces. (bzr r12782) --- src/ui/dialog/xml-tree.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index a537b7fca..dfddfb1d3 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -328,7 +328,7 @@ void XmlTree::attr_reset_context(gint attr) bool XmlTree::sp_xml_tree_key_press(GdkEventKey *event) { - unsigned int shortcut = get_group0_keyval (event) | + unsigned int shortcut = Inkscape::UI::Tools::get_group0_keyval (event) | ( event->state & GDK_SHIFT_MASK ? SP_SHORTCUT_SHIFT_MASK : 0 ) | ( event->state & GDK_CONTROL_MASK ? @@ -842,7 +842,7 @@ void XmlTree::on_document_uri_set(gchar const * /*uri*/, SPDocument * /*document gboolean XmlTree::quit_on_esc (GtkWidget *w, GdkEventKey *event, GObject */*tbl*/) { - switch (get_group0_keyval (event)) { + switch (Inkscape::UI::Tools::get_group0_keyval (event)) { case GDK_KEY_Escape: // defocus gtk_widget_destroy(w); return TRUE; -- cgit v1.2.3 From c04e30df241a3ee039077425bab9b9c37abe2854 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 9 Nov 2013 23:36:13 +0100 Subject: Moved and renamed some tool-related files. (bzr r12785) --- src/ui/dialog/xml-tree.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index dfddfb1d3..0e1e9f7a6 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -27,7 +27,7 @@ #include "dialogs/dialog-events.h" #include "document.h" #include "document-undo.h" -#include "event-context.h" +#include "ui/tools/tool-base.h" #include "helper/window.h" #include "inkscape.h" #include "interface.h" -- cgit v1.2.3 From 0f447656fa20753681f2f88713a08df3bfabcb7f Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Sat, 15 Mar 2014 09:16:21 +0100 Subject: UI. Fix for Bug #1016889 (GTK3: status bar of XML Editor triggers resize of dialog window. Fixed bugs: - https://launchpad.net/bugs/1016889 (bzr r13155) --- src/ui/dialog/xml-tree.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/ui/dialog/xml-tree.cpp') diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 0e1e9f7a6..55d0aff09 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -100,6 +100,9 @@ XmlTree::XmlTree (void) : status.set_alignment( 0.0, 0.5); status.set_size_request(1, -1); status.set_markup(""); +#if WITH_GTKMM_3_0 + status.set_line_wrap(true); +#endif status_box.pack_start( status, TRUE, TRUE, 0); contents->pack_end(status_box, false, false, 2); -- cgit v1.2.3