X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fui.c;h=203b8f377779be95e4cfb4262a64bd6be60dd004;hb=b8d6baf21a4e1c3eeebc01e8a366d0cb0bf75f4c;hp=6e3b915ca891e26fa2fda6f1b57ae87948b68df1;hpb=a12bc94bf9e1527448c8407c66ff6272212b2455;p=melted_gui

diff --git a/src/ui.c b/src/ui.c
index 6e3b915..203b8f3 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -132,6 +132,7 @@ static GtkWidget* create_treeview(GtkWidget* top, char* name, const column_desc_
     treeview = gtk_tree_view_new ();
     gtk_widget_show (treeview);
     gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
+    gtk_tree_view_set_grid_lines(GTK_TREE_VIEW(treeview), GTK_TREE_VIEW_GRID_LINES_BOTH);
 
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
     gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
@@ -229,6 +230,30 @@ static GtkWidget* pane_library_buttons(GtkWidget* top, omnplay_instance_t* app)
     return hbox;
 }
 
+static GtkWidget* pane_library_search_buttons(GtkWidget* top, omnplay_instance_t* app)
+{
+    GtkWidget* hbox;
+
+    hbox = gtk_hbox_new (FALSE, 0);
+    gtk_widget_show (hbox);
+
+    /* text entry */
+    gtk_box_pack_start (GTK_BOX (hbox),
+        app->library.search = gtk_entry_new(),
+            TRUE, TRUE, 0);
+    gtk_widget_show(app->library.search);
+
+    /* playlist modify buttons */
+    gtk_box_pack_start (GTK_BOX (hbox),
+        ui_create_button(top, app, BUTTON_LIBRARY_FIND),
+            FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (hbox),
+        ui_create_button(top, app, BUTTON_LIBRARY_FIND_NEXT),
+            FALSE, FALSE, 0);
+
+    return hbox;
+}
+
 static GtkWidget* pane_library(GtkWidget* top, omnplay_instance_t* app)
 {
     GtkWidget* vbox;
@@ -242,11 +267,16 @@ static GtkWidget* pane_library(GtkWidget* top, omnplay_instance_t* app)
         pane_library_buttons(top, app),
         FALSE, FALSE, 0);
 
-    /* add buttons box */
+    /* add grid */
     gtk_box_pack_start (GTK_BOX (vbox),
         pane_library_grid(top, app),
         TRUE, TRUE, 0);
 
+    /* add search buttons */
+    gtk_box_pack_start (GTK_BOX (vbox),
+        pane_library_search_buttons(top, app),
+        FALSE, FALSE, 0);
+
     return vbox;
 }
 
@@ -255,11 +285,14 @@ static GtkWidget* create_channel_status(GtkWidget* top, omnplay_instance_t* app,
     GtkWidget* vbox;
     GtkWidget* hbox;
     GtkWidget* frame;
+    char name[PATH_MAX];
     omnplay_player_t* player;
 
     player = &app->players.item[idx];
 
-    frame = gtk_frame_new(player->name);
+    snprintf(name, sizeof(name), "%c [%s]", idx + 'A', player->name);
+
+    frame = gtk_frame_new(name);
     gtk_widget_show(frame);
 
     vbox = gtk_vbox_new(FALSE, 0);
@@ -528,6 +561,7 @@ static GtkWidget* pane_top(GtkWidget* top, omnplay_instance_t* app)
 GtkWidget* ui_omnplay (omnplay_instance_t* app)
 {
     GtkWidget *wnd;
+    GtkWidget* vbox;
 
     wnd = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     GLADE_HOOKUP_OBJECT_NO_REF (wnd, wnd, "omnplay_window");
@@ -535,8 +569,17 @@ GtkWidget* ui_omnplay (omnplay_instance_t* app)
     gtk_window_set_title (GTK_WINDOW (wnd), _("Omneon Player"));
     gtk_window_set_default_size (GTK_WINDOW (wnd), 1024, 768);
 
-    gtk_container_add (GTK_CONTAINER (wnd),
-        pane_top(wnd, app));
+    vbox = gtk_vbox_new(FALSE, 0);
+    gtk_widget_show(vbox);
+
+    gtk_container_add(GTK_CONTAINER(wnd), vbox);
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+        pane_top(wnd, app),
+        TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (vbox),
+        app->status_label = create_label(wnd, "omnplay started", NULL, GTK_JUSTIFY_LEFT),
+        FALSE, FALSE, 0);
 
     app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN] =
         create_pixbuf("block_type_block_start_16x16.png");
@@ -680,28 +723,3 @@ int ui_playlist_item_dialog(omnplay_instance_t* app, playlist_item_t* item)
 
     return r;
 };
-
-void ui_library_refresh(omnplay_instance_t* app, GtkWidget **p_win, GtkWidget **p_label)
-{
-    GtkWidget *win, *box, *label;
-
-    win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title(GTK_WINDOW(win), _("Library refreshing..."));
-    gtk_window_set_default_size(GTK_WINDOW(win), 250, 100);
-    gtk_window_set_modal(GTK_WINDOW(win), TRUE);
-    gtk_window_set_transient_for(GTK_WINDOW(win), GTK_WINDOW(app->window));
-
-    box = gtk_vbox_new(FALSE, 0);
-    gtk_widget_show(box);
-    gtk_container_add(GTK_CONTAINER(win), box);
-
-    label = create_label(NULL, "Requsting status...", NULL, 0),
-    gtk_widget_show(label);
-    gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, 0);
-
-    gtk_window_present(GTK_WINDOW(win));
-    gtk_widget_show(win);
-
-    *p_win = win;
-    *p_label = label;
-};