Menu
▾
▴
[xine-cvs] CVS: sinek/src playlist.c,1.4,1.5 prefs.c,1.4,1.5 tune.c,1.4,1.5
|
From: G?rer ?z. <ma...@us...> - 2001-12-26 11:19:59
|
Update of /cvsroot/xine/sinek/src
In directory usw-pr-cvs1:/tmp/cvs-serv3681/src
Modified Files:
playlist.c prefs.c tune.c
Log Message:
unimportant fixes.
Index: playlist.c
===================================================================
RCS file: /cvsroot/xine/sinek/src/playlist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- playlist.c 2001/12/25 18:43:19 1.4
+++ playlist.c 2001/12/26 11:19:53 1.5
@@ -32,6 +32,7 @@
static gint cb_double_selection(GtkWidget *w, GdkEventButton *ev, gpointer data);
static void cb_add(GtkWidget *w, gpointer data);
static void cb_remove(GtkWidget *w, gpointer data);
+static void cb_remove_all(GtkWidget *w, gpointer data);
void pl_load(void);
@@ -40,7 +41,7 @@
GtkWidget *vb, *info, *sw, *lab, *hb, *but;
pl_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(pl_win), "Sinek Playlist");
+ gtk_window_set_title(GTK_WINDOW(pl_win), _("Sinek Playlist"));
gtk_window_set_wmclass(GTK_WINDOW(pl_win), "Sinek Playlist", "Sinek");
gtk_window_set_default_size(GTK_WINDOW(pl_win), 450, 200);
@@ -59,54 +60,59 @@
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(vb), sw, TRUE, TRUE, 0);
- clist_wid = gtk_clist_new(3);
+ clist_wid = gtk_clist_new(1);
gtk_widget_show(clist_wid);
gtk_container_add(GTK_CONTAINER(sw), clist_wid);
gtk_container_set_border_width(GTK_CONTAINER(clist_wid), 2);
gtk_clist_column_titles_show(GTK_CLIST(clist_wid));
- gtk_clist_columns_autosize(GTK_CLIST(clist_wid));
-/* gtk_clist_set_column_width(GTK_CLIST(clist_wid), 0, 260);
+/* gtk_clist_columns_autosize(GTK_CLIST(clist_wid));
+ gtk_clist_set_column_width(GTK_CLIST(clist_wid), 0, 260);
gtk_clist_set_column_width(GTK_CLIST(clist_wid), 1, 70);
gtk_clist_set_column_width(GTK_CLIST(clist_wid), 2, 70);
*/ gtk_clist_set_reorderable(GTK_CLIST(clist_wid), TRUE);
gtk_signal_connect(GTK_OBJECT(clist_wid), "select_row", GTK_SIGNAL_FUNC(cb_selection), NULL);
gtk_signal_connect(GTK_OBJECT(clist_wid), "button_press_event", GTK_SIGNAL_FUNC(cb_double_selection), NULL);
- lab = gtk_label_new("Media Resource");
+ lab = gtk_label_new(_("Media"));
gtk_widget_show(lab);
gtk_clist_set_column_widget(GTK_CLIST(clist_wid), 0, lab);
- lab = gtk_label_new("Time");
+/* lab = gtk_label_new("Time");
gtk_widget_show(lab);
gtk_clist_set_column_widget(GTK_CLIST(clist_wid), 1, lab);
lab = gtk_label_new("Format");
gtk_widget_show(lab);
gtk_clist_set_column_widget(GTK_CLIST(clist_wid), 2, lab);
-
+*/
hb = gtk_hbox_new(TRUE, 0);
gtk_widget_show(hb);
gtk_box_pack_start(GTK_BOX(vb), hb, FALSE, TRUE, 4);
gtk_container_set_border_width(GTK_CONTAINER(hb), 5);
- but = gtk_button_new_with_label("Play");
+ but = gtk_button_new_with_label(_("Play"));
gtk_widget_show(but);
gtk_box_pack_start(GTK_BOX(hb), but, TRUE, TRUE, 4);
gtk_signal_connect(GTK_OBJECT(but), "clicked", GTK_SIGNAL_FUNC(cb_play), NULL);
- but = gtk_button_new_with_label("Add...");
+ but = gtk_button_new_with_label(_("Add..."));
gtk_widget_show(but);
gtk_box_pack_start(GTK_BOX(hb), but, TRUE, TRUE, 4);
gtk_signal_connect(GTK_OBJECT(but), "clicked", GTK_SIGNAL_FUNC(cb_add), NULL);
- but = gtk_button_new_with_label("Remove");
+ but = gtk_button_new_with_label(_("Remove"));
gtk_widget_show(but);
gtk_box_pack_start(GTK_BOX(hb), but, TRUE, TRUE, 4);
gtk_signal_connect(GTK_OBJECT(but), "clicked", GTK_SIGNAL_FUNC(cb_remove), NULL);
- but = gtk_button_new_with_label("Save");
+ but = gtk_button_new_with_label(_("Remove All"));
gtk_widget_show(but);
gtk_box_pack_start(GTK_BOX(hb), but, TRUE, TRUE, 4);
+ gtk_signal_connect(GTK_OBJECT(but), "clicked", GTK_SIGNAL_FUNC(cb_remove_all), NULL);
+
+ but = gtk_button_new_with_label(_("Save"));
+ gtk_widget_show(but);
+ gtk_box_pack_start(GTK_BOX(hb), but, TRUE, TRUE, 4);
gtk_signal_connect(GTK_OBJECT(but), "clicked", GTK_SIGNAL_FUNC(cb_save), NULL);
pl_load();
@@ -260,10 +266,9 @@
static void cb_add(GtkWidget *w, gpointer data)
{
- if(add_win) goto out;
+ if(add_win == NULL)
+ add_win = file_request(1);
- add_win = file_request(1);
-out:
window_show(add_win);
}
@@ -278,4 +283,18 @@
gtk_clist_columns_autosize(GTK_CLIST(clist_wid));
pl_remove(item);
pl_row = -1;
+}
+
+
+static void cb_remove_all(GtkWidget *w, gpointer data)
+{
+ GList *item;
+
+ while((item = g_list_first(playlist)))
+ {
+ pl_remove(item->data);
+ }
+ gtk_clist_clear(GTK_CLIST(clist_wid));
+ pl_row = -1;
+ pl_cur = NULL;
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/xine/sinek/src/prefs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prefs.c 2001/12/23 17:29:00 1.4
+++ prefs.c 2001/12/26 11:19:53 1.5
@@ -117,8 +117,8 @@
if(sinek.prefs_win) goto out;
sinek.prefs_win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(sinek.prefs_win), "Preferences");
- gtk_window_set_wmclass(GTK_WINDOW(sinek.prefs_win), "Sinek Prefs", "Sinek");
+ gtk_window_set_title(GTK_WINDOW(sinek.prefs_win), _("Sinek Settings"));
+ gtk_window_set_wmclass(GTK_WINDOW(sinek.prefs_win), "Sinek Settings", "Sinek");
tips = gtk_tooltips_new();
@@ -145,7 +145,7 @@
bb = gtk_hbutton_box_new();
gtk_widget_show(bb);
- gtk_box_pack_start(GTK_BOX(vb), bb, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vb), bb, FALSE, FALSE, 0);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bb), 10);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bb), GTK_BUTTONBOX_END);
gtk_container_set_border_width(GTK_CONTAINER(bb), 5);
Index: tune.c
===================================================================
RCS file: /cvsroot/xine/sinek/src/tune.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tune.c 2001/12/19 11:14:53 1.4
+++ tune.c 2001/12/26 11:19:53 1.5
@@ -62,6 +62,7 @@
gtk_widget_show(hb2);
gtk_box_pack_start(GTK_BOX(vb), hb2, FALSE, FALSE, 0);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hb2), GTK_BUTTONBOX_END);
+ gtk_button_box_set_spacing(GTK_BUTTON_BOX(hb2), 10);
b = gtk_button_new_with_label(_("OK"));
gtk_widget_show(b);
|
