Add new app icon and switch to rDNS icon name

https://gitlab.xfce.org/xfce/thunar/-/merge_requests/11
xfce-mirror · Jun 11, 2020 · 78f73f6 · 78f73f6
1 parent 39b20ab
commit 78f73f6
Show file tree

Hide file tree

Showing 28 changed files with 1,791 additions and 1,423 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -21,7 +21,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS =								\
 	icons								\
-	pixmaps								\
 	po								\
 	thunarx								\
 	thunar								\

diff --git a/configure.ac.in b/configure.ac.in
@@ -237,10 +237,8 @@ icons/Makefile
 icons/16x16/Makefile
 icons/24x24/Makefile
 icons/48x48/Makefile
-icons/64x64/Makefile
 icons/128x128/Makefile
 icons/scalable/Makefile
-pixmaps/Makefile
 plugins/Makefile
 plugins/thunar-apr/Makefile
 plugins/thunar-sbr/Makefile

diff --git a/icons/128x128/Makefile.am b/icons/128x128/Makefile.am
@@ -1,6 +1,6 @@
 iconsdir = $(datadir)/icons/hicolor/128x128/apps
 icons_DATA =								\
-	Thunar.png
+	org.xfce.thunar.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)

diff --git a/icons/128x128/Thunar.png b/icons/128x128/Thunar.png
diff --git a/icons/128x128/org.xfce.thunar.png b/icons/128x128/org.xfce.thunar.png
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
@@ -1,6 +1,6 @@
 appsdir = $(datadir)/icons/hicolor/16x16/apps
 apps_DATA =								\
-	Thunar.png
+	org.xfce.thunar.png
 
 stockdir = $(datadir)/icons/hicolor/16x16/stock/navigation
 stock_DATA =								\

diff --git a/icons/16x16/Thunar.png b/icons/16x16/Thunar.png
diff --git a/icons/16x16/org.xfce.thunar.png b/icons/16x16/org.xfce.thunar.png
diff --git a/icons/16x16/org.xfce.thunar.svg b/icons/16x16/org.xfce.thunar.svg
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
@@ -1,14 +1,9 @@
-iconsdir = $(datadir)/icons/hicolor/24x24/apps
-icons_DATA =								\
-	Thunar.png
-
 stockdir = $(datadir)/icons/hicolor/24x24/stock/navigation
 stock_DATA =								\
 	stock_folder-copy.png						\
 	stock_folder-move.png
 
 EXTRA_DIST =								\
-	$(icons_DATA)							\
 	$(stock_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/24x24/Thunar.png b/icons/24x24/Thunar.png
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
@@ -1,6 +1,6 @@
 iconsdir = $(datadir)/icons/hicolor/48x48/apps
 icons_DATA =								\
-	Thunar.png
+	org.xfce.thunar.png
 
 EXTRA_DIST =								\
 	$(icons_DATA)

diff --git a/icons/48x48/Thunar.png b/icons/48x48/Thunar.png
diff --git a/icons/48x48/org.xfce.thunar.png b/icons/48x48/org.xfce.thunar.png