Skip to content
Snippets Groups Projects
Commit 28c89caf authored by Renne Thomas's avatar Renne Thomas
Browse files

correct icon licenses

parent d3f1335d
No related branches found
No related tags found
1 merge request!19Correct before release
...@@ -6,10 +6,14 @@ Files: * ...@@ -6,10 +6,14 @@ Files: *
Copyright: Olivier Langella <olivier.langella@u-psud.fr> Copyright: Olivier Langella <olivier.langella@u-psud.fr>
License: GPL-3.0+ License: GPL-3.0+
Files: */src/resources/icons/apache Files: */src/resources/icons/apache/unicons
Copyright: Unicons <https://iconscout.com/unicons> Copyright: Unicons <https://iconscout.com/unicons>
License: Apache 2.0 License: Apache 2.0
Files: */src/resources/icons/mit Files: */src/resources/icons/mit/ionicons
Copyright: Michael Amprimo or Ben Sperry Copyright: ionic team <https://github.com/ionic-team/ionicons>
License: Expat License: MIT
Files: */src/resources/icons/mit/jamicons
Copyright: Michael Amprimo <https://github.com/michaelampr/jam>
License: MIT
...@@ -38,7 +38,7 @@ AlignmentGroupsQMenu::AlignmentGroupsQMenu(MsIdentificationListWindow *parent, ...@@ -38,7 +38,7 @@ AlignmentGroupsQMenu::AlignmentGroupsQMenu(MsIdentificationListWindow *parent,
this->setTitle("Context menu"); this->setTitle("Context menu");
createGroupsSubMenu(); createGroupsSubMenu();
this->addMenu(mp_subMenuGroup); 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"); "&Ungroup");
connect(this, connect(this,
...@@ -60,8 +60,8 @@ AlignmentGroupsQMenu::createGroupsSubMenu() ...@@ -60,8 +60,8 @@ AlignmentGroupsQMenu::createGroupsSubMenu()
{ {
mp_subMenuGroup = new QMenu(tr("&Group"), this); mp_subMenuGroup = new QMenu(tr("&Group"), this);
mp_subMenuGroup->setIcon( mp_subMenuGroup->setIcon(
QIcon(":/icons/resources/icons/apache/icon_group.svg")); QIcon(":/icons/resources/icons/apache/unicons/icon_group.svg"));
QIcon *icon = new QIcon(":/icons/resources/icons/mit/icon_plus.svg"); QIcon *icon = new QIcon(":/icons/resources/icons/mit/jamicons/icon_plus.svg");
mp_subMenuGroup->addAction(*icon, "&New Group"); mp_subMenuGroup->addAction(*icon, "&New Group");
mp_subMenuGroup->addSeparator(); mp_subMenuGroup->addSeparator();
} }
......
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../../xtpcpp.qrc"> <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>
<property name="iconSize"> <property name="iconSize">
<size> <size>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../../xtpcpp.qrc"> <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>
<property name="iconSize"> <property name="iconSize">
<size> <size>
......
...@@ -97,13 +97,13 @@ ...@@ -97,13 +97,13 @@
<file>resources/icons/icon_info.svg</file> <file>resources/icons/icon_info.svg</file>
<file>resources/icons/icon_wait.gif</file> <file>resources/icons/icon_wait.gif</file>
<!-- following icons created by Michael Amprimo https://github.com/michaelampr/jam--> <!-- following icons created by Michael Amprimo https://github.com/michaelampr/jam-->
<file>resources/icons/mit/icon_plus.svg</file> <file>resources/icons/mit/jamicons/icon_plus.svg</file>
<file>resources/icons/mit/icon_close.svg</file> <file>resources/icons/mit/jamicons/icon_close.svg</file>
<!-- following icons created by Ben Sperry https://github.com/ionic-team/ionicons--> <!-- 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--> <!-- following icons created Unicons by https://iconscout.com/unicons-->
<file>resources/icons/apache/icon_group.svg</file> <file>resources/icons/apache/unicons/icon_group.svg</file>
<file>resources/icons/apache/icon_ungroup.svg</file> <file>resources/icons/apache/unicons/icon_ungroup.svg</file>
</qresource> </qresource>
<qresource prefix="/labeling"> <qresource prefix="/labeling">
<file>resources/catalog_label.xml</file> <file>resources/catalog_label.xml</file>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment