initial work to add customizable layout support:

defined data structures, few stubs, many regressions, implemented tabbed playlist widget;
now it should be possible to have several playlist viewers visible at the same time;
playlist keyboard handling is partially broken

1 files changed, 60 insertions, 70 deletions

diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index 67d70dba..d09e9dc7 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -35,12 +35,12 @@ create_mainwin (void)
   GtkWidget *File;
   GtkWidget *File_menu;
   GtkWidget *open;
-  GtkWidget *image555;
+  GtkWidget *image563;
   GtkWidget *separator2;
   GtkWidget *add_files;
-  GtkWidget *image556;
+  GtkWidget *image564;
   GtkWidget *add_folders;
-  GtkWidget *image557;
+  GtkWidget *image565;
   GtkWidget *add_location1;
   GtkWidget *separatormenuitem1;
   GtkWidget *new_playlist1;
@@ -48,18 +48,18 @@ create_mainwin (void)
   GtkWidget *playlist_save_as;
   GtkWidget *separator8;
   GtkWidget *quit;
-  GtkWidget *image558;
+  GtkWidget *image566;
   GtkWidget *Edit;
   GtkWidget *Edit_menu;
   GtkWidget *clear1;
-  GtkWidget *image559;
+  GtkWidget *image567;
   GtkWidget *select_all1;
   GtkWidget *deselect_all1;
   GtkWidget *invert_selection1;
   GtkWidget *Selection;
   GtkWidget *Selection_menu;
   GtkWidget *remove1;
-  GtkWidget *image560;
+  GtkWidget *image568;
   GtkWidget *crop1;
   GtkWidget *find1;
   GtkWidget *sort_by1;
@@ -78,6 +78,7 @@ create_mainwin (void)
   GtkWidget *view_headers;
   GtkWidget *view_tabs;
   GtkWidget *view_eq;
+  GtkWidget *design_mode1;
   GtkWidget *Playback;
   GtkWidget *Playback_menu;
   GtkWidget *Order;
@@ -101,16 +102,16 @@ create_mainwin (void)
   GtkWidget *Help;
   GtkWidget *Help_menu;
   GtkWidget *help1;
-  GtkWidget *image561;
+  GtkWidget *image569;
   GtkWidget *changelog1;
   GtkWidget *separator10;
   GtkWidget *gpl1;
   GtkWidget *lgpl1;
   GtkWidget *separator9;
   GtkWidget *about1;
-  GtkWidget *image562;
+  GtkWidget *image570;
   GtkWidget *translators1;
-  GtkWidget *image563;
+  GtkWidget *image571;
   GtkWidget *hbox2;
   GtkWidget *hbox3;
   GtkWidget *stopbtn;
@@ -125,9 +126,6 @@ create_mainwin (void)
   GtkWidget *image5;
   GtkWidget *seekbar;
   GtkWidget *volumebar;
-  GtkWidget *tabstrip;
-  GtkWidget *frame1;
-  GtkWidget *playlist;
   GtkWidget *plugins_bottom_vbox;
   GtkWidget *statusbar;
   GtkAccelGroup *accel_group;
@@ -161,9 +159,9 @@ create_mainwin (void)
                               GDK_O, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image555 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image555);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image555);
+  image563 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image563);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image563);
 
   separator2 = gtk_separator_menu_item_new ();
   gtk_widget_show (separator2);
@@ -174,17 +172,17 @@ create_mainwin (void)
   gtk_widget_show (add_files);
   gtk_container_add (GTK_CONTAINER (File_menu), add_files);
 
-  image556 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image556);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image556);
+  image564 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image564);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image564);
 
   add_folders = gtk_image_menu_item_new_with_mnemonic (_("Add folder(s)"));
   gtk_widget_show (add_folders);
   gtk_container_add (GTK_CONTAINER (File_menu), add_folders);
 
-  image557 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image557);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image557);
+  image565 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image565);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image565);
 
   add_location1 = gtk_menu_item_new_with_mnemonic (_("Add location"));
   gtk_widget_show (add_location1);
@@ -222,9 +220,9 @@ create_mainwin (void)
                               GDK_Q, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image558 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image558);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image558);
+  image566 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image566);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image566);
 
   Edit = gtk_menu_item_new_with_mnemonic (_("_Edit"));
   gtk_widget_show (Edit);
@@ -237,9 +235,9 @@ create_mainwin (void)
   gtk_widget_show (clear1);
   gtk_container_add (GTK_CONTAINER (Edit_menu), clear1);
 
-  image559 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image559);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image559);
+  image567 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image567);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image567);
 
   select_all1 = gtk_menu_item_new_with_mnemonic (_("Select all"));
   gtk_widget_show (select_all1);
@@ -270,9 +268,9 @@ create_mainwin (void)
   gtk_widget_show (remove1);
   gtk_container_add (GTK_CONTAINER (Selection_menu), remove1);
 
-  image560 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image560);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image560);
+  image568 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image568);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image568);
 
   crop1 = gtk_menu_item_new_with_mnemonic (_("Crop"));
   gtk_widget_show (crop1);
@@ -348,6 +346,10 @@ create_mainwin (void)
   gtk_widget_show (view_eq);
   gtk_container_add (GTK_CONTAINER (View_menu), view_eq);
 
+  design_mode1 = gtk_check_menu_item_new_with_mnemonic (_("Design mode"));
+  gtk_widget_show (design_mode1);
+  gtk_container_add (GTK_CONTAINER (View_menu), design_mode1);
+
   Playback = gtk_menu_item_new_with_mnemonic (_("_Playback"));
   gtk_widget_show (Playback);
   gtk_container_add (GTK_CONTAINER (menubar1), Playback);
@@ -366,16 +368,19 @@ create_mainwin (void)
   order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_linear));
   gtk_widget_show (order_linear);
   gtk_container_add (GTK_CONTAINER (Order_menu), order_linear);
+  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_linear), TRUE);
 
   order_shuffle = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Shuffle tracks"));
   order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_shuffle));
   gtk_widget_show (order_shuffle);
   gtk_container_add (GTK_CONTAINER (Order_menu), order_shuffle);
+  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_shuffle), TRUE);
 
   order_shuffle_albums = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Shuffle albums"));
   order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_shuffle_albums));
   gtk_widget_show (order_shuffle_albums);
   gtk_container_add (GTK_CONTAINER (Order_menu), order_shuffle_albums);
+  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_shuffle_albums), TRUE);
 
   order_random = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Random"));
   order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_random));
@@ -394,11 +399,13 @@ create_mainwin (void)
   loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_all));
   gtk_widget_show (loop_all);
   gtk_container_add (GTK_CONTAINER (Looping_menu), loop_all);
+  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_all), TRUE);
 
   loop_single = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop Single Song"));
   loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_single));
   gtk_widget_show (loop_single);
   gtk_container_add (GTK_CONTAINER (Looping_menu), loop_single);
+  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_single), TRUE);
 
   loop_disable = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Don't Loop"));
   loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_disable));
@@ -445,9 +452,9 @@ create_mainwin (void)
   gtk_widget_show (help1);
   gtk_container_add (GTK_CONTAINER (Help_menu), help1);
 
-  image561 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image561);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image561);
+  image569 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image569);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image569);
 
   changelog1 = gtk_menu_item_new_with_mnemonic (_("_ChangeLog"));
   gtk_widget_show (changelog1);
@@ -475,17 +482,17 @@ create_mainwin (void)
   gtk_widget_show (about1);
   gtk_container_add (GTK_CONTAINER (Help_menu), about1);
 
-  image562 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image562);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image562);
+  image570 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image570);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image570);
 
   translators1 = gtk_image_menu_item_new_with_mnemonic (_("_Translators"));
   gtk_widget_show (translators1);
   gtk_container_add (GTK_CONTAINER (Help_menu), translators1);
 
-  image563 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image563);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image563);
+  image571 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image571);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image571);
 
   hbox2 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox2);
@@ -580,27 +587,9 @@ create_mainwin (void)
   GTK_WIDGET_UNSET_FLAGS (volumebar, GTK_CAN_FOCUS);
   GTK_WIDGET_UNSET_FLAGS (volumebar, GTK_CAN_DEFAULT);
 
-  tabstrip = create_tabstrip_widget ("tabstrip", "", "", 0, 0);
-  gtk_widget_show (tabstrip);
-  gtk_box_pack_start (GTK_BOX (vbox1), tabstrip, FALSE, TRUE, 0);
-  gtk_widget_set_size_request (tabstrip, -1, 24);
-  GTK_WIDGET_UNSET_FLAGS (tabstrip, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (tabstrip, GTK_CAN_DEFAULT);
-
-  frame1 = gtk_frame_new (NULL);
-  gtk_widget_show (frame1);
-  gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (frame1), 1);
-
-  playlist = create_ddb_listview_widget ("playlist", "", "", 0, 0);
-  gtk_widget_show (playlist);
-  gtk_container_add (GTK_CONTAINER (frame1), playlist);
-  GTK_WIDGET_UNSET_FLAGS (playlist, GTK_CAN_FOCUS);
-  GTK_WIDGET_UNSET_FLAGS (playlist, GTK_CAN_DEFAULT);
-
   plugins_bottom_vbox = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (plugins_bottom_vbox);
-  gtk_box_pack_start (GTK_BOX (vbox1), plugins_bottom_vbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox1), plugins_bottom_vbox, TRUE, TRUE, 0);
 
   statusbar = gtk_statusbar_new ();
   gtk_widget_show (statusbar);
@@ -711,6 +700,9 @@ create_mainwin (void)
   g_signal_connect ((gpointer) view_eq, "activate",
                     G_CALLBACK (on_toggle_eq),
                     NULL);
+  g_signal_connect ((gpointer) design_mode1, "activate",
+                    G_CALLBACK (on_design_mode1_activate),
+                    NULL);
   g_signal_connect ((gpointer) order_linear, "activate",
                     G_CALLBACK (on_order_linear_activate),
                     NULL);
@@ -785,12 +777,12 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, File, "File");
   GLADE_HOOKUP_OBJECT (mainwin, File_menu, "File_menu");
   GLADE_HOOKUP_OBJECT (mainwin, open, "open");
-  GLADE_HOOKUP_OBJECT (mainwin, image555, "image555");
+  GLADE_HOOKUP_OBJECT (mainwin, image563, "image563");
   GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2");
   GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files");
-  GLADE_HOOKUP_OBJECT (mainwin, image556, "image556");
+  GLADE_HOOKUP_OBJECT (mainwin, image564, "image564");
   GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders");
-  GLADE_HOOKUP_OBJECT (mainwin, image557, "image557");
+  GLADE_HOOKUP_OBJECT (mainwin, image565, "image565");
   GLADE_HOOKUP_OBJECT (mainwin, add_location1, "add_location1");
   GLADE_HOOKUP_OBJECT (mainwin, separatormenuitem1, "separatormenuitem1");
   GLADE_HOOKUP_OBJECT (mainwin, new_playlist1, "new_playlist1");
@@ -798,18 +790,18 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, playlist_save_as, "playlist_save_as");
   GLADE_HOOKUP_OBJECT (mainwin, separator8, "separator8");
   GLADE_HOOKUP_OBJECT (mainwin, quit, "quit");
-  GLADE_HOOKUP_OBJECT (mainwin, image558, "image558");
+  GLADE_HOOKUP_OBJECT (mainwin, image566, "image566");
   GLADE_HOOKUP_OBJECT (mainwin, Edit, "Edit");
   GLADE_HOOKUP_OBJECT (mainwin, Edit_menu, "Edit_menu");
   GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1");
-  GLADE_HOOKUP_OBJECT (mainwin, image559, "image559");
+  GLADE_HOOKUP_OBJECT (mainwin, image567, "image567");
   GLADE_HOOKUP_OBJECT (mainwin, select_all1, "select_all1");
   GLADE_HOOKUP_OBJECT (mainwin, deselect_all1, "deselect_all1");
   GLADE_HOOKUP_OBJECT (mainwin, invert_selection1, "invert_selection1");
   GLADE_HOOKUP_OBJECT (mainwin, Selection, "Selection");
   GLADE_HOOKUP_OBJECT (mainwin, Selection_menu, "Selection_menu");
   GLADE_HOOKUP_OBJECT (mainwin, remove1, "remove1");
-  GLADE_HOOKUP_OBJECT (mainwin, image560, "image560");
+  GLADE_HOOKUP_OBJECT (mainwin, image568, "image568");
   GLADE_HOOKUP_OBJECT (mainwin, crop1, "crop1");
   GLADE_HOOKUP_OBJECT (mainwin, find1, "find1");
   GLADE_HOOKUP_OBJECT (mainwin, sort_by1, "sort_by1");
@@ -828,6 +820,7 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, view_headers, "view_headers");
   GLADE_HOOKUP_OBJECT (mainwin, view_tabs, "view_tabs");
   GLADE_HOOKUP_OBJECT (mainwin, view_eq, "view_eq");
+  GLADE_HOOKUP_OBJECT (mainwin, design_mode1, "design_mode1");
   GLADE_HOOKUP_OBJECT (mainwin, Playback, "Playback");
   GLADE_HOOKUP_OBJECT (mainwin, Playback_menu, "Playback_menu");
   GLADE_HOOKUP_OBJECT (mainwin, Order, "Order");
@@ -849,16 +842,16 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, Help, "Help");
   GLADE_HOOKUP_OBJECT (mainwin, Help_menu, "Help_menu");
   GLADE_HOOKUP_OBJECT (mainwin, help1, "help1");
-  GLADE_HOOKUP_OBJECT (mainwin, image561, "image561");
+  GLADE_HOOKUP_OBJECT (mainwin, image569, "image569");
   GLADE_HOOKUP_OBJECT (mainwin, changelog1, "changelog1");
   GLADE_HOOKUP_OBJECT (mainwin, separator10, "separator10");
   GLADE_HOOKUP_OBJECT (mainwin, gpl1, "gpl1");
   GLADE_HOOKUP_OBJECT (mainwin, lgpl1, "lgpl1");
   GLADE_HOOKUP_OBJECT (mainwin, separator9, "separator9");
   GLADE_HOOKUP_OBJECT (mainwin, about1, "about1");
-  GLADE_HOOKUP_OBJECT (mainwin, image562, "image562");
+  GLADE_HOOKUP_OBJECT (mainwin, image570, "image570");
   GLADE_HOOKUP_OBJECT (mainwin, translators1, "translators1");
-  GLADE_HOOKUP_OBJECT (mainwin, image563, "image563");
+  GLADE_HOOKUP_OBJECT (mainwin, image571, "image571");
   GLADE_HOOKUP_OBJECT (mainwin, hbox2, "hbox2");
   GLADE_HOOKUP_OBJECT (mainwin, hbox3, "hbox3");
   GLADE_HOOKUP_OBJECT (mainwin, stopbtn, "stopbtn");
@@ -873,9 +866,6 @@ create_mainwin (void)
   GLADE_HOOKUP_OBJECT (mainwin, image5, "image5");
   GLADE_HOOKUP_OBJECT (mainwin, seekbar, "seekbar");
   GLADE_HOOKUP_OBJECT (mainwin, volumebar, "volumebar");
-  GLADE_HOOKUP_OBJECT (mainwin, tabstrip, "tabstrip");
-  GLADE_HOOKUP_OBJECT (mainwin, frame1, "frame1");
-  GLADE_HOOKUP_OBJECT (mainwin, playlist, "playlist");
   GLADE_HOOKUP_OBJECT (mainwin, plugins_bottom_vbox, "plugins_bottom_vbox");
   GLADE_HOOKUP_OBJECT (mainwin, statusbar, "statusbar");