From 0b5c5d9e8fc81c5c592ce891a759e38ca9b7858f Mon Sep 17 00:00:00 2001 From: waker Date: Mon, 19 Aug 2013 21:46:12 +0200 Subject: gtkui: moved widget layout initialization into separate function --- plugins/gtkui/gtkui.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 8752a0f1..44972331 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -920,6 +920,29 @@ unlock_playlist_columns_cb (void *ctx) { return FALSE; } +static void +init_widget_layout (void) { + w_init (); + ddb_gtkui_widget_t *rootwidget = w_get_rootwidget (); + gtk_widget_show (rootwidget->widget); + gtk_box_pack_start (GTK_BOX(lookup_widget(mainwin, "plugins_bottom_vbox")), rootwidget->widget, TRUE, TRUE, 0); + + // load layout + char layout[4000]; + deadbeef->conf_get_str ("gtkui.layout", "tabbed_playlist \"\" { }", layout, sizeof (layout)); + + ddb_gtkui_widget_t *w = NULL; + w_create_from_string (layout, &w); + if (!w) { + ddb_gtkui_widget_t *plt = w_create ("tabbed_playlist"); + w_append (rootwidget, plt); + gtk_widget_show (plt->widget); + } + else { + w_append (rootwidget, w); + } +} + void gtkui_thread (void *ctx) { #ifdef __linux__ @@ -1070,29 +1093,7 @@ gtkui_thread (void *ctx) { gtk_widget_show (mainwin); - // construct mainwindow widgets - { - - w_init (); - ddb_gtkui_widget_t *rootwidget = w_get_rootwidget (); - gtk_widget_show (rootwidget->widget); - gtk_box_pack_start (GTK_BOX(lookup_widget(mainwin, "plugins_bottom_vbox")), rootwidget->widget, TRUE, TRUE, 0); - - // load layout - char layout[4000]; - deadbeef->conf_get_str ("gtkui.layout", "tabbed_playlist \"\" { }", layout, sizeof (layout)); - - ddb_gtkui_widget_t *w = NULL; - w_create_from_string (layout, &w); - if (!w) { - ddb_gtkui_widget_t *plt = w_create ("tabbed_playlist"); - w_append (rootwidget, plt); - gtk_widget_show (plt->widget); - } - else { - w_append (rootwidget, w); - } - } + init_widget_layout (); gtkui_setup_gui_refresh (); -- cgit v1.2.3