X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fui.c;h=a202491e14b684f51f7c23968767e9cc5d45b14c;hb=4c546648c90359fcbc9695c1c9139d7368462c09;hp=bea64e65e3a611b361f9b3d1f22c07d63f8f3581;hpb=60c5e3509ce7c34d015956a562a98cce45e82ecb;p=omnplay

diff --git a/src/ui.c b/src/ui.c
index bea64e6..a202491 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -131,6 +131,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);
 
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
     gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
@@ -138,14 +139,17 @@ static GtkWidget* create_treeview(GtkWidget* top, char* name, const column_desc_
     for(i = 0, count = 0; columns[i].title; i++, count++)
         list_store_types[i] = (columns[i].type == G_TYPE_OBJECT)?GDK_TYPE_PIXBUF:columns[i].type;
     list_store_types[count] = G_TYPE_INT;
+    list_store_types[count + 1] = G_TYPE_BOOLEAN;
+    list_store_types[count + 2] = G_TYPE_STRING;
 
-    list_store = gtk_list_store_newv(count + 1, list_store_types);
+    list_store = gtk_list_store_newv(count + 3, list_store_types);
 
     gtk_tree_view_set_model( GTK_TREE_VIEW( treeview ), GTK_TREE_MODEL( list_store ) );
 
     for(i = 0; columns[i].title; i++)
     {
         char* prop;
+        column = NULL;
 
         if(columns[i].type == G_TYPE_OBJECT)
         {
@@ -162,10 +166,21 @@ static GtkWidget* create_treeview(GtkWidget* top, char* name, const column_desc_
         {
             renderer = gtk_cell_renderer_text_new();
             prop = "text";
+
+            column = gtk_tree_view_column_new_with_attributes(
+                columns[i].title, renderer,
+                    prop, i,
+                    "background-set", count + 1,
+                    "background", count + 2,
+                    NULL);
         }
 
-        column = gtk_tree_view_column_new_with_attributes(
-            columns[i].title, renderer, prop, i, NULL);
+        if(!column)
+            column = gtk_tree_view_column_new_with_attributes(
+                columns[i].title, renderer,
+                    prop, i,
+                    NULL);
+
         gtk_tree_view_append_column(GTK_TREE_VIEW( treeview ), column);
     };
 
@@ -214,6 +229,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;
@@ -227,11 +266,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;
 }
 
@@ -240,11 +284,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);
@@ -513,6 +560,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");
@@ -520,8 +568,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");
@@ -655,7 +712,7 @@ int ui_playlist_item_dialog(omnplay_instance_t* app, playlist_item_t* item)
             item->player = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
 
             /* check if all data entered correctly */
-            if(item->dur && item->id[0])
+            if(item->id[0])
                 c = 0;
         };
     };