diff --git a/debian/copyright b/debian/copyright index 5a8af8e115563b3e33cd1356e38598f9fc047d7e..75463728928205cb75f41852e4419c49669acb03 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 ae4012fe72b0ae01d573dc8745b7659d6a0aaf15..9dc416a508cdba05a9f8bd46d03212d9661d45b3 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 fd79b6abc66bb6ba88a11cdebc0d42c9c0debbf2..4b2afe9bf461c2842850bd4c4d8e09a221918a6d 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 ccce1dfdac948976c3d6c046a90401cbd652c124..e05c7aec4771f01589efa3e0e80cfe91dcf1de78 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>