Commit 10dcb8c3 authored by Emmanuel Milou's avatar Emmanuel Milou

[#2347] Use GNOME user settings for Menu and Toolbar appareance

parent 1582b152
......@@ -198,7 +198,13 @@ create_main_window ()
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
widget = create_toolbar_actions (ui_manager);
gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH);
// Do not override GNOME user settings
// gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
widget = create_toolbar_windows (ui_manager);
// Do not override GNOME user settings
//gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
gtk_box_pack_start (GTK_BOX (vbox), current_calls->tree, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
......@@ -211,10 +217,6 @@ create_main_window ()
gtk_box_pack_start(GTK_BOX(subvbox),
GTK_WIDGET(embedded_error_notebook), FALSE, FALSE, 0);
widget = create_toolbar_windows (ui_manager);
gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
if(SHOW_VOLUME){
speaker_control = create_slider("speaker");
gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
......
......@@ -24,7 +24,7 @@
#include <calltree.h>
#include <uimanager.h>
#define MAIN_WINDOW_WIDTH 400
#define MAIN_WINDOW_WIDTH 350
#define MAIN_WINDOW_HEIGHT 320
/** @file mainwindow.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment