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);
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;
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;
}
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);
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;
}
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");
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");
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;
-};