X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fui.c;h=9ceebfe50de8193c4f1e59980e9b6309f3a00f5c;hb=8f058cdb606938af320e3ca33a7c10a14741a0d6;hp=1a6a2f931cfdb9eb62b4eca6e2475abb0256c3e5;hpb=459178fa4efc80e84a3044d45796e05f4012f257;p=melted_gui diff --git a/src/ui.c b/src/ui.c index 1a6a2f9..9ceebfe 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1,6 +1,6 @@ /* - * ui.c -- GTK+ 2 omnplay - * Copyright (C) 2011 Maksym Veremeyenko + * ui.c -- GTK+ 2 melted gui + * Copyright (C) 2012 Maksym Veremeyenko * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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); @@ -191,7 +192,7 @@ static GtkWidget* create_treeview(GtkWidget* top, char* name, const column_desc_ return treeview; }; -static GtkWidget* pane_library_grid(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_library_tree(GtkWidget* top, instance_t* app) { GtkWidget *scrolledwindow; @@ -201,12 +202,12 @@ 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", library_columns)); + app->library_tree = create_treeview(top, "treeview_library", library_columns)); return scrolledwindow; } -static GtkWidget* pane_library_buttons(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_library_buttons(GtkWidget* top, instance_t* app) { GtkWidget* hbox; @@ -229,7 +230,7 @@ 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) +static GtkWidget* pane_library_search_buttons(GtkWidget* top, instance_t* app) { GtkWidget* hbox; @@ -253,7 +254,7 @@ static GtkWidget* pane_library_search_buttons(GtkWidget* top, omnplay_instance_t return hbox; } -static GtkWidget* pane_library(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_library(GtkWidget* top, instance_t* app) { GtkWidget* vbox; @@ -268,7 +269,7 @@ static GtkWidget* pane_library(GtkWidget* top, omnplay_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 */ @@ -279,16 +280,19 @@ static GtkWidget* pane_library(GtkWidget* top, omnplay_instance_t* app) return vbox; } -static GtkWidget* create_channel_status(GtkWidget* top, omnplay_instance_t* app, int idx) +static GtkWidget* create_channel_status(GtkWidget* top, instance_t* app, int idx) { GtkWidget* vbox; GtkWidget* hbox; GtkWidget* frame; - omnplay_player_t* player; + char name[PATH_MAX]; + player_t* player; player = &app->players.item[idx]; - frame = gtk_frame_new(player->name); + snprintf(name, sizeof(name), "unit %d [%c]", player->unit, idx + 'A'); + + frame = gtk_frame_new(name); gtk_widget_show(frame); vbox = gtk_vbox_new(FALSE, 0); @@ -349,7 +353,7 @@ static GtkWidget* create_channel_status(GtkWidget* top, omnplay_instance_t* app, return frame; } -static GtkWidget* pane_operate_status(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_operate_status(GtkWidget* top, instance_t* app) { int i; GtkWidget* vbox; @@ -378,7 +382,7 @@ static GtkWidget* pane_operate_status(GtkWidget* top, omnplay_instance_t* app) return vbox; } -static GtkWidget* pane_operate_buttons_playlist(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_operate_buttons_playlist(GtkWidget* top, instance_t* app) { GtkWidget* hbox; @@ -435,10 +439,20 @@ static GtkWidget* pane_operate_buttons_playlist(GtkWidget* top, omnplay_instance ui_create_button(top, app, BUTTON_PLAYLIST_ITEM_DOWN), FALSE, FALSE, 0); + /* spacer */ + gtk_box_pack_start (GTK_BOX (hbox), + create_label(top, " ", NULL, GTK_JUSTIFY_CENTER), + FALSE, FALSE, 0); + + /* playlist relink */ + gtk_box_pack_start (GTK_BOX (hbox), + ui_create_button(top, app, BUTTON_PLAYLIST_RELINK), + FALSE, FALSE, 0); + return hbox; } -static GtkWidget* pane_operate_grid(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_operate_grid(GtkWidget* top, instance_t* app) { GtkWidget *scrolledwindow; @@ -453,7 +467,7 @@ static GtkWidget* pane_operate_grid(GtkWidget* top, omnplay_instance_t* app) return scrolledwindow; } -static GtkWidget* pane_operate_buttons_operate(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_operate_buttons_operate(GtkWidget* top, instance_t* app) { GtkWidget* hbox; @@ -487,7 +501,7 @@ static GtkWidget* pane_operate_buttons_operate(GtkWidget* top, omnplay_instance_ return hbox; } -static GtkWidget* pane_operate_operate(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_operate_operate(GtkWidget* top, instance_t* app) { GtkWidget* vbox; @@ -513,7 +527,7 @@ static GtkWidget* pane_operate_operate(GtkWidget* top, omnplay_instance_t* app) } -static GtkWidget* pane_operate(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_operate(GtkWidget* top, instance_t* app) { GtkWidget* hbox; @@ -534,7 +548,7 @@ static GtkWidget* pane_operate(GtkWidget* top, omnplay_instance_t* app) }; -static GtkWidget* pane_top(GtkWidget* top, omnplay_instance_t* app) +static GtkWidget* pane_top(GtkWidget* top, instance_t* app) { GtkWidget* pane; @@ -554,40 +568,50 @@ static GtkWidget* pane_top(GtkWidget* top, omnplay_instance_t* app) return pane; } -GtkWidget* ui_omnplay (omnplay_instance_t* app) +GtkWidget* ui_create(instance_t* app) { GtkWidget *wnd; + GtkWidget* vbox; wnd = gtk_window_new (GTK_WINDOW_TOPLEVEL); - GLADE_HOOKUP_OBJECT_NO_REF (wnd, wnd, "omnplay_window"); + GLADE_HOOKUP_OBJECT_NO_REF (wnd, wnd, PACKAGE "_window"); - gtk_window_set_title (GTK_WINDOW (wnd), _("Omneon Player")); + gtk_window_set_title (GTK_WINDOW (wnd), _(PRODUCT_NAME)); 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); - app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_BEGIN] = + 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, "started", NULL, GTK_JUSTIFY_LEFT), + FALSE, FALSE, 0); + + app->playlist.block_icons[PLAYLIST_ITEM_BLOCK_BEGIN] = create_pixbuf("block_type_block_start_16x16.png"); - app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY] = + app->playlist.block_icons[PLAYLIST_ITEM_BLOCK_BODY] = create_pixbuf("block_type_block_middle_16x16.png"); - app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_END] = + app->playlist.block_icons[PLAYLIST_ITEM_BLOCK_END] = create_pixbuf("block_type_block_end_16x16.png"); - app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE] = + app->playlist.block_icons[PLAYLIST_ITEM_BLOCK_SINGLE] = create_pixbuf("block_type_block_single_16x16.png"); - app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_BEGIN] = + app->playlist.block_icons[PLAYLIST_ITEM_LOOP_BEGIN] = create_pixbuf("block_type_loop_start_16x16.png"); - app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_BODY] = + app->playlist.block_icons[PLAYLIST_ITEM_LOOP_BODY] = create_pixbuf("block_type_loop_middle_16x16.png"); - app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_END] = + app->playlist.block_icons[PLAYLIST_ITEM_LOOP_END] = create_pixbuf("block_type_loop_end_16x16.png"); - app->playlist.block_icons[OMNPLAY_PLAYLIST_ITEM_LOOP_SINGLE] = + app->playlist.block_icons[PLAYLIST_ITEM_LOOP_SINGLE] = create_pixbuf("block_type_block_loop_16x16.png"); return wnd; } -int ui_playlist_item_dialog(omnplay_instance_t* app, playlist_item_t* item) +int ui_playlist_item_dialog(instance_t* app, playlist_item_t* item) { int r, c; char tc[32]; @@ -710,27 +734,55 @@ 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) +/********************************************************************************/ + +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) { - GtkWidget *win, *box, *label; + 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; - 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)); + gdk_threads_enter(); - box = gtk_vbox_new(FALSE, 0); - gtk_widget_show(box); - gtk_container_add(GTK_CONTAINER(win), box); + list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->playlist_grid))); - label = create_label(NULL, "Requsting status...", NULL, 0), - gtk_widget_show(label); - gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, 0); + item[0] = (void*)app; + item[1] = (void*)list_store; + item[2] = (void*)idx; + item[3] = (void*)rem; - gtk_window_present(GTK_WINDOW(win)); - gtk_widget_show(win); + gtk_tree_model_foreach(GTK_TREE_MODEL(list_store), ui_playlist_draw_item_rem_proc, item); - *p_win = win; - *p_label = label; + gdk_flush(); + gdk_threads_leave(); };