Lingui: update hb icon. Fix icon in notification bubble on fedora.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4991 b64f7644-9d1e-0410-96f1-a4d463321fa5

11 files changed, 23 insertions, 7 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 01edebf2f..baaa9ffeb 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -5072,7 +5072,7 @@ ghb_notify_done(signal_user_data_t *ud)
 	notification = notify_notification_new(
 		"Encode Complete",
 		"Put down that cocktail, Your HandBrake queue is done!",
-		"hb-icon"
+		NULL
 #if NOTIFY_CHECK_VERSION (0, 7, 0)
                 );
 #else
@@ -5081,8 +5081,13 @@ ghb_notify_done(signal_user_data_t *ud)
 	GtkStatusIcon *si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
 	notify_notification_attach_to_status_icon(notification, si);
 #endif
+	GtkIconTheme *theme = gtk_icon_theme_get_default();
+	GdkPixbuf *pb = gtk_icon_theme_load_icon(theme, "hb-icon", 64,
+											GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+	notify_notification_set_icon_from_pixbuf(notification, pb);
 	g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
 	notify_notification_show(notification, NULL);
+	g_object_unref(G_OBJECT(pb));
 #endif
 
 	if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 3)
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 32733f624..8c95f2975 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -1687,7 +1687,7 @@
 										<property name="height_request">200</property>
 										<property name="visible">True</property>
 										<property name="icon_name">hb-icon</property>
-										<property name="icon-size">6</property>
+										<property name="pixel-size">128</property>
 										<signal name="size_allocate" handler="preview_button_size_allocate_cb"/>
 									  </object>
 									</child>
@@ -4486,7 +4486,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property>
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="icon_name">hb-icon</property>
-                        <property name="icon-size">6</property>
+                        <property name="pixel-size">64</property>
                       </object>
                     </child>
                   </object>
@@ -7544,7 +7544,7 @@ libx264 authors:
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="icon_name">hb-icon</property>
-                        <property name="icon-size">6</property>
+                        <property name="pixel-size">64</property>
                       </object>
                     </child>
                   </object>
diff --git a/gtk/src/hb-icon.1024.png b/gtk/src/hb-icon.1024.png
new file mode 100644
index 000000000..25c4fc892
--- /dev/null
+++ b/gtk/src/hb-icon.1024.png
diff --git a/gtk/src/hb-icon.128.png b/gtk/src/hb-icon.128.png
index 187df406d..bc608e0d6 100644
--- a/gtk/src/hb-icon.128.png
+++ b/gtk/src/hb-icon.128.png
diff --git a/gtk/src/hb-icon.16.png b/gtk/src/hb-icon.16.png
new file mode 100644
index 000000000..5aea34d21
--- /dev/null
+++ b/gtk/src/hb-icon.16.png
diff --git a/gtk/src/hb-icon.256.png b/gtk/src/hb-icon.256.png
new file mode 100644
index 000000000..584fb6b8c
--- /dev/null
+++ b/gtk/src/hb-icon.256.png
diff --git a/gtk/src/hb-icon.32.png b/gtk/src/hb-icon.32.png
new file mode 100644
index 000000000..793f088f8
--- /dev/null
+++ b/gtk/src/hb-icon.32.png
diff --git a/gtk/src/hb-icon.512.png b/gtk/src/hb-icon.512.png
new file mode 100644
index 000000000..a876fee4a
--- /dev/null
+++ b/gtk/src/hb-icon.512.png
diff --git a/gtk/src/hb-icon.64.png b/gtk/src/hb-icon.64.png
index 813953cac..843504085 100644
--- a/gtk/src/hb-icon.64.png
+++ b/gtk/src/hb-icon.64.png
diff --git a/gtk/src/icons.c b/gtk/src/icons.c
index a99deba03..042525592 100644
--- a/gtk/src/icons.c
+++ b/gtk/src/icons.c
@@ -7,7 +7,7 @@ void
 ghb_load_icons()
 {
 	GHashTableIter iter;
-	gchar *name;
+	gchar *key;
 	GValue *gval;
 
 	GValue *icons = ghb_resource_get("icons");
@@ -15,13 +15,19 @@ ghb_load_icons()
 	// middle (void*) cast prevents gcc warning "defreferencing type-punned
 	// pointer will break strict-aliasing rules"
 	while (g_hash_table_iter_next(
-			&iter, (gpointer*)(void*)&name, (gpointer*)(void*)&gval))
+			&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval))
 	{
 		gint colorspace, bps, width, height, rowstride;
 		gboolean alpha;
 		ghb_rawdata_t *rd;
 		gint size;
 		GdkPixbuf *pb;
+		char *name = g_strdup(key);
+		char *pos;
+
+		pos = g_strstr_len(name, -1, ".");
+		if (pos != NULL)
+			*pos = '\0';
 
 		colorspace = ghb_value_int(ghb_dict_lookup(gval, "colorspace"));
 		alpha = ghb_value_boolean(ghb_dict_lookup(gval, "alpha"));
@@ -37,5 +43,6 @@ ghb_load_icons()
 		size = gdk_pixbuf_get_height(pb);
 		gtk_icon_theme_add_builtin_icon(name, size, pb);
 		g_object_unref(pb);
+		g_free(name);
 	}
 }
diff --git a/gtk/src/resources.list b/gtk/src/resources.list
index 5a06877c9..c833c7f0c 100644
--- a/gtk/src/resources.list
+++ b/gtk/src/resources.list
@@ -5,7 +5,11 @@
 		<icon name="hb-canceled" file="hb-canceled.16.png" />
 		<icon name="hb-complete" file="hb-complete.16.png" />
 		<icon name="hb-drawer" file="hb-drawer.32.png" />
-		<icon name="hb-icon" file="hb-icon.128.png" />
+		<icon name="hb-icon.256" file="hb-icon.256.png" />
+		<icon name="hb-icon.128" file="hb-icon.128.png" />
+		<icon name="hb-icon.64" file="hb-icon.64.png" />
+		<icon name="hb-icon.32" file="hb-icon.32.png" />
+		<icon name="hb-icon.16" file="hb-icon.16.png" />
 		<icon name="hb-status" file="hb-status.32.png" />
 		<icon name="hb-status-empty" file="hb-status-empty.32.png" />
 		<icon name="hb-pause" file="hb-pause.32.png" />