Merge from trunk

(bzr r8846.2.17)

3 files changed, 84 insertions, 37 deletions

diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index 144717332..a717537ab 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -557,20 +557,22 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const
             default:
                 break;
         }
-    } else if (bevent.button == 3 || pc->expecting_clicks_for_LPE == 1) { // when the last click for a waiting LPE occurs we want to finish the path
-        if (pc->npoints != 0) {
-
-            spdc_pen_finish_segment(pc, event_dt, bevent.state);
-            if (pc->green_closed) {
-                // finishing at the start anchor, close curve
-                spdc_pen_finish(pc, TRUE);
-            } else {
-                // finishing at some other anchor, finish curve but not close
-                spdc_pen_finish(pc, FALSE);
-            }
-
-            ret = TRUE;
+    } else if (pc->expecting_clicks_for_LPE == 1 && pc->npoints != 0) {
+        // when the last click for a waiting LPE occurs we want to finish the path
+        spdc_pen_finish_segment(pc, event_dt, bevent.state);
+        if (pc->green_closed) {
+            // finishing at the start anchor, close curve
+            spdc_pen_finish(pc, TRUE);
+        } else {
+            // finishing at some other anchor, finish curve but not close
+            spdc_pen_finish(pc, FALSE);
         }
+
+        ret = TRUE;
+    } else if (bevent.button == 3 && pc->npoints != 0) {
+        // right click - finish path
+        spdc_pen_finish(pc, FALSE);
+        ret = TRUE;
     }
 
     if (pc->expecting_clicks_for_LPE > 0) {
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index ddc28a858..d5fa90406 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -89,18 +89,26 @@ void UXManager::setTask(SPDesktop* dt, gint val)
     for (vector<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it) {
         SPDesktopWidget* dtw = *it;
         if (dtw->desktop == dt) {
-            if (val == 0) {
-                dtw->setToolboxPosition("ToolToolbar", GTK_POS_LEFT);
-                dtw->setToolboxPosition("CommandsToolbar", GTK_POS_TOP);
-                dtw->setToolboxPosition("SnapToolbar", GTK_POS_TOP);
-                // for now skip "AuxToolbar";
-            } else {
-                dtw->setToolboxPosition("ToolToolbar", GTK_POS_TOP);
-                dtw->setToolboxPosition("CommandsToolbar", GTK_POS_LEFT);
-                dtw->setToolboxPosition("SnapToolbar", GTK_POS_RIGHT);
-                // for now skip "AuxToolbar";
+            switch (val) {
+                default:
+                case 0:
+                    dtw->setToolboxPosition("ToolToolbar", GTK_POS_LEFT);
+                    dtw->setToolboxPosition("CommandsToolbar", GTK_POS_TOP);
+                    //dtw->setToolboxPosition("AuxToolbar", GTK_POS_TOP);
+                    dtw->setToolboxPosition("SnapToolbar", GTK_POS_TOP);
+                    break;
+                case 1:
+                    dtw->setToolboxPosition("ToolToolbar", GTK_POS_TOP);
+                    dtw->setToolboxPosition("CommandsToolbar", GTK_POS_LEFT);
+                    //dtw->setToolboxPosition("AuxToolbar", GTK_POS_TOP);
+                    dtw->setToolboxPosition("SnapToolbar", GTK_POS_RIGHT);
+                    break;
+                case 2:
+                    dtw->setToolboxPosition("ToolToolbar", GTK_POS_LEFT);
+                    dtw->setToolboxPosition("CommandsToolbar", GTK_POS_RIGHT);
+                    dtw->setToolboxPosition("SnapToolbar", GTK_POS_RIGHT);
+                    //dtw->setToolboxPosition("AuxToolbar", GTK_POS_RIGHT);
             }
-            break;
         }
     }
 }
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index e3d309c47..00f83cdbd 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -860,6 +860,12 @@ Glib::RefPtr<Gtk::ActionGroup> create_or_fetch_actions( SPDesktop* desktop )
                             1, _("Set the custom task"),
                             -1 );
 
+        gtk_list_store_append( model, &iter );
+        gtk_list_store_set( model, &iter,
+                            0, _("Wide"),
+                            1, _("Setup for widescreen work"),
+                            -1 );
+
         EgeSelectOneAction* act = ege_select_one_action_new( "TaskSetAction", _("Task"), (""), NULL, GTK_TREE_MODEL(model) );
         g_object_set( act, "short_label", _("Task:"), NULL );
         mainActions->add(Glib::wrap(GTK_ACTION(act)));
@@ -1625,34 +1631,63 @@ static void setupToolboxCommon( GtkWidget *toolbox,
     gtk_container_add( GTK_CONTAINER(toolbox), toolBar );
 }
 
+#define noDUMP_DETAILS 1
+
 void ToolboxFactory::setOrientation(GtkWidget* toolbox, GtkOrientation orientation)
 {
-    //g_message("Set orientation for %p to be %d", toolbox, orientation);
-    //GType type = GTK_WIDGET_TYPE(toolbox);
-    //g_message("        [%s]", g_type_name(type));
-    //g_message("             %p", g_object_get_data(G_OBJECT(toolbox), BAR_ID_KEY));
+#if DUMP_DETAILS
+    g_message("Set orientation for %p to be %d", toolbox, orientation);
+    GType type = GTK_WIDGET_TYPE(toolbox);
+    g_message("        [%s]", g_type_name(type));
+    g_message("             %p", g_object_get_data(G_OBJECT(toolbox), BAR_ID_KEY));
+#endif
 
     GtkPositionType pos = (orientation == GTK_ORIENTATION_HORIZONTAL) ? GTK_POS_LEFT : GTK_POS_TOP;
     GtkHandleBox* handleBox = 0;
 
     if (GTK_IS_BIN(toolbox)) {
-        //g_message("            is a BIN");
+#if DUMP_DETAILS
+        g_message("            is a BIN");
+#endif // DUMP_DETAILS
         GtkWidget* child = gtk_bin_get_child(GTK_BIN(toolbox));
         if (child) {
-            //GType type2 = GTK_WIDGET_TYPE(child);
-            //g_message("            child    [%s]", g_type_name(type2));
+#if DUMP_DETAILS
+            GType type2 = GTK_WIDGET_TYPE(child);
+            g_message("            child    [%s]", g_type_name(type2));
+#endif // DUMP_DETAILS
 
             if (GTK_IS_BOX(child)) {
-                //g_message("                is a BOX");
+#if DUMP_DETAILS
+                g_message("                is a BOX");
+#endif // DUMP_DETAILS
 
                 GList* children = gtk_container_get_children(GTK_CONTAINER(child));
-                if (children && children->data) {
-                    //GtkWidget* child2 = GTK_WIDGET(children->data);
-                    //GType type3 = GTK_WIDGET_TYPE(child2);
-                    //g_message("                child    [%s]", g_type_name(type3));
-                    g_message("need to add dynamic switch");
+                if (children) {
                     for (GList* curr = children; curr; curr = g_list_next(curr)) {
                         GtkWidget* child2 = GTK_WIDGET(curr->data);
+#if DUMP_DETAILS
+                        GType type3 = GTK_WIDGET_TYPE(child2);
+                        g_message("                child2   [%s]", g_type_name(type3));
+#endif // DUMP_DETAILS
+
+                        if (GTK_IS_CONTAINER(child2)) {
+                            GList* children2 = gtk_container_get_children(GTK_CONTAINER(child2));
+                            if (children2) {
+                                for (GList* curr2 = children2; curr2; curr2 = g_list_next(curr2)) {
+                                    GtkWidget* child3 = GTK_WIDGET(curr2->data);
+#if DUMP_DETAILS
+                                    GType type4 = GTK_WIDGET_TYPE(child3);
+                                    g_message("                    child3   [%s]", g_type_name(type4));
+#endif // DUMP_DETAILS
+                                    if (GTK_IS_TOOLBAR(child3)) {
+                                        GtkToolbar* childBar = GTK_TOOLBAR(child3);
+                                        gtk_toolbar_set_orientation(childBar, orientation);
+                                    }
+                                }
+                                g_list_free(children2);
+                            }
+                        }
+
 
                         if (GTK_IS_TOOLBAR(child2)) {
                             GtkToolbar* childBar = GTK_TOOLBAR(child2);
@@ -1660,6 +1695,8 @@ void ToolboxFactory::setOrientation(GtkWidget* toolbox, GtkOrientation orientati
                             if (GTK_IS_HANDLE_BOX(toolbox)) {
                                 handleBox = GTK_HANDLE_BOX(toolbox);
                             }
+                        } else {
+                            g_message("need to add dynamic switch");
                         }
                     }
                     g_list_free(children);