From 2a9a41246c827271aa1829659cef08c589a62818 Mon Sep 17 00:00:00 2001 From: Andreas Butti Date: Fri, 23 Nov 2018 10:07:47 +0100 Subject: [PATCH] Fixed warnings, use play icon for play objects --- .../toolbarMenubar/ToolSelectCombocontrol.cpp | 58 +++---- .../toolbarMenubar/ToolSelectCombocontrol.h | 6 +- ui/pixmaps/object-play.svg | 155 ++++++++++++++++-- 3 files changed, 169 insertions(+), 50 deletions(-) diff --git a/src/gui/toolbarMenubar/ToolSelectCombocontrol.cpp b/src/gui/toolbarMenubar/ToolSelectCombocontrol.cpp index da12b4fb..a95d8edd 100644 --- a/src/gui/toolbarMenubar/ToolSelectCombocontrol.cpp +++ b/src/gui/toolbarMenubar/ToolSelectCombocontrol.cpp @@ -6,8 +6,10 @@ #include #include -ToolSelectCombocontrol::ToolSelectCombocontrol(ToolMenuHandler* th, ActionHandler* handler, GladeGui* gui, string id) : - ToolButton(handler, gui, id, ACTION_TOOL_SELECT_RECT, GROUP_TOOL, true, "rect-select.svg", _("Select Rectangle")) +ToolSelectCombocontrol::ToolSelectCombocontrol(ToolMenuHandler* toolMenuHandler, ActionHandler* handler, GladeGui* gui, string id) + : ToolButton(handler, gui, id, ACTION_TOOL_SELECT_RECT, GROUP_TOOL, true, "rect-select.svg", _("Select Rectangle")), + toolMenuHandler(toolMenuHandler), + popup(gtk_menu_new()) { XOJ_INIT_TYPE(ToolSelectCombocontrol); @@ -15,10 +17,6 @@ ToolSelectCombocontrol::ToolSelectCombocontrol(ToolMenuHandler* th, ActionHandle this->labelWidget = NULL; this->iconWidget = NULL; - GtkWidget* popup = gtk_menu_new(); - - GtkWidget* menuItem; - this->iconSelectRect = gui->loadIconPixbuf("rect-select.svg"); this->iconSelectRgion = gui->loadIconPixbuf("lasso.svg"); this->iconSelectObject = gui->loadIconPixbuf("object-select.svg"); @@ -28,33 +26,10 @@ ToolSelectCombocontrol::ToolSelectCombocontrol(ToolMenuHandler* th, ActionHandle g_object_ref(this->iconSelectObject); g_object_ref(this->iconPlayObject); - menuItem = gtk_image_menu_item_new_with_label(_C("Select Rectangle")); - gtk_container_add(GTK_CONTAINER(popup), menuItem); - th->registerMenupoint(menuItem, ACTION_TOOL_SELECT_RECT, GROUP_TOOL); - gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menuItem), true); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), gui->loadIcon("rect-select.svg")); - gtk_widget_show_all(menuItem); - - menuItem = gtk_image_menu_item_new_with_label(_C("Select Region")); - gtk_container_add(GTK_CONTAINER(popup), menuItem); - th->registerMenupoint(menuItem, ACTION_TOOL_SELECT_REGION, GROUP_TOOL); - gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menuItem), true); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), gui->loadIcon("lasso.svg")); - gtk_widget_show_all(menuItem); - - menuItem = gtk_image_menu_item_new_with_label(_C("Select Object")); - gtk_container_add(GTK_CONTAINER(popup), menuItem); - th->registerMenupoint(menuItem, ACTION_TOOL_SELECT_OBJECT, GROUP_TOOL); - gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menuItem), true); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), gui->loadIcon("object-select.svg")); - gtk_widget_show_all(menuItem); - - menuItem = gtk_image_menu_item_new_with_label(_C("Play Object")); - gtk_container_add(GTK_CONTAINER(popup),menuItem); - th->registerMenupoint(menuItem,ACTION_TOOL_PLAY_OBJECT, GROUP_TOOL); - gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menuItem), true); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuItem), gui->loadIcon("object-play.svg")); - gtk_widget_show_all(menuItem); + addMenuitem(_("Select Rectangle"), "rect-select.svg", ACTION_TOOL_SELECT_RECT, GROUP_TOOL); + addMenuitem(_("Select Region"), "lasso.svg", ACTION_TOOL_SELECT_REGION, GROUP_TOOL); + addMenuitem(_("Select Object"), "object-select.svg", ACTION_TOOL_SELECT_OBJECT, GROUP_TOOL); + addMenuitem(_("Play Object"), "object-play.svg", ACTION_TOOL_PLAY_OBJECT, GROUP_TOOL); setPopupMenu(popup); } @@ -71,6 +46,23 @@ ToolSelectCombocontrol::~ToolSelectCombocontrol() XOJ_RELEASE_TYPE(ToolSelectCombocontrol); } +void ToolSelectCombocontrol::addMenuitem(string text, string icon, ActionType type, ActionGroup group) +{ + GtkWidget* box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + GtkWidget* label = gtk_label_new(text.c_str()); + GtkWidget* menuItem = gtk_menu_item_new(); + + gtk_container_add(GTK_CONTAINER(box), gui->loadIcon(icon)); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_box_pack_end(GTK_BOX(box), label, true, true, 0); + + gtk_container_add(GTK_CONTAINER(menuItem), box); + gtk_widget_show_all(menuItem); + gtk_container_add(GTK_CONTAINER(popup), menuItem); + + toolMenuHandler->registerMenupoint(menuItem, type, group); +} + void ToolSelectCombocontrol::selected(ActionGroup group, ActionType action) { XOJ_CHECK_TYPE(ToolSelectCombocontrol); diff --git a/src/gui/toolbarMenubar/ToolSelectCombocontrol.h b/src/gui/toolbarMenubar/ToolSelectCombocontrol.h index 89855cd9..4c830cbd 100644 --- a/src/gui/toolbarMenubar/ToolSelectCombocontrol.h +++ b/src/gui/toolbarMenubar/ToolSelectCombocontrol.h @@ -21,7 +21,7 @@ class ToolMenuHandler; class ToolSelectCombocontrol : public ToolButton { public: - ToolSelectCombocontrol(ToolMenuHandler* th, ActionHandler* handler, GladeGui* gui, string id); + ToolSelectCombocontrol(ToolMenuHandler* toolMenuHandler, ActionHandler* handler, GladeGui* gui, string id); virtual ~ToolSelectCombocontrol(); public: @@ -29,10 +29,14 @@ public: protected: virtual GtkToolItem* newItem(); + void addMenuitem(string text, string icon, ActionType type, ActionGroup group); private: XOJ_TYPE_ATTRIB; + ToolMenuHandler* toolMenuHandler; + GtkWidget* popup; + GtkWidget* iconWidget; GtkWidget* labelWidget; diff --git a/ui/pixmaps/object-play.svg b/ui/pixmaps/object-play.svg index 1ca4aa01..ddc58536 100644 --- a/ui/pixmaps/object-play.svg +++ b/ui/pixmaps/object-play.svg @@ -1,17 +1,140 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + image/svg+xml + + + + + + + + +