Git commit b0790554d1ccd68931b4229810feca7e3dd6eee9 by Friedrich W. H. Koss= ebau. Committed on 18/07/2016 at 17:10. Pushed by kossebau into branch 'master'. Consistently use "calligrawords" as id on the system * rename share/words -> share/calligrawords * rename wordsrc -> calligrawordsrc * rename words.rc -> calligrawords.rc * rename words.appdata.xml -> org.kde.calligrawords.appdata.xml * rename translation catalog words.po -> calligrawords.po CCMAIL:kde-i18n-doc@kde.org M +1 -1 filters/words/ascii/CMakeLists.txt R +0 -0 filters/words/ascii/org.kde.calligrawords_ascii.desktop [fro= m: filters/words/ascii/calligrawords_ascii.desktop - 100% similarity] M +1 -1 gemini/TemplatesModel.cpp M +1 -1 words/CMakeLists.txt M +1 -1 words/Messages.sh M +3 -3 words/app/CMakeLists.txt R +2 -2 words/app/org.kde.calligrawords.appdata.xml [from: words/app= /words.appdata.xml - 099% similarity] R +1 -1 words/app/org.kde.calligrawords.desktop [from: words/app/wor= ds.desktop - 099% similarity] M +8 -8 words/part/CMakeLists.txt M +2 -2 words/part/KWAboutData.h M +1 -1 words/part/KWOdfLoader.cpp M +2 -2 words/part/KWPart.cpp M +1 -1 words/part/KWView.cpp M +1 -1 words/part/author/author.rc M +1 -1 words/part/author/author_readonly.rc R +1 -1 words/part/calligrawords.rc [from: words/part/words.rc - 099= % similarity] R +1 -1 words/part/calligrawords_readonly.rc [from: words/part/words= _readonly.rc - 091% similarity] R +0 -0 words/part/calligrawordsrc [from: words/part/wordsrc - 100% = similarity] M +1 -1 words/pics/CMakeLists.txt M +1 -1 words/plugins/scripting/CMakeLists.txt M +1 -1 words/plugins/scripting/KWScriptingPart.cpp M +4 -4 words/plugins/scripting/scripts/CMakeLists.txt M +2 -2 words/plugins/scripting/scripts/oouno.py M +1 -1 words/styles/CMakeLists.txt M +4 -4 words/templates/Wordprocessing/CMakeLists.txt http://commits.kde.org/calligra/b0790554d1ccd68931b4229810feca7e3dd6eee9 diff --git a/filters/words/ascii/CMakeLists.txt b/filters/words/ascii/CMake= Lists.txt index 75f22d6..93ad785 100644 --- a/filters/words/ascii/CMakeLists.txt +++ b/filters/words/ascii/CMakeLists.txt @@ -38,6 +38,6 @@ install(TARGETS calligra_filter_odt2ascii DESTINATION ${P= LUGIN_INSTALL_DIR}/call = kcoreaddons_desktop_to_json(calligra_filter_odt2ascii calligra_filter_odt2= ascii.desktop) = -install( PROGRAMS calligrawords_ascii.desktop DESTINATION ${XDG_APPS_INS= TALL_DIR}) +install( PROGRAMS org.kde.calligrawords_ascii.desktop DESTINATION ${XDG_= APPS_INSTALL_DIR}) = endif() diff --git a/filters/words/ascii/calligrawords_ascii.desktop b/filters/word= s/ascii/org.kde.calligrawords_ascii.desktop similarity index 100% rename from filters/words/ascii/calligrawords_ascii.desktop rename to filters/words/ascii/org.kde.calligrawords_ascii.desktop diff --git a/gemini/TemplatesModel.cpp b/gemini/TemplatesModel.cpp index 16769cd..cbee4d3 100644 --- a/gemini/TemplatesModel.cpp +++ b/gemini/TemplatesModel.cpp @@ -57,7 +57,7 @@ public: = KoTemplateTree* tree(0); if(templateType =3D=3D WORDS_MIME_TYPE) - tree =3D new KoTemplateTree("words/templates/", true); + tree =3D new KoTemplateTree("calligrawords/templates/", true); else if(templateType =3D=3D STAGE_MIME_TYPE) tree =3D new KoTemplateTree("stage/templates/", true); if(!tree) diff --git a/words/CMakeLists.txt b/words/CMakeLists.txt index 21da576..99d5a62 100644 --- a/words/CMakeLists.txt +++ b/words/CMakeLists.txt @@ -1,6 +1,6 @@ project(words) = -add_definitions(-DTRANSLATION_DOMAIN=3D\"words\") +add_definitions(-DTRANSLATION_DOMAIN=3D\"calligrawords\") = include_directories( ${KOMAIN_INCLUDES} diff --git a/words/Messages.sh b/words/Messages.sh index 0e0abeb..4b1c126 100755 --- a/words/Messages.sh +++ b/words/Messages.sh @@ -4,5 +4,5 @@ source ../calligra_xgettext.sh # Collect also the app strings in the part catalog, only a few strings, # no need for overhead of separate catalog for the app $EXTRACTRC `find part app -name \*.ui -o -name \*.rc` >> rc.cpp -calligra_xgettext words.pot rc.cpp *.cpp `find part app -name \*.cpp -o -= name \*.cpp -o -name \*.h` +calligra_xgettext calligrawords.pot rc.cpp *.cpp `find part app -name \*.= cpp -o -name \*.cpp -o -name \*.h` rm -f rc.cpp diff --git a/words/app/CMakeLists.txt b/words/app/CMakeLists.txt index b3730c1..1329057 100644 --- a/words/app/CMakeLists.txt +++ b/words/app/CMakeLists.txt @@ -14,7 +14,7 @@ kf5_add_kdeinit_executable( calligrawords ${words_KDEINIT= _SRCS}) = if (APPLE) set_target_properties(calligrawords PROPERTIES MACOSX_BUNDLE_INFO_PLIST= ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template) - set_target_properties(calligrawords PROPERTIES MACOSX_BUNDLE_GUI_IDENTI= FIER "org.calligra.words") + set_target_properties(calligrawords PROPERTIES MACOSX_BUNDLE_GUI_IDENTI= FIER "org.kde.calligrawords") set_target_properties(calligrawords PROPERTIES MACOSX_BUNDLE_BUNDLE_NAM= E "Words") install( FILES ${CMAKE_CURRENT_BINARY_DIR}/words_KDEINIT_SRCS.icns DEST= INATION ${BUNDLE_INSTALL_DIR}/calligrawords.app/Contents/Resources) endif () @@ -26,5 +26,5 @@ install(TARGETS kdeinit_calligrawords ${INSTALL_TARGETS_= DEFAULT_ARGS}) target_link_libraries( calligrawords kdeinit_calligrawords ) install(TARGETS calligrawords ${INSTALL_TARGETS_DEFAULT_ARGS}) = -install( PROGRAMS words.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) -install( FILES words.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appda= ta/) +install( PROGRAMS org.kde.calligrawords.desktop DESTINATION ${XDG_APPS_IN= STALL_DIR}) +install( FILES org.kde.calligrawords.appdata.xml DESTINATION ${SHARE_INSTA= LL_PREFIX}/appdata/) diff --git a/words/app/words.appdata.xml b/words/app/org.kde.calligrawords.= appdata.xml similarity index 99% rename from words/app/words.appdata.xml rename to words/app/org.kde.calligrawords.appdata.xml index 57d779b..95f973f 100644 --- a/words/app/words.appdata.xml +++ b/words/app/org.kde.calligrawords.appdata.xml @@ -1,9 +1,9 @@ - words.desktop + org.kde.calligrawords.desktop CC0-1.0 GPL-2.0+ - Words + Calligra Words Words Words Words diff --git a/words/app/words.desktop b/words/app/org.kde.calligrawords.desk= top similarity index 99% rename from words/app/words.desktop rename to words/app/org.kde.calligrawords.desktop index 921f6f9..db7f345 100644 --- a/words/app/words.desktop +++ b/words/app/org.kde.calligrawords.desktop @@ -136,6 +136,6 @@ X-Calligra-DefaultMimeTypes=3Dapplication/vnd.oasis.ope= ndocument.text-master,appli X-DocPath=3Dhttp://userbase.kde.org/Special:MyLanguage/Words X-KDE-StartupNotify=3Dtrue X-DBUS-StartupType=3DMulti -X-DBUS-ServiceName=3Dorg.calligra.words +X-DBUS-ServiceName=3Dorg.kde.calligrawords Categories=3DQt;KDE;Office; InitialPreference=3D4 diff --git a/words/part/CMakeLists.txt b/words/part/CMakeLists.txt index 4bc98e7..d535294 100644 --- a/words/part/CMakeLists.txt +++ b/words/part/CMakeLists.txt @@ -170,19 +170,19 @@ install(TARGETS wordsprivate ${INSTALL_TARGETS_DEFAU= LT_ARGS}) set(wordspart_PART_SRCS KWFactoryInit.cpp ) = = -add_library(wordspart MODULE ${wordspart_PART_SRCS}) +add_library(calligrawordspart MODULE ${wordspart_PART_SRCS}) = -kcoreaddons_desktop_to_json(wordspart wordspart.desktop) +kcoreaddons_desktop_to_json(calligrawordspart wordspart.desktop) = -target_link_libraries(wordspart wordsprivate ) +target_link_libraries(calligrawordspart wordsprivate ) = -install(TARGETS wordspart DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/part= s) +install(TARGETS calligrawordspart DESTINATION ${PLUGIN_INSTALL_DIR}/calli= gra/parts) = = ########### install files ############### = -install( FILES words.rc words_readonly.rc DESTINATION ${KXMLGUI_INSTALL_D= IR}/words) -install( FILES wordsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES calligrawords.rc calligrawords_readonly.rc DESTINATION ${K= XMLGUI_INSTALL_DIR}/calligrawords) +install( FILES calligrawordsrc DESTINATION ${CONFIG_INSTALL_DIR} ) = install( FILES words_export.h @@ -198,14 +198,14 @@ KWApplicationConfig.h KWViewMode.h KWView.h KWViewModeNormal.h -DESTINATION ${INCLUDE_INSTALL_DIR}/words/part COMPONENT Devel) +DESTINATION ${INCLUDE_INSTALL_DIR}/calligrawords/part COMPONENT Devel) = install( FILES frames/KWFrame.h frames/KWFrameLayout.h frames/KWFrameSet.h frames/KWTextFrameSet.h -DESTINATION ${INCLUDE_INSTALL_DIR}/words/part/frames COMPONENT Devel) +DESTINATION ${INCLUDE_INSTALL_DIR}/calligrawords/part/frames COMPONENT Dev= el) = = ###What follows is calligraauthor section### diff --git a/words/part/KWAboutData.h b/words/part/KWAboutData.h index c5a56a2..da44591 100644 --- a/words/part/KWAboutData.h +++ b/words/part/KWAboutData.h @@ -28,7 +28,7 @@ KAboutData * newWordsAboutData() { KAboutData * aboutData =3D new KAboutData( - QStringLiteral("words"), + QStringLiteral("calligrawords"), i18nc("application name", "Calligra Words"), QStringLiteral(CALLIGRA_VERSION_STRING), i18n("Word processor"), @@ -37,7 +37,7 @@ KAboutData * newWordsAboutData() QString(), QStringLiteral("https://www.calligra.org/words/")); aboutData->setProductName("calligrawords"); // for bugs.kde.org - aboutData->setOrganizationDomain("calligra.org"); + aboutData->setOrganizationDomain("kde.org"); aboutData->addAuthor(i18n("Pierre Ducroquet"), i18n("Co maintainer"), = ""); aboutData->addAuthor(i18n("C. Boemann"), i18n("Co maintainer"), "cbo@b= oemann.dk"); aboutData->addAuthor(i18n("Sebastian Sauer"), i18n("Everything"), "mai= l@dipe.org"); diff --git a/words/part/KWOdfLoader.cpp b/words/part/KWOdfLoader.cpp index 5e078e1..005af62 100644 --- a/words/part/KWOdfLoader.cpp +++ b/words/part/KWOdfLoader.cpp @@ -121,7 +121,7 @@ bool KWOdfLoader::load(KoOdfReadStore &odfStore) = if (updater) updater->setProgress(20); = - KoOdfLoadingContext odfContext(odfStore.styles(), odfStore.store(), QL= atin1String("words/styles/")); + KoOdfLoadingContext odfContext(odfStore.styles(), odfStore.store(), QL= atin1String("calligrawords/styles/")); KoShapeLoadingContext sc(odfContext, m_document->resourceManager()); sc.setDocumentRdf(m_document->documentRdf()); = diff --git a/words/part/KWPart.cpp b/words/part/KWPart.cpp index 81b84ff..f493a49 100644 --- a/words/part/KWPart.cpp +++ b/words/part/KWPart.cpp @@ -41,14 +41,14 @@ KWPart::KWPart(QObject *parent) : KoPart(KWFactory::componentData(), parent) , m_document(0) { - setTemplatesResourcePath(QLatin1String("words/templates/")); + setTemplatesResourcePath(QLatin1String("calligrawords/templates/")); } = KWPart::KWPart(const KoComponentData &componentData, QObject *parent) : KoPart(componentData, parent) , m_document(0) { - setTemplatesResourcePath(QLatin1String("words/templates/")); + setTemplatesResourcePath(QLatin1String("calligrawords/templates/")); } = KWPart::~KWPart() diff --git a/words/part/KWView.cpp b/words/part/KWView.cpp index 774ef2d..a0f6ead 100644 --- a/words/part/KWView.cpp +++ b/words/part/KWView.cpp @@ -137,7 +137,7 @@ KWView::KWView(KoPart *part, KWDocument *document, QWid= get *parent) layout->addWidget(m_gui); = setComponentName(KWFactory::componentData().componentName(), KWFactory= ::componentData().componentDisplayName()); - setXMLFile("words.rc"); + setXMLFile("calligrawords.rc"); = m_currentPage =3D m_document->pageManager()->begin(); = diff --git a/words/part/author/author.rc b/words/part/author/author.rc index 9bbc2b8..df14e1d 100644 --- a/words/part/author/author.rc +++ b/words/part/author/author.rc @@ -1,4 +1,4 @@ - + &File diff --git a/words/part/author/author_readonly.rc b/words/part/author/autho= r_readonly.rc index 1ca9e36..0ad0dc7 100644 --- a/words/part/author/author_readonly.rc +++ b/words/part/author/author_readonly.rc @@ -1,4 +1,4 @@ - + &File diff --git a/words/part/words.rc b/words/part/calligrawords.rc similarity index 99% rename from words/part/words.rc rename to words/part/calligrawords.rc index 317a6bf..dd6b188 100644 --- a/words/part/words.rc +++ b/words/part/calligrawords.rc @@ -1,4 +1,4 @@ - + &File diff --git a/words/part/words_readonly.rc b/words/part/calligrawords_readon= ly.rc similarity index 91% rename from words/part/words_readonly.rc rename to words/part/calligrawords_readonly.rc index 8c917d7..e110785 100644 --- a/words/part/words_readonly.rc +++ b/words/part/calligrawords_readonly.rc @@ -1,4 +1,4 @@ - + &File diff --git a/words/part/wordsrc b/words/part/calligrawordsrc similarity index 100% rename from words/part/wordsrc rename to words/part/calligrawordsrc diff --git a/words/pics/CMakeLists.txt b/words/pics/CMakeLists.txt index e5d5a9a..e538b4d 100644 --- a/words/pics/CMakeLists.txt +++ b/words/pics/CMakeLists.txt @@ -28,6 +28,6 @@ ecm_install_icons( ICONS ecm_install_icons( ICONS 22-actions-tool_pagelayout.png = - DESTINATION ${DATA_INSTALL_DIR}/words/icons + DESTINATION ${DATA_INSTALL_DIR}/calligrawords/icons THEME hicolor ) diff --git a/words/plugins/scripting/CMakeLists.txt b/words/plugins/scripti= ng/CMakeLists.txt index 492ed7f..897c4b5 100644 --- a/words/plugins/scripting/CMakeLists.txt +++ b/words/plugins/scripting/CMakeLists.txt @@ -25,4 +25,4 @@ qt5_wrap_cpp(krossmodulewords_PART_SRCS add_library(krossmodulewords MODULE ${krossmodulewords_PART_SRCS}) target_link_libraries(krossmodulewords kokross wordsprivate) install(TARGETS krossmodulewords DESTINATION ${PLUGIN_INSTALL_DIR}/calligr= awords/extensions) -install(FILES scripting.rc DESTINATION ${DATA_INSTALL_DIR}/words/kpartplug= ins) +install(FILES scripting.rc DESTINATION ${DATA_INSTALL_DIR}/calligrawords/k= partplugins) diff --git a/words/plugins/scripting/KWScriptingPart.cpp b/words/plugins/sc= ripting/KWScriptingPart.cpp index cbb3737..5acfa90 100644 --- a/words/plugins/scripting/KWScriptingPart.cpp +++ b/words/plugins/scripting/KWScriptingPart.cpp @@ -33,7 +33,7 @@ KWScriptingPart::KWScriptingPart(QObject* parent, const Q= VariantList& args) { Q_UNUSED(args); setComponentData(KWScriptingPart::componentData()); - setXMLFile(KStandardDirs::locate("data", "words/kpartplugins/scripting= .rc"), true); + setXMLFile(KStandardDirs::locate("data", "calligrawords/kpartplugins/s= cripting.rc"), true); kDebug(32010) << "Parent:" << parent->metaObject()->className(); = /* diff --git a/words/plugins/scripting/scripts/CMakeLists.txt b/words/plugins= /scripting/scripts/CMakeLists.txt index 1c6dee5..04e8252 100644 --- a/words/plugins/scripting/scripts/CMakeLists.txt +++ b/words/plugins/scripting/scripts/CMakeLists.txt @@ -1,6 +1,6 @@ -install(FILES scripts.rc DESTINATION ${DATA_INSTALL_DIR}/words/scripts) +install(FILES scripts.rc DESTINATION ${DATA_INSTALL_DIR}/calligrawords/scr= ipts) = -#install(FILES variable_readfile.py DESTINATION ${DATA_INSTALL_DIR}/words/= scripts/variables) +#install(FILES variable_readfile.py DESTINATION ${DATA_INSTALL_DIR}/callig= rawords/scripts/variables) = install(FILES importfile.py @@ -11,7 +11,7 @@ install(FILES xmlviewer.py doctree.rb onlinehelp.py - DESTINATION ${DATA_INSTALL_DIR}/words/scripts/extensions) + DESTINATION ${DATA_INSTALL_DIR}/calligrawords/scripts/extensions) = install(FILES sample_cursor.rb @@ -25,4 +25,4 @@ install(FILES sample_variables.py sample_insertshape.py sample_allshapes.py - DESTINATION ${DATA_INSTALL_DIR}/words/scripts/samples) + DESTINATION ${DATA_INSTALL_DIR}/calligrawords/scripts/samples) diff --git a/words/plugins/scripting/scripts/oouno.py b/words/plugins/scrip= ting/scripts/oouno.py index 8ac0149..bcdeedf 100755 --- a/words/plugins/scripting/scripts/oouno.py +++ b/words/plugins/scripting/scripts/oouno.py @@ -6,9 +6,9 @@ This python script connects with OpenOffice.org using PyUNO= and provides us the functionality to control OpenOffice.org. = # Execute the python-script with the ODT-file as argument - python `kde4-config --install data`/words/scripts/extensions/oouno.py = /path/mydoc.odt + python `kde4-config --install data`/calligrawords/scripts/extensions/o= ouno.py /path/mydoc.odt # Define the hostaddress and port the OpenOffice.org server is running= on - python `kde4-config --install data`/words/scripts/extensions/oouno.py = --host=3D192.168.0.1 --port=3D2002 /path/mydoc.odt + python `kde4-config --install data`/calligrawords/scripts/extensions/o= ouno.py --host=3D192.168.0.1 --port=3D2002 /path/mydoc.odt = We are using the PyUNO module to access OpenOffice.org. For this an option= al hidden OpenOffice.org instance need to be started. Then the script connects as cl= ient to diff --git a/words/styles/CMakeLists.txt b/words/styles/CMakeLists.txt index 8289393..26da396 100644 --- a/words/styles/CMakeLists.txt +++ b/words/styles/CMakeLists.txt @@ -1,3 +1,3 @@ install( FILES defaultstyles.xml - DESTINATION ${DATA_INSTALL_DIR}/words/styles) + DESTINATION ${DATA_INSTALL_DIR}/calligrawords/styles) diff --git a/words/templates/Wordprocessing/CMakeLists.txt b/words/template= s/Wordprocessing/CMakeLists.txt index e8d3bc8..f044f66 100644 --- a/words/templates/Wordprocessing/CMakeLists.txt +++ b/words/templates/Wordprocessing/CMakeLists.txt @@ -1,7 +1,7 @@ = -install( FILES A4.odt ProfessionalLetter.odt ProfessionalA4.odt FaxA4.odt= FaxLetter.odt ColorfulA4.odt ColorfulLetter.odt DESTINATION ${DATA_= INSTALL_DIR}/words/templates/Normal/.source) -install( FILES a4.png professional.png fax.png colorful.png DESTINATION= ${DATA_INSTALL_DIR}/words/templates/Normal/.thumbnail) -install( FILES .directory A4.desktop ProfessionalLetter.desktop Professi= onalA4.desktop FaxA4.desktop FaxLetter.desktop ColorfulA4.desktop= ColorfulLetter.desktop DESTINATION ${DATA_INSTALL_DIR}/words/templates/No= rmal) +install( FILES A4.odt ProfessionalLetter.odt ProfessionalA4.odt FaxA4.odt= FaxLetter.odt ColorfulA4.odt ColorfulLetter.odt DESTINATION ${DATA_= INSTALL_DIR}/calligrawords/templates/Normal/.source) +install( FILES a4.png professional.png fax.png colorful.png DESTINATION= ${DATA_INSTALL_DIR}/calligrawords/templates/Normal/.thumbnail) +install( FILES .directory A4.desktop ProfessionalLetter.desktop Professi= onalA4.desktop FaxA4.desktop FaxLetter.desktop ColorfulA4.desktop= ColorfulLetter.desktop DESTINATION ${DATA_INSTALL_DIR}/calligrawords/temp= lates/Normal) = ecm_install_icons( ICONS 48-actions-template_a4.png @@ -18,7 +18,7 @@ ecm_install_icons( ICONS = 48-actions-template_plaintext.png = - DESTINATION ${DATA_INSTALL_DIR}/words/icons + DESTINATION ${DATA_INSTALL_DIR}/calligrawords/icons THEME hicolor ) =