From 4d0869a8e66d665aa2a8702dbbf0af153650a8dd Mon Sep 17 00:00:00 2001 From: Maurizio Galli Date: Fri, 28 Aug 2020 18:16:53 +0800 Subject: [PATCH 1/2] Added new stock icons and use reverse DNS file names --- Makefile.am | 5 +- icons/16x16/Makefile.am | 2 +- icons/16x16/org.xfce.ristretto.png | Bin 0 -> 903 bytes icons/16x16/org.xfce.ristretto.svg | 294 +++ icons/16x16/ristretto.png | Bin 797 -> 0 bytes icons/48x48/Makefile.am | 2 +- icons/48x48/org.xfce.ristretto.png | Bin 0 -> 2796 bytes icons/48x48/org.xfce.ristretto.svg | 292 +++ icons/48x48/ristretto.png | Bin 3445 -> 0 bytes icons/scalable/Makefile.am | 2 +- icons/scalable/org.xfce.ristretto.svg | 568 ++++++ icons/scalable/ristretto.svg | 1620 ----------------- ...ml.in => org.xfce.ristretto.appdata.xml.in | 2 +- ...esktop.in => org.xfce.ristretto.desktop.in | 2 +- src/image_viewer.c | 2 +- src/main.c | 4 +- src/main_window.c | 12 +- src/preferences_dialog.c | 2 +- 18 files changed, 1171 insertions(+), 1638 deletions(-) create mode 100644 icons/16x16/org.xfce.ristretto.png create mode 100644 icons/16x16/org.xfce.ristretto.svg delete mode 100644 icons/16x16/ristretto.png create mode 100644 icons/48x48/org.xfce.ristretto.png create mode 100644 icons/48x48/org.xfce.ristretto.svg delete mode 100644 icons/48x48/ristretto.png create mode 100644 icons/scalable/org.xfce.ristretto.svg delete mode 100644 icons/scalable/ristretto.svg rename ristretto.appdata.xml.in => org.xfce.ristretto.appdata.xml.in (97%) rename ristretto.desktop.in => org.xfce.ristretto.desktop.in (93%) diff --git a/Makefile.am b/Makefile.am index 206076f9..c72598e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,8 @@ -## Process this file with automake to produce Makefile.in SUBDIRS = src po icons desktopdir = $(datadir)/applications -desktop_in_files = ristretto.desktop.in +desktop_in_files = org.xfce.ristretto.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ @@ -13,7 +12,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_XML_RULE@ appdatadir = $(datadir)/metainfo appdata_DATA = $(appdata_in_files:.xml.in=.xml) -appdata_in_files = ristretto.appdata.xml.in +appdata_in_files = org.xfce.ristretto.appdata.xml.in EXTRA_DIST = \ README.md \ diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am index 000f39ff..ea998b16 100644 --- a/icons/16x16/Makefile.am +++ b/icons/16x16/Makefile.am @@ -2,7 +2,7 @@ # Inspired by Makefile.am from the Thunar file-manager iconsdir = $(datadir)/icons/hicolor/16x16/apps -icons_DATA = ristretto.png +icons_DATA = org.xfce.ristretto.png EXTRA_DIST = $(icons_DATA) diff --git a/icons/16x16/org.xfce.ristretto.png b/icons/16x16/org.xfce.ristretto.png new file mode 100644 index 0000000000000000000000000000000000000000..c4fa6c6384fb2a7e92a4e113126df5569bc25ee2 GIT binary patch literal 903 zcmV;219<$2P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H102_2g zSaeirbZlh+L1cGfX>?&ANn>wrAXH^-aBN|8WwpEKKL7v#7<5HgbU}4=Xm4@=M@~;o zMIc0Fb7^O8AXH^xZD5XeegFUfQglUFbVF}&d2(rIXmkKWLm)wPbaH88b#!TOZY@)2 zVRB_bY-wv{AZT=Sa5^t9V{&C-bZK^FV{dJ3Z*FrgZ*pfZY-wX_lLTS*8OW%Ws}*4%s*c)mSP?~oh+K_ zW#9ArSETEblhIXrbJwVs8XA;OIu_EArS?;v)Q5<~+j-o)CUs^SQOcNmL&IH0OMj-e zE*V>kl7PT861W)S1W!A(ic#94b&LuuHY|%PB^VJm(9+x#&MXXKWs&LPIDu*;AWvw& z;Y$f$m+-tLyr6)D4oSKSKw-4#FuNkdmANsr6iKKQbqbUiG%-oZ6Z(tzUIEX`BMA$| zvVj(bQAz<2#q}huqTy4DAWE?$0kb&fh-j`EV{_Pt31_iMjl}ZPpbF4Y6Kit;<9GXb zH9krq`U*gzrjB)6wvpR&lFsxcvZ)bNIYAXrrfvL?qW|JKqR;cozAGPn<=KNl-b_8i z9`B(xX=#%Sv{Xy18U#*2mhIIa;}F{0cQHCb1)wmx0`S8G2Tz=0c;FT<$A-x-d?`n$ zO|!mjI~{wwF`i#p!*T{)>7Zn-HHk#P`pp|y-P*$J+#J@rA5E`Z*-R#r=K0KPM#m=T z*t(P0TC`Fnc{1_hw1b|7C^GMI@7dkCgD?n|sTT^13_g6!n${MApll&f6p=H_LigUh zeNh{ItZmZ + + + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + GNOME Design Team + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/16x16/ristretto.png b/icons/16x16/ristretto.png deleted file mode 100644 index 9144752308c3b0c721a7e4225c88d4f71d3d28dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 797 zcmV+&1LFLNP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00f-?00f-@d^BsJ00007bV*G`2ipuD z2q-%vUY*wf00Ny!L_t(I%XO2@Yn)XS#((GDYcqM- zp$HX?_i#@~| zuAQCZrkjt_>2&z`qYnUsj0TS^q?FJkJoD76eE#7HeqaBTX6Be|OaRb7UGe>?z|s32 z=Y@g{34 zU+;%#tmRFDu zUDuRlNeG@8BPk`k_jn&@wOXvNu29$Ym<7OE%N=*N`RVYrt?gWNxlSv)P<*&XJP( z#l^)V((P{O^z<|_M(VmI#>CmPzj5KhMVzyEAMoBYKYt?&3k#?!S(f3PV=x$u7QWlv z(3zPTs;ZD7)Pay~@{(B9M~W|MuGL bjsW}vL#;$wqogqa00000NkvXXu0mjfNpfvF diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am index b7f2fcaa..4ef67425 100644 --- a/icons/48x48/Makefile.am +++ b/icons/48x48/Makefile.am @@ -2,7 +2,7 @@ # Inspired by Makefile.am from the Thunar file-manager iconsdir = $(datadir)/icons/hicolor/48x48/apps -icons_DATA = ristretto.png +icons_DATA = org.xfce.ristretto.png EXTRA_DIST = $(icons_DATA) diff --git a/icons/48x48/org.xfce.ristretto.png b/icons/48x48/org.xfce.ristretto.png new file mode 100644 index 0000000000000000000000000000000000000000..2ebcae9cd366fad4a2acb128d5f5d5cb2078fadc GIT binary patch literal 2796 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 + + + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + GNOME Design Team + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/48x48/ristretto.png b/icons/48x48/ristretto.png deleted file mode 100644 index 679971d3343e00eb38aaafaca4654f077786cd5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3445 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 + + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + GNOME Design Team + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/scalable/ristretto.svg b/icons/scalable/ristretto.svg deleted file mode 100644 index 20b4d028..00000000 --- a/icons/scalable/ristretto.svg +++ /dev/null @@ -1,1620 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ristretto.appdata.xml.in b/org.xfce.ristretto.appdata.xml.in similarity index 97% rename from ristretto.appdata.xml.in rename to org.xfce.ristretto.appdata.xml.in index d3b2e4c1..4e546aef 100644 --- a/ristretto.appdata.xml.in +++ b/org.xfce.ristretto.appdata.xml.in @@ -1,7 +1,7 @@ - ristretto.desktop + org.xfce.ristretto.desktop CC-BY-3.0 GPL-2.0+ Ristretto diff --git a/ristretto.desktop.in b/org.xfce.ristretto.desktop.in similarity index 93% rename from ristretto.desktop.in rename to org.xfce.ristretto.desktop.in index 6b8233ef..51932284 100644 --- a/ristretto.desktop.in +++ b/org.xfce.ristretto.desktop.in @@ -4,7 +4,7 @@ _Name=Ristretto Image Viewer _Comment=Look at your images easily _GenericName=Image Viewer Exec=ristretto %F -Icon=ristretto +Icon=org.xfce.ristretto Terminal=false Type=Application X-MultipleArgs=false diff --git a/src/image_viewer.c b/src/image_viewer.c index ebacd730..c7d0d367 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -39,7 +39,7 @@ #endif #ifndef BACKGROUND_ICON_NAME -#define BACKGROUND_ICON_NAME "ristretto" +#define BACKGROUND_ICON_NAME "org.xfce.ristretto" #endif #ifndef BACKGROUND_ICON_SIZE diff --git a/src/main.c b/src/main.c index b4e4869d..ca85bc12 100644 --- a/src/main.c +++ b/src/main.c @@ -120,7 +120,7 @@ main(int argc, char **argv) xfconf_init (NULL); - gtk_window_set_default_icon_name ("ristretto"); + gtk_window_set_default_icon_name ("org.xfce.ristretto"); settings = rstto_settings_new (); if (FALSE == show_settings) @@ -168,7 +168,7 @@ main(int argc, char **argv) { xfce_dialog_show_help ( GTK_WINDOW (window), - "ristretto", + "org.xfce.ristretto", "preferences", NULL); } diff --git a/src/main_window.c b/src/main_window.c index 7978f795..cf165710 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -53,7 +53,7 @@ #define RISTRETTO_APP_TITLE _("Image Viewer") #endif -#define RISTRETTO_DESKTOP_ID "ristretto.desktop" +#define RISTRETTO_DESKTOP_ID "org.xfce.ristretto.desktop" #define RSTTO_RECENT_FILES_APP_NAME "ristretto" #define RSTTO_RECENT_FILES_GROUP "Graphics" @@ -1468,7 +1468,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS else { gtk_window_set_icon (GTK_WINDOW (window), NULL); - gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto"); + gtk_window_set_icon_name (GTK_WINDOW (window), "org.xfce.ristretto"); } app_list = g_app_info_get_all_for_type (content_type); @@ -1560,7 +1560,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS title = g_strdup (RISTRETTO_APP_TITLE); gtk_window_set_icon (GTK_WINDOW (window), NULL); - gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto"); + gtk_window_set_icon_name (GTK_WINDOW (window), "org.xfce.ristretto"); } rstto_main_window_update_buttons (window); @@ -2845,7 +2845,7 @@ cb_rstto_main_window_about (GtkWidget *widget, RsttoMainWindow *window) gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about_dialog), "https://docs.xfce.org/apps/ristretto/start"); gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG (about_dialog), - "ristretto"); + "org.xfce.ristretto"); gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about_dialog), authors); gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG (about_dialog), @@ -2874,7 +2874,7 @@ cb_rstto_main_window_contents (GtkWidget *widget, RsttoMainWindow *window) { xfce_dialog_show_help ( GTK_WINDOW (window), - "ristretto", + "org.xfce.ristretto", "start", ""); } @@ -4671,7 +4671,7 @@ cb_rstto_thumbnailer_ready( else { gtk_window_set_icon (GTK_WINDOW (window), NULL); - gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto"); + gtk_window_set_icon_name (GTK_WINDOW (window), "org.xfce.ristretto"); } } } diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c index 314261b4..ae7918d6 100644 --- a/src/preferences_dialog.c +++ b/src/preferences_dialog.c @@ -578,7 +578,7 @@ rstto_preferences_dialog_new (GtkWindow *parent) { GtkWidget *dialog = g_object_new (RSTTO_TYPE_PREFERENCES_DIALOG, "title", _("Image Viewer Preferences"), - "icon-name", "ristretto", + "icon-name", "org.xfce.ristretto", "transient-for", parent, NULL); -- GitLab From 6a51a6100034a978d1725688487fd6e09df2b4ce Mon Sep 17 00:00:00 2001 From: Maurizio Galli Date: Fri, 28 Aug 2020 18:22:45 +0800 Subject: [PATCH 2/2] Fix POTFILES --- po/POTFILES.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 91421bd1..279dd0f0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,5 +11,5 @@ src/thumbnailer.c src/wallpaper_manager.c src/xfce_wallpaper_manager.c src/gnome_wallpaper_manager.c -ristretto.desktop.in -ristretto.appdata.xml.in +org.xfce.ristretto.desktop.in +org.xfce.ristretto.appdata.xml.in -- GitLab