diff --git a/configure.ac b/configure.ac
index 5cd4f02..9aee772 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ GTK_REQUIRED=2.10
MAFW_REQUIRED=0.1
PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
-PKG_CHECK_MODULES(HILDON, hildon-1 >= 1.99)
+PKG_CHECK_MODULES(GTK, gtk+-2.0)
PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.0)
PKG_CHECK_MODULES(MAFW, mafw >= $MAFW_REQUIRED
mafw-shared >= $MAFW_REQUIRED)
diff --git a/data/mafw-test-gui.ui b/data/mafw-test-gui.ui
index 57f0cb0..6befe57 100644
--- a/data/mafw-test-gui.ui
+++ b/data/mafw-test-gui.ui
@@ -21,432 +21,368 @@
MAFW Test GUI
-
+
5
diff --git a/debian/control b/debian/control
index 814814e..de2797d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: misc
Priority: optional
Maintainer: Juha Kellokoski
Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, libgtk2.0-dev (>= 2.10),
- libhildon1-dev, libmafw0-dev (>= 0.1), libmafw-shared0-dev,
+ libmafw0-dev (>= 0.1), libmafw-shared0-dev,
libgconf2-dev
Standards-Version: 3.7.2
Package: mafw-test-gui
Architecture: any
Section: misc
-Depends: gconf2, ${shlibs:Depends}, ${misc:Depends}
+Depends: gnome-icon-theme, gconf2, ${shlibs:Depends}, ${misc:Depends}
Description: GUI for testing MAFW
MAFW based tester's toy.
diff --git a/src/Makefile.am b/src/Makefile.am
index 16e2818..c110a8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ else
shareddir = $(datadir)/mafw-test-gui
endif
-AM_CFLAGS = $(HILDON_CFLAGS) $(GTHREAD_CFLAGS) \
+AM_CFLAGS = $(HILDON_CFLAGS) $(GTHREAD_CFLAGS) $(GTK_CFLAGS) \
$(GCONF_CFLAGS) $(MAFW_CFLAGS) \
-I$(top_srcdir) -DDATA_DIR='"$(shareddir)"' -DGTK_DISABLE_DEPRECATED
@@ -37,6 +37,7 @@ mafw_test_gui_SOURCES = main.c \
fullscreen.h
mafw_test_gui_LDADD = $(HILDON_LIBS) \
+ $(GTK_LIBS) \
$(GTHREAD_LIBS) \
$(GCONF_LIBS) \
$(MAFW_LIBS)
diff --git a/src/fullscreen.c b/src/fullscreen.c
index ef2751e..7bc2a41 100644
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -20,7 +20,7 @@
*
*/
-#include
+#include
#include "fullscreen.h"
#include "metadata-view.h"
@@ -62,20 +62,12 @@ on_key_press_event (GtkWidget* widget, GdkEventKey* event, gpointer user_data)
switch(event->keyval)
{
- case HILDON_HARDKEY_ESC:
+ case GDK_Escape:
close_fullscreen_window ();
retval = TRUE;
break;
- case HILDON_HARDKEY_MENU:
- /* Let hildon take care of this button */
- break;
-
- case HILDON_HARDKEY_HOME:
- /* Let hildon take care of this button */
- break;
-
- case HILDON_HARDKEY_FULLSCREEN:
+ case GDK_F11:
if (fullscreen == TRUE)
gtk_window_unfullscreen (GTK_WINDOW(window));
else
@@ -84,24 +76,24 @@ on_key_press_event (GtkWidget* widget, GdkEventKey* event, gpointer user_data)
retval = TRUE;
break;
- case HILDON_HARDKEY_SELECT:
+ case GDK_Select:
/* renderer_controls::play() switches between play/resume */
play ();
break;
- case HILDON_HARDKEY_UP:
+ case GDK_Up:
move_position(1);
break;
- case HILDON_HARDKEY_DOWN:
+ case GDK_Down:
move_position(-1);
break;
- case HILDON_HARDKEY_LEFT:
+ case GDK_Left:
prev();
break;
- case HILDON_HARDKEY_RIGHT:
+ case GDK_Right:
next();
break;
@@ -143,7 +135,7 @@ open_fullscreen_window (void)
if (window == NULL)
{
- window = hildon_window_new ();
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
layout = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), layout);
diff --git a/src/gui.c b/src/gui.c
index e57f958..13d71f7 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include "gui.h"
@@ -79,6 +80,8 @@ on_delete_uri_dialog_event (GtkWidget *widget,
**/
static gchar *get_renderer_and_non_container_oid(MafwRenderer **renderer)
{
+ GtkWidget *warning;
+
if (selected_is_container() == FALSE)
{
gchar* oid;
@@ -86,18 +89,32 @@ static gchar *get_renderer_and_non_container_oid(MafwRenderer **renderer)
oid = get_selected_object_id ();
if (oid == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "Current item has no object ID");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Current item has no "
+ "object ID");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return NULL;
}
*renderer = get_selected_renderer ();
if (*renderer == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No renderer selected");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No renderer "
+ "selected");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_free (oid);
return NULL;
}
@@ -130,6 +147,7 @@ static void get_metadata_from_oid(gchar *oid, MafwSourceMetadataResultCb cb,
{
MafwSource *source;
gchar *source_uuid;
+ GtkWidget *warning;
if (!mafw_source_split_objectid(oid, &source_uuid, NULL))
{
@@ -145,9 +163,14 @@ static void get_metadata_from_oid(gchar *oid, MafwSourceMetadataResultCb cb,
if (!source)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "Source not available");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Source not available");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
else
{
@@ -366,21 +389,33 @@ on_create_object_activate (GtkMenuItem* item, gpointer user_data)
{
MafwSource *selected_source = get_selected_source();
gchar *selected_oid = playlist_get_selected_oid();
+ GtkWidget *warning;
if (selected_source == NULL)
{
g_free(selected_oid);
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No source selected");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No source selected");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
else if (selected_oid == NULL)
{
g_free(selected_oid);
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No playlist item selected");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No playlist item selected");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
return;
}
@@ -404,19 +439,30 @@ on_destroy_object_activate (GtkMenuItem* item, gpointer user_data)
{
MafwSource *selected_source = get_selected_source();
gchar *selected_oid = get_selected_object_id();
+ GtkWidget *warning;
if (selected_source == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No source selected");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No source selected");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
return;
}
else if (selected_oid == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No playlist item selected");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No playlist item selected");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
return;
}
@@ -581,11 +627,18 @@ static void import_oid_mdat_cb(MafwSource *self,
gpointer user_data,
const GError *error)
{
+ GtkWidget *warning;
+
if (error)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
else
{
@@ -598,11 +651,16 @@ static void import_oid_mdat_cb(MafwSource *self,
!(G_IS_VALUE(cur_value) &&
G_VALUE_HOLDS_STRING(cur_value)))
{/* No URI?? */
- hildon_banner_show_information (
- NULL,
- "qgn_list_smiley_angry",
- "Metadata does not contain "
- "any URI information");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Metadata does not "
+ "contain any URI "
+ "information");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
else
{
@@ -753,9 +811,10 @@ setup_menu (void)
GtkWidget *item;
GtkWidget *sub_menu;
GtkWidget *sub_item;
+ GtkWidget *vbox;
GSList *group = NULL;
- menu = gtk_menu_new();
+ menu = gtk_menu_bar_new();
/* Playlist view sub-menu */
item = gtk_menu_item_new_with_label("Playlist view");
@@ -889,17 +948,16 @@ setup_menu (void)
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(on_play_uri_event), NULL);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu),
- gtk_separator_menu_item_new ());
-
/* Close */
item = gtk_menu_item_new_with_label("Close");
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
g_signal_connect(G_OBJECT(item), "activate",
G_CALLBACK(on_delete_event), NULL);
- hildon_window_set_main_menu (HILDON_WINDOW (main_window), GTK_MENU (menu));
- gtk_widget_show_all(menu);
+ vbox = GTK_WIDGET(gtk_builder_get_object(builder,
+ "menu-vbox"));
+ gtk_box_pack_start(GTK_BOX(vbox), menu, FALSE, FALSE, 0);
+ gtk_widget_show_all(vbox);
}
static gboolean
@@ -907,7 +965,7 @@ on_main_win_keypress (GtkWidget* widget, GdkEventKey* event, gpointer user_data)
{
switch (event->keyval)
{
- case HILDON_HARDKEY_FULLSCREEN:
+ case GDK_F11:
if (mwin_fullscreen)
gtk_window_unfullscreen (
GTK_WINDOW(main_window));
@@ -916,8 +974,8 @@ on_main_win_keypress (GtkWidget* widget, GdkEventKey* event, gpointer user_data)
mwin_fullscreen = !mwin_fullscreen;
return TRUE;
- case HILDON_HARDKEY_LEFT:
- case HILDON_HARDKEY_RIGHT:
+ case GDK_Left:
+ case GDK_Right:
if (playlist_has_focus())
source_tv_get_focus(NULL);
else
@@ -934,7 +992,6 @@ init_ui (gint *argc,
{
GtkWidget *builder_window;
GtkWidget *widgets;
- HildonProgram *program;
gtk_init (argc, argv);
g_thread_init (NULL);
@@ -946,11 +1003,8 @@ init_ui (gint *argc,
return FALSE;
}
- /* Create a new hildon program and add the hildon window to be the main
- program window */
- program = HILDON_PROGRAM (hildon_program_get_instance ());
- main_window = hildon_window_new ();
- hildon_program_add_window (program, HILDON_WINDOW (main_window));
+ main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_default_size(GTK_WINDOW(main_window), 800, 400);
g_set_application_name("MAFW Test GUI");
/* Create the main window from the gtk-builder file */
diff --git a/src/gui.h b/src/gui.h
index aebfb73..d1aeff4 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -24,7 +24,6 @@
#define __GUI_H__
#include
-#include
#include "source-treeview.h"
diff --git a/src/main.c b/src/main.c
index 340b8a8..6846ecb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -77,12 +77,12 @@ void mtg_print_signal (MafwExtension* origin, const gchar* signal,
#endif
}
-static void
+static void
source_added_cb(MafwRegistry * registry, GObject *source, gpointer user_data)
{
/* Get a reference to the available source */
if (MAFW_IS_SOURCE(source)) {
- g_print("Source %s available\n",
+ g_print("Source %s available\n",
mafw_extension_get_name(MAFW_EXTENSION(source)));
/* Do not add metadata resolver source */
if (strcmp(mafw_extension_get_uuid(MAFW_EXTENSION(source)), "gnomevfs") != 0)
@@ -93,12 +93,12 @@ source_added_cb(MafwRegistry * registry, GObject *source, gpointer user_data)
}
}
-static void
+static void
source_removed_cb(MafwRegistry * registry, GObject *source, gpointer user_data)
{
/* Get a reference to the unavailable source */
if (MAFW_IS_SOURCE(source)) {
- g_print("Removing source %s \n",
+ g_print("Removing source %s \n",
mafw_extension_get_name(MAFW_EXTENSION(source)));
remove_source(MAFW_SOURCE(source));
@@ -107,12 +107,12 @@ source_removed_cb(MafwRegistry * registry, GObject *source, gpointer user_data)
}
}
-static void
+static void
renderer_added_cb(MafwRegistry * registry, GObject *renderer, gpointer user_data)
{
/* Get a reference to the available renderer */
if (MAFW_IS_RENDERER(renderer)) {
- g_print("Renderer %s available\n",
+ g_print("Renderer %s available\n",
mafw_extension_get_name(MAFW_EXTENSION(renderer)));
add_media_renderer(MAFW_RENDERER(renderer));
@@ -126,7 +126,7 @@ renderer_removed_cb(MafwRegistry * registry, GObject *renderer, gpointer user_da
{
/* Get a reference to the available renderer */
if (MAFW_IS_RENDERER(renderer)) {
- g_print("Renderer %s removed\n",
+ g_print("Renderer %s removed\n",
mafw_extension_get_name(MAFW_EXTENSION(renderer)));
remove_media_renderer(MAFW_RENDERER(renderer));
@@ -144,14 +144,14 @@ crawler_state_changed (GConfClient *client,
const GConfValue *value;
gchar *str_value;
MafwPlaylist *playlist;
-
- /* Reload current playlist when crawler is done
+
+ /* Reload current playlist when crawler is done
indexing local content */
value = gconf_entry_get_value(entry);
str_value = gconf_value_to_string(value);
-
- if (str_value &&
+
+ if (str_value &&
g_ascii_strcasecmp (str_value, "IDLE") == 0) {
g_print ("Crawler is done indexing." \
"Reloading current playlist\n");
@@ -162,7 +162,7 @@ crawler_state_changed (GConfClient *client,
}
}
-static void
+static void
register_crawler_watch (void)
{
GConfClient *client = gconf_client_get_default();
@@ -170,9 +170,9 @@ register_crawler_watch (void)
"/apps/osso/mafw-metalayer-crawler",
GCONF_CLIENT_PRELOAD_NONE,
NULL);
- gconf_client_notify_add(client,
+ gconf_client_notify_add(client,
"/apps/osso/mafw-metalayer-crawler/state",
- crawler_state_changed,
+ crawler_state_changed,
NULL, NULL, NULL);
}
@@ -182,6 +182,7 @@ init_app (void)
GError *error = NULL;
GList *extension_list;
gchar **plugin_list;
+ GtkWidget *warning;
g_type_init ();
@@ -195,12 +196,16 @@ init_app (void)
mafw_shared_init(registry, &error);
if (error != NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s", error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
g_error_free(error);
error = NULL;
- }
+ }
g_signal_connect(registry,
"renderer_added", G_CALLBACK(renderer_added_cb), NULL);
@@ -220,7 +225,7 @@ init_app (void)
renderer_added_cb(registry, G_OBJECT(extension_list->data), NULL);
extension_list = g_list_next(extension_list);
}
-
+
extension_list = mafw_registry_get_sources(registry);
while (extension_list)
{
@@ -228,7 +233,7 @@ init_app (void)
extension_list = g_list_next(extension_list);
}
-
+
/* Check if we need to load any plugins directly */
if (NULL != g_getenv("MAFW_TG_PLUGINS")) {
plugin_list = g_strsplit(g_getenv("MAFW_TG_PLUGINS"),
@@ -245,12 +250,20 @@ init_app (void)
msg = g_strdup_printf("Unable to load plugin"
"%s: %s", *plugin,
error->message);
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry", msg);
+ warning =
+ gtk_message_dialog_new(
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s", msg);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_free(msg);
g_error_free(error);
error = NULL;
- }
+ }
}
g_strfreev(plugin_list);
}
diff --git a/src/metadata-view.c b/src/metadata-view.c
index f19212b..d5a6c26 100644
--- a/src/metadata-view.c
+++ b/src/metadata-view.c
@@ -165,7 +165,7 @@ static void add_metadata(const gchar *key, gpointer val, gpointer user_data)
gtk_widget_show(metadata_visual);
}
}
-
+
/* The source:browse_cb sends the metadata in different way, than the
renderer::metadata-changed signal sends it*/
else if (!strcmp(key, MAFW_METADATA_KEY_DURATION))
@@ -288,6 +288,7 @@ void mdata_view_update(const gchar *key, GValueArray *value)
void set_current_oid(const gchar *obj_id)
{
MafwSource *source;
+ GtkWidget *warning;
gchar *source_uuid;
/* Clear metadata treeview */
@@ -323,13 +324,18 @@ void set_current_oid(const gchar *obj_id)
/* Get some metadata for the object ID */
if (source == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "Source not available");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Source not available");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
else
{
- /* Disable seekbar, and enable only if we
+ /* Disable seekbar, and enable only if we
get seekble=TRUE metadata. Waiting to do this in
mdata_view_mdata_result might end up in
race-condition with the renderer metadata
@@ -448,5 +454,5 @@ setup_metadata_treeview (GtkBuilder *builder)
g_signal_connect (metadata_visual, "button-press-event",
G_CALLBACK(on_metadata_visual_button_press_event),
NULL);
-
+
}
diff --git a/src/playlist-controls.c b/src/playlist-controls.c
index 752fef5..6630531 100644
--- a/src/playlist-controls.c
+++ b/src/playlist-controls.c
@@ -116,12 +116,20 @@ toggle_repeat (gboolean new_state)
void
on_shuffle_button_toggled (GtkWidget *widget)
{
+ GtkWidget *warning;
+
MafwPlaylist *playlist = MAFW_PLAYLIST(get_current_playlist());
if (playlist == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No current playlist");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No current playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -183,6 +191,7 @@ void
on_add_playlist_button_clicked (GtkWidget *widget)
{
gchar* name;
+ GtkWidget *warning;
name = get_name_dialog("New playlist", ~0);
if (name != NULL)
@@ -200,9 +209,15 @@ on_add_playlist_button_clicked (GtkWidget *widget)
if (error != NULL)
{
- hildon_banner_show_information (main_window,
- "qgn_list_gene_invalid",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_error_free(error);
}
else if (playlist != NULL)
@@ -213,18 +228,29 @@ on_add_playlist_button_clicked (GtkWidget *widget)
if (find_playlist_iter(playlist, &iter)) {
gtk_combo_box_set_active_iter(
GTK_COMBO_BOX(playlist_name_combobox), &iter);
- hildon_banner_show_information (
- main_window,
- "qgn_note_infoprint",
- "Playlist already exists");
+
+ warning = gtk_message_dialog_new(
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Playlist already exists");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
}
else
{
- hildon_banner_show_information (
- main_window,
- "qgn_list_gene_invalid",
- "Unable to create new playlist");
+ warning = gtk_message_dialog_new(
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Unable to create new playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
g_free(name);
@@ -289,6 +315,7 @@ void
on_rename_playlist_button_clicked (GtkWidget *widget)
{
MafwProxyPlaylist *playlist;
+ GtkWidget *warning;
guint old_id;
const gchar* old_name;
gchar* new_name;
@@ -307,10 +334,15 @@ on_rename_playlist_button_clicked (GtkWidget *widget)
old_name = mafw_playlist_get_name (MAFW_PLAYLIST (playlist));
if (strcmp(old_name, new_name) != 0)
{
- hildon_banner_show_information(
- main_window,
- "qgn_list_gene_invalid",
- "Unable to rename playlist");
+ warning = gtk_message_dialog_new(
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Unable to rename playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
g_free(new_name);
@@ -325,6 +357,7 @@ on_save_playlist_button_clicked (GtkWidget *widget)
gchar* old_name;
gchar* new_name;
GError *error = NULL;
+ GtkWidget *warning;
manager = mafw_playlist_manager_get();
playlist = get_current_playlist();
@@ -341,20 +374,27 @@ on_save_playlist_button_clicked (GtkWidget *widget)
new_name,
&error)) == NULL)
{
- hildon_banner_show_information (
- main_window,
- "qgn_list_gene_invalid",
- error?error->message:"Unable to duplicate "
- "playlist");
-
+ warning = gtk_message_dialog_new(
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error?error->message:"Unable to duplicate "
+ "playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
if(error)
{
- hildon_banner_show_information (
- main_window,
- "qgn_list_gene_invalid",
- error->message);
- g_error_free(error);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
g_free(new_name);
@@ -410,6 +450,7 @@ get_name_dialog(const gchar* text, guint pls_id)
{
GtkWidget *dialog;
GtkWidget *entry;
+ GtkWidget *warning;
gchar *name;
dialog = gtk_dialog_new_with_buttons("Playlist name",
@@ -438,10 +479,16 @@ show_dlg:
name = g_strstrip(name);
if (name == NULL || strlen(name) == 0)
{
- hildon_banner_show_information(
- main_window,
- "qgn_list_gene_invalid",
- "Empty names are not allowed");
+ warning = gtk_message_dialog_new(
+ NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Empty names are not allowed");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_free(name);
goto show_dlg;
}
@@ -576,7 +623,7 @@ append_playlist_to_combo(MafwProxyPlaylist *playlist, gpointer user_data)
(GCallback) on_mafw_playlist_contents_changed, NULL);
g_signal_connect (playlist, "item-moved",
(GCallback) on_mafw_playlist_item_moved, NULL);
-
+
g_free(name);
}
@@ -591,7 +638,9 @@ static void import_cb(MafwPlaylistManager *self,
gpointer user_data,
const GError *error)
{
- #ifndef G_DEBUG_DISABLE
+ GtkWidget *warning;
+
+#ifndef G_DEBUG_DISABLE
g_print ("SIGNAL import-cb with import-id: %d ", import_id);
if (playlist)
{
@@ -603,30 +652,42 @@ static void import_cb(MafwPlaylistManager *self,
}
else
fprintf (stderr, "with error: %s", error->message);
- #endif
- if (error)
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- error->message);
+#endif
+ if (error) {
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+ }
}
void playlist_import(const gchar *oid)
{
MafwPlaylistManager *manager;
+ GtkWidget *warning;
guint import_id;
GError *err = NULL;
manager = mafw_playlist_manager_get ();
- g_assert (manager != NULL);
+ g_assert (manager != NULL);
import_id = mafw_playlist_manager_import(manager, oid, NULL, import_cb,
NULL, &err);
if (import_id == MAFW_PLAYLIST_MANAGER_INVALID_IMPORT_ID)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- err->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ err->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
}
@@ -732,9 +793,16 @@ on_mafw_playlist_destruction_failed(MafwPlaylistManager* manager,
MafwProxyPlaylist *playlist,
gpointer user_data)
{
- hildon_banner_show_information (main_window,
- "qgn_list_gene_invalid",
- "The playlist cannot be destroyed.");
+ GtkWidget *warning;
+
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "The playlist cannot be destroyed");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
/**
@@ -852,8 +920,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (widget != NULL);
gtk_button_set_label (GTK_BUTTON(widget), NULL);
- image = gtk_image_new_from_icon_name ("qgn_widg_mplayer_add",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("add",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON(widget), image);
/* Remove playlist */
@@ -862,8 +930,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (widget != NULL);
gtk_button_set_label (GTK_BUTTON(widget), NULL);
- image = gtk_image_new_from_icon_name ("qgn_widg_mplayer_remove",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("remove",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON(widget), image);
/* Add item */
@@ -872,8 +940,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (widget != NULL);
gtk_button_set_label (GTK_BUTTON(widget), NULL);
- image = gtk_image_new_from_icon_name ("qgn_list_gene_forward",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("gtk-go-forward-ltr",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON(widget), image);
/* Remove item */
@@ -882,8 +950,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (widget != NULL);
gtk_button_set_label (GTK_BUTTON(widget), NULL);
- image = gtk_image_new_from_icon_name ("qgn_list_gene_back",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("gtk-go-forward-rtl",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON(widget), image);
/* Remove item */
@@ -892,8 +960,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (widget != NULL);
gtk_button_set_label (GTK_BUTTON(widget), NULL);
- image = gtk_image_new_from_icon_name ("qgn_toolb_gene_deletebutton",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("gtk-delete",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON(widget), image);
/* Raise */
@@ -902,8 +970,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (raise_item != NULL);
gtk_button_set_label (GTK_BUTTON (raise_item), NULL);
- image = gtk_image_new_from_icon_name ("qgn_indi_arrow_up",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("gtk-go-up",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (raise_item), image);
/* Lower */
@@ -912,8 +980,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (lower_item != NULL);
gtk_button_set_label (GTK_BUTTON (lower_item), NULL);
- image = gtk_image_new_from_icon_name ("qgn_indi_arrow_down",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("gtk-go-down",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (lower_item), image);
/* Repeat */
@@ -922,8 +990,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (repeat_toggle != NULL);
gtk_button_set_label (GTK_BUTTON(repeat_toggle), NULL);
- image = gtk_image_new_from_icon_name ("qgn_medi_random_off_repeat_on",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("stock_repeat",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON(repeat_toggle), image);
/* Shuffle */
@@ -932,8 +1000,8 @@ setup_playlist_controls (GtkBuilder *builder)
g_assert (shuffle_toggle != NULL);
gtk_button_set_label (GTK_BUTTON (shuffle_toggle), NULL);
- image = gtk_image_new_from_icon_name ("qgn_medi_random_on_repeat_off",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("stock_shuffle",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (shuffle_toggle), image);
/* Playlist combo */
diff --git a/src/playlist-treeview.c b/src/playlist-treeview.c
index 2467bae..3b41fba 100644
--- a/src/playlist-treeview.c
+++ b/src/playlist-treeview.c
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
static GtkWidget *playlist_treeview = NULL;
static GtkTreeModel *playlist_model = NULL;
@@ -86,6 +87,7 @@ display_playlist_contents(MafwPlaylist *playlist)
GError* error = NULL;
guint size, i;
GtkTreeIter iter;
+ GtkWidget *warning;
g_assert (playlist != NULL);
@@ -104,13 +106,19 @@ display_playlist_contents(MafwPlaylist *playlist)
size = mafw_playlist_get_size (playlist, &error);
if (error != NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_error_free (error);
return;
}
-
+
if (size == 0)
return;
@@ -119,7 +127,7 @@ display_playlist_contents(MafwPlaylist *playlist)
gtk_list_store_append(GTK_LIST_STORE(playlist_model), &iter);
gtk_list_store_set (GTK_LIST_STORE (playlist_model), &iter,
COLUMN_INDEX, i,
- -1);
+ -1);
}
if (playlist_updater_id == 0)
{
@@ -216,7 +224,7 @@ static void get_playlist_mds(MafwPlaylist *current_playlist, gint from, gint to)
(GDestroyNotify)pl_get_md_finished);
if (!pl_get_mds)
pl_get_mds = g_ptr_array_new();
-
+
pldat->from = from;
pldat->to = to;
pldat->get_md_id = pl_get_md_id;
@@ -236,14 +244,14 @@ static gboolean playlist_updater(gpointer data)
{
goto updater_exit;
}
-
+
if (!gtk_tree_model_get_iter_first(playlist_model, &iter))
goto updater_exit;
do
{
gchar *cur_oid;
-
+
gtk_tree_model_get(playlist_model, &iter,
COLUMN_OBJECTID, &cur_oid,
-1);
@@ -285,13 +293,13 @@ updater_exit:
static gboolean check_md_reqs(guint from, guint to)
{
gint i = 0;
-
+
if (!pl_get_mds)
return FALSE;
for (i = 0; pl_get_mds->len > i; i++)
{
struct pl_get_mds_data *pldat = g_ptr_array_index(pl_get_mds, i);
-
+
if (!pldat)
continue;
if (pldat->from <= to && pldat->to >= from)
@@ -309,6 +317,7 @@ on_mafw_playlist_contents_changed(MafwPlaylist *playlist, guint from,
{
MafwPlaylist *current_playlist;
GtkTreeIter iter;
+ GtkWidget *warning;
guint i;
mtg_print_signal_gen (mafw_playlist_get_name (
@@ -320,9 +329,15 @@ on_mafw_playlist_contents_changed(MafwPlaylist *playlist, guint from,
current_playlist = MAFW_PLAYLIST(get_current_playlist ());
if (current_playlist == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No playlist selected");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No playlist selected");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -374,12 +389,12 @@ on_mafw_playlist_contents_changed(MafwPlaylist *playlist, guint from,
gtk_list_store_set (GTK_LIST_STORE (playlist_model), &iter,
COLUMN_INDEX, from + i,
-1);
-
+
/* If the insertion happened before the currently playing
index, it must be incremented. */
if (playing_index >= from + i)
playing_index++;
-
+
}
if (playlist_updater_id == 0)
{
@@ -562,6 +577,7 @@ void
on_add_item_button_clicked (GtkWidget *widget)
{
MafwPlaylist *playlist;
+ GtkWidget *warning;
GError *error = NULL;
gint index;
gchar* oid;
@@ -569,9 +585,15 @@ on_add_item_button_clicked (GtkWidget *widget)
playlist = MAFW_PLAYLIST (get_current_playlist ());
if (playlist == NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- "No current playlist");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No current playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -590,9 +612,15 @@ on_add_item_button_clicked (GtkWidget *widget)
oid = get_selected_object_id();
if (oid == NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- "Item has no object ID");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "Item has no object ID");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -602,10 +630,14 @@ on_add_item_button_clicked (GtkWidget *widget)
if (error != NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- error->message);
- g_error_free(error);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
else
{
@@ -623,14 +655,21 @@ on_remove_item_button_clicked (GtkWidget *widget)
MafwPlaylist *playlist;
gint index;
GError *error = NULL;
+ GtkWidget *warning;
/* Get the currently selected playlist */
playlist = MAFW_PLAYLIST (get_current_playlist ());
if (playlist == NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- "No current playlist");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No current playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -643,9 +682,15 @@ on_remove_item_button_clicked (GtkWidget *widget)
mafw_playlist_remove_item (playlist, (guint) index, &error);
if (error != NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_error_free(error);
}
}
@@ -659,14 +704,21 @@ on_raise_item_button_clicked (GtkWidget *widget)
MafwPlaylist *playlist;
GError *error = NULL;
gint index;
+ GtkWidget *warning;
/* Get the selected playlist */
playlist = MAFW_PLAYLIST (get_current_playlist ());
if (playlist == NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- "No current playlist");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No current playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -680,9 +732,15 @@ on_raise_item_button_clicked (GtkWidget *widget)
&error);
if (error != NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_error_free(error);
}
}
@@ -696,14 +754,21 @@ on_lower_item_button_clicked (GtkWidget *widget)
MafwPlaylist *playlist;
gint index;
GError *error = NULL;
+ GtkWidget *warning;
/* Get the selected playlist */
playlist = MAFW_PLAYLIST (get_current_playlist ());
if (playlist == NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- "No current playlist");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No current playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -717,9 +782,15 @@ on_lower_item_button_clicked (GtkWidget *widget)
&error);
if (error != NULL)
{
- hildon_banner_show_information (widget,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_error_free(error);
}
}
@@ -732,13 +803,20 @@ on_clear_playlist_button_clicked (GtkWidget *widget)
{
MafwPlaylist *playlist;
GError* error = NULL;
+ GtkWidget *warning;
playlist = MAFW_PLAYLIST (get_current_playlist ());
if (playlist == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No current playlist");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No current playlist");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -746,9 +824,15 @@ on_clear_playlist_button_clicked (GtkWidget *widget)
mafw_playlist_clear (playlist, &error);
if (error != NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
g_error_free(error);
}
}
@@ -850,17 +934,17 @@ on_playlist_key_pressed (GtkWidget* widget, GdkEventKey* event,
{
switch (event->keyval)
{
- case HILDON_HARDKEY_UP:
+ case GDK_Up:
if (!is_up_possible())
return TRUE;
break;
- case HILDON_HARDKEY_DOWN:
+ case GDK_Down:
if (!is_down_possible())
return TRUE;
break;
- case HILDON_HARDKEY_SELECT:
+ case GDK_Select:
return play_selected();
- case HILDON_HARDKEY_ESC:
+ case GDK_Escape:
on_remove_item_button_clicked(NULL);
return TRUE;
}
diff --git a/src/renderer-combo.c b/src/renderer-combo.c
index 9b66775..400c740 100644
--- a/src/renderer-combo.c
+++ b/src/renderer-combo.c
@@ -25,7 +25,6 @@
#include
#include
-#include
#include "renderer-combo.h"
#include "renderer-controls.h"
@@ -338,9 +337,16 @@ static gboolean get_renderer_iter(MafwExtension *self, GtkTreeModel *model,
static void renderer_error_cb(GObject *render, guint domain, gint code,
gchar *message)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- message);
+ GtkWidget *warning;
+
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
static void update_volume(MafwExtension *self, const gchar *name, GValue *value,
@@ -349,13 +355,20 @@ static void update_volume(MafwExtension *self, const gchar *name, GValue *value,
GtkComboBox *combo = GTK_COMBO_BOX (renderer_combo);
GtkTreeModel *model;
GtkTreeIter iter;
+ GtkWidget *warning;
guint vol;
if (error)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
model = gtk_combo_box_get_model (combo);
diff --git a/src/renderer-controls.c b/src/renderer-controls.c
index 3cdbcf0..0eb4986 100644
--- a/src/renderer-controls.c
+++ b/src/renderer-controls.c
@@ -24,7 +24,6 @@
#include
#include
#include
-#include
#include
@@ -111,10 +110,18 @@ remove_timeout (void)
static void
play_error_cb(MafwRenderer *renderer, gpointer user_data, const GError *error)
{
- if (error != NULL)
- hildon_banner_show_information (GTK_WIDGET (user_data),
- "qgn_list_smiley_angry",
- error->message);
+ GtkWidget *warning;
+
+ if (error != NULL) {
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+ }
}
static void
@@ -123,10 +130,18 @@ set_position_cb (MafwRenderer *renderer,
gpointer user_data,
const GError *error)
{
- if (error != NULL)
- hildon_banner_show_information (GTK_WIDGET (user_data),
- "qgn_list_smiley_angry",
- error->message);
+ GtkWidget *warning;
+
+ if (error != NULL) {
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+ }
}
void
@@ -272,16 +287,24 @@ void on_mute_button_toggled(GtkToggleButton *togglebutton, gpointer user_data)
static void mute_cb(MafwExtension *self, const gchar *name, GValue *value,
gpointer user_data, const GError *error)
{
+ GtkWidget *warning;
+
if (!error && MAFW_RENDERER(self) == get_selected_renderer() &&
!strcmp(name, MAFW_PROPERTY_RENDERER_MUTE))
{
toggle_mute_button(g_value_get_boolean(value));
}
- if (error != NULL)
- hildon_banner_show_information (GTK_WIDGET (user_data),
- "qgn_list_smiley_angry",
- error->message);
+ if (error != NULL) {
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+ }
}
/**
@@ -489,13 +512,19 @@ get_position_info_cb (MafwRenderer *renderer,
gpointer user_data,
const GError *error)
{
+ GtkWidget *warning;
if (error == NULL) {
set_position_hscale_position (position);
} else {
- hildon_banner_show_information (GTK_WIDGET (user_data),
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
}
@@ -585,15 +614,15 @@ prepare_controls_for_state (MafwPlayState state)
if (play_possible == TRUE)
{
GtkWidget* image;
- image = gtk_image_new_from_icon_name ("qgn_widg_mplayer_play",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("player_play",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (play_button), image);
}
if (pause_possible == TRUE)
{
GtkWidget* image;
- image = gtk_image_new_from_icon_name ("qgn_widg_mplayer_pause",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("player_pause",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (play_button), image);
}
@@ -640,8 +669,8 @@ setup_renderer_controls (GtkBuilder *builder)
g_assert (prev_button != NULL);
gtk_button_set_label (GTK_BUTTON (prev_button), NULL);
- image = gtk_image_new_from_icon_name ("qgn_widg_mplayer_rew",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("stock_media-prev",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (prev_button), image);
/* Seek backwards */
@@ -651,8 +680,8 @@ setup_renderer_controls (GtkBuilder *builder)
g_assert (seek_backwards_button != NULL);
gtk_button_set_label (GTK_BUTTON (seek_backwards_button), NULL);
- image = gtk_image_new_from_icon_name ("qgn_list_hw_button_left",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("player_rew",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (seek_backwards_button), image);
/* Play */
@@ -661,8 +690,8 @@ setup_renderer_controls (GtkBuilder *builder)
g_assert (play_button != NULL);
gtk_button_set_label (GTK_BUTTON (play_button), NULL);
- image = gtk_image_new_from_icon_name ("qgn_widg_mplayer_play",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("player_play",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (play_button), image);
/* Stop */
@@ -671,8 +700,8 @@ setup_renderer_controls (GtkBuilder *builder)
g_assert (stop_button != NULL);
gtk_button_set_label (GTK_BUTTON (stop_button), NULL);
- image = gtk_image_new_from_icon_name ("qgn_widg_mplayer_stop",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("player_stop",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (stop_button), image);
/* Seek forwards */
@@ -682,8 +711,8 @@ setup_renderer_controls (GtkBuilder *builder)
g_assert (seek_forwards_button != NULL);
gtk_button_set_label (GTK_BUTTON (seek_forwards_button), NULL);
- image = gtk_image_new_from_icon_name ("qgn_list_hw_button_right",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("player_fwd",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (seek_forwards_button), image);
/* Next */
@@ -692,8 +721,8 @@ setup_renderer_controls (GtkBuilder *builder)
g_assert (next_button != NULL);
gtk_button_set_label (GTK_BUTTON (next_button), NULL);
- image = gtk_image_new_from_icon_name ("qgn_widg_mplayer_fwd",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("stock_media-next",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (next_button), image);
/* Mute */
@@ -702,8 +731,8 @@ setup_renderer_controls (GtkBuilder *builder)
g_assert (mute_toggle != NULL);
gtk_button_set_label (GTK_BUTTON (mute_toggle), NULL);
- image = gtk_image_new_from_icon_name ("qgn_medi_volume_muted",
- HILDON_ICON_SIZE_SMALL);
+ image = gtk_image_new_from_icon_name ("stock_volume-mute",
+ GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (mute_toggle), image);
#ifndef MAFW_TEST_GUI_ENABLE_MUTE
diff --git a/src/source-treeview.c b/src/source-treeview.c
index e541daa..7cc1cf4 100644
--- a/src/source-treeview.c
+++ b/src/source-treeview.c
@@ -24,7 +24,7 @@
#include
#include
#include
-
+#include
#include
#include "source-treeview.h"
@@ -35,6 +35,8 @@
#include "gui.h"
#include "main.h"
+#define ICON_SIZE 24
+
/*****************************************************************************
* Static widgets & variables
*****************************************************************************/
@@ -204,11 +206,11 @@ on_source_treeview_key_pressed (GtkWidget* widget, GdkEventKey* event,
{
switch (event->keyval)
{
- case HILDON_HARDKEY_UP:
+ case GDK_Up:
if (!is_up_possible())
return TRUE;
break;
- case HILDON_HARDKEY_DOWN:
+ case GDK_Down:
if (!is_down_possible())
return TRUE;
break;
@@ -569,6 +571,8 @@ browse_cb (MafwSource *source, guint browseid, gint remaining_count,
guint index, const gchar *objectid, GHashTable *metadata,
gpointer user_data, const GError *error)
{
+ GtkWidget *warning;
+
#ifndef G_DEBUG_DISABLE
mtg_print_signal (MAFW_EXTENSION(source), "browse-result",
"BrowseID: %u, Remaining count: %d, Index: %u "
@@ -590,10 +594,14 @@ browse_cb (MafwSource *source, guint browseid, gint remaining_count,
model);
g_object_unref (model);
}
- hildon_banner_show_information(
- main_window,
- NULL,
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
perf_end();
}
@@ -713,6 +721,8 @@ cancel_browse (const gchar* objectid, guint browseid)
MafwRegistry* registry;
MafwExtension* extension;
gchar* uuid;
+ GtkWidget *warning;
+
mafw_source_split_objectid (objectid, &uuid, NULL);
if (uuid == NULL)
return;
@@ -734,12 +744,14 @@ cancel_browse (const gchar* objectid, guint browseid)
if (extension == NULL)
{
/* Unable to find a source. Go to top level. */
- gchar* msg;
- msg = g_strdup_printf("No source for UUID %s", uuid);
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- msg);
- g_free(msg);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "No source for UUID %s",
+ uuid);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
else
{
@@ -749,10 +761,14 @@ cancel_browse (const gchar* objectid, guint browseid)
browseid,
&error) == FALSE)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- error->message);
- g_error_free (error);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
}
}
@@ -942,12 +958,19 @@ metadata_cb (MafwSource* self, const gchar* objectid, GHashTable *metadata,
gpointer user_data, const GError* error)
{
GtkTreeIter iter;
+ GtkWidget *warning;
if (error != NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- error->message);
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ error->message);
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -1031,6 +1054,7 @@ display_sources(void)
{
MafwRegistry* registry;
GList* node;
+ GtkWidget *warning;
while (container_stack_pop (NULL, NULL) == TRUE)
{
@@ -1050,9 +1074,15 @@ display_sources(void)
node = mafw_registry_get_sources(registry);
if (node == NULL)
{
- hildon_banner_show_information (NULL,
- "qgn_list_smiley_angry",
- "No sources available");
+ warning = gtk_message_dialog_new(NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ "No sources available");
+ gtk_dialog_run(GTK_DIALOG(warning));
+ gtk_widget_destroy(warning);
+
return;
}
@@ -1340,38 +1370,38 @@ static void mimeimage_init(void)
mimeimages[qgn_list_gene_fldr_cls] =
gtk_icon_theme_load_icon(theme,
- "qgn_list_filesys_common_fldr",
- HILDON_ICON_PIXEL_SIZE_SMALL,
+ "stock_folder",
+ ICON_SIZE,
GTK_ICON_LOOKUP_NO_SVG,
NULL);
mimeimages[qgn_list_gene_music_file] =
gtk_icon_theme_load_icon(theme,
- "qgn_list_gene_music_file",
- HILDON_ICON_PIXEL_SIZE_SMALL,
+ "sound",
+ ICON_SIZE,
GTK_ICON_LOOKUP_NO_SVG,
NULL);
mimeimages[qgn_list_gene_video_file] =
gtk_icon_theme_load_icon(theme,
- "qgn_list_gene_video_file",
- HILDON_ICON_PIXEL_SIZE_SMALL,
+ "video",
+ ICON_SIZE,
GTK_ICON_LOOKUP_NO_SVG,
NULL);
mimeimages[qgn_list_gene_image_file] =
gtk_icon_theme_load_icon(theme,
- "qgn_list_gene_image_file",
- HILDON_ICON_PIXEL_SIZE_SMALL,
+ "emblem-photos",
+ ICON_SIZE,
GTK_ICON_LOOKUP_NO_SVG,
NULL);
mimeimages[qgn_list_gene_notsupported] =
gtk_icon_theme_load_icon(theme,
- "qgn_list_gene_notsupported",
- HILDON_ICON_PIXEL_SIZE_SMALL,
+ "gtk-file",
+ ICON_SIZE,
GTK_ICON_LOOKUP_NO_SVG,
NULL);
mimeimages[qgn_list_filemanager] =
gtk_icon_theme_load_icon(theme,
- "qgn_list_filemanager",
- HILDON_ICON_PIXEL_SIZE_SMALL,
+ "file-manager",
+ ICON_SIZE,
GTK_ICON_LOOKUP_NO_SVG,
NULL);
}