commit f8d2838a66a560c22a11f4d2089fde684a00b9cc
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Mon Dec 21 22:56:13 2009 +0000
status bar update re-added
- gtkpod_tracks_statusbar_update added in to gtkpod app interface
- couple of incorrect return calls fixed in anjuta-app.c
libgtkpod/gtkpod_app_iface.c | 58 ++++++++++----------
libgtkpod/gtkpod_app_iface.h | 1 +
plugins/playlist_display/display_playlists.c | 33 +++++++-----
src/anjuta-app.c | 6 +-
src/file.c | 12 ++---
src/file_itunesdb.c | 3 +-
src/misc_playlist.c | 73 ++++++++++----------------
src/misc_track.c | 3 +-
8 files changed, 87 insertions(+), 102 deletions(-)
---
diff --git a/libgtkpod/gtkpod_app_iface.c b/libgtkpod/gtkpod_app_iface.c
index 66c12d5..c322e58 100644
--- a/libgtkpod/gtkpod_app_iface.c
+++ b/libgtkpod/gtkpod_app_iface.c
@@ -41,31 +41,12 @@ static void gtkpod_app_base_init(GtkPodAppInterface* klass)
{
klass->current_itdb = NULL;
klass->current_playlist = NULL;
- gtkpod_app_signals[PLAYLIST_SELECTED] = g_signal_new (
- "playlist_selected",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE,
- 1,
- G_TYPE_POINTER
- );
-
- gtkpod_app_signals[ITDB_UPDATED] = g_signal_new (
- "itdb_updated",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_LAST,
-// G_STRUCT_OFFSET (GtkPodAppInterface, itdb_updated),
- 0,
- NULL, NULL,
- _gtkpod_app_marshal_VOID__POINTER_POINTER,
- G_TYPE_NONE,
- 2,
- G_TYPE_POINTER,
- G_TYPE_POINTER
- );
+ gtkpod_app_signals[PLAYLIST_SELECTED]
+ = g_signal_new("playlist_selected", G_OBJECT_CLASS_TYPE
(klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+ gtkpod_app_signals[ITDB_UPDATED] = g_signal_new("itdb_updated",
G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST,
+ // G_STRUCT_OFFSET (GtkPodAppInterface, itdb_updated),
+ 0, NULL, NULL, _gtkpod_app_marshal_VOID__POINTER_POINTER, G_TYPE_NONE,
2, G_TYPE_POINTER, G_TYPE_POINTER);
initialized = TRUE;
}
@@ -74,8 +55,8 @@ static void gtkpod_app_base_init(GtkPodAppInterface* klass) {
GType gtkpod_app_get_type(void) {
static GType type = 0;
if (!type) {
- static const GTypeInfo
- info = { sizeof(GtkPodAppInterface), (GBaseInitFunc)
gtkpod_app_base_init, NULL, NULL, NULL, NULL, 0, 0, NULL };
+ static const GTypeInfo info =
+ { sizeof(GtkPodAppInterface), (GBaseInitFunc)
gtkpod_app_base_init, NULL, NULL, NULL, NULL, 0, 0, NULL };
type = g_type_register_static(G_TYPE_INTERFACE, "GtkPodAppInterface",
&info, 0);
g_type_interface_add_prerequisite(type, G_TYPE_OBJECT);
}
@@ -97,6 +78,25 @@ void gtkpod_statusbar_message(gchar* message, ...) {
va_end (args);
}
+void gtkpod_tracks_statusbar_update(void) {
+ gchar *buf;
+ Playlist *pl;
+ pl = gtkpod_get_current_playlist();
+ /* select of which iTunesDB data should be displayed */
+ if (pl) {
+ iTunesDB *itdb = pl->itdb;
+ gint trknr = g_list_length(pl->members);
+ g_return_if_fail (itdb);
+
+ buf = g_strdup_printf(_(" P:%d T:%d/%d"), itdb_playlists_number(itdb)
- 1, trknr, itdb_tracks_number(itdb));
+ }
+ else {
+ buf = g_strdup("");
+ }
+ gtkpod_statusbar_message(buf);
+ g_free(buf);
+}
+
void gtkpod_warning(gchar* message, ...) {
g_return_if_fail (GTKPOD_IS_APP(gtkpod_app));
va_list args;
@@ -147,7 +147,7 @@ void gtkpod_set_current_itdb(iTunesDB* itdb) {
g_return_if_fail (GTKPOD_IS_APP(gtkpod_app));
GTKPOD_APP_GET_INTERFACE (gtkpod_app)->current_itdb = itdb;
- if (! itdb) // If setting itdb to null then set playlist to null too
+ if (!itdb) // If setting itdb to null then set playlist to null too
gtkpod_set_current_playlist(NULL);
if (itdb && g_list_index(itdb->playlists, gtkpod_get_current_playlist())
== -1)
@@ -166,5 +166,5 @@ void gtkpod_set_current_playlist(Playlist* playlist) {
if (playlist) // if playlist not null then set its itdb as current
gtkpod_set_current_itdb(playlist->itdb);
- g_signal_emit (gtkpod_app, gtkpod_app_signals[PLAYLIST_SELECTED], 0,
playlist);
+ g_signal_emit(gtkpod_app, gtkpod_app_signals[PLAYLIST_SELECTED], 0,
playlist);
}
diff --git a/libgtkpod/gtkpod_app_iface.h b/libgtkpod/gtkpod_app_iface.h
index 4729c30..229ec08 100644
--- a/libgtkpod/gtkpod_app_iface.h
+++ b/libgtkpod/gtkpod_app_iface.h
@@ -95,6 +95,7 @@ GType gtkpod_app_get_type(void);
void gp_init(GtkPodApp *window, int argc, char *argv[]);
void gtkpod_statusbar_message(gchar* message, ...);
+void gtkpod_tracks_statusbar_update(void);
void gtkpod_warning(gchar* message, ...);
void gtkpod_warning_simple (const gchar *format, ...);
void gtkpod_warning_hig(GtkMessageType icon, const gchar *primary_text, const
gchar *secondary_text);
diff --git a/plugins/playlist_display/display_playlists.c
b/plugins/playlist_display/display_playlists.c
index de7d0e2..1bb531e 100644
--- a/plugins/playlist_display/display_playlists.c
+++ b/plugins/playlist_display/display_playlists.c
@@ -35,7 +35,6 @@
#include <stdlib.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
#include "libgtkpod/gp_itdb.h"
#include "plugin.h"
#include "display_playlists.h"
@@ -53,10 +52,19 @@ static GtkTreeView *playlist_treeview = NULL;
static gboolean pm_selection_blocked = FALSE;
/* Drag and drop definitions */
-static GtkTargetEntry
- pm_drag_types[] = { { DND_GTKPOD_PLAYLISTLIST_TYPE, 0,
DND_GTKPOD_PLAYLISTLIST }, { "text/uri-list", 0, DND_TEXT_URI_LIST }, {
"text/plain", 0, DND_TEXT_PLAIN }, { "STRING", 0, DND_TEXT_PLAIN } };
-static GtkTargetEntry
- pm_drop_types[] = { { DND_GTKPOD_PLAYLISTLIST_TYPE, 0,
DND_GTKPOD_PLAYLISTLIST }, { DND_GTKPOD_TRACKLIST_TYPE, 0, DND_GTKPOD_TRACKLIST
}, { "text/uri-list", 0, DND_TEXT_URI_LIST }, { "text/plain", 0, DND_TEXT_PLAIN
}, { "STRING", 0, DND_TEXT_PLAIN } };
+static GtkTargetEntry pm_drag_types[] =
+ {
+ { DND_GTKPOD_PLAYLISTLIST_TYPE, 0, DND_GTKPOD_PLAYLISTLIST },
+ { "text/uri-list", 0, DND_TEXT_URI_LIST },
+ { "text/plain", 0, DND_TEXT_PLAIN },
+ { "STRING", 0, DND_TEXT_PLAIN } };
+static GtkTargetEntry pm_drop_types[] =
+ {
+ { DND_GTKPOD_PLAYLISTLIST_TYPE, 0, DND_GTKPOD_PLAYLISTLIST },
+ { DND_GTKPOD_TRACKLIST_TYPE, 0, DND_GTKPOD_TRACKLIST },
+ { "text/uri-list", 0, DND_TEXT_URI_LIST },
+ { "text/plain", 0, DND_TEXT_PLAIN },
+ { "STRING", 0, DND_TEXT_PLAIN } };
static void pm_rows_reordered(void);
static GtkTreePath *pm_get_path_for_itdb(Itdb_iTunesDB *itdb);
@@ -128,8 +136,7 @@ static gboolean pm_drag_drop(GtkWidget *widget,
GdkDragContext *drag_context, gi
static void pm_drag_end(GtkWidget *widget, GdkDragContext *drag_context,
gpointer user_data) {
/* puts ("drag_end"); */
gp_remove_autoscroll_row_timeout(widget);
- g_warning("pm_drag_end - status\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
}
static void pm_drag_leave(GtkWidget *widget, GdkDragContext *drag_context,
guint time, gpointer user_data) {
@@ -1137,9 +1144,9 @@ void pm_select_playlist(Playlist *playlist) {
g_return_if_fail (playlist_treeview);
- if (! playlist) {
+ if (!playlist) {
ts = gtk_tree_view_get_selection(playlist_treeview);
- gtk_tree_selection_unselect_all (ts);
+ gtk_tree_selection_unselect_all(ts);
}
else if (pm_get_iter_for_playlist(playlist, &iter)) {
ts = gtk_tree_view_get_selection(playlist_treeview);
@@ -1246,7 +1253,7 @@ static gboolean pm_selection_changed_cb(gpointer data) {
// st_enable_disable_view_sort (0, TRUE);
// st_add_track (NULL, TRUE, TRUE, 0);
// }
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
break;
case PM_COLUMN_PHOTOS:
g_return_val_if_fail (photodb, FALSE);
@@ -2183,7 +2190,7 @@ void message_sb_no_itdb_selected() {
* @newitdb: pointer to the new itdb that should be added in place of the old
itdb.
*
*/
-void playlist_display_update_itdb_cb (GtkPodApp *app, gpointer olditdb,
gpointer newitdb, gpointer data) {
+void playlist_display_update_itdb_cb(GtkPodApp *app, gpointer olditdb,
gpointer newitdb, gpointer data) {
gint pos = -1; /* default: add to the end */
g_return_if_fail (olditdb);
@@ -2203,7 +2210,7 @@ void playlist_display_update_itdb_cb (GtkPodApp *app,
gpointer olditdb, gpointer
pm_add_itdb(new_itdb, pos);
}
-void playlist_display_select_playlist_cb (GtkPodApp *app, gpointer pl,
gpointer data) {
+void playlist_display_select_playlist_cb(GtkPodApp *app, gpointer pl, gpointer
data) {
Playlist *playlist = pl;
- pm_select_playlist (playlist);
+ pm_select_playlist(playlist);
}
diff --git a/src/anjuta-app.c b/src/anjuta-app.c
index e78250b..bc11863 100644
--- a/src/anjuta-app.c
+++ b/src/anjuta-app.c
@@ -897,13 +897,13 @@ static void anjuta_shell_iface_init(AnjutaShellIface
*iface) {
* -------------------------------------------------------------------------
*/
static void anjuta_gtkpod_app_statusbar_message(GtkPodApp *gtkpod_app, gchar*
message, ...) {
- g_return_if_fail(! ANJUTA_IS_APP(gtkpod_app));
+ g_return_if_fail(ANJUTA_IS_APP(gtkpod_app));
AnjutaStatus *status = anjuta_shell_get_status(ANJUTA_SHELL(gtkpod_app),
NULL);
anjuta_status_push(status, "%s", message);
}
static void anjuta_gtkpod_app_warning(GtkPodApp *gtkpod_app, gchar *message,
...) {
- g_return_if_fail(! GTK_IS_WINDOW(gtkpod_app));
+ g_return_if_fail(GTK_IS_WINDOW(gtkpod_app));
anjuta_util_dialog_warning(GTK_WINDOW(gtkpod_app), message);
}
@@ -918,7 +918,7 @@ static void anjuta_gtkpod_app_warning_hig(GtkPodApp
*gtkpod_app, GtkMessageType
}
static gint anjuta_gtkpod_app_confirmation_hig(GtkPodApp *gtkpod_app,
GtkMessageType icon, const gchar *primary_text, const gchar *secondary_text,
const gchar *accept_button_text, const gchar *cancel_button_text, const gchar
*third_button_text, const gchar *help_context) {
- g_return_val_if_fail(! GTK_IS_WINDOW(gtkpod_app), GTK_RESPONSE_CANCEL);
+ g_return_val_if_fail(GTK_IS_WINDOW(gtkpod_app), GTK_RESPONSE_CANCEL);
gint result;
diff --git a/src/file.c b/src/file.c
index 8bdd744..86208f2 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1513,8 +1513,7 @@ void display_non_updated(Track *track, gchar *txt) {
g_string_free(str, TRUE);
str = NULL;
track_nr = 0;
- g_warning("TODO file:display_non_updated - status\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
}
else if (prefs_get_int("show_non_updated") && track) {
/* add info about it to str */
@@ -1573,8 +1572,7 @@ void display_updated(Track *track, gchar *txt) {
g_string_free(str, TRUE);
str = NULL;
track_nr = 0;
- g_warning("TODO file:display_updated - status needed\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
}
else if (prefs_get_int("show_updated") && track) {
/* add info about it to str */
@@ -1633,8 +1631,7 @@ void display_mserv_problems(Track *track, gchar *txt) {
g_string_free(str, TRUE);
str = NULL;
track_nr = 0;
- g_warning("TODO file:display_mserv_problems - status\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
}
else if (prefs_get_int("mserv_use") && prefs_get_int("mserv_report_probs")
&& track) {
/* add info about it to str */
@@ -2013,8 +2010,7 @@ gboolean add_track_by_filename(iTunesDB *itdb, gchar
*fname, Playlist *plitem, g
++count;
if (count >= 10) /* update every ten tracks added */
{
- g_warning("TODO file:add_track_by_filename - status needed\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
count = 0;
}
}
diff --git a/src/file_itunesdb.c b/src/file_itunesdb.c
index 1c6055b..0dabada 100644
--- a/src/file_itunesdb.c
+++ b/src/file_itunesdb.c
@@ -719,8 +719,7 @@ static iTunesDB *gp_merge_itdb(iTunesDB *old_itdb) {
itdb_spl_update_live(new_itdb);
}
- g_warning("TODO - gp_merge_itdb status\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
return new_itdb;
}
diff --git a/src/misc_playlist.c b/src/misc_playlist.c
index ecbc25d..139bc63 100644
--- a/src/misc_playlist.c
+++ b/src/misc_playlist.c
@@ -203,8 +203,7 @@ void generate_category_playlists(iTunesDB *itdb, T_item
cat) {
g_free(category);
}
}
- g_warning("TODO generate_category_playlists - status\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
}
/* Generate a new playlist containing all the tracks currently
@@ -391,11 +390,9 @@ Playlist *generate_playlist_with_name(iTunesDB *itdb,
GList *tracks, gchar *pl_n
}
}
else { /* n==0 */
- g_warning("TODO generate_playlist_with_name - status\n");
- // gtkpod_statusbar_message (_("No tracks available, playlist not
created"));
+ gtkpod_statusbar_message(_("No tracks available, playlist not
created"));
}
- g_warning("TODO generate_playlist_with_name - status update\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
return new_pl;
}
@@ -868,34 +865,25 @@ static void check_db_danglingok1(gpointer user_data1,
gpointer user_data2) {
release_widgets();
}
-static void glist_list_tracks (GList * tlist, GString * str)
-{
- if (str==NULL)
- {
- fprintf(stderr, "Report the bug please: shouldn't be NULL at
%s:%d\n",__FILE__,__LINE__);
- return;
- }
- /* traverse the list and append to the str */
- for (tlist = g_list_first(tlist);
- tlist != NULL;
- tlist = g_list_next(tlist))
- {
- ExtraTrackData *etr;
- Track *track = tlist->data;
- g_return_if_fail (track);
- etr = track->userdata;
- g_return_if_fail (etr);
- g_string_append_printf
- (str,"%s(%d) %s-%s -> %s\n",_("Track"),
- track->id, track->artist, track->title,
etr->pc_path_utf8);
- }
+static void glist_list_tracks(GList * tlist, GString * str) {
+ if (str == NULL) {
+ fprintf(stderr, "Report the bug please: shouldn't be NULL at %s:%d\n",
__FILE__, __LINE__);
+ return;
+ }
+ /* traverse the list and append to the str */
+ for (tlist = g_list_first(tlist); tlist != NULL; tlist =
g_list_next(tlist)) {
+ ExtraTrackData *etr;
+ Track *track = tlist->data;
+ g_return_if_fail (track);
+ etr = track->userdata;
+ g_return_if_fail (etr);
+ g_string_append_printf(str, "%s(%d) %s-%s -> %s\n", _("Track"),
track->id, track->artist, track->title, etr->pc_path_utf8);
+ }
} /* end of glist_list_tracks */
/* checks iTunesDB for presence of dangling links and checks IPODs
* Music directory on subject of orphaned files */
-void check_db (iTunesDB *itdb)
-{
-
+void check_db(iTunesDB *itdb) {
GTree *files_known = NULL;
GDir *dir_des = NULL;
@@ -904,7 +892,8 @@ void check_db (iTunesDB *itdb)
gchar *ipod_filename = NULL;
# define localdebug 0 /* may be later becomes more general verbose
param */
Playlist* pl_orphaned = NULL;
- GList * l_dangling[2] = { NULL, NULL }; /* 2 kinds of dangling tracks:
with approp
+ GList * l_dangling[2] =
+ { NULL, NULL }; /* 2 kinds of dangling tracks: with approp
* files and without */
/* 1 - Original file is present on PC and has the same sha1*/
/* 0 - Doesn't exist */
@@ -947,10 +936,8 @@ void check_db (iTunesDB *itdb)
// gtkpod_statusbar_timeout (30*STATUSBAR_TIMEOUT);
block_widgets();
- g_warning("TODO check_db - status\n");
- // gtkpod_statusbar_message(_("Creating a tree of known files"));
- g_warning("TODO check_db - status update\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_statusbar_message(_("Creating a tree of known files"));
+ gtkpod_tracks_statusbar_update();
/* put all files in the hash table */
files_known = g_tree_new_full(str_cmp, NULL, treeKeyDestroy,
treeValueDestroy);
@@ -989,9 +976,8 @@ void check_db (iTunesDB *itdb)
g_strfreev(tokens);
}
- g_warning("TODO check_db - status update\n");
- // gtkpod_statusbar_message(_("Checking iPOD files against known files
in DB"));
- // gtkpod_tracks_statusbar_update();
+ gtkpod_statusbar_message(_("Checking iPOD files against known files in
DB"));
+ gtkpod_tracks_statusbar_update();
process_gtk_events_blocked();
music_dir = itdb_get_music_dir(mountpoint);
@@ -1023,7 +1009,8 @@ void check_db (iTunesDB *itdb)
gchar *num_str = g_strdup_printf("F%02d", h);
Track *dupl_track;
- const gchar *p_dcomps[] = { num_str, ipod_filename, NULL };
+ const gchar *p_dcomps[] =
+ { num_str, ipod_filename, NULL };
fn_orphaned = itdb_resolve_path(music_dir, p_dcomps);
@@ -1076,12 +1063,8 @@ void check_db (iTunesDB *itdb)
}
ndangling = g_tree_nnodes(files_known);
- g_warning("TODO check_db - status\n");
- // gtkpod_statusbar_message (_("Found %d orphaned and %d dangling
files. Processing..."),
- // norphaned, ndangling);
-
- g_warning("TODO check_db - status update\n");
- // gtkpod_tracks_statusbar_update();
+ gtkpod_statusbar_message(_("Found %d orphaned and %d dangling files.
Processing..."), norphaned, ndangling);
+ gtkpod_tracks_statusbar_update();
g_free(music_dir);
music_dir = NULL;
diff --git a/src/misc_track.c b/src/misc_track.c
index aa4b4ec..602ae9f 100644
--- a/src/misc_track.c
+++ b/src/misc_track.c
@@ -240,8 +240,7 @@ void gp_duplicate_remove (Track *oldtrack, Track *track)
str = NULL;
removed = FALSE;
deltrack_nr = 0;
- g_warning("TODO misc_track:gp_duplicate_remove - status\n");
-// gtkpod_tracks_statusbar_update();
+ gtkpod_tracks_statusbar_update();
}
if (oldtrack && track)
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
