From 28c89cafd58438fd1388ab16ae5d39204dbbd1c7 Mon Sep 17 00:00:00 2001
From: Thomas Renne <thomas.renne@u-psud.fr>
Date: Tue, 17 Mar 2020 12:15:10 +0100
Subject: [PATCH] correct icon licenses
---
debian/copyright | 12 ++++++++----
.../Alignment_group_menu/alignmentgroupmenu.cpp | 6 +++---
src/gui/xic_view/xic_box/xic_box.ui | 4 ++--
.../icons/apache/{ => unicons}/icon_group.svg | 0
.../icons/apache/{ => unicons}/icon_ungroup.svg | 0
.../icons/mit/{ => ionicons}/icon_bar_chart.svg | 0
.../icons/mit/{ => jamicons}/icon_close.svg | 0
src/resources/icons/mit/{ => jamicons}/icon_plus.svg | 0
src/xtpcpp.qrc | 10 +++++-----
9 files changed, 18 insertions(+), 14 deletions(-)
rename src/resources/icons/apache/{ => unicons}/icon_group.svg (100%)
rename src/resources/icons/apache/{ => unicons}/icon_ungroup.svg (100%)
rename src/resources/icons/mit/{ => ionicons}/icon_bar_chart.svg (100%)
rename src/resources/icons/mit/{ => jamicons}/icon_close.svg (100%)
rename src/resources/icons/mit/{ => jamicons}/icon_plus.svg (100%)
diff --git a/debian/copyright b/debian/copyright
index 5a8af8e1..75463728 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,14 @@ Files: *
Copyright: Olivier Langella <olivier.langella@u-psud.fr>
License: GPL-3.0+
-Files: */src/resources/icons/apache
+Files: */src/resources/icons/apache/unicons
Copyright: Unicons <https://iconscout.com/unicons>
License: Apache 2.0
-Files: */src/resources/icons/mit
-Copyright: Michael Amprimo or Ben Sperry
-License: Expat
+Files: */src/resources/icons/mit/ionicons
+Copyright: ionic team <https://github.com/ionic-team/ionicons>
+License: MIT
+
+Files: */src/resources/icons/mit/jamicons
+Copyright: Michael Amprimo <https://github.com/michaelampr/jam>
+License: MIT
diff --git a/src/gui/widgets/Alignment_group_menu/alignmentgroupmenu.cpp b/src/gui/widgets/Alignment_group_menu/alignmentgroupmenu.cpp
index ae4012fe..9dc416a5 100644
--- a/src/gui/widgets/Alignment_group_menu/alignmentgroupmenu.cpp
+++ b/src/gui/widgets/Alignment_group_menu/alignmentgroupmenu.cpp
@@ -38,7 +38,7 @@ AlignmentGroupsQMenu::AlignmentGroupsQMenu(MsIdentificationListWindow *parent,
this->setTitle("Context menu");
createGroupsSubMenu();
this->addMenu(mp_subMenuGroup);
- this->addAction(QIcon(":/icons/resources/icons/apache/icon_ungroup.svg"),
+ this->addAction(QIcon(":/icons/resources/icons/apache/unicons/icon_ungroup.svg"),
"&Ungroup");
connect(this,
@@ -60,8 +60,8 @@ AlignmentGroupsQMenu::createGroupsSubMenu()
{
mp_subMenuGroup = new QMenu(tr("&Group"), this);
mp_subMenuGroup->setIcon(
- QIcon(":/icons/resources/icons/apache/icon_group.svg"));
- QIcon *icon = new QIcon(":/icons/resources/icons/mit/icon_plus.svg");
+ QIcon(":/icons/resources/icons/apache/unicons/icon_group.svg"));
+ QIcon *icon = new QIcon(":/icons/resources/icons/mit/jamicons/icon_plus.svg");
mp_subMenuGroup->addAction(*icon, "&New Group");
mp_subMenuGroup->addSeparator();
}
diff --git a/src/gui/xic_view/xic_box/xic_box.ui b/src/gui/xic_view/xic_box/xic_box.ui
index fd79b6ab..4b2afe9b 100644
--- a/src/gui/xic_view/xic_box/xic_box.ui
+++ b/src/gui/xic_view/xic_box/xic_box.ui
@@ -129,7 +129,7 @@
</property>
<property name="icon">
<iconset resource="../../../xtpcpp.qrc">
- <normaloff>:/icons/resources/icons/mit/icon_bar_chart.svg</normaloff>:/icons/resources/icons/mit/icon_bar_chart.svg</iconset>
+ <normaloff>:/icons/resources/icons/mit/ionicons/icon_bar_chart.svg</normaloff>:/icons/resources/icons/mit/ionicons/icon_bar_chart.svg</iconset>
</property>
<property name="iconSize">
<size>
@@ -174,7 +174,7 @@
</property>
<property name="icon">
<iconset resource="../../../xtpcpp.qrc">
- <normaloff>:/icons/resources/icons/mit/icon_close.svg</normaloff>:/icons/resources/icons/mit/icon_close.svg</iconset>
+ <normaloff>:/icons/resources/icons/mit/jamicons/icon_close.svg</normaloff>:/icons/resources/icons/mit/jamicons/icon_close.svg</iconset>
</property>
<property name="iconSize">
<size>
diff --git a/src/resources/icons/apache/icon_group.svg b/src/resources/icons/apache/unicons/icon_group.svg
similarity index 100%
rename from src/resources/icons/apache/icon_group.svg
rename to src/resources/icons/apache/unicons/icon_group.svg
diff --git a/src/resources/icons/apache/icon_ungroup.svg b/src/resources/icons/apache/unicons/icon_ungroup.svg
similarity index 100%
rename from src/resources/icons/apache/icon_ungroup.svg
rename to src/resources/icons/apache/unicons/icon_ungroup.svg
diff --git a/src/resources/icons/mit/icon_bar_chart.svg b/src/resources/icons/mit/ionicons/icon_bar_chart.svg
similarity index 100%
rename from src/resources/icons/mit/icon_bar_chart.svg
rename to src/resources/icons/mit/ionicons/icon_bar_chart.svg
diff --git a/src/resources/icons/mit/icon_close.svg b/src/resources/icons/mit/jamicons/icon_close.svg
similarity index 100%
rename from src/resources/icons/mit/icon_close.svg
rename to src/resources/icons/mit/jamicons/icon_close.svg
diff --git a/src/resources/icons/mit/icon_plus.svg b/src/resources/icons/mit/jamicons/icon_plus.svg
similarity index 100%
rename from src/resources/icons/mit/icon_plus.svg
rename to src/resources/icons/mit/jamicons/icon_plus.svg
diff --git a/src/xtpcpp.qrc b/src/xtpcpp.qrc
index ccce1dfd..e05c7aec 100644
--- a/src/xtpcpp.qrc
+++ b/src/xtpcpp.qrc
@@ -97,13 +97,13 @@
<file>resources/icons/icon_info.svg</file>
<file>resources/icons/icon_wait.gif</file>
<!-- following icons created by Michael Amprimo https://github.com/michaelampr/jam-->
- <file>resources/icons/mit/icon_plus.svg</file>
- <file>resources/icons/mit/icon_close.svg</file>
+ <file>resources/icons/mit/jamicons/icon_plus.svg</file>
+ <file>resources/icons/mit/jamicons/icon_close.svg</file>
<!-- following icons created by Ben Sperry https://github.com/ionic-team/ionicons-->
- <file>resources/icons/mit/icon_bar_chart.svg</file>
+ <file>resources/icons/mit/ionicons/icon_bar_chart.svg</file>
<!-- following icons created Unicons by https://iconscout.com/unicons-->
- <file>resources/icons/apache/icon_group.svg</file>
- <file>resources/icons/apache/icon_ungroup.svg</file>
+ <file>resources/icons/apache/unicons/icon_group.svg</file>
+ <file>resources/icons/apache/unicons/icon_ungroup.svg</file>
</qresource>
<qresource prefix="/labeling">
<file>resources/catalog_label.xml</file>
--
GitLab