Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15195/src
Modified Files:
display.c misc_confirm.c misc_playlist.c misc_track.c
Log Message:
* src/display.c
src/misc_confirm.c
src/misc_playlist.c
src/misc_track.c: use message_sb_...() instead of indivudual strings.
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- display.c 23 Jun 2006 16:26:32 -0000 1.145
+++ display.c 23 Jun 2006 16:59:23 -0000 1.146
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-24 01:18:27 jcs>
+/* Time-stamp: <2006-06-24 01:53:45 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -886,12 +886,14 @@
{
Playlist *pl = pm_get_selected_playlist ();
- if (!pl)
+ if (pl)
{
- gtkpod_statusbar_message (_("No playlist selected"));
- return;
+ details_edit (pl->members);
+ }
+ else
+ {
+ message_sb_no_playlist_selected ();
}
- details_edit (pl->members);
}
void on_edit_details_selected_tab_entry (GtkMenuItem *menuitem,
@@ -1275,17 +1277,18 @@
Playlist *pl;
pl = pm_get_selected_playlist();
- if (!pl)
- { /* no playlist selected */
- gtkpod_statusbar_message (_("No playlist selected."));
- return;
+ if (pl)
+ {
+ sync_playlist (pl, NULL,
+ KEY_SYNC_CONFIRM_DIRS, 0,
+ KEY_SYNC_DELETE_TRACKS, 0,
+ KEY_SYNC_CONFIRM_DELETE, 0,
+ KEY_SYNC_SHOW_SUMMARY, 0);
+ }
+ else
+ {
+ message_sb_no_playlist_selected ();
}
-
- sync_playlist (pl, NULL,
- KEY_SYNC_CONFIRM_DIRS, 0,
- KEY_SYNC_DELETE_TRACKS, 0,
- KEY_SYNC_CONFIRM_DELETE, 0,
- KEY_SYNC_SHOW_SUMMARY, 0);
}
void
@@ -1331,10 +1334,12 @@
if (!pl)
{
- gtkpod_statusbar_message (_("No playlist selected"));
- return;
+ export_files_init (pl->members, NULL, FALSE, NULL);
+ }
+ else
+ {
+ message_sb_no_playlist_selected ();
}
- export_files_init (pl->members, NULL, FALSE, NULL);
}
@@ -1372,7 +1377,7 @@
}
else
{
- gtkpod_statusbar_message (_("No tracks selected"));
+ message_sb_no_tracks_selected ();
}
}
@@ -1383,12 +1388,14 @@
{
Playlist *pl = pm_get_selected_playlist ();
- if (!pl)
+ if (pl)
{
- gtkpod_statusbar_message (_("No playlist selected"));
- return;
+ export_playlist_file_init (pl->members);
+ }
+ else
+ {
+ message_sb_no_playlist_selected ();
}
- export_playlist_file_init (pl->members);
}
@@ -1426,7 +1433,7 @@
}
else
{
- gtkpod_statusbar_message (_("No tracks selected"));
+ message_sb_no_tracks_selected ();
}
}
@@ -1436,9 +1443,13 @@
{
Playlist *pl = pm_get_selected_playlist ();
if (pl)
+ {
tools_play_tracks (pl->members);
+ }
else
- gtkpod_statusbar_message (_("No playlist selected"));
+ {
+ message_sb_no_playlist_selected ();
+ }
}
@@ -1475,7 +1486,9 @@
tracks = NULL;
}
else
- gtkpod_statusbar_message (_("No tracks selected"));
+ {
+ message_sb_no_tracks_selected ();
+ }
}
@@ -1485,9 +1498,13 @@
{
Playlist *pl = pm_get_selected_playlist ();
if (pl)
+ {
tools_enqueue_tracks (pl->members);
+ }
else
- gtkpod_statusbar_message (_("No playlist selected"));
+ {
+ message_sb_no_playlist_selected ();
+ }
}
@@ -1524,7 +1541,9 @@
tracks = NULL;
}
else
- gtkpod_statusbar_message (_("No tracks selected"));
+ {
+ message_sb_no_tracks_selected ();
+ }
}
Index: misc_confirm.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_confirm.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- misc_confirm.c 12 Jun 2006 02:44:00 -0000 1.38
+++ misc_confirm.c 23 Jun 2006 16:59:23 -0000 1.39
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-31 21:53:06 jcs>
+/* Time-stamp: <2006-06-24 01:59:05 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -331,7 +331,7 @@
pl = pm_get_selected_playlist ();
if (pl == NULL)
{ /* no playlist??? Cannot happen, but... */
- gtkpod_statusbar_message (_("No playlist selected."));
+ message_sb_no_playlist_selected ();
return;
}
itdb = pl->itdb;
@@ -340,7 +340,7 @@
selected_tracks = tm_get_selected_tracks();
if (selected_tracks == NULL)
{ /* no tracks selected */
- gtkpod_statusbar_message (_("No tracks selected."));
+ message_sb_no_tracks_selected ();
return;
}
@@ -419,7 +419,7 @@
pl = pm_get_selected_playlist();
if (pl == NULL)
{ /* no playlist??? Cannot happen, but... */
- gtkpod_statusbar_message (_("No playlist selected."));
+ message_sb_no_playlist_selected ();
return;
}
itdb = pl->itdb;
@@ -669,7 +669,7 @@
pl = pm_get_selected_playlist();
if (!pl)
{ /* no playlist selected */
- gtkpod_statusbar_message (_("No playlist selected."));
+ message_sb_no_playlist_selected ();
return;
}
Index: misc_playlist.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_playlist.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- misc_playlist.c 23 Jun 2006 16:46:12 -0000 1.37
+++ misc_playlist.c 23 Jun 2006 16:59:23 -0000 1.38
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-24 01:38:21 jcs>
+/* Time-stamp: <2006-06-24 01:53:45 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -288,7 +288,7 @@
if (!pl)
{
- gtkpod_statusbar_message (_("No playlist selected"));
+ message_sb_no_playlist_selected ();
return;
}
Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- misc_track.c 21 Jun 2006 04:50:09 -0000 1.48
+++ misc_track.c 23 Jun 2006 16:59:23 -0000 1.49
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-11 14:15:48 jcs>
+/* Time-stamp: <2006-06-24 01:53:44 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1613,7 +1613,7 @@
pl = pm_get_selected_playlist();
if (!pl)
{ /* no playlist selected */
- gtkpod_statusbar_message (_("No playlist selected."));
+ message_sb_no_playlist_selected ();
return;
}
for (gl=pl->members; gl; gl=gl->next)
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
