From 11756d2e52fe82475d434a0e6961beed8204a0fd Mon Sep 17 00:00:00 2001 From: Denis Washington Date: Tue, 26 Jun 2007 14:45:57 +0000 Subject: [PATCH] Placeholder thumbnails for gtk+, metacity and icon themes. 2007-06-26 Denis Washington * gtk-theme-thumbnailing.png: * icon-theme-thumbnailing.png: * window-theme-thumbnailing.png: Placeholder thumbnails for gtk+, metacity and icon themes. * Makefile.am: Add new files. * appearance.h: * appearance-style.h: * appearance-style.c: (style_init), (style_shutdown), (prepare_list): Use the new placeholder thumbnails for the details window's theme lists. * appearance-main.c: Call new style_shutdown (). svn path=/trunk/; revision=7781 --- capplets/appearance/ChangeLog | 16 ++++++++++++ capplets/appearance/Makefile.am | 5 +++- capplets/appearance/appearance-main.c | 1 + capplets/appearance/appearance-style.c | 23 +++++++++++++++++- capplets/appearance/appearance-style.h | 1 + capplets/appearance/appearance.h | 5 ++++ .../appearance/gtk-theme-thumbnailing.png | Bin 0 -> 1764 bytes .../appearance/icon-theme-thumbnailing.png | Bin 0 -> 1167 bytes .../appearance/window-theme-thumbnailing.png | Bin 0 -> 2183 bytes 9 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 capplets/appearance/gtk-theme-thumbnailing.png create mode 100644 capplets/appearance/icon-theme-thumbnailing.png create mode 100644 capplets/appearance/window-theme-thumbnailing.png diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index c7e2abfdf..2529fe277 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,19 @@ +2007-06-26 Denis Washington + + * gtk-theme-thumbnailing.png: + * icon-theme-thumbnailing.png: + * window-theme-thumbnailing.png: + Placeholder thumbnails for gtk+, metacity and icon themes. + + * Makefile.am: Add new files. + + * appearance.h: + * appearance-style.h: + * appearance-style.c: (style_init), (style_shutdown), (prepare_list): + Use the new placeholder thumbnails for the details window's theme lists. + + * appearance-main.c: Call new style_shutdown (). + 2007-06-25 Denis Washington * appearance.glade: Fixed resize problems. diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am index 27ae4a424..bd06f3d60 100644 --- a/capplets/appearance/Makefile.am +++ b/capplets/appearance/Makefile.am @@ -50,7 +50,10 @@ dist_pixmap_DATA = \ subpixel-rgb.png \ subpixel-vbgr.png \ subpixel-vrgb.png \ - theme-thumbnailing.png + theme-thumbnailing.png \ + gtk-theme-thumbnailing.png \ + window-theme-thumbnailing.png \ + icon-theme-thumbnailing.png wallpaperdir = $(datadir)/gnome-background-properties diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index 4f2a8d4e9..67327b3f2 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -76,6 +76,7 @@ main_window_response (GtkWidget *widget, gtk_main_quit (); themes_shutdown (data); + style_shutdown (data); desktop_shutdown (data); font_shutdown (data); diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index 40834b58c..51867640a 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -647,6 +647,7 @@ prepare_list (AppearanceData *data, GtkWidget *list, ThemeType type, GCallback c { const gchar *name = NULL; const gchar *label = NULL; + GdkPixbuf *thumbnail = NULL; GtkTreeIter i; if (type == THEME_TYPE_GTK || type == THEME_TYPE_WINDOW) { @@ -662,6 +663,7 @@ prepare_list (AppearanceData *data, GtkWidget *list, ThemeType type, GCallback c switch (type) { case THEME_TYPE_GTK: + thumbnail = data->gtk_theme_icon; generate_gtk_theme_thumbnail_async ((GnomeThemeInfo *) l->data, (ThemeThumbnailFunc) gtk_theme_thumbnail_cb, data, @@ -669,6 +671,7 @@ prepare_list (AppearanceData *data, GtkWidget *list, ThemeType type, GCallback c break; case THEME_TYPE_ICON: + thumbnail = data->icon_theme_icon; generate_icon_theme_thumbnail_async ((GnomeThemeIconInfo *) l->data, (ThemeThumbnailFunc) icon_theme_thumbnail_cb, data, @@ -676,6 +679,7 @@ prepare_list (AppearanceData *data, GtkWidget *list, ThemeType type, GCallback c break; case THEME_TYPE_WINDOW: + thumbnail = data->window_theme_icon; generate_metacity_theme_thumbnail_async ((GnomeThemeInfo *) l->data, (ThemeThumbnailFunc) metacity_theme_thumbnail_cb, data, @@ -687,7 +691,9 @@ prepare_list (AppearanceData *data, GtkWidget *list, ThemeType type, GCallback c gtk_list_store_insert_with_values (store, &i, 0, COL_LABEL, label ? label : name, - COL_NAME, name, -1); + COL_NAME, name, + COL_THUMBNAIL, thumbnail, + -1); } g_list_free (themes); @@ -732,6 +738,10 @@ style_init (AppearanceData *data) GtkSettings *settings; GtkWidget *w; + data->gtk_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/gtk-theme-thumbnailing.png", NULL); + data->window_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/window-theme-thumbnailing.png", NULL); + data->icon_theme_icon = gdk_pixbuf_new_from_file (GNOMECC_PIXMAP_DIR "/icon-theme-thumbnailing.png", NULL); + w = glade_xml_get_widget (data->xml, "theme_details"); g_signal_connect (w, "response", (GCallback) style_response_cb, NULL); g_signal_connect (w, "delete_event", (GCallback) gtk_true, NULL); @@ -770,3 +780,14 @@ style_init (AppearanceData *data) gnome_theme_info_register_theme_change ((ThemeChangedCallback) changed_on_disk_cb, data); } + +void +style_shutdown (AppearanceData *data) +{ + if (data->gtk_theme_icon) + g_object_unref (data->gtk_theme_icon); + if (data->window_theme_icon) + g_object_unref (data->window_theme_icon); + if (data->icon_theme_icon) + g_object_unref (data->icon_theme_icon); +} diff --git a/capplets/appearance/appearance-style.h b/capplets/appearance/appearance-style.h index 6d254e876..83f147ca7 100644 --- a/capplets/appearance/appearance-style.h +++ b/capplets/appearance/appearance-style.h @@ -19,3 +19,4 @@ */ void style_init (AppearanceData *data); +void style_shutdown (AppearanceData *data); diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h index 32572ffca..7d988f7c8 100644 --- a/capplets/appearance/appearance.h +++ b/capplets/appearance/appearance.h @@ -56,4 +56,9 @@ typedef struct { GnomeThemeMetaInfo *theme_custom; GdkPixbuf *theme_icon; GtkWidget *theme_save_dialog; + + /* style */ + GdkPixbuf *gtk_theme_icon; + GdkPixbuf *window_theme_icon; + GdkPixbuf *icon_theme_icon; } AppearanceData; diff --git a/capplets/appearance/gtk-theme-thumbnailing.png b/capplets/appearance/gtk-theme-thumbnailing.png new file mode 100644 index 0000000000000000000000000000000000000000..52065c7f3e6f75452967229d5424109322651621 GIT binary patch literal 1764 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 literal 0 HcmV?d00001 diff --git a/capplets/appearance/window-theme-thumbnailing.png b/capplets/appearance/window-theme-thumbnailing.png new file mode 100644 index 0000000000000000000000000000000000000000..ce3bd1abe62463733520372cab739e6a142d5886 GIT binary patch literal 2183 zcmV;22zd92P)`KXvJzIdkqC6SGT1BN7yZpu~q2#U(Dmh-^$Ex++R`9|B(RF=oLa zMuZ4rh`Ia|x$J|)_@pR?Tro<-c#md{>*XwaE^}t4yQ}KwL(j~ao|&^}P7JtbroJ%H zRo(sTs`}RV*T4GJFr!}i^J}8DMI;bHKpTTX5pnP!2*G=l)@Y>(!DF?yG?ovMcUlDJ zsLd~;w3(ejk#cDE1Eth1wq&1ASBx{Ye>-KHL;_iJ6KyRvoukuS$BG24lS2r@Iu4I*7~+gNMST2FMJcMg|#kfeq&rKj`Wp&xrqj|l%2!1w?XOtr0}kQ;IVTJjJ8Y?!iWfk5BR)|uFoS%5rW{e7HNIH zOYme~D4=jz8>KB;gHm8?^Az4;6$)((&R1Paa2dY6#U!m2z|K{CirKe|lY z-YgjIp9YLoC}n!B+9gbYyeN?15J@MR5SJI!zCx_(M3Bn3^$xSv7WLYAS6w)dGASlW zcLq?ZVP5Z8yhllaLI^5B89TmCdWO^pk9O2-31c+Na|_h#_3Ers^hxa1Z8o>L*bZau zT;39{gwk)wgc=RW(OPrm%EFE)dQul*W4lc&ANNcdu~ifqS1mWNR&#NyO_n=SqgY*< z1K|9HCTZP_@0bh`EaQXtG0OtA>rz4F019}Y%MuxqtPG5k43L}`o~>3jI!_bRx6!ks z#*KgXys-%z+a2DrGSBitoh)>*Qbwm`e=G zMAxeECwu3e_q6kXwn_hF$Q@~7%6IN18qqtiw7~_%e=at;>d+##QBIHx>rFB-Xl=T; z$*!HTlP>B9$?YGjJ)PEpQt)0%R!a2;Q0aSRI)nhq z?6g-#!z5wEMNc-5D@6C)^`MJ7AQB!-$BIDk4lMt zUuUSe=%H|Js7-=|K%zWXUa^Gtfh;dbQ_GcymRP&kB=cqTF1xg6A_ed1nh(B!`>Jcy zQ&tumm7u66i+`?d;D3MU$Sp@H{b1oXS3O%)ya2U(h#Y=x=xl8NKu!GfL}lN8bA8s z6a4b|XZYQ3U*_V43v@bdmX=p|=ew@sLm&AlC%MVp+JI1**ZRi($1wMs`QSBaBXaTksyNBieh`6bbf`x`5hj5_Y86~ zR2Q-)X=90<9E;#u8-og#QR?*Gc~#+mUr)YS`1~htn)up0%eeO&U#Hn@a_86X8Xd%4 zJ6jT{lpT00l{+~S{7%wguRNm&DmawVr9gUXOr;6l4Gg6kGq%+_C1FQ~LmZR}Ub=#; za0foWeBIUa{p0K3e*?Fj{30Lx@G%Y_xrVLH4W51a=REkm@9>vD{h<;|Jn_^|dCz;V zpX?#QW2{Blw4ahxS|P3|bJAUv@2!l0La?=Yf`sntUZD_N)+#;Xq{(RU*xDSR`#XUO zaP5uhBlvA^zm_xKx{u=@`^4C5wzr#n?v|T)Xjo&ILaWsR z;Kmzo`@jL7G}b8O+CR6Jn#e7*4FyvGiUDR$dMy66L(BK!B748sY>}%x8FWf ztA?p3_}sZ_3i9yb!;#==!q(PSrJSZ|Bsd}x91+*Smj{YGiwcg21V=;{eR(2DYcuV# zqk<#B5s~1CNN_|9vf?^8DmWq%91#hQ1V==IBO<{Ok>H3(a6}|HA`%=4j)(+DM1mtC z!4Z+*h&K=2|7-~O8Tyr-SwQdqo2+vMYybY&O#M#QtiXB4e*r*k_q2C-TQdLv002ov JPDHLkV1jF6F0}vv literal 0 HcmV?d00001