From d483c2ab23354cf5ea58a2d2225ab464b77f6614 Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Wed, 28 Jun 2017 15:17:39 +0200 Subject: menu-items: C++ify --- src/widgets/desktop-widget.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/widgets/desktop-widget.cpp') diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index ce4c5936c..fa7e680c6 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -66,6 +66,7 @@ #include #include #include +#include #include "inkscape-version.h" using Inkscape::UI::Widget::UnitTracker; @@ -1439,9 +1440,9 @@ void SPDesktopWidget::layoutWidgets() } if (!prefs->getBool(pref_root + "menu/state", true)) { - gtk_widget_hide (dtw->menubar); + dtw->menubar->hide(); } else { - gtk_widget_show_all (dtw->menubar); + dtw->menubar->show_all(); } if (!prefs->getBool(pref_root + "commands/state", true)) { @@ -1647,10 +1648,12 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview) dtw->layer_selector->setDesktop(dtw->desktop); dtw->menubar = sp_ui_main_menubar (dtw->desktop); - gtk_widget_set_name(dtw->menubar, "MenuBar"); - gtk_widget_show_all (dtw->menubar); + dtw->menubar->set_name("MenuBar"); + dtw->menubar->show_all(); SPNamedView *nv = dtw->desktop->namedview; - gtk_box_pack_start (GTK_BOX (dtw->vbox), dtw->menubar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (dtw->vbox), + GTK_WIDGET(dtw->menubar->gobj()), + FALSE, FALSE, 0); dtw->layoutWidgets(); std::vector toolboxes; -- cgit v1.2.3 From 4e9ea206bf17a0520e154c0fabe0128a4cc4f6fb Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Wed, 28 Jun 2017 16:57:52 +0200 Subject: Revert "menu-items: C++ify" This reverts commit d483c2ab23354cf5ea58a2d2225ab464b77f6614. --- src/widgets/desktop-widget.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/widgets/desktop-widget.cpp') diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index fa7e680c6..ce4c5936c 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -66,7 +66,6 @@ #include #include #include -#include #include "inkscape-version.h" using Inkscape::UI::Widget::UnitTracker; @@ -1440,9 +1439,9 @@ void SPDesktopWidget::layoutWidgets() } if (!prefs->getBool(pref_root + "menu/state", true)) { - dtw->menubar->hide(); + gtk_widget_hide (dtw->menubar); } else { - dtw->menubar->show_all(); + gtk_widget_show_all (dtw->menubar); } if (!prefs->getBool(pref_root + "commands/state", true)) { @@ -1648,12 +1647,10 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview) dtw->layer_selector->setDesktop(dtw->desktop); dtw->menubar = sp_ui_main_menubar (dtw->desktop); - dtw->menubar->set_name("MenuBar"); - dtw->menubar->show_all(); + gtk_widget_set_name(dtw->menubar, "MenuBar"); + gtk_widget_show_all (dtw->menubar); SPNamedView *nv = dtw->desktop->namedview; - gtk_box_pack_start (GTK_BOX (dtw->vbox), - GTK_WIDGET(dtw->menubar->gobj()), - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (dtw->vbox), dtw->menubar, FALSE, FALSE, 0); dtw->layoutWidgets(); std::vector toolboxes; -- cgit v1.2.3 From 22d06152d0fabc7fe50bb6829f00b2bac4ed1796 Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Thu, 29 Jun 2017 13:43:56 +0200 Subject: Remove old icon handling code --- src/widgets/desktop-widget.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/widgets/desktop-widget.cpp') diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index ce4c5936c..2479fa453 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -351,7 +351,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) ToolboxFactory::setOrientation( dtw->tool_toolbox, GTK_ORIENTATION_VERTICAL ); gtk_box_pack_start( GTK_BOX(dtw->hbox), dtw->tool_toolbox, FALSE, TRUE, 0 ); // Lock guides button - dtw->guides_lock = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION, + dtw->guides_lock = sp_button_new_from_data( GTK_ICON_SIZE_MENU, SP_BUTTON_TYPE_TOGGLE, NULL, INKSCAPE_ICON("object-locked"), @@ -410,7 +410,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->vscrollbar_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); // Sticky zoom button - dtw->sticky_zoom = sp_button_new_from_data ( Inkscape::ICON_SIZE_DECORATION, + dtw->sticky_zoom = sp_button_new_from_data ( GTK_ICON_SIZE_MENU, SP_BUTTON_TYPE_TOGGLE, NULL, INKSCAPE_ICON("zoom-original"), @@ -435,7 +435,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) tip = act->tip; } } - dtw->cms_adjust = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION, + dtw->cms_adjust = sp_button_new_from_data( GTK_ICON_SIZE_MENU, SP_BUTTON_TYPE_TOGGLE, NULL, INKSCAPE_ICON("color-management"), @@ -543,7 +543,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->layer_selector = new Inkscape::Widgets::LayerSelector(NULL); // FIXME: need to unreference on container destruction to avoid leak dtw->layer_selector->reference(); - //dtw->layer_selector->set_size_request(-1, SP_ICON_SIZE_BUTTON); gtk_box_pack_start(GTK_BOX(dtw->statusbar), GTK_WIDGET(dtw->layer_selector->gobj()), FALSE, FALSE, 1); // Select Status -- cgit v1.2.3