Git commit b4a6a532fdea244f100d96bc716be37916c5d2d9 by Friedrich W. H. Koss= ebau. Committed on 18/07/2016 at 18:55. Pushed by kossebau into branch 'master'. Consistently use "calligraplanwork" as id on the system * rename share/plan -> share/calligraplanwork * rename planworkrc -> calligraplanworkrc * rename planwork.rc -> calligraplanwork.rc * rename translation catalog planwork.po -> calligraplanwork.po CCMAIL:kde-i18n-doc@kde.org M +10 -10 plan/workpackage/CMakeLists.txt M +1 -1 plan/workpackage/Messages.sh M +1 -1 plan/workpackage/aboutdata.h R +1 -1 plan/workpackage/calligraplanwork.rc [from: plan/workpackage= /planwork.rc - 092% similarity] R +1 -1 plan/workpackage/calligraplanwork_mainwindow.rc [from: plan/= workpackage/planwork_mainwindow.rc - 088% similarity] R +1 -1 plan/workpackage/calligraplanwork_readonly.rc [from: plan/wo= rkpackage/planwork_readonly.rc - 073% similarity] R +0 -0 plan/workpackage/calligraplanworkrc [from: plan/workpackage/= planworkrc - 100% similarity] R +1 -1 plan/workpackage/calligraplanworksettings.kcfg [from: plan/w= orkpackage/planworksettings.kcfg - 092% similarity] R +2 -2 plan/workpackage/calligraplanworksettings.kcfgc [from: plan/= workpackage/planworksettings.kcfgc - 052% similarity] M +2 -2 plan/workpackage/factory.cpp M +1 -1 plan/workpackage/mainwindow.cpp R +0 -0 plan/workpackage/org.kde.calligraplanwork.desktop [from: pla= n/workpackage/planwork.desktop - 100% similarity] M +2 -2 plan/workpackage/part.cpp M +3 -3 plan/workpackage/templates/Simple/CMakeLists.txt http://commits.kde.org/calligra/b4a6a532fdea244f100d96bc716be37916c5d2d9 diff --git a/plan/workpackage/CMakeLists.txt b/plan/workpackage/CMakeLists.= txt index a0a2b85..c75c055 100644 --- a/plan/workpackage/CMakeLists.txt +++ b/plan/workpackage/CMakeLists.txt @@ -1,6 +1,6 @@ #project(planwork) = -add_definitions(-DTRANSLATION_DOMAIN=3D\"planwork\") +add_definitions(-DTRANSLATION_DOMAIN=3D\"calligraplanwork\") = add_subdirectory( templates ) add_subdirectory( pics ) @@ -35,7 +35,7 @@ ki18n_wrap_ui(planworkfactory_LIB_SRCS taskcompletionpanel.ui ) = -kconfig_add_kcfg_files(planworksettings_SRCS planworksettings.kcfgc) +kconfig_add_kcfg_files(planworksettings_SRCS calligraplanworksettings.kcfg= c) = add_library(planworkfactory SHARED ${planworkfactory_LIB_SRCS} ${planworks= ettings_SRCS}) generate_export_header(planworkfactory BASE_NAME kplatowork) @@ -56,7 +56,7 @@ target_link_libraries(planworkfactory set_target_properties(planworkfactory PROPERTIES VERSION ${GENERIC_CALLIGR= A_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} ) = install(TARGETS planworkfactory ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES planworksettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) +install(FILES calligraplanworksettings.kcfg DESTINATION ${KCFG_INSTALL_DIR= }) = = ########### KPlatoWork part ############### @@ -64,12 +64,12 @@ install(FILES planworksettings.kcfg DESTINATION ${KCFG_= INSTALL_DIR}) set(planworkpart_PART_SRCS factoryinit.cpp ) = = -add_library(planworkpart MODULE ${planworkpart_PART_SRCS}) -kcoreaddons_desktop_to_json(planworkpart planworkpart.desktop) +add_library(calligraplanworkpart MODULE ${planworkpart_PART_SRCS}) +kcoreaddons_desktop_to_json(calligraplanworkpart planworkpart.desktop) = -target_link_libraries(planworkpart Qt5::Core KF5::Parts planworkfactory) +target_link_libraries(calligraplanworkpart Qt5::Core KF5::Parts planworkfa= ctory) = -install(TARGETS planworkpart DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS calligraplanworkpart DESTINATION ${PLUGIN_INSTALL_DIR}) = = ########### KPlatoWork application ############### @@ -122,7 +122,7 @@ install(TARGETS calligraplanwork ${INSTALL_TARGETS_DEF= AULT_ARGS}) = ########### install files ############### = -install( FILES planwork.rc planwork_readonly.rc planwork_mainwindow.rc DE= STINATION ${KXMLGUI_INSTALL_DIR}/planwork) -install( FILES planworkrc DESTINATION ${CONFIG_INSTALL_DIR}) -install( PROGRAMS planwork.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( FILES calligraplanwork.rc calligraplanwork_readonly.rc calligrap= lanwork_mainwindow.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/calligraplanwork) +install( FILES calligraplanworkrc DESTINATION ${CONFIG_INSTALL_DIR}) +install( PROGRAMS org.kde.calligraplanwork.desktop DESTINATION ${XDG_APP= S_INSTALL_DIR}) = diff --git a/plan/workpackage/Messages.sh b/plan/workpackage/Messages.sh index 03c2cce..e3b2c1c 100755 --- a/plan/workpackage/Messages.sh +++ b/plan/workpackage/Messages.sh @@ -2,5 +2,5 @@ source ../../calligra_xgettext.sh = $EXTRACTRC `find . -name \*.ui` `find . -name \*.rc` >> rc.cpp -calligra_xgettext planwork.pot *.cpp aboutdata.h +calligra_xgettext calligraplanwork.pot *.cpp aboutdata.h rm -f rc.cpp diff --git a/plan/workpackage/aboutdata.h b/plan/workpackage/aboutdata.h index c6d517b..ac7e54b 100644 --- a/plan/workpackage/aboutdata.h +++ b/plan/workpackage/aboutdata.h @@ -35,7 +35,7 @@ static const char PLANWORK_VERSION[] =3D CALLIGRA_VERSION= _STRING; KAboutData * newAboutData() { KAboutData * aboutData =3D new KAboutData( - QStringLiteral("planwork"), + QStringLiteral("calligraplanwork"), i18nc("application name", "Plan WorkPackage Handler"), QStringLiteral(CALLIGRA_VERSION_STRING), i18n("PlanWork - Work Package handler for the Plan Project Plannin= g Tool"), diff --git a/plan/workpackage/planwork.rc b/plan/workpackage/calligraplanwo= rk.rc similarity index 92% rename from plan/workpackage/planwork.rc rename to plan/workpackage/calligraplanwork.rc index 4459981..4bdb1b3 100644 --- a/plan/workpackage/planwork.rc +++ b/plan/workpackage/calligraplanwork.rc @@ -1,5 +1,5 @@ - + &Edit diff --git a/plan/workpackage/planwork_mainwindow.rc b/plan/workpackage/cal= ligraplanwork_mainwindow.rc similarity index 88% rename from plan/workpackage/planwork_mainwindow.rc rename to plan/workpackage/calligraplanwork_mainwindow.rc index cf56a91..a76d3ab 100644 --- a/plan/workpackage/planwork_mainwindow.rc +++ b/plan/workpackage/calligraplanwork_mainwindow.rc @@ -1,5 +1,5 @@ - + &Edit diff --git a/plan/workpackage/planwork_readonly.rc b/plan/workpackage/calli= graplanwork_readonly.rc similarity index 73% rename from plan/workpackage/planwork_readonly.rc rename to plan/workpackage/calligraplanwork_readonly.rc index e9a62f5..28fe616 100644 --- a/plan/workpackage/planwork_readonly.rc +++ b/plan/workpackage/calligraplanwork_readonly.rc @@ -1,4 +1,4 @@ - + &View diff --git a/plan/workpackage/planworkrc b/plan/workpackage/calligraplanwor= krc similarity index 100% rename from plan/workpackage/planworkrc rename to plan/workpackage/calligraplanworkrc diff --git a/plan/workpackage/planworksettings.kcfg b/plan/workpackage/call= igraplanworksettings.kcfg similarity index 92% rename from plan/workpackage/planworksettings.kcfg rename to plan/workpackage/calligraplanworksettings.kcfg index 99bf3f7..a978061 100644 --- a/plan/workpackage/planworksettings.kcfg +++ b/plan/workpackage/calligraplanworksettings.kcfg @@ -3,7 +3,7 @@ xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=3D"http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - + diff --git a/plan/workpackage/planworksettings.kcfgc b/plan/workpackage/cal= ligraplanworksettings.kcfgc similarity index 52% rename from plan/workpackage/planworksettings.kcfgc rename to plan/workpackage/calligraplanworksettings.kcfgc index 0c885f5..d58748a 100644 --- a/plan/workpackage/planworksettings.kcfgc +++ b/plan/workpackage/calligraplanworksettings.kcfgc @@ -1,6 +1,6 @@ -File=3Dplanworksettings.kcfg = +File=3Dcalligraplanworksettings.kcfg ClassName=3DPlanWorkSettings Singleton=3Dtrue Mutators=3Dtrue TranslationSystem=3Dkde -TranslationDomain=3Dplanwork +TranslationDomain=3Dcalligraplanwork diff --git a/plan/workpackage/factory.cpp b/plan/workpackage/factory.cpp index 7281302..9c31992 100644 --- a/plan/workpackage/factory.cpp +++ b/plan/workpackage/factory.cpp @@ -72,8 +72,8 @@ const KoComponentData &Factory::global() s_global =3D new KoComponentData( *aboutData() ); = // Add any application-specific resource directories here - KoResourcePaths::addResourceType("planwork_template", "data", "pla= nwork/templates/"); - KoResourcePaths::addResourceType("projects", "data", "planwork/pro= jects/"); + KoResourcePaths::addResourceType("planwork_template", "data", "cal= ligraplanwork/templates/"); + KoResourcePaths::addResourceType("projects", "data", "calligraplan= work/projects/"); = // Tell the iconloader about share/apps/calligra/icons KIconLoader::global()->addAppDir("calligra"); diff --git a/plan/workpackage/mainwindow.cpp b/plan/workpackage/mainwindow.= cpp index 2bacf85..2876cf2 100644 --- a/plan/workpackage/mainwindow.cpp +++ b/plan/workpackage/mainwindow.cpp @@ -75,7 +75,7 @@ KPlatoWork_MainWindow::KPlatoWork_MainWindow() a->setEnabled( false ); connect( m_part->undoStack(), SIGNAL(canRedoChanged(bool)), a, SLOT(se= tEnabled(bool)) ); = - setupGUI( KXmlGuiWindow::Default, "planwork_mainwindow.rc" ); + setupGUI( KXmlGuiWindow::Default, "calligraplanwork_mainwindow.rc" ); = setCentralWidget( m_part->widget() ); createGUI( m_part ); diff --git a/plan/workpackage/planwork.desktop b/plan/workpackage/org.kde.c= alligraplanwork.desktop similarity index 100% rename from plan/workpackage/planwork.desktop rename to plan/workpackage/org.kde.calligraplanwork.desktop diff --git a/plan/workpackage/part.cpp b/plan/workpackage/part.cpp index 55f4096..97f8c2c 100644 --- a/plan/workpackage/part.cpp +++ b/plan/workpackage/part.cpp @@ -349,9 +349,9 @@ Part::Part( QWidget *parentWidget, QObject *parent, con= st QVariantList & /*args* debugPlanWork; setComponentData( *Factory::aboutData() ); if ( isReadWrite() ) { - setXMLFile( "planwork.rc" ); + setXMLFile( "calligraplanwork.rc" ); } else { - setXMLFile( "planwork_readonly.rc" ); + setXMLFile( "calligraplanwork_readonly.rc" ); } = View *v =3D new View( this, parentWidget, actionCollection() ); diff --git a/plan/workpackage/templates/Simple/CMakeLists.txt b/plan/workpa= ckage/templates/Simple/CMakeLists.txt index d9784b8..ccf93a4 100644 --- a/plan/workpackage/templates/Simple/CMakeLists.txt +++ b/plan/workpackage/templates/Simple/CMakeLists.txt @@ -1,5 +1,5 @@ -install( FILES Empty.planworkt DESTINATION ${DATA_INSTALL_DIR}/planwork/= templates/Simple/.source) -install( FILES .directory Empty.desktop DESTINATION ${DATA_INSTALL_DIR}/p= lanwork/templates/Simple) +install( FILES Empty.planworkt DESTINATION ${DATA_INSTALL_DIR}/calligrap= lanwork/templates/Simple/.source) +install( FILES .directory Empty.desktop DESTINATION ${DATA_INSTALL_DIR}/c= alligraplanwork/templates/Simple) = ecm_install_icons( ICONS 16-actions-template_empty.png @@ -9,6 +9,6 @@ ecm_install_icons( ICONS 64-actions-template_empty.png 128-actions-template_empty.png = - DESTINATION ${DATA_INSTALL_DIR}/planwork/icons + DESTINATION ${DATA_INSTALL_DIR}/calligraplanwork/icons THEME hicolor )