[meld/deprecation-cleanup: 34/48] data: Move all action icons to resource loading
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/deprecation-cleanup: 34/48] data: Move all action icons to resource loading
- Date: Sun, 2 Dec 2018 02:44:59 +0000 (UTC)
commit 3f049f58ca6316e638d779c31a569cbf35d73e14
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Dec 2 07:37:34 2018 +1000
data: Move all action icons to resource loading
.../icons}/16x16/actions/meld-change-apply-left.png | Bin
.../icons}/16x16/actions/meld-change-apply-right.png | Bin
.../resources/icons}/16x16/actions/meld-change-copy.png | Bin
.../resources/icons}/16x16/actions/meld-change-delete.png | Bin
meld/resources/icons/README | 6 ++++++
meld/resources/meld.gresource.xml | 4 ++++
6 files changed, 10 insertions(+)
---
diff --git a/data/icons/hicolor/16x16/actions/meld-change-apply-left.png
b/meld/resources/icons/16x16/actions/meld-change-apply-left.png
similarity index 100%
rename from data/icons/hicolor/16x16/actions/meld-change-apply-left.png
rename to meld/resources/icons/16x16/actions/meld-change-apply-left.png
diff --git a/data/icons/hicolor/16x16/actions/meld-change-apply-right.png
b/meld/resources/icons/16x16/actions/meld-change-apply-right.png
similarity index 100%
rename from data/icons/hicolor/16x16/actions/meld-change-apply-right.png
rename to meld/resources/icons/16x16/actions/meld-change-apply-right.png
diff --git a/data/icons/hicolor/16x16/actions/meld-change-copy.png
b/meld/resources/icons/16x16/actions/meld-change-copy.png
similarity index 100%
rename from data/icons/hicolor/16x16/actions/meld-change-copy.png
rename to meld/resources/icons/16x16/actions/meld-change-copy.png
diff --git a/data/icons/hicolor/16x16/actions/meld-change-delete.png
b/meld/resources/icons/16x16/actions/meld-change-delete.png
similarity index 100%
rename from data/icons/hicolor/16x16/actions/meld-change-delete.png
rename to meld/resources/icons/16x16/actions/meld-change-delete.png
diff --git a/meld/resources/icons/README b/meld/resources/icons/README
new file mode 100644
index 00000000..f420fda6
--- /dev/null
+++ b/meld/resources/icons/README
@@ -0,0 +1,6 @@
+Action icons
+============
+
+The change action icons in ./16x16/actions are all used and have been
+recently updated. These are extremely simple icons, but we would ideally have
+these at additional sizes for different file comparison line heights.
diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml
index 073851d2..ca2a22ec 100644
--- a/meld/resources/meld.gresource.xml
+++ b/meld/resources/meld.gresource.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/meld">
+ <file>icons/16x16/actions/meld-change-apply-left.png</file>
+ <file>icons/16x16/actions/meld-change-apply-right.png</file>
+ <file>icons/16x16/actions/meld-change-copy.png</file>
+ <file>icons/16x16/actions/meld-change-delete.png</file>
</gresource>
</gresources>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]