summaryrefslogtreecommitdiffstats
path: root/src/widgets/desktop-widget.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2016-05-17 19:21:49 +0000
committertavmjong-free <tavmjong@free.fr>2016-05-17 19:21:49 +0000
commitbf37c1d8ecb463130faf2e756dffff0f7efb868c (patch)
tree47f10e58651670e8d138ed3ad396b4b7304f4540 /src/widgets/desktop-widget.cpp
parentGTK3: Fix error if default style.css file not found. Modified patch from houz. (diff)
downloadinkscape-bf37c1d8ecb463130faf2e756dffff0f7efb868c.tar.gz
inkscape-bf37c1d8ecb463130faf2e756dffff0f7efb868c.zip
Remove three unneeded widgets in desktop status bar.
(bzr r14898)
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
-rw-r--r--src/widgets/desktop-widget.cpp20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index bae26f98c..80e5fdb4f 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -672,10 +672,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
g_signal_connect (G_OBJECT (dtw->hadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw);
g_signal_connect (G_OBJECT (dtw->vadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw);
- GtkWidget *statusbar_tail=gtk_statusbar_new();
- gtk_widget_set_name(statusbar_tail, "StatusBarTail");
- gtk_box_pack_end (GTK_BOX (dtw->statusbar), statusbar_tail, FALSE, FALSE, 0);
-
// zoom status spinbutton
dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1);
gtk_widget_set_name(dtw->zoom_status, "ZoomStatus");
@@ -712,9 +708,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
GTK_FILL, GTK_FILL, 0, 0);
#endif
- eventbox = gtk_event_box_new ();
- gtk_container_add (GTK_CONTAINER (eventbox), dtw->coord_status);
- gtk_widget_set_tooltip_text (eventbox, _("Cursor coordinates"));
+ gtk_widget_set_tooltip_text (dtw->coord_status, _("Cursor coordinates"));
GtkWidget *label_x = gtk_label_new(_("X:"));
GtkWidget *label_y = gtk_label_new(_("Y:"));
@@ -755,7 +749,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
#endif
sp_set_font_size_smaller (dtw->coord_status);
- gtk_box_pack_end (GTK_BOX (statusbar_tail), eventbox, FALSE, FALSE, 1);
+
+ gtk_box_pack_end (GTK_BOX (dtw->statusbar), dtw->coord_status, FALSE, FALSE, 0);
dtw->layer_selector = new Inkscape::Widgets::LayerSelector(NULL);
// FIXME: need to unreference on container destruction to avoid leak
@@ -794,15 +789,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
// space label 2 pixels from left edge
gtk_container_add (GTK_CONTAINER (dtw->select_status_eventbox), dtw->select_status);
-// WHAT DOES THE FOLLOWING GTK_BOX DO?
-#if GTK_CHECK_VERSION(3,0,0)
- gtk_box_pack_start(GTK_BOX(dtw->statusbar),
- gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0),
- FALSE, FALSE, 2);
-#else
- gtk_box_pack_start (GTK_BOX (dtw->statusbar), gtk_hbox_new(FALSE, 0), FALSE, FALSE, 2);
-#endif
-
gtk_box_pack_start (GTK_BOX (dtw->statusbar), dtw->select_status_eventbox, TRUE, TRUE, 0);
gtk_widget_show_all (dtw->vbox);