diff --git a/krita/krita4.xmlgui b/krita/krita4.xmlgui index 5f9197f78c..e250ade684 100644 --- a/krita/krita4.xmlgui +++ b/krita/krita4.xmlgui @@ -1,407 +1,409 @@ &File &Edit Fill Special &View &Canvas &Snap To &Image &Rotate &Layer New &Import/Export Import &Convert &Select &Group &Transform &Rotate Transform &All Layers &Rotate S&plit S&plit Alpha &Select Select &Opaque Filte&r &Tools Scripts Setti&ngs &Help File + + Brushes and Stuff diff --git a/plugins/extensions/actionsearch/ActionSearch.action b/plugins/extensions/actionsearch/ActionSearch.action index 201573c25d..0c20eeeea0 100644 --- a/plugins/extensions/actionsearch/ActionSearch.action +++ b/plugins/extensions/actionsearch/ActionSearch.action @@ -1,15 +1,18 @@ - + + General - Search Actions + Search in Krita - Workspaces - Workspaces + + + 0 + 0 false diff --git a/plugins/extensions/actionsearch/ActionSearch.xmlgui b/plugins/extensions/actionsearch/ActionSearch.xmlgui deleted file mode 100644 index 03c2652e86..0000000000 --- a/plugins/extensions/actionsearch/ActionSearch.xmlgui +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/plugins/extensions/actionsearch/CMakeLists.txt b/plugins/extensions/actionsearch/CMakeLists.txt index efd13b33d4..1601fc6d64 100644 --- a/plugins/extensions/actionsearch/CMakeLists.txt +++ b/plugins/extensions/actionsearch/CMakeLists.txt @@ -1,16 +1,14 @@ set(kritaactionsearch_SOURCES ActionSearch.cpp KisActionSearchWidget.cpp ) ki18n_wrap_ui(kritaactionsearch_SOURCES WdgActionSearch.ui ) add_library(kritaactionsearch MODULE ${kritaactionsearch_SOURCES}) target_link_libraries(kritaactionsearch kritaui) install(TARGETS kritaactionsearch DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES ActionSearch.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) - -install( FILES actionsearch.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions) +install( FILES ActionSearch.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions) diff --git a/plugins/extensions/actionsearch/KisActionSearchWidget.cpp b/plugins/extensions/actionsearch/KisActionSearchWidget.cpp index 1e2206a6f7..75c7fd202f 100644 --- a/plugins/extensions/actionsearch/KisActionSearchWidget.cpp +++ b/plugins/extensions/actionsearch/KisActionSearchWidget.cpp @@ -1,209 +1,209 @@ /* * Copyright (c) 2019 Boudewijn Rempt * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "KisActionSearchWidget.h" #include #include #include #include #include #include #include #include KisActionModel::KisActionModel(KActionCollection *actionCollection, QObject *parent) : QAbstractListModel(parent) , m_actionCollection(actionCollection) { } // reimp from QAbstractListModel int KisActionModel::rowCount(const QModelIndex &/*parent*/) const { qDebug() << "Count" << m_actionCollection->count(); return m_actionCollection->count(); } int KisActionModel::columnCount(const QModelIndex &/*parent*/) const { return 1; } QVariant KisActionModel::data(const QModelIndex &index, int role) const { qDebug() << index.isValid() << index; QAction *action = m_actionCollection->action(index.row()); qDebug() << action; // switch (role) { // case Qt::DisplayRole: return action->text(); // case Qt::WhatsThisRole: // return action->whatsThis(); // case Qt::UserRole + 1: // return QStringList() << action->text() << action->property("tags").toStringList(); // default: // return action->objectName(); // }; } KisActionSearchModel::KisActionSearchModel(QObject *parent) { } void KisActionSearchModel::setFilterText(const QString &filter) { m_filter = filter; } bool KisActionSearchModel::filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const { return true; } bool KisActionSearchModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { const QModelIndex index = sourceModel()->index(source_row, 0, source_parent); if (!index.isValid()) return false; return true; QStringList tags = index.data(Qt::UserRole + 1).toStringList(); bool hit = false; Q_FOREACH(const QString &tag, tags) { if (true || tag.contains(m_filter)) { hit = true; break; } } return hit; } bool KisActionSearchModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const { QVariant leftData = sourceModel()->data(source_left, Qt::DisplayRole); QVariant rightData = sourceModel()->data(source_right, Qt::DisplayRole); QString leftName = leftData.toString(); QString rightName = rightData.toString(); return QString::localeAwareCompare(leftName, rightName) < 0; } class KisActionSearchWidget::Private { public: KisActionSearchModel *searchModel; }; KisActionSearchWidget::KisActionSearchWidget(KActionCollection *actionCollection, QWidget *parent) : QWidget(parent) , Ui_WdgActionSearch() , d(new KisActionSearchWidget::Private()) { setupUi(this); connect(bnTrigger, SIGNAL(pressed()), SIGNAL(actionTriggered())); connect(lstAction, SIGNAL(activated(QModelIndex)), SLOT(actionSelected(QModelIndex))); KisActionModel *actionModel = new KisActionModel(actionCollection, this); d->searchModel = new KisActionSearchModel(this); d->searchModel->setSourceModel(actionModel); lstAction->setModel(actionModel); } KisActionSearchWidget::~KisActionSearchWidget() { } void KisActionSearchWidget::actionSelected(const QModelIndex &idx) { lblWhatsThis->setText(idx.data(Qt::WhatsThisRole).toString()); } class KisActionSearchLine::Private { public: bool popupVisible {false}; QFrame *frame {0}; KisActionSearchWidget *searchWidget {0}; QHBoxLayout *frameLayout {0}; }; KisActionSearchLine::KisActionSearchLine(KActionCollection *actionCollection, QWidget *parent) : QLineEdit(parent) , d(new KisActionSearchLine::Private()) { d->frame = new QFrame(this); d->searchWidget = new KisActionSearchWidget(actionCollection, this); - connect(d->searchWidget, SIGNAL(actionTriggered), SLOT(hidePopup())); + connect(d->searchWidget, SIGNAL(actionTriggered()), SLOT(hidePopup())); d->frame->setFrameStyle(QFrame::Box | QFrame::Plain); d->frame->setWindowFlags(Qt::Popup); d->frameLayout = new QHBoxLayout(d->frame); d->frameLayout->setMargin(0); d->frameLayout->setSizeConstraint(QLayout::SetFixedSize); d->frame->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); d->searchWidget->setParent(d->frame); d->frameLayout->addWidget(d->searchWidget); d->frame->setFrameStyle(Qt::Popup); } KisActionSearchLine::~KisActionSearchLine() { } void KisActionSearchLine::showPopup() { if (d->searchWidget && !d->searchWidget->isVisible()) { d->frame->raise(); d->frame->show(); adjustPosition(); } else { hidePopup(); } } void KisActionSearchLine::hidePopup() { if (d->searchWidget) { d->frame->setVisible(false); } } void KisActionSearchLine::focusInEvent(QFocusEvent *ev) { QLineEdit::focusInEvent(ev); showPopup(); } void KisActionSearchLine::adjustPosition() { QSize popSize = d->searchWidget->size(); QRect popupRect(this->mapToGlobal(QPoint(0, this->size().height())), popSize); // Get the available geometry of the screen which contains this KisPopupButton QDesktopWidget* desktopWidget = QApplication::desktop(); QRect screenRect = desktopWidget->availableGeometry(this); popupRect = kisEnsureInRect(popupRect, screenRect); d->frame->setGeometry(popupRect); } diff --git a/plugins/extensions/buginfo/CMakeLists.txt b/plugins/extensions/buginfo/CMakeLists.txt index a102ed6838..d46e4e1114 100644 --- a/plugins/extensions/buginfo/CMakeLists.txt +++ b/plugins/extensions/buginfo/CMakeLists.txt @@ -1,10 +1,9 @@ set(kritabuginfo_SOURCES buginfo.cpp dlg_buginfo.cpp ) ki18n_wrap_ui(kritabuginfo_SOURCES wdg_buginfo.ui ) add_library(kritabuginfo MODULE ${kritabuginfo_SOURCES}) target_link_libraries(kritabuginfo kritaui) install(TARGETS kritabuginfo DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES buginfo.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/buginfo/buginfo.xmlgui b/plugins/extensions/buginfo/buginfo.xmlgui deleted file mode 100644 index 9ba556b739..0000000000 --- a/plugins/extensions/buginfo/buginfo.xmlgui +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/plugins/extensions/clonesarray/CMakeLists.txt b/plugins/extensions/clonesarray/CMakeLists.txt index 9071e666ea..04f6ff9c3b 100644 --- a/plugins/extensions/clonesarray/CMakeLists.txt +++ b/plugins/extensions/clonesarray/CMakeLists.txt @@ -1,10 +1,9 @@ set(kritaclonesarray_SOURCES clonesarray.cpp dlg_clonesarray.cpp ) ki18n_wrap_ui(kritaclonesarray_SOURCES wdg_clonesarray.ui ) add_library(kritaclonesarray MODULE ${kritaclonesarray_SOURCES}) target_link_libraries(kritaclonesarray kritaui) install(TARGETS kritaclonesarray DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES clonesarray.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/clonesarray/clonesarray.xmlgui b/plugins/extensions/clonesarray/clonesarray.xmlgui deleted file mode 100644 index 244bf9496e..0000000000 --- a/plugins/extensions/clonesarray/clonesarray.xmlgui +++ /dev/null @@ -1,9 +0,0 @@ - - - - - La&yer - - - - diff --git a/plugins/extensions/colorrange/CMakeLists.txt b/plugins/extensions/colorrange/CMakeLists.txt index 9c12875c97..19dd4786ea 100644 --- a/plugins/extensions/colorrange/CMakeLists.txt +++ b/plugins/extensions/colorrange/CMakeLists.txt @@ -1,6 +1,5 @@ set(kritacolorrange_SOURCES colorrange.cc dlg_colorrange.cc ) ki18n_wrap_ui(kritacolorrange_SOURCES wdg_colorrange.ui ) add_library(kritacolorrange MODULE ${kritacolorrange_SOURCES}) target_link_libraries(kritacolorrange kritaui) install(TARGETS kritacolorrange DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES colorrange.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/colorrange/colorrange.xmlgui b/plugins/extensions/colorrange/colorrange.xmlgui deleted file mode 100644 index 9a4bbcb660..0000000000 --- a/plugins/extensions/colorrange/colorrange.xmlgui +++ /dev/null @@ -1,11 +0,0 @@ - - - - Select - - - - - - - diff --git a/plugins/extensions/colorspaceconversion/CMakeLists.txt b/plugins/extensions/colorspaceconversion/CMakeLists.txt index 5bb991cd41..f54f6578a4 100644 --- a/plugins/extensions/colorspaceconversion/CMakeLists.txt +++ b/plugins/extensions/colorspaceconversion/CMakeLists.txt @@ -1,6 +1,5 @@ set(kritacolorspaceconversion_SOURCES colorspaceconversion.cc dlg_colorspaceconversion.cc ) ki18n_wrap_ui(kritacolorspaceconversion_SOURCES wdgconvertcolorspace.ui ) add_library(kritacolorspaceconversion MODULE ${kritacolorspaceconversion_SOURCES}) target_link_libraries(kritacolorspaceconversion kritaui) install(TARGETS kritacolorspaceconversion DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES colorspaceconversion.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/colorspaceconversion/colorspaceconversion.xmlgui b/plugins/extensions/colorspaceconversion/colorspaceconversion.xmlgui deleted file mode 100644 index adba6cbd22..0000000000 --- a/plugins/extensions/colorspaceconversion/colorspaceconversion.xmlgui +++ /dev/null @@ -1,11 +0,0 @@ - - - - &Image - - - La&yer - - - - diff --git a/plugins/extensions/imagesize/CMakeLists.txt b/plugins/extensions/imagesize/CMakeLists.txt index e77ad22441..c5b6836e64 100644 --- a/plugins/extensions/imagesize/CMakeLists.txt +++ b/plugins/extensions/imagesize/CMakeLists.txt @@ -1,20 +1,19 @@ add_subdirectory( pics ) set(kritaimagesize_SOURCES imagesize.cc dlg_imagesize.cc dlg_canvassize.cc dlg_layersize.cc kcanvaspreview.cc ) ki18n_wrap_ui(kritaimagesize_SOURCES wdg_imagesize.ui wdg_canvassize.ui wdg_layersize.ui ) add_library(kritaimagesize MODULE ${kritaimagesize_SOURCES}) target_link_libraries(kritaimagesize kritaui) install(TARGETS kritaimagesize DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES imagesize.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/imagesize/imagesize.xmlgui b/plugins/extensions/imagesize/imagesize.xmlgui deleted file mode 100644 index 8959697aa8..0000000000 --- a/plugins/extensions/imagesize/imagesize.xmlgui +++ /dev/null @@ -1,16 +0,0 @@ - - - - Image - - - - - Layer - - - &Select - - - - diff --git a/plugins/extensions/imagesplit/CMakeLists.txt b/plugins/extensions/imagesplit/CMakeLists.txt index 69329fda10..b3b4207364 100644 --- a/plugins/extensions/imagesplit/CMakeLists.txt +++ b/plugins/extensions/imagesplit/CMakeLists.txt @@ -1,14 +1,13 @@ set(kritaimagesplit_SOURCES imagesplit.cpp dlg_imagesplit.cpp wdg_imagesplit.cpp ) ki18n_wrap_ui(kritaimagesplit_SOURCES wdg_imagesplit.ui ) add_library(kritaimagesplit MODULE ${kritaimagesplit_SOURCES}) target_link_libraries(kritaimagesplit kritaui) install(TARGETS kritaimagesplit DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES imagesplit.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/imagesplit/imagesplit.xmlgui b/plugins/extensions/imagesplit/imagesplit.xmlgui deleted file mode 100644 index 0070f8cfc5..0000000000 --- a/plugins/extensions/imagesplit/imagesplit.xmlgui +++ /dev/null @@ -1,8 +0,0 @@ - - - - Image - - - - diff --git a/plugins/extensions/layersplit/CMakeLists.txt b/plugins/extensions/layersplit/CMakeLists.txt index 843219f59f..eee4e7dc76 100644 --- a/plugins/extensions/layersplit/CMakeLists.txt +++ b/plugins/extensions/layersplit/CMakeLists.txt @@ -1,14 +1,13 @@ set(kritalayersplit_SOURCES layersplit.cpp dlg_layersplit.cpp wdg_layersplit.cpp ) ki18n_wrap_ui(kritalayersplit_SOURCES wdg_layersplit.ui ) add_library(kritalayersplit MODULE ${kritalayersplit_SOURCES}) target_link_libraries(kritalayersplit kritaui) install(TARGETS kritalayersplit DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES layersplit.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/layersplit/layersplit.xmlgui b/plugins/extensions/layersplit/layersplit.xmlgui deleted file mode 100644 index 89ba9e6bd7..0000000000 --- a/plugins/extensions/layersplit/layersplit.xmlgui +++ /dev/null @@ -1,8 +0,0 @@ - - - - &Layer - - - - diff --git a/plugins/extensions/metadataeditor/CMakeLists.txt b/plugins/extensions/metadataeditor/CMakeLists.txt index 0aa8d25e59..d4810ce686 100644 --- a/plugins/extensions/metadataeditor/CMakeLists.txt +++ b/plugins/extensions/metadataeditor/CMakeLists.txt @@ -1,12 +1,11 @@ set(kritametadataeditor_SOURCES metadataeditor.cc kis_entry_editor.cc kis_meta_data_editor.cc kis_meta_data_model.cpp ) ki18n_wrap_ui(kritametadataeditor_SOURCES editors/dublincore.ui editors/exif.ui ) add_library(kritametadataeditor MODULE ${kritametadataeditor_SOURCES}) target_link_libraries(kritametadataeditor kritaui ) install(TARGETS kritametadataeditor DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES metadataeditor.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins ) install( FILES editors/dublincore.xmlgui editors/exif.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins/metadataeditor ) diff --git a/plugins/extensions/metadataeditor/metadataeditor.xmlgui b/plugins/extensions/metadataeditor/metadataeditor.xmlgui deleted file mode 100644 index 640e8a01f9..0000000000 --- a/plugins/extensions/metadataeditor/metadataeditor.xmlgui +++ /dev/null @@ -1,8 +0,0 @@ - - - - La&yer - - - - diff --git a/plugins/extensions/modify_selection/CMakeLists.txt b/plugins/extensions/modify_selection/CMakeLists.txt index 297724be87..b439500485 100644 --- a/plugins/extensions/modify_selection/CMakeLists.txt +++ b/plugins/extensions/modify_selection/CMakeLists.txt @@ -1,21 +1,20 @@ set(kritamodifyselection_SOURCES dlg_grow_selection.cc dlg_shrink_selection.cc dlg_border_selection.cc dlg_feather_selection.cc modify_selection.cc modify_selection_operations.cpp ) ki18n_wrap_ui(kritamodifyselection_SOURCES wdg_grow_selection.ui wdg_shrink_selection.ui wdg_border_selection.ui wdg_feather_selection.ui ) add_library(kritamodifyselection MODULE ${kritamodifyselection_SOURCES}) target_link_libraries(kritamodifyselection kritaui) install(TARGETS kritamodifyselection DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES modify_selection.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/modify_selection/modify_selection.xmlgui b/plugins/extensions/modify_selection/modify_selection.xmlgui deleted file mode 100644 index b2b5ffe192..0000000000 --- a/plugins/extensions/modify_selection/modify_selection.xmlgui +++ /dev/null @@ -1,12 +0,0 @@ - - - - &Select - - - - - - - - diff --git a/plugins/extensions/offsetimage/CMakeLists.txt b/plugins/extensions/offsetimage/CMakeLists.txt index f0a078c9bd..5a398e358c 100644 --- a/plugins/extensions/offsetimage/CMakeLists.txt +++ b/plugins/extensions/offsetimage/CMakeLists.txt @@ -1,11 +1,10 @@ set(kritaoffsetimage_SOURCES offsetimage.cpp dlg_offsetimage.cpp kis_offset_processing_visitor.cpp ) ki18n_wrap_ui(kritaoffsetimage_SOURCES wdg_offsetimage.ui ) add_library(kritaoffsetimage MODULE ${kritaoffsetimage_SOURCES}) target_link_libraries(kritaoffsetimage kritaui) install(TARGETS kritaoffsetimage DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES offsetimage.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/offsetimage/offsetimage.xmlgui b/plugins/extensions/offsetimage/offsetimage.xmlgui deleted file mode 100644 index 8feb5a09c0..0000000000 --- a/plugins/extensions/offsetimage/offsetimage.xmlgui +++ /dev/null @@ -1,14 +0,0 @@ - - - - - &Image - - - - - La&yer - - - - diff --git a/plugins/extensions/rotateimage/CMakeLists.txt b/plugins/extensions/rotateimage/CMakeLists.txt index 4b7c08cd5b..ce3a7ba090 100644 --- a/plugins/extensions/rotateimage/CMakeLists.txt +++ b/plugins/extensions/rotateimage/CMakeLists.txt @@ -1,6 +1,5 @@ set(kritarotateimage_SOURCES rotateimage.cc dlg_rotateimage.cc ) ki18n_wrap_ui(kritarotateimage_SOURCES wdg_rotateimage.ui ) add_library(kritarotateimage MODULE ${kritarotateimage_SOURCES}) target_link_libraries(kritarotateimage kritaui) install(TARGETS kritarotateimage DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES rotateimage.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/rotateimage/rotateimage.xmlgui b/plugins/extensions/rotateimage/rotateimage.xmlgui deleted file mode 100644 index 05ef85b9e0..0000000000 --- a/plugins/extensions/rotateimage/rotateimage.xmlgui +++ /dev/null @@ -1,28 +0,0 @@ - - - - &Image - &Rotate - - - - - - - - - - - - La&yer - &Rotate - - - - - - - - - - diff --git a/plugins/extensions/separate_channels/CMakeLists.txt b/plugins/extensions/separate_channels/CMakeLists.txt index f5e7e7f579..01df7541cc 100644 --- a/plugins/extensions/separate_channels/CMakeLists.txt +++ b/plugins/extensions/separate_channels/CMakeLists.txt @@ -1,6 +1,5 @@ set(kritaseparatechannels_SOURCES kis_channel_separator.cc dlg_separate.cc kis_separate_channels_plugin.cc ) ki18n_wrap_ui(kritaseparatechannels_SOURCES wdg_separations.ui ) add_library(kritaseparatechannels MODULE ${kritaseparatechannels_SOURCES}) target_link_libraries(kritaseparatechannels kritaui) install(TARGETS kritaseparatechannels DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES imageseparate.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/separate_channels/imageseparate.xmlgui b/plugins/extensions/separate_channels/imageseparate.xmlgui deleted file mode 100644 index ccbba154b2..0000000000 --- a/plugins/extensions/separate_channels/imageseparate.xmlgui +++ /dev/null @@ -1,9 +0,0 @@ - - - - Image - - - - - diff --git a/plugins/extensions/shearimage/CMakeLists.txt b/plugins/extensions/shearimage/CMakeLists.txt index 7bd87060e4..1620b84810 100644 --- a/plugins/extensions/shearimage/CMakeLists.txt +++ b/plugins/extensions/shearimage/CMakeLists.txt @@ -1,6 +1,5 @@ set(kritashearimage_SOURCES shearimage.cc dlg_shearimage.cc ) ki18n_wrap_ui(kritashearimage_SOURCES wdg_shearimage.ui ) add_library(kritashearimage MODULE ${kritashearimage_SOURCES}) target_link_libraries(kritashearimage kritaui) install(TARGETS kritashearimage DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES shearimage.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/shearimage/shearimage.xmlgui b/plugins/extensions/shearimage/shearimage.xmlgui deleted file mode 100644 index c8e1b0cb6f..0000000000 --- a/plugins/extensions/shearimage/shearimage.xmlgui +++ /dev/null @@ -1,11 +0,0 @@ - - - - &Image - - - La&yer - - - - diff --git a/plugins/extensions/waveletdecompose/CMakeLists.txt b/plugins/extensions/waveletdecompose/CMakeLists.txt index 00bfa032a9..9d1ab98a36 100644 --- a/plugins/extensions/waveletdecompose/CMakeLists.txt +++ b/plugins/extensions/waveletdecompose/CMakeLists.txt @@ -1,14 +1,13 @@ set(kritawaveletdecompose_SOURCES waveletdecompose.cpp dlg_waveletdecompose.cpp kis_wavelet_kernel.cpp ) ki18n_wrap_ui(kritawaveletdecompose_SOURCES wdg_waveletdecompose.ui ) add_library(kritawaveletdecompose MODULE ${kritawaveletdecompose_SOURCES}) target_link_libraries(kritawaveletdecompose kritaui) install(TARGETS kritawaveletdecompose DESTINATION ${KRITA_PLUGIN_INSTALL_DIR}) -install( FILES waveletdecompose.xmlgui DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) diff --git a/plugins/extensions/waveletdecompose/waveletdecompose.xmlgui b/plugins/extensions/waveletdecompose/waveletdecompose.xmlgui deleted file mode 100644 index 207a64d2ca..0000000000 --- a/plugins/extensions/waveletdecompose/waveletdecompose.xmlgui +++ /dev/null @@ -1,8 +0,0 @@ - - - - &Layer - - - -