diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ endif() add_subdirectory(plugins) -#add_subdirectory(pics) +add_subdirectory(pics) set(kreport_LIB_SRCS common/kreport_debug.cpp diff --git a/src/items/check/check.desktop b/src/items/check/check.desktop --- a/src/items/check/check.desktop +++ b/src/items/check/check.desktop @@ -34,7 +34,7 @@ Comment[uk]=Елемент пункту позначки для звітів Comment[x-test]=xxCheck box element for Reportsxx Type=Service -Icon=checkbox +Icon=kreport_checkbox_element Encoding=UTF-8 X-KDE-ServiceTypes=KReport/Element diff --git a/src/items/field/field.desktop b/src/items/field/field.desktop --- a/src/items/field/field.desktop +++ b/src/items/field/field.desktop @@ -34,7 +34,7 @@ Comment[uk]=Елемент поля для звітів Comment[x-test]=xxField element for Reportsxx Type=Service -Icon=edit-rename +Icon=kreport_field_element Encoding=UTF-8 X-KDE-ServiceTypes=KReport/Element diff --git a/src/items/image/image.desktop b/src/items/image/image.desktop --- a/src/items/image/image.desktop +++ b/src/items/image/image.desktop @@ -34,7 +34,7 @@ Comment[uk]=Елемент зображення для звітів Comment[x-test]=xxImage element for Reportsxx Type=Service -Icon=image +Icon=kreport_image_element Encoding=UTF-8 X-KDE-ServiceTypes=KReport/Element diff --git a/src/items/label/label.desktop b/src/items/label/label.desktop --- a/src/items/label/label.desktop +++ b/src/items/label/label.desktop @@ -34,7 +34,7 @@ Comment[uk]=Елемент мітки для звітів Comment[x-test]=xxLabel element for Reportsxx Type=Service -Icon=label +Icon=kreport_label_element Encoding=UTF-8 X-KDE-ServiceTypes=KReport/Element diff --git a/src/items/text/text.desktop b/src/items/text/text.desktop --- a/src/items/text/text.desktop +++ b/src/items/text/text.desktop @@ -36,7 +36,7 @@ Comment[uk]=Елемент тексту для звітів Comment[x-test]=xxText element for Reportsxx Type=Service -Icon=insert-text +Icon=kreport_text_element Encoding=UTF-8 X-KDE-ServiceTypes=KReport/Element diff --git a/src/pics/hicolor/16-actions-kreport_checkbox_element.svg b/src/pics/hicolor/16-actions-kreport_checkbox_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/16-actions-kreport_checkbox_element.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/pics/hicolor/16-actions-kreport_field_element.svg b/src/pics/hicolor/16-actions-kreport_field_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/16-actions-kreport_field_element.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/pics/hicolor/16-actions-kreport_image_element.svg b/src/pics/hicolor/16-actions-kreport_image_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/16-actions-kreport_image_element.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/pics/hicolor/16-actions-kreport_label_element.svg b/src/pics/hicolor/16-actions-kreport_label_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/16-actions-kreport_label_element.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/pics/hicolor/16-actions-kreport_line_element.svg b/src/pics/hicolor/16-actions-kreport_line_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/16-actions-kreport_line_element.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/pics/hicolor/16-actions-kreport_text_element.svg b/src/pics/hicolor/16-actions-kreport_text_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/16-actions-kreport_text_element.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/pics/hicolor/22-actions-kreport_checkbox_element.svg b/src/pics/hicolor/22-actions-kreport_checkbox_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/22-actions-kreport_checkbox_element.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/pics/hicolor/22-actions-kreport_field_element.svg b/src/pics/hicolor/22-actions-kreport_field_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/22-actions-kreport_field_element.svg @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/pics/hicolor/22-actions-kreport_image_element.svg b/src/pics/hicolor/22-actions-kreport_image_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/22-actions-kreport_image_element.svg @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + diff --git a/src/pics/hicolor/22-actions-kreport_label_element.svg b/src/pics/hicolor/22-actions-kreport_label_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/22-actions-kreport_label_element.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/pics/hicolor/22-actions-kreport_line_element.svg b/src/pics/hicolor/22-actions-kreport_line_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/22-actions-kreport_line_element.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/pics/hicolor/22-actions-kreport_text_element.svg b/src/pics/hicolor/22-actions-kreport_text_element.svg new file mode 100644 --- /dev/null +++ b/src/pics/hicolor/22-actions-kreport_text_element.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/pics/hicolor/CMakeLists.txt b/src/pics/hicolor/CMakeLists.txt --- a/src/pics/hicolor/CMakeLists.txt +++ b/src/pics/hicolor/CMakeLists.txt @@ -1,2 +1,11 @@ -ecm_install_icons(${DATA_INSTALL_DIR}/calligra/icons) +ecm_install_icons(ICONS + 16-actions-kreport_checkbox_element.svg 22-actions-kreport_checkbox_element.svg + 16-actions-kreport_field_element.svg 22-actions-kreport_field_element.svg + 16-actions-kreport_image_element.svg 22-actions-kreport_image_element.svg + 16-actions-kreport_label_element.svg 22-actions-kreport_label_element.svg + 16-actions-kreport_line_element.svg 22-actions-kreport_line_element.svg + 16-actions-kreport_text_element.svg 22-actions-kreport_text_element.svg + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) diff --git a/src/pics/hicolor/hi16-action-line.png b/src/pics/hicolor/hi16-action-line.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/plugins/barcode/pics/hicolor/22-actions-kreport_barcode_element.svg b/src/plugins/barcode/pics/hicolor/22-actions-kreport_barcode_element.svg new file mode 100644 --- /dev/null +++ b/src/plugins/barcode/pics/hicolor/22-actions-kreport_barcode_element.svg @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/plugins/barcode/pics/hicolor/CMakeLists.txt b/src/plugins/barcode/pics/hicolor/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/src/plugins/barcode/pics/hicolor/CMakeLists.txt @@ -0,0 +1,6 @@ +ecm_install_icons(ICONS + 16-actions-kreport_barcode_element.svg 22-actions-kreport_barcode_element.svg + + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) diff --git a/src/plugins/chart/CMakeLists.txt b/src/plugins/chart/CMakeLists.txt --- a/src/plugins/chart/CMakeLists.txt +++ b/src/plugins/chart/CMakeLists.txt @@ -1,10 +1,5 @@ -include_directories( - ${KOREPORT_INCLUDES} -) - ecm_create_qm_loader(koreport_chartplugin_QM_LOADER kreport_chartplugin_qt) -#build a shared library set(koreport_chartplugin_LIB_SRCS ${PROJECT_SOURCE_DIR}/src/common/kreportplugin_debug.cpp KoReportItemChart.cpp @@ -24,7 +19,4 @@ install(TARGETS koreport_chartplugin DESTINATION ${PLUGIN_INSTALL_DIR}) - -########### install files ############### - -install( FILES koreport_chartplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) +add_subdirectory(pics) diff --git a/src/plugins/chart/koreport_chartplugin.desktop b/src/plugins/chart/koreport_chartplugin.desktop --- a/src/plugins/chart/koreport_chartplugin.desktop +++ b/src/plugins/chart/koreport_chartplugin.desktop @@ -1,43 +1,21 @@ [Desktop Entry] -Name=Chart Report Plugin -Name[ca]=Connector d'informes de diagrames -Name[de]=Diagramm-Reportmodul -Name[es]=Complemento de gráficos para informes -Name[fi]=Raportoinnin kaavioliitännäinen -Name[fr]=Module externe de panneaux pour Chart -Name[gl]=Complemento de informes de gráficos -Name[hu]=Diagram bővítmény -Name[it]=Estensione rapporti grafici -Name[ja]=チャートレポートプラグイン -Name[nb]=Programtillegg for diagramrapport -Name[nl]=Plug-in voor grafiekrapport -Name[pl]=Wtyczka raportu z wykresami -Name[pt]='Plugin' Web de Relatórios de Gráficos -Name[pt_BR]=Plugin de mapas para relatório -Name[sk]=Plugin správy Chart -Name[sv]=Insticksprogram för diagramrapport -Name[tr]=Çizelge Rapor Eklentisi -Name[uk]=Додаток діаграм звіту -Name[x-test]=xxChart Report Pluginxx -Comment=Calligra Reports Chart Plugin -Comment[ca]=Connector d'informes de diagrames del Calligra -Comment[de]=Diagrammberichtmodul für Calligra -Comment[es]=Complemento de gráficos para informes de Calligra -Comment[fi]=Calligra Reportsin kaavioliitännäinen -Comment[gl]=Complemento para Calligra de gráficas web. -Comment[hu]=Calligra diagram bővítmény -Comment[it]=Estensione per grafici dei rapporti di Calligra -Comment[ja]=Calligra レポートチャートプラグイン -Comment[nb]=Diagran-tillegg for Calligra-rapporter -Comment[nl]=Plug-in voor Calligra Reports Chart -Comment[pl]=Wtyczka wykresów dla raportów -Comment[pt]='Plugin' de Gráficos dos Relatórios do Calligra -Comment[pt_BR]=Plugin de gráficos de relatórios do Calligra -Comment[sk]=Grafový plugin Calligra Reports -Comment[sv]=Calligra-insticksprogram för diagramrapport -Comment[tr]=Calligra Rapor Çizelge Eklentisi -Comment[uk]=Додаток діаграм у звітах Calligra -Comment[x-test]=xxCalligra Reports Chart Pluginxx -X-KDE-Library=kreport_chartplugin -X-KDE-ServiceTypes=KoReport/ItemPlugin +Name=Chart +Comment=Chart element for Reports Type=Service +Icon=kreport_chart_element +Encoding=UTF-8 + +X-KDE-Library=kreport_chartplugin +X-KDE-ServiceTypes=KReport/Element +X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Email=kexi@kde.org +X-KDE-PluginInfo-Name=org.kde.kreport.chart +X-KDE-PluginInfo-Version=1.0 +X-KDE-PluginInfo-Website=http://kexi-project.org +X-KDE-PluginInfo-Category= +X-KDE-PluginInfo-Depends= +X-KDE-PluginInfo-License=LGPL +X-KDE-PluginInfo-EnabledByDefault=true +X-KDE-PluginInfo-LegacyName=chart + +X-KReport-Priority=50 diff --git a/src/plugins/chart/pics/CMakeLists.txt b/src/plugins/chart/pics/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/src/plugins/chart/pics/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(hicolor) diff --git a/src/plugins/chart/pics/hicolor/16-actions-kreport_chart_element.svg b/src/plugins/chart/pics/hicolor/16-actions-kreport_chart_element.svg new file mode 100644 --- /dev/null +++ b/src/plugins/chart/pics/hicolor/16-actions-kreport_chart_element.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/plugins/chart/pics/hicolor/22-actions-kreport_chart_element.svg b/src/plugins/chart/pics/hicolor/22-actions-kreport_chart_element.svg new file mode 100644 --- /dev/null +++ b/src/plugins/chart/pics/hicolor/22-actions-kreport_chart_element.svg @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/plugins/chart/pics/hicolor/CMakeLists.txt b/src/plugins/chart/pics/hicolor/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/src/plugins/chart/pics/hicolor/CMakeLists.txt @@ -0,0 +1,6 @@ +ecm_install_icons(ICONS + 16-actions-kreport_chart_element.svg 22-actions-kreport_chart_element.svg + + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) diff --git a/src/plugins/maps/CMakeLists.txt b/src/plugins/maps/CMakeLists.txt --- a/src/plugins/maps/CMakeLists.txt +++ b/src/plugins/maps/CMakeLists.txt @@ -24,4 +24,5 @@ ########### install files ############### install(TARGETS kreport_mapsplugin DESTINATION ${KREPORT_PLUGIN_INSTALL_DIR}) -ecm_install_icons(${DATA_INSTALL_DIR}/calligra/icons) + +add_subdirectory(pics) diff --git a/src/plugins/maps/hi16-action-report_map_element.png b/src/plugins/maps/hi16-action-report_map_element.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/plugins/maps/pics/hicolor/22-actions-kreport_maps_element.svg b/src/plugins/maps/pics/hicolor/22-actions-kreport_maps_element.svg new file mode 100644 --- /dev/null +++ b/src/plugins/maps/pics/hicolor/22-actions-kreport_maps_element.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/plugins/maps/pics/hicolor/CMakeLists.txt b/src/plugins/maps/pics/hicolor/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/src/plugins/maps/pics/hicolor/CMakeLists.txt @@ -0,0 +1,6 @@ +ecm_install_icons(ICONS + 16-actions-kreport_maps_element.svg 22-actions-kreport_maps_element.svg + + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) diff --git a/src/plugins/web/CMakeLists.txt b/src/plugins/web/CMakeLists.txt --- a/src/plugins/web/CMakeLists.txt +++ b/src/plugins/web/CMakeLists.txt @@ -29,5 +29,5 @@ ########### install files ############### install(TARGETS koreport_webplugin DESTINATION ${PLUGIN_INSTALL_DIR}) -install( FILES koreport_webplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -ecm_install_icons(${DATA_INSTALL_DIR}/calligra/icons) + +add_subdirectory(pics) diff --git a/src/plugins/web/hi16-action-report_web_element.png b/src/plugins/web/hi16-action-report_web_element.png deleted file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/plugins/web/pics/hicolor/22-actions-kreport_web_element.svg b/src/plugins/web/pics/hicolor/22-actions-kreport_web_element.svg new file mode 100644 --- /dev/null +++ b/src/plugins/web/pics/hicolor/22-actions-kreport_web_element.svg @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/plugins/web/pics/hicolor/CMakeLists.txt b/src/plugins/web/pics/hicolor/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/src/plugins/web/pics/hicolor/CMakeLists.txt @@ -0,0 +1,6 @@ +ecm_install_icons(ICONS + 16-actions-kreport_web_element.svg 22-actions-kreport_web_element.svg + + DESTINATION ${ICON_INSTALL_DIR} + THEME hicolor +) diff --git a/src/wrtembed/KoReportDesigner.cpp b/src/wrtembed/KoReportDesigner.cpp --- a/src/wrtembed/KoReportDesigner.cpp +++ b/src/wrtembed/KoReportDesigner.cpp @@ -1332,7 +1332,8 @@ KoReportPluginManager* manager = KoReportPluginManager::self(); QList actList = manager->actions(); - QAction *act = new QAction(QIcon::fromTheme(QLatin1String("draw-line")), tr("Line"), group); + //! @todo make line a real plugin so this isn't needed: + QAction *act = new QAction(QIcon::fromTheme(QLatin1String("kreport_line_element")), tr("Line"), group); act->setObjectName(QLatin1String("org.kde.kreport.line")); act->setData(9); act->setCheckable(true);