[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: [calligra] sheets: Consistently use "calligrasheets" as id on the system
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2016-07-18 19:22:42
Message-ID: E1bPE7m-0005f7-Ur () code ! kde ! org
[Download RAW message or body]
Git commit 681b83ba97bd1da119af94b91eebc5316f6739a6 by Friedrich W. H. Kossebau.
Committed on 18/07/2016 at 18:00.
Pushed by kossebau into branch 'master'.
Consistently use "calligrasheets" as id on the system
* rename share/sheets -> share/calligrasheets
* rename sheetsrc -> calligrasheetsrc
* rename sheets.rc -> calligrasheets.rc
* rename sheets.appdata.xml -> org.kde.calligrasheets.appdata.xml
* rename translation catalog sheets.po -> calligrasheets.po
CCMAIL:kde-i18n-doc@kde.org
M +11 -11 sheets/CMakeLists.txt
M +1 -1 sheets/FunctionModuleRegistry.cpp
M +1 -1 sheets/Localization.cpp
M +1 -1 sheets/Messages.sh
R +0 -0 sheets/calligrasheets.kcfg [from: sheets/sheets.kcfg - 100% \
similarity] R +1 -1 sheets/calligrasheets.rc [from: sheets/sheets.rc - 099% \
similarity] R +1 -1 sheets/calligrasheets_readonly.rc [from: \
sheets/sheets_readonly.rc - 088% similarity] R +0 -0 sheets/calligrasheetsrc \
[from: sheets/sheetsrc - 100% similarity] M +1 -1 \
sheets/data/sheetstyles/CMakeLists.txt M +3 -3 \
sheets/data/templates/Business/CMakeLists.txt M +3 -3 \
sheets/data/templates/General/CMakeLists.txt M +3 -3 \
sheets/data/templates/HomeFamily/CMakeLists.txt M +1 -1 \
sheets/data/toolbar/hicolor/CMakeLists.txt M +1 -1 sheets/dtd/CMakeLists.txt
M +13 -13 sheets/functions/CMakeLists.txt
R +2 -2 sheets/org.kde.calligrasheets.appdata.xml [from: \
sheets/sheets.appdata.xml - 099% similarity] R +1 -1 \
sheets/org.kde.calligrasheets.desktop [from: sheets/sheets.desktop - 099% similarity] \
M +3 -3 sheets/part/AboutData.h M +1 -1 sheets/part/Factory.cpp
M +1 -1 sheets/part/Part.cpp
M +1 -1 sheets/part/View.cpp
M +1 -1 sheets/plugins/scripting/CMakeLists.txt
M +1 -1 sheets/plugins/scripting/ScriptingPart.cpp
M +4 -4 sheets/plugins/scripting/scripts/CMakeLists.txt
M +1 -1 sheets/plugins/solver/CMakeLists.txt
M +1 -1 sheets/plugins/solver/Solver.cpp
M +1 -1 sheets/ui/CellToolBase.cpp
http://commits.kde.org/calligra/681b83ba97bd1da119af94b91eebc5316f6739a6
diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
index cfc5210..de3bfab 100644
--- a/sheets/CMakeLists.txt
+++ b/sheets/CMakeLists.txt
@@ -18,7 +18,7 @@ if (SHOULD_BUILD_PART_SHEETS)
add_subdirectory( shape )
add_subdirectory( plugins )
-add_definitions(-DTRANSLATION_DOMAIN=\"sheets\")
+add_definitions(-DTRANSLATION_DOMAIN=\"calligrasheets\")
add_subdirectory( data )
add_subdirectory( tests )
@@ -374,10 +374,10 @@ install(TARGETS calligrasheetspart DESTINATION \
${PLUGIN_INSTALL_DIR}/calligra/p
########### install files ###############
-install( FILES sheets.rc sheets_readonly.rc DESTINATION \
${KXMLGUI_INSTALL_DIR}/sheets)
-install( FILES ui/CellToolOptionWidgets.xml DESTINATION ${DATA_INSTALL_DIR}/sheets)
-install( FILES sheets.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
-install( FILES sheetsrc DESTINATION ${CONFIG_INSTALL_DIR})
+install( FILES calligrasheets.rc calligrasheets_readonly.rc DESTINATION \
${KXMLGUI_INSTALL_DIR}/calligrasheets) +install( FILES ui/CellToolOptionWidgets.xml \
DESTINATION ${DATA_INSTALL_DIR}/calligrasheets) +install( FILES calligrasheets.kcfg \
DESTINATION ${KCFG_INSTALL_DIR} ) +install( FILES calligrasheetsrc DESTINATION \
${CONFIG_INSTALL_DIR})
# TODO: with the new embedded JSON data for plugins there is no schema ATM to define \
extended # propertiessheets_plugin.desktop, sheets_viewplugin.desktop
@@ -426,17 +426,17 @@ install( FILES
part/Headers.h
part/ToolRegistry.h
part/View.h
-DESTINATION ${INCLUDE_INSTALL_DIR}/sheets/part COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/calligrasheets/part COMPONENT Devel)
install( FILES
ui/CellToolBase.h
ui/CellEditorBase.h
ui/Selection.h
ui/SheetView.h
-DESTINATION ${INCLUDE_INSTALL_DIR}/sheets/ui COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/calligrasheets/ui COMPONENT Devel)
install( FILES
database/Database.h
database/Filter.h
-DESTINATION ${INCLUDE_INSTALL_DIR}/sheets/database COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/calligrasheets/database COMPONENT Devel)
install( FILES
commands/AbstractRegionCommand.h
commands/DataManipulators.h
@@ -446,7 +446,7 @@ install( FILES
dialogs/pivotoptions.h
dialogs/pivotmain.h
-DESTINATION ${INCLUDE_INSTALL_DIR}/sheets/commands COMPONENT Devel)
+DESTINATION ${INCLUDE_INSTALL_DIR}/calligrasheets/commands COMPONENT Devel)
endif ()
@@ -475,7 +475,7 @@ install(TARGETS kdeinit_calligrasheets \
${INSTALL_TARGETS_DEFAULT_ARGS}) target_link_libraries( calligrasheets \
kdeinit_calligrasheets ) install(TARGETS calligrasheets \
${INSTALL_TARGETS_DEFAULT_ARGS})
-install( PROGRAMS sheets.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install( FILES sheets.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+install( PROGRAMS org.kde.calligrasheets.desktop DESTINATION \
${XDG_APPS_INSTALL_DIR}) +install( FILES org.kde.calligrasheets.appdata.xml \
DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
endif ()
diff --git a/sheets/FunctionModuleRegistry.cpp b/sheets/FunctionModuleRegistry.cpp
index 260fc25..1be76cc 100644
--- a/sheets/FunctionModuleRegistry.cpp
+++ b/sheets/FunctionModuleRegistry.cpp
@@ -66,7 +66,7 @@ void \
FunctionModuleRegistry::Private::registerFunctionModule(FunctionModule* mod }
Q_ASSERT(!module->descriptionFileName().isEmpty());
const QString fileName = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation,
- \
QStringLiteral("sheets/functions/")+module->descriptionFileName()); + \
QStringLiteral("calligrasheets/functions/")+module->descriptionFileName()); if \
(fileName.isEmpty()) {
debugSheetsFormula << module->descriptionFileName() << "not found.";
return;
diff --git a/sheets/Localization.cpp b/sheets/Localization.cpp
index d33f1cd..178b80a 100644
--- a/sheets/Localization.cpp
+++ b/sheets/Localization.cpp
@@ -99,7 +99,7 @@ QDomElement Localization::save(QDomDocument& doc) const
void Localization::defaultSystemConfig()
{
- KLocale locale("sheets");
+ KLocale locale("calligrasheets");
setWeekStartDay(locale.weekStartDay());
setDecimalSymbol(locale.decimalSymbol());
setThousandsSeparator(locale.thousandsSeparator());
diff --git a/sheets/Messages.sh b/sheets/Messages.sh
index a1c6124..91d86a1 100755
--- a/sheets/Messages.sh
+++ b/sheets/Messages.sh
@@ -4,5 +4,5 @@ source ../calligra_xgettext.sh
$EXTRACTRC --tag-group=koffice functions/*.xml > xml_doc.cpp
$EXTRACTRC chart/*.ui dialogs/*.ui part/dialogs/*.ui *.kcfg *.rc >> rc.cpp
$EXTRACTATTR --attr=optionWidget,name ui/CellToolOptionWidgets.xml >> rc.cpp
-calligra_xgettext sheets.pot *.cpp chart/*.cpp commands/*.cpp database/*.cpp \
dialogs/*.cpp functions/*.cpp part/AboutData.h part/*.cpp part/commands/*.cpp \
part/dialogs/*.cpp ui/*.cpp +calligra_xgettext calligrasheets.pot *.cpp chart/*.cpp \
commands/*.cpp database/*.cpp dialogs/*.cpp functions/*.cpp part/AboutData.h \
part/*.cpp part/commands/*.cpp part/dialogs/*.cpp ui/*.cpp rm -f xml_doc.cpp rc.cpp
diff --git a/sheets/sheets.kcfg b/sheets/calligrasheets.kcfg
similarity index 100%
rename from sheets/sheets.kcfg
rename to sheets/calligrasheets.kcfg
diff --git a/sheets/sheets.rc b/sheets/calligrasheets.rc
similarity index 99%
rename from sheets/sheets.rc
rename to sheets/calligrasheets.rc
index a4742d2..0efa5c8 100644
--- a/sheets/sheets.rc
+++ b/sheets/calligrasheets.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui name="Calligra Sheets" version="42" translationDomain="sheets">
+<gui name="Calligra Sheets" version="42" translationDomain="calligrasheets">
<MenuBar>
<!-- <<<<<<<<<<<<<<<<<<<<<>>>>>< File Menu >>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
<Menu name="file"><text>&File</text>
diff --git a/sheets/sheets_readonly.rc b/sheets/calligrasheets_readonly.rc
similarity index 88%
rename from sheets/sheets_readonly.rc
rename to sheets/calligrasheets_readonly.rc
index 89e94cf..37e9dff 100644
--- a/sheets/sheets_readonly.rc
+++ b/sheets/calligrasheets_readonly.rc
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="KSpread" version="2" \
translationDomain="sheets"> +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui \
name="KSpread" version="2" translationDomain="calligrasheets"> <MenuBar>
<Menu name="edit"><text>&Edit</text>
<Action name="copy"/>
diff --git a/sheets/sheetsrc b/sheets/calligrasheetsrc
similarity index 100%
rename from sheets/sheetsrc
rename to sheets/calligrasheetsrc
diff --git a/sheets/data/sheetstyles/CMakeLists.txt \
b/sheets/data/sheetstyles/CMakeLists.txt index 57721a6..535a9bb 100644
--- a/sheets/data/sheetstyles/CMakeLists.txt
+++ b/sheets/data/sheetstyles/CMakeLists.txt
@@ -1,5 +1,5 @@
-install( FILES standard1.ksts standard1.png standard1.xml standard2.ksts \
standard2.png standard2.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/sheetstyles) \
+install( FILES standard1.ksts standard1.png standard1.xml standard2.ksts \
standard2.png standard2.xml DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/sheetstyles)
diff --git a/sheets/data/templates/Business/CMakeLists.txt \
b/sheets/data/templates/Business/CMakeLists.txt index 58eb249..3ab3303 100644
--- a/sheets/data/templates/Business/CMakeLists.txt
+++ b/sheets/data/templates/Business/CMakeLists.txt
@@ -1,6 +1,6 @@
-install( FILES Invoice.kst ExpenseReport.kst BalanceSheet.kst PriceQuotation.kst \
PackingSlip.kst DESTINATION \
${DATA_INSTALL_DIR}/sheets/templates/Business/.source)
-install( FILES .directory Invoice.desktop ExpenseReport.desktop \
BalanceSheet.desktop PriceQuotation.desktop PackingSlip.desktop DESTINATION \
${DATA_INSTALL_DIR}/sheets/templates/Business) +install( FILES Invoice.kst \
ExpenseReport.kst BalanceSheet.kst PriceQuotation.kst PackingSlip.kst DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/templates/Business/.source) +install( FILES \
.directory Invoice.desktop ExpenseReport.desktop BalanceSheet.desktop \
PriceQuotation.desktop PackingSlip.desktop DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/templates/Business)
ecm_install_icons( ICONS
48-actions-template_balancesheet.png
@@ -14,7 +14,7 @@ ecm_install_icons( ICONS
sc-actions-template_packingslip.svgz
sc-actions-template_pricequotation.svgz
- DESTINATION ${DATA_INSTALL_DIR}/sheets/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/icons
THEME hicolor
)
diff --git a/sheets/data/templates/General/CMakeLists.txt \
b/sheets/data/templates/General/CMakeLists.txt index 4b2c4a0..7688ab7 100644
--- a/sheets/data/templates/General/CMakeLists.txt
+++ b/sheets/data/templates/General/CMakeLists.txt
@@ -1,5 +1,5 @@
-install( FILES Worksheet.kst StudentIDCard.kst DESTINATION \
${DATA_INSTALL_DIR}/sheets/templates/General/.source)
-install( FILES .directory Worksheet.desktop StudentIDCard.desktop DESTINATION \
${DATA_INSTALL_DIR}/sheets/templates/General) +install( FILES Worksheet.kst \
StudentIDCard.kst DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/templates/General/.source) +install( FILES \
.directory Worksheet.desktop StudentIDCard.desktop DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/templates/General)
ecm_install_icons( ICONS
48-actions-template_studentidcard.png
@@ -7,6 +7,6 @@ ecm_install_icons( ICONS
sc-actions-template_studentidcard.svgz
sc-actions-template_worksheet.svgz
- DESTINATION ${DATA_INSTALL_DIR}/sheets/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/icons
THEME hicolor
)
diff --git a/sheets/data/templates/HomeFamily/CMakeLists.txt \
b/sheets/data/templates/HomeFamily/CMakeLists.txt index c654f33..2216c69 100644
--- a/sheets/data/templates/HomeFamily/CMakeLists.txt
+++ b/sheets/data/templates/HomeFamily/CMakeLists.txt
@@ -1,6 +1,6 @@
-install( FILES BMI.kst MenuPlan.kst VacationChecklist.kst CreditCardTracker.kst \
DESTINATION ${DATA_INSTALL_DIR}/sheets/templates/HomeFamily/.source)
-install( FILES .directory BMI.desktop MenuPlan.desktop VacationChecklist.desktop \
CreditCardTracker.desktop DESTINATION \
${DATA_INSTALL_DIR}/sheets/templates/HomeFamily) +install( FILES BMI.kst \
MenuPlan.kst VacationChecklist.kst CreditCardTracker.kst DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/templates/HomeFamily/.source) +install( FILES \
.directory BMI.desktop MenuPlan.desktop VacationChecklist.desktop \
CreditCardTracker.desktop DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/templates/HomeFamily)
ecm_install_icons( ICONS
48-actions-template_bmi.png
@@ -12,7 +12,7 @@ ecm_install_icons( ICONS
sc-actions-template_menuplan.svgz
sc-actions-template_vacationchecklist.svgz
- DESTINATION ${DATA_INSTALL_DIR}/sheets/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/icons
THEME hicolor
)
diff --git a/sheets/data/toolbar/hicolor/CMakeLists.txt \
b/sheets/data/toolbar/hicolor/CMakeLists.txt index 5f07de3..b3790e4 100644
--- a/sheets/data/toolbar/hicolor/CMakeLists.txt
+++ b/sheets/data/toolbar/hicolor/CMakeLists.txt
@@ -89,6 +89,6 @@ ecm_install_icons( ICONS
32-actions-format-precision-less.png
32-actions-format-precision-more.png
- DESTINATION ${DATA_INSTALL_DIR}/sheets/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/icons
THEME hicolor
)
diff --git a/sheets/dtd/CMakeLists.txt b/sheets/dtd/CMakeLists.txt
index 645fd51..bc2e729 100644
--- a/sheets/dtd/CMakeLists.txt
+++ b/sheets/dtd/CMakeLists.txt
@@ -1 +1 @@
-install( FILES kspread.dtd DESTINATION ${DATA_INSTALL_DIR}/sheets/dtd)
+install( FILES kspread.dtd DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/dtd)
diff --git a/sheets/functions/CMakeLists.txt b/sheets/functions/CMakeLists.txt
index bea30d9..b615037 100644
--- a/sheets/functions/CMakeLists.txt
+++ b/sheets/functions/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(kspreadbitopsmodule MODULE BitOpsModule.h bitops.cpp)
kcoreaddons_desktop_to_json(kspreadbitopsmodule kspreadbitopsmodule.desktop)
target_link_libraries(kspreadbitopsmodule calligrasheetscommon)
install(TARGETS kspreadbitopsmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES bitops.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES bitops.xml DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -15,7 +15,7 @@ add_library(kspreadconversionmodule MODULE ConversionModule.h \
conversion.cpp) kcoreaddons_desktop_to_json(kspreadconversionmodule \
kspreadconversionmodule.desktop) target_link_libraries(kspreadconversionmodule \
calligrasheetscommon) install(TARGETS kspreadconversionmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES conversion.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES conversion.xml DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -23,7 +23,7 @@ add_library(kspreaddatabasemodule MODULE DatabaseModule.h \
database.cpp) kcoreaddons_desktop_to_json(kspreaddatabasemodule \
kspreaddatabasemodule.desktop) target_link_libraries(kspreaddatabasemodule \
calligrasheetscommon) install(TARGETS kspreaddatabasemodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES database.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES database.xml DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -31,7 +31,7 @@ add_library(kspreaddatetimemodule MODULE DateTimeModule.h \
datetime.cpp) kcoreaddons_desktop_to_json(kspreaddatetimemodule \
kspreaddatetimemodule.desktop) target_link_libraries(kspreaddatetimemodule \
calligrasheetscommon) install(TARGETS kspreaddatetimemodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES datetime.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES datetime.xml DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -39,7 +39,7 @@ add_library(kspreadengineeringmodule MODULE EngineeringModule.h \
engineering.cpp) kcoreaddons_desktop_to_json(kspreadengineeringmodule \
kspreadengineeringmodule.desktop) target_link_libraries(kspreadengineeringmodule \
calligrasheetscommon) install(TARGETS kspreadengineeringmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES engineering.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES engineering.xml DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -47,7 +47,7 @@ add_library(kspreadfinancialmodule MODULE FinancialModule.h \
financial.cpp) kcoreaddons_desktop_to_json(kspreadfinancialmodule \
kspreadfinancialmodule.desktop) target_link_libraries(kspreadfinancialmodule \
calligrasheetscommon) install(TARGETS kspreadfinancialmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES financial.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES financial.xml DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -55,7 +55,7 @@ add_library(kspreadinformationmodule MODULE InformationModule.h \
information.cpp) kcoreaddons_desktop_to_json(kspreadinformationmodule \
kspreadinformationmodule.desktop) target_link_libraries(kspreadinformationmodule \
calligrasheetscommon) install(TARGETS kspreadinformationmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES information.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES information.xml DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -63,7 +63,7 @@ add_library(kspreadlogicmodule MODULE LogicModule.h logic.cpp)
kcoreaddons_desktop_to_json(kspreadlogicmodule kspreadlogicmodule.desktop)
target_link_libraries(kspreadlogicmodule calligrasheetscommon)
install(TARGETS kspreadlogicmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES logic.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES logic.xml DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -71,7 +71,7 @@ add_library(kspreadmathmodule MODULE MathModule.h math.cpp)
kcoreaddons_desktop_to_json(kspreadmathmodule kspreadmathmodule.desktop)
target_link_libraries(kspreadmathmodule calligrasheetscommon)
install(TARGETS kspreadmathmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES math.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES math.xml DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -79,7 +79,7 @@ add_library(kspreadreferencemodule MODULE ReferenceModule.h \
reference.cpp) kcoreaddons_desktop_to_json(kspreadreferencemodule \
kspreadreferencemodule.desktop) target_link_libraries(kspreadreferencemodule \
calligrasheetscommon) install(TARGETS kspreadreferencemodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES reference.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES reference.xml DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -87,7 +87,7 @@ add_library(kspreadstatisticalmodule MODULE StatisticalModule.h \
statistical.cpp) kcoreaddons_desktop_to_json(kspreadstatisticalmodule \
kspreadstatisticalmodule.desktop) target_link_libraries(kspreadstatisticalmodule \
calligrasheetscommon) install(TARGETS kspreadstatisticalmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES statistical.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES statistical.xml DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -95,7 +95,7 @@ add_library(kspreadtextmodule MODULE TextModule.h text.cpp)
kcoreaddons_desktop_to_json(kspreadtextmodule kspreadtextmodule.desktop)
target_link_libraries(kspreadtextmodule calligrasheetscommon)
install(TARGETS kspreadtextmodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES text.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES text.xml DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/functions)
########### next target ###############
@@ -103,4 +103,4 @@ add_library(kspreadtrigonometrymodule MODULE TrigonometryModule.h \
trig.cpp) kcoreaddons_desktop_to_json(kspreadtrigonometrymodule \
kspreadtrigonometrymodule.desktop) target_link_libraries(kspreadtrigonometrymodule \
calligrasheetscommon) install(TARGETS kspreadtrigonometrymodule DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/functions)
-install(FILES trig.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
+install(FILES trig.xml DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/functions)
diff --git a/sheets/sheets.appdata.xml b/sheets/org.kde.calligrasheets.appdata.xml
similarity index 99%
rename from sheets/sheets.appdata.xml
rename to sheets/org.kde.calligrasheets.appdata.xml
index 40cc3d2..2bcb306 100644
--- a/sheets/sheets.appdata.xml
+++ b/sheets/org.kde.calligrasheets.appdata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
- <id>sheets.desktop</id>
+ <id>org.kde.calligrasheets.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
- <name>Sheets</name>
+ <name>Calligra Sheets</name>
<name xml:lang="ast">Fueyes</name>
<name xml:lang="bs">Listovi</name>
<name xml:lang="ca">Sheets</name>
diff --git a/sheets/sheets.desktop b/sheets/org.kde.calligrasheets.desktop
similarity index 99%
rename from sheets/sheets.desktop
rename to sheets/org.kde.calligrasheets.desktop
index 29e2b48..84a0d71 100644
--- a/sheets/sheets.desktop
+++ b/sheets/org.kde.calligrasheets.desktop
@@ -126,7 +126,7 @@ X-KDE-ServiceTypes=Calligra/Application
X-Calligra-DefaultMimeTypes=application/vnd.oasis.opendocument.spreadsheet,applicatio \
n/x-kspread,application/vnd.ms-excel,text/csv,application/x-quattropro,application/vnd \
.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.openxmlformats-officedocument.spreadsheetml.template
X-KDE-NativeMimeType=application/vnd.oasis.opendocument.spreadsheet
X-DBUS-StartupType=multi
-X-DBUS-ServiceName=org.calligra.sheets
+X-DBUS-ServiceName=org.kde.calligrasheets
X-DocPath=sheets/index.html
X-KDE-StartupNotify=true
Categories=Qt;KDE;Office;
diff --git a/sheets/part/AboutData.h b/sheets/part/AboutData.h
index ec63b90..6a533d8 100644
--- a/sheets/part/AboutData.h
+++ b/sheets/part/AboutData.h
@@ -36,16 +36,16 @@ static const char version[] = CALLIGRA_VERSION_STRING;
static KAboutData * newAboutData()
{
KAboutData * aboutData = new KAboutData(
- QStringLiteral("sheets"),
+ QStringLiteral("calligrasheets"),
i18nc("application name", "Calligra Sheets"),
QStringLiteral(CALLIGRA_VERSION_STRING),
- i18n("Calligra Spreadsheet Application"),
+ i18n("Spreadsheet Application"),
KAboutLicense::LGPL,
i18n("Copyright 1998-%1, The Calligra Sheets Team", \
QStringLiteral(CALLIGRA_YEAR)), QString(),
QStringLiteral("https://www.calligra.org/sheets/"));
aboutData->setProductName("calligrasheets"); // for bugs.kde.org
- aboutData->setOrganizationDomain("calligra.org");
+ aboutData->setOrganizationDomain("kde.org");
aboutData->addAuthor(i18n("Torben Weis"), i18n("Original Author"), \
"weis@kde.org");
aboutData->addAuthor(i18n("Marijn Kruisselbrink"), i18n("Maintainer"), \
"mkruisselbrink@kde.org");
aboutData->addAuthor(i18n("Sebastian Sauer"), i18n("ODS and Excel, functions, \
scripting"), "mail@dipe.org");
diff --git a/sheets/part/Factory.cpp b/sheets/part/Factory.cpp
index 1189a6d..fe95a53 100644
--- a/sheets/part/Factory.cpp
+++ b/sheets/part/Factory.cpp
@@ -76,7 +76,7 @@ const KoComponentData &Factory::global()
if (!s_global) {
s_global = new KoComponentData(*aboutData());
- KoResourcePaths::addResourceType("sheet-styles", "data", \
"sheets/sheetstyles/"); + KoResourcePaths::addResourceType("sheet-styles", \
"data", "calligrasheets/sheetstyles/");
KoDockRegistry *dockRegistry = KoDockRegistry::instance();
dockRegistry->add(new CellEditorDockerFactory);
diff --git a/sheets/part/Part.cpp b/sheets/part/Part.cpp
index e8b2bfb..13e913b 100644
--- a/sheets/part/Part.cpp
+++ b/sheets/part/Part.cpp
@@ -39,7 +39,7 @@ using namespace Calligra::Sheets;
Part::Part(QObject *parent)
: KoPart(Factory::global(), parent)
{
- setTemplatesResourcePath(QLatin1String("sheets/templates/"));
+ setTemplatesResourcePath(QLatin1String("calligrasheets/templates/"));
}
Part::~Part()
diff --git a/sheets/part/View.cpp b/sheets/part/View.cpp
index afddb6b..5a60ccd 100644
--- a/sheets/part/View.cpp
+++ b/sheets/part/View.cpp
@@ -559,7 +559,7 @@ View::View(KoPart *part, QWidget *_parent, Doc *_doc)
d->loading = true;
setComponentName(Factory::global().componentName(), \
Factory::global().componentDisplayName());
- setXMLFile("sheets.rc");
+ setXMLFile("calligrasheets.rc");
// GUI Initializations
initView();
diff --git a/sheets/plugins/scripting/CMakeLists.txt \
b/sheets/plugins/scripting/CMakeLists.txt index ccafcf7..9a448de 100644
--- a/sheets/plugins/scripting/CMakeLists.txt
+++ b/sheets/plugins/scripting/CMakeLists.txt
@@ -38,4 +38,4 @@ target_link_libraries(krossmodulesheets
)
install(TARGETS krossmodulesheets DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/extensions)
-install( FILES scripting.rc DESTINATION ${DATA_INSTALL_DIR}/sheets/viewplugins)
+install( FILES scripting.rc DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/viewplugins)
diff --git a/sheets/plugins/scripting/ScriptingPart.cpp \
b/sheets/plugins/scripting/ScriptingPart.cpp index 6ec8d1b..8f3e7d0 100644
--- a/sheets/plugins/scripting/ScriptingPart.cpp
+++ b/sheets/plugins/scripting/ScriptingPart.cpp
@@ -50,7 +50,7 @@ ScriptingPart::ScriptingPart(QObject* parent, const QVariantList& \
argList) {
Q_UNUSED(argList);
//setComponentData(ScriptingPart::componentData());
- setXMLFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"sheets/viewplugins/scripting.rc"), true); + \
setXMLFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligrasheets/viewplugins/scripting.rc"), true);
debugSheetsScripting << "Scripting plugin. Class:" << metaObject()->className() \
<< ", Parent:" << parent->metaObject()->className();
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
diff --git a/sheets/plugins/scripting/scripts/CMakeLists.txt \
b/sheets/plugins/scripting/scripts/CMakeLists.txt index 8d2fc9b..d0064e3 100644
--- a/sheets/plugins/scripting/scripts/CMakeLists.txt
+++ b/sheets/plugins/scripting/scripts/CMakeLists.txt
@@ -1,6 +1,6 @@
install(FILES
scripts.rc
- DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts)
+ DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/scripts)
install(FILES
csvimport.py csvexport.py csvoptions.ui
@@ -10,16 +10,16 @@ install(FILES
logger.py
xmlviewer.py
myorca.py
- DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/extensions)
+ DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/scripts/extensions)
install(FILES
functions.py
rpyfunctions.py
yfinance.py yweather.py
pytime.py pyregexp.py
- DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/functions)
+ DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/scripts/functions)
install(FILES
consoledocker.py
snippetsdocker.rb
- DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/docker)
+ DESTINATION ${DATA_INSTALL_DIR}/calligrasheets/scripts/docker)
diff --git a/sheets/plugins/solver/CMakeLists.txt \
b/sheets/plugins/solver/CMakeLists.txt index 1a5cf33..6a20192 100644
--- a/sheets/plugins/solver/CMakeLists.txt
+++ b/sheets/plugins/solver/CMakeLists.txt
@@ -34,6 +34,6 @@ install(TARGETS sheetssolver DESTINATION \
${PLUGIN_INSTALL_DIR}/calligrasheets/e
########### install files ###############
-install( FILES solver.rc DESTINATION ${DATA_INSTALL_DIR}/sheets/viewplugins)
+install( FILES solver.rc DESTINATION \
${DATA_INSTALL_DIR}/calligrasheets/viewplugins)
endif()
diff --git a/sheets/plugins/solver/Solver.cpp b/sheets/plugins/solver/Solver.cpp
index 5bb0c56..6814031 100644
--- a/sheets/plugins/solver/Solver.cpp
+++ b/sheets/plugins/solver/Solver.cpp
@@ -59,7 +59,7 @@ Solver::Solver(QObject* parent, const QVariantList& args)
{
Q_UNUSED(args)
- setXMLFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"sheets/viewplugins/solver.rc"), true); + \
setXMLFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligrasheets/viewplugins/solver.rc"), true);
d->dialog = 0;
d->view = qobject_cast<View*>(parent);
diff --git a/sheets/ui/CellToolBase.cpp b/sheets/ui/CellToolBase.cpp
index bba9148..b43e115 100644
--- a/sheets/ui/CellToolBase.cpp
+++ b/sheets/ui/CellToolBase.cpp
@@ -1149,7 +1149,7 @@ QList<QPointer<QWidget> > CellToolBase::createOptionWidgets()
{
QList<QPointer<QWidget> > widgets;
- QString xmlName = QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"sheets/CellToolOptionWidgets.xml"); + QString xmlName = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligrasheets/CellToolOptionWidgets.xml"); debugSheets << xmlName;
if (xmlName.isEmpty()) {
warnSheets << "couldn't find CellToolOptionWidgets.xml file";
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic