Revision: 1970
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1970&view=rev
Author: jcsjcs
Date: 2008-05-10 23:07:12 -0700 (Sat, 10 May 2008)
Log Message:
-----------
* src/misc_playlist.c: don't allow adding of playlists if iPod is
not loaded. Thanks to Andrea.
* src/fileselection.c: use gtkpod_warning_simple() instead of
error_dialog() -- reducing code. Thanks to Andrea.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/display.c
gtkpod/trunk/src/fileselection.c
gtkpod/trunk/src/misc_playlist.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2008-05-10 13:10:38 UTC (rev 1969)
+++ gtkpod/trunk/ChangeLog 2008-05-11 06:07:12 UTC (rev 1970)
@@ -1,3 +1,11 @@
+2008-05-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/misc_playlist.c: don't allow adding of playlists if iPod is
+ not loaded. Thanks to Andrea.
+
+ * src/fileselection.c: use gtkpod_warning_simple() instead of
+ error_dialog() -- reducing code. Thanks to Andrea.
+
2008-05-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
* data/gtkpod.glade: added lost handler to "create new
Modified: gtkpod/trunk/src/display.c
===================================================================
--- gtkpod/trunk/src/display.c 2008-05-10 13:10:38 UTC (rev 1969)
+++ gtkpod/trunk/src/display.c 2008-05-11 06:07:12 UTC (rev 1970)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-12-13 01:02:57 jcs>
+/* Time-stamp: <2008-05-05 23:04:02 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -155,7 +155,7 @@
}
-/* make sure only suitable delete menu items are available */
+/* make sure only suitable menu items are available */
void display_adjust_menus (void)
{
GtkWidget *delete;
@@ -173,6 +173,13 @@
edit3 = gtkpod_xml_get_widget (main_window_xml, "create_playlists_menu");
edit4 = gtkpod_xml_get_widget (main_window_xml,
"randomize_current_playlist_menu");
edit5 = gtkpod_xml_get_widget (main_window_xml, "save_track_order_menu");
+
+#if 0
+ edit6 = gtkpod_xml_get_widget (main_window_xml, "add_files1");
+ edit7 = gtkpod_xml_get_widget (main_window_xml, "add_directory1");
+ edit8 = gtkpod_xml_get_widget (main_window_xml, "add_playlist1");
+#endif
+
dtfpl = gtkpod_xml_get_widget (main_window_xml,
"delete_selected_tracks_from_playlist");
dtfip = gtkpod_xml_get_widget (main_window_xml,
@@ -202,6 +209,13 @@
espl = gtkpod_xml_get_widget (main_window_xml,
"edit_smart_playlist");
+#if 0
+ tb_edit1 = gtkpod_xml_get_widget (main_window_xml, "add_files_button");
+ tb_edit2 = gtkpod_xml_get_widget (main_window_xml, "add_dirs_button");
+ tb_edit3 = gtkpod_xml_get_widget (main_window_xml, "add_PL_button");
+ tb_edit4 = gtkpod_xml_get_widget (main_window_xml, "new_PL_button");
+#endif
+
pl = pm_get_selected_playlist ();
if (pl == NULL)
Modified: gtkpod/trunk/src/fileselection.c
===================================================================
--- gtkpod/trunk/src/fileselection.c 2008-05-10 13:10:38 UTC (rev 1969)
+++ gtkpod/trunk/src/fileselection.c 2008-05-11 06:07:12 UTC (rev 1970)
@@ -54,26 +54,6 @@
#include "fileselection.h"
#include "display_coverart.h"
-/*
- * Data global to this module only
- */
-
-static void error_dialog (const gchar *str)
-{
- GtkWidget *dialog;
-
- g_return_if_fail (str);
-
- dialog = gtk_message_dialog_new (GTK_WINDOW (gtkpod_window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_OK,
- str);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-}
-
-
/* OK button */
static void add_files_ok(GtkFileChooser* filechooser, Playlist *playlist)
{
@@ -158,7 +138,7 @@
if (!pl)
{
- error_dialog (_("Please select a playlist or repository before adding
tracks."));
+ gtkpod_warning_simple (_("Please select a playlist or repository before
adding tracks."));
return;
}
@@ -169,7 +149,7 @@
if (!eitdb->itdb_imported)
{
- error_dialog (_("Please load the iPod before adding tracks."));
+ gtkpod_warning_simple (_("Please load the iPod before adding tracks."));
return;
}
@@ -299,7 +279,7 @@
if (!itdb)
{
- error_dialog (_("Please select a playlist or repository before adding
tracks."));
+ gtkpod_warning_simple (_("Please select a playlist or repository before
adding tracks."));
return;
}
@@ -308,7 +288,7 @@
if (!eitdb->itdb_imported)
{
- error_dialog (_("Please load the iPod before adding tracks."));
+ gtkpod_warning_simple (_("Please load the iPod before adding tracks."));
return;
}
@@ -650,7 +630,7 @@
if(!pl)
{
- error_dialog (_("Please select a playlist or repository before adding
tracks."));
+ gtkpod_warning_simple (_("Please select a playlist or repository
before adding tracks."));
return;
}
Modified: gtkpod/trunk/src/misc_playlist.c
===================================================================
--- gtkpod/trunk/src/misc_playlist.c 2008-05-10 13:10:38 UTC (rev 1969)
+++ gtkpod/trunk/src/misc_playlist.c 2008-05-11 06:07:12 UTC (rev 1970)
@@ -57,11 +57,21 @@
Playlist *add_new_pl_user_name (iTunesDB *itdb,
gchar *dflt, gint32 position)
{
+ ExtraiTunesDBData *eitdb;
Playlist *result = NULL;
gchar *name;
g_return_val_if_fail (itdb, NULL);
+ eitdb = itdb->userdata;
+ g_return_val_if_fail (eitdb, NULL);
+
+ if (!eitdb->itdb_imported)
+ {
+ gtkpod_warning_simple(_("Please load the iPod before adding
playlists."));
+ return NULL;
+ }
+
name = get_user_string (
_("New Playlist"),
_("Please enter a name for the new playlist"),
@@ -84,11 +94,21 @@
void add_new_pl_or_spl_user_name (iTunesDB *itdb,
gchar *dflt, gint32 position)
{
+ ExtraiTunesDBData *eitdb;
gboolean is_spl = FALSE;
gchar *name;
g_return_if_fail (itdb);
+ eitdb = itdb->userdata;
+ g_return_if_fail (eitdb);
+
+ if (!eitdb->itdb_imported)
+ {
+ gtkpod_warning_simple(_("Please load the iPod before adding
playlists."));
+ return;
+ }
+
name = get_user_string (
_("New Playlist"),
_("Please enter a name for the new playlist"),
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
