X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fui.c;h=a4ac0246a9ae65d85fd39e2f6aa1d0a4e1016907;hb=542e0abd65b0663c9cb2cb5a39e1840f493a4ba9;hp=cafefb58be18a8acef53016fc3bdf9d39b21656f;hpb=ed7ca5c41e345f28a10e70624e0e0ca709f3fb51;p=omnplay

diff --git a/src/ui.c b/src/ui.c
index cafefb5..a4ac024 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -35,6 +35,69 @@
 #include "ui_buttons.h"
 #include "support.h"
 
+typedef struct column_desc
+{
+    char* title;
+    GType type;
+} column_desc_t;
+
+static const column_desc_t playlist_columns[] =
+{
+    {
+        "REM",
+        G_TYPE_STRING
+    },
+    {
+        "B",
+        G_TYPE_OBJECT
+    },
+    {
+        "CH",
+        G_TYPE_STRING
+    },
+    {
+        "ID",
+        G_TYPE_STRING
+    },
+    {
+        "IN",
+        G_TYPE_STRING
+    },
+    {
+        "DUR",
+        G_TYPE_STRING
+    },
+    {
+        "TITLE",
+        G_TYPE_STRING
+    },
+    {
+        NULL,
+        G_TYPE_STRING
+    }
+};
+
+const static column_desc_t library_columns[] =
+{
+    {
+        "ID",
+        G_TYPE_STRING
+    },
+    {
+        "DUR",
+        G_TYPE_STRING
+    },
+    {
+        "TITLE",
+        G_TYPE_STRING
+    },
+    {
+        NULL,
+        G_TYPE_STRING
+    }
+};
+
+
 static GtkWidget* create_label(GtkWidget* top, char* text, char* reg, GtkJustification jtype)
 {
     GtkWidget* label;
@@ -53,33 +116,50 @@ static GtkWidget* create_label(GtkWidget* top, char* text, char* reg, GtkJustifi
     return label;
 };
 
-static GtkWidget* create_treeview(GtkWidget* top, char* name, const char* columns[])
+static GtkWidget* create_treeview(GtkWidget* top, char* name, const column_desc_t columns[])
 {
-    int i;
+    int i, count;
 
     GtkWidget *treeview;
     GtkCellRenderer *renderer;
     GtkTreeViewColumn *column;
     GtkListStore *list_store;
+    GType list_store_types[32];
 
     treeview = gtk_tree_view_new ();
     gtk_widget_show (treeview);
 
-    list_store = gtk_list_store_new(7,
-        G_TYPE_STRING,
-        G_TYPE_STRING,
-        G_TYPE_STRING,
-        G_TYPE_STRING,
-        G_TYPE_STRING,
-        G_TYPE_STRING,
-        G_TYPE_STRING);
+    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 + 1] = G_TYPE_INT;
+
+    list_store = gtk_list_store_newv(count + 1, list_store_types);
+
     gtk_tree_view_set_model( GTK_TREE_VIEW( treeview ), GTK_TREE_MODEL( list_store ) );
 
-    for(i = 0; columns[i]; i++)
+    for(i = 0; columns[i].title; i++)
     {
-        renderer = gtk_cell_renderer_toggle_new();
+        char* prop;
+
+        if(columns[i].type == G_TYPE_OBJECT)
+        {
+            renderer = gtk_cell_renderer_pixbuf_new();
+            gtk_cell_renderer_set_padding(renderer, 0, 0);
+            prop = "pixbuf";
+        }
+        else if(columns[i].type == G_TYPE_BOOLEAN)
+        {
+            renderer = gtk_cell_renderer_toggle_new();
+            prop = "active";
+        }
+        else
+        {
+            renderer = gtk_cell_renderer_text_new();
+            prop = "text";
+        }
+
         column = gtk_tree_view_column_new_with_attributes(
-            columns[i], renderer, "text", i, NULL);
+            columns[i].title, renderer, prop, i, NULL);
         gtk_tree_view_append_column(GTK_TREE_VIEW( treeview ), column);
     };
 
@@ -92,7 +172,6 @@ static GtkWidget* create_treeview(GtkWidget* top, char* name, const char* column
 
 static GtkWidget* pane_library_grid(GtkWidget* top, omnplay_instance_t* app)
 {
-    static const char* columns[] = {"ID", "DUR", "TITLE", NULL};
     GtkWidget *scrolledwindow;
 
     scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
@@ -101,7 +180,7 @@ static GtkWidget* pane_library_grid(GtkWidget* top, omnplay_instance_t* app)
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
     gtk_container_add (GTK_CONTAINER (scrolledwindow),
-        app->library_grid = create_treeview(top, "treeview_library", columns));
+        app->library_grid = create_treeview(top, "treeview_library", library_columns));
 
     return scrolledwindow;
 }
@@ -311,7 +390,6 @@ static GtkWidget* pane_operate_buttons_playlist(GtkWidget* top, omnplay_instance
 
 static GtkWidget* pane_operate_grid(GtkWidget* top, omnplay_instance_t* app)
 {
-    static const char* columns[] = {"REM", "B", "CH", "ID", "IN", "DUR", "TITLE", NULL};
     GtkWidget *scrolledwindow;
 
     scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
@@ -320,7 +398,7 @@ static GtkWidget* pane_operate_grid(GtkWidget* top, omnplay_instance_t* app)
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
     gtk_container_add (GTK_CONTAINER (scrolledwindow),
-        app->playlist_grid = create_treeview(top, "treeview_playlist", columns));
+        app->playlist_grid = create_treeview(top, "treeview_playlist", playlist_columns));
 
     return scrolledwindow;
 }
@@ -439,5 +517,22 @@ GtkWidget* ui_omnplay (omnplay_instance_t* app)
     gtk_container_add (GTK_CONTAINER (wnd),
         pane_top(wnd, app));
 
+    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN] =
+        create_pixbuf("block_type_block_start_16x16.png");
+    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY] =
+        create_pixbuf("block_type_block_middle_16x16.png");
+    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_END] =
+        create_pixbuf("block_type_block_end_16x16.png");
+    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE] =
+        create_pixbuf("block_type_block_single_16x16.png");
+    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_BEGIN] =
+        create_pixbuf("block_type_loop_start_16x16.png");
+    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_BODY] =
+        create_pixbuf("block_type_loop_middle_16x16.png");
+    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_END] =
+        create_pixbuf("block_type_loop_end_16x16.png");
+    app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_SINGLE] =
+        create_pixbuf("block_type_block_loop_16x16.png");
+
     return wnd;
 }