X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fui.c;h=ef556b759862d362a0cffe9aca1f9ca843a59379;hb=07c6d84a23c9043e2334987fc8533f68e5e23183;hp=c3d75d219290c541ddc24ccbd3fe602ea98d089b;hpb=888b62e244add3b4b495427cd3e789b9e4dca70e;p=melted_gui diff --git a/src/ui.c b/src/ui.c index c3d75d2..ef556b7 100644 --- a/src/ui.c +++ b/src/ui.c @@ -81,15 +81,15 @@ static const column_desc_t playlist_columns[] = const static column_desc_t library_columns[] = { { - "ID", - G_TYPE_STRING + "TYPE", + G_TYPE_OBJECT }, { "DUR", G_TYPE_STRING }, { - "TITLE", + "NAME", G_TYPE_STRING }, { @@ -118,7 +118,7 @@ static GtkWidget* create_label(GtkWidget* top, char* text, char* reg, GtkJustifi return label; }; -static GtkWidget* create_treeview(GtkWidget* top, char* name, const column_desc_t columns[]) +static GtkWidget* create_treeview_list(GtkWidget* top, char* name, const column_desc_t columns[]) { int i, count; @@ -192,7 +192,82 @@ static GtkWidget* create_treeview(GtkWidget* top, char* name, const column_desc_ return treeview; }; -static GtkWidget* pane_library_grid(GtkWidget* top, instance_t* app) +static GtkWidget* create_treeview_tree(GtkWidget* top, char* name, const column_desc_t columns[]) +{ + int i, count; + + GtkWidget *treeview; + GtkTreeSelection *selection; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + GtkTreeStore *tree_store; + GType tree_store_types[32]; + + 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); + + for(i = 0, count = 0; columns[i].title; i++, count++) + tree_store_types[i] = (columns[i].type == G_TYPE_OBJECT)?GDK_TYPE_PIXBUF:columns[i].type; + tree_store_types[count + 0] = G_TYPE_POINTER; + tree_store_types[count + 1] = G_TYPE_POINTER; + tree_store_types[count + 2] = G_TYPE_BOOLEAN; + tree_store_types[count + 3] = G_TYPE_STRING; + + tree_store = gtk_tree_store_newv(count + 4, tree_store_types); + + gtk_tree_view_set_model( GTK_TREE_VIEW( treeview ), GTK_TREE_MODEL( tree_store ) ); + + for(i = 0; columns[i].title; i++) + { + char* prop; + column = NULL; + + 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].title, renderer, + prop, i, + "background-set", count + 2, + "background", count + 3, + 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); + }; + + g_object_unref(tree_store); + + GLADE_HOOKUP_OBJECT (top, treeview, name); + + return treeview; +}; + +static GtkWidget* pane_library_tree(GtkWidget* top, instance_t* app) { GtkWidget *scrolledwindow; @@ -202,7 +277,7 @@ static GtkWidget* pane_library_grid(GtkWidget* top, instance_t* app) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (scrolledwindow), - app->library_grid = create_treeview(top, "treeview_library", library_columns)); + app->library_tree = create_treeview_tree(top, "treeview_library", library_columns)); return scrolledwindow; } @@ -269,7 +344,7 @@ static GtkWidget* pane_library(GtkWidget* top, instance_t* app) /* add grid */ gtk_box_pack_start (GTK_BOX (vbox), - pane_library_grid(top, app), + pane_library_tree(top, app), TRUE, TRUE, 0); /* add search buttons */ @@ -462,7 +537,7 @@ static GtkWidget* pane_operate_grid(GtkWidget* top, instance_t* app) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (scrolledwindow), - app->playlist_grid = create_treeview(top, "treeview_playlist", playlist_columns)); + app->playlist_grid = create_treeview_list(top, "treeview_playlist", playlist_columns)); return scrolledwindow; } @@ -733,3 +808,56 @@ int ui_playlist_item_dialog(instance_t* app, playlist_item_t* item) return r; }; + +/********************************************************************************/ + +void ui_update_player(player_t* player, char *tc_cur, char *tc_rem, char *state, char *status, char *clip) +{ + /* update status in status page */ + gdk_threads_enter(); + gtk_label_set_text(GTK_LABEL (player->label_tc_cur), tc_cur); + gtk_label_set_text(GTK_LABEL (player->label_tc_rem), tc_rem); + gtk_label_set_text(GTK_LABEL (player->label_state), state); + gtk_label_set_text(GTK_LABEL (player->label_status), status); + gtk_label_set_text(GTK_LABEL (player->label_clip), clip); + gdk_flush(); + gdk_threads_leave(); +}; + +static gboolean ui_playlist_draw_item_rem_proc( + GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data) +{ + int i; + void** args = (void**)user_data; + GtkListStore *list_store = (GtkListStore *)args[1]; + int idx = (int)args[2]; + char* rem = (char*)args[3]; + + gtk_tree_model_get(model, iter, 7, &i, -1); + + if(i != idx) return FALSE; + + gtk_list_store_set(list_store, iter, 0, rem, -1); + + return TRUE; +}; + +void ui_playlist_draw_item_rem(instance_t* app, int idx, char* rem) +{ + void* item[4]; + GtkListStore *list_store; + + gdk_threads_enter(); + + list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->playlist_grid))); + + item[0] = (void*)app; + item[1] = (void*)list_store; + item[2] = (void*)idx; + item[3] = (void*)rem; + + gtk_tree_model_foreach(GTK_TREE_MODEL(list_store), ui_playlist_draw_item_rem_proc, item); + + gdk_flush(); + gdk_threads_leave(); +};