[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: [calligra] plan: Consistently use "calligraplan" as id on the system
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2016-07-18 19:22:43
Message-ID: E1bPE7n-0005f7-10 () code ! kde ! org
[Download RAW message or body]
Git commit 5c75faa9ecac5af6372104e3c0ecb39083ef6f02 by Friedrich W. H. Kossebau.
Committed on 18/07/2016 at 18:55.
Pushed by kossebau into branch 'master'.
Consistently use "calligraplan" as id on the system
* rename share/plan -> share/calligraplan
* rename planrc -> calligraplanrc
* rename plan.rc -> calligraplan.rc
* rename plan.appdata.xml -> org.kde.calligraplan.appdata.xml
* rename translation catalog plans.po -> calligraplan.po
* rename translation catalog planlibs.po -> calligraplanlibs.po
CCMAIL:kde-i18n-doc@kde.org
M +12 -12 plan/CMakeLists.txt
M +1 -1 plan/Messages.sh
M +4 -4 plan/about/aboutpage.cpp
R +1 -1 plan/calligraplan.rc [from: plan/plan.rc - 098% similarity]
R +1 -1 plan/calligraplan_readonly.rc [from: plan/plan_readonly.rc - 094% \
similarity] R +0 -0 plan/calligraplanrc [from: plan/planrc - 100% similarity]
R +0 -0 plan/calligraplansettings.kcfg [from: plan/plansettings.kcfg - 100% \
similarity] R +3 -3 plan/calligraplansettings.kcfgc [from: \
plan/plansettings.kcfgc - 062% similarity] M +2 -2 plan/kptaboutdata.h
M +1 -1 plan/kptfactory.cpp
M +1 -1 plan/kptpart.cpp
M +4 -4 plan/kptview.cpp
M +1 -1 plan/libs/CMakeLists.txt
M +1 -1 plan/libs/Messages.sh
R +1 -1 plan/org.kde.calligraplan.appdata.xml [from: plan/plan.appdata.xml - \
099% similarity] R +1 -1 plan/org.kde.calligraplan.desktop [from: \
plan/plan.desktop - 098% similarity] M +1 -1 \
plan/plugins/scripting/CMakeLists.txt M +1 -1 \
plan/plugins/scripting/ScriptingPart.cpp M +3 -3 \
plan/plugins/scripting/scripts/CMakeLists.txt M +3 -3 \
plan/templates/Simple/CMakeLists.txt M +1 -1 plan/toolbar/CMakeLists.txt
http://commits.kde.org/calligra/5c75faa9ecac5af6372104e3c0ecb39083ef6f02
diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt
index 607c3b0..26cb0a5 100644
--- a/plan/CMakeLists.txt
+++ b/plan/CMakeLists.txt
@@ -37,7 +37,7 @@ add_subdirectory( workpackage )
include_directories(${KPLATO_INCLUDES})
-add_definitions(-DTRANSLATION_DOMAIN=\"plan\")
+add_definitions(-DTRANSLATION_DOMAIN=\"calligraplan\")
########### KPlato private library ###############
@@ -85,7 +85,7 @@ ki18n_wrap_ui(planprivate_LIB_SRCS
kptinsertfilepanel.ui
)
-kconfig_add_kcfg_files(plansettings_SRCS plansettings.kcfgc)
+kconfig_add_kcfg_files(plansettings_SRCS calligraplansettings.kcfgc)
add_library(planprivate SHARED ${planprivate_LIB_SRCS} ${plansettings_SRCS} )
generate_export_header(planprivate BASE_NAME kplato)
@@ -112,13 +112,13 @@ install(TARGETS planprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
set(planpart_PART_SRCS kptfactoryinit.cpp )
-add_library(planpart MODULE ${planpart_PART_SRCS})
+add_library(calligraplanpart MODULE ${planpart_PART_SRCS})
-kcoreaddons_desktop_to_json(planpart planpart.desktop)
+kcoreaddons_desktop_to_json(calligraplanpart planpart.desktop)
-target_link_libraries(planpart KF5::Parts planprivate)
+target_link_libraries(calligraplanpart KF5::Parts planprivate)
-install(TARGETS planpart DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/parts)
+install(TARGETS calligraplanpart DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/parts)
########### KPlato executable ###############
@@ -150,11 +150,11 @@ install(TARGETS calligraplan ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
-install( FILES plan.rc plan_readonly.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/plan)
-install( PROGRAMS plan.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install( FILES planrc DESTINATION ${CONFIG_INSTALL_DIR})
-install(FILES plansettings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
-install(FILES plan.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+install( FILES calligraplan.rc calligraplan_readonly.rc DESTINATION \
${KXMLGUI_INSTALL_DIR}/calligraplan) +install( PROGRAMS org.kde.calligraplan.desktop \
DESTINATION ${XDG_APPS_INSTALL_DIR}) +install( FILES calligraplanrc DESTINATION \
${CONFIG_INSTALL_DIR}) +install(FILES calligraplansettings.kcfg DESTINATION \
${KCFG_INSTALL_DIR}) +install(FILES org.kde.calligraplan.appdata.xml DESTINATION \
${SHARE_INSTALL_PREFIX}/appdata/)
# TODO: with the new embedded JSON data for plugins there is no schema ATM to define \
extended properties # plan_viewplugin.desktop
@@ -166,5 +166,5 @@ install(FILES
about/tips.html
about/tutorial.html
about/plan.css
- DESTINATION ${DATA_INSTALL_DIR}/plan/about
+ DESTINATION ${DATA_INSTALL_DIR}/calligraplan/about
)
diff --git a/plan/Messages.sh b/plan/Messages.sh
index 598a766..12d8270 100755
--- a/plan/Messages.sh
+++ b/plan/Messages.sh
@@ -3,5 +3,5 @@ source ../calligra_xgettext.sh
# Note: Don't extract sub-directories: specifically not libs, workpackage and \
plugins. $EXTRACTRC *.ui *.kcfg *.rc >> rc.cpp
-calligra_xgettext plan.pot *.cpp about/*.cpp kptaboutdata.h
+calligra_xgettext calligraplan.pot *.cpp about/*.cpp kptaboutdata.h
rm -f rc.cpp
diff --git a/plan/about/aboutpage.cpp b/plan/about/aboutpage.cpp
index b82178e..4efda43 100644
--- a/plan/about/aboutpage.cpp
+++ b/plan/about/aboutpage.cpp
@@ -46,7 +46,7 @@ KPlatoAboutPage::~KPlatoAboutPage()
QString KPlatoAboutPage::main()
{
KIconLoader *iconloader = KIconLoader::global();
- QString res = loadFile( \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, "plan/about/main.html" \
)); + QString res = loadFile( \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligraplan/about/main.html" )); if ( res.isEmpty() ) {
return res;
}
@@ -81,7 +81,7 @@ QString KPlatoAboutPage::main()
QString KPlatoAboutPage::intro()
{
KIconLoader *iconloader = KIconLoader::global();
- QString res = loadFile( \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, "plan/about/intro.html" \
)); + QString res = loadFile( \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligraplan/about/intro.html" )); if ( res.isEmpty() ) {
return res;
}
@@ -111,7 +111,7 @@ QString KPlatoAboutPage::intro()
QString KPlatoAboutPage::tips()
{
- QString res = loadFile( \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, "plan/about/tips.html" \
)); + QString res = loadFile( \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligraplan/about/tips.html" )); if ( res.isEmpty() ) {
return res;
}
@@ -157,7 +157,7 @@ QString KPlatoAboutPage::tips()
QString KPlatoAboutPage::tutorial( const QString &header, const QString &text, const \
QString &nextpage, const QString &nexttext ) {
- QString res = loadFile( \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"plan/about/tutorial.html" )); + QString res = loadFile( \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligraplan/about/tutorial.html" )); if ( res.isEmpty() ) {
return res;
}
diff --git a/plan/plan.rc b/plan/calligraplan.rc
similarity index 98%
rename from plan/plan.rc
rename to plan/calligraplan.rc
index 8dbb557..c50d2bd 100644
--- a/plan/plan.rc
+++ b/plan/calligraplan.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" >
-<kpartgui name="Calligra Plan" version="25" translationDomain="plan">
+<kpartgui name="Calligra Plan" version="25" translationDomain="calligraplan">
<MenuBar>
<Menu name="file"><text>&File</text>
<Separator/>
diff --git a/plan/plan_readonly.rc b/plan/calligraplan_readonly.rc
similarity index 94%
rename from plan/plan_readonly.rc
rename to plan/calligraplan_readonly.rc
index a7be7f4..e64bd36 100644
--- a/plan/plan_readonly.rc
+++ b/plan/calligraplan_readonly.rc
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui name="KPlato" version="4" \
translationDomain="plan"> +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" ><kpartgui \
name="KPlato" version="4" translationDomain="calligraplan"> <MenuBar>
<Menu name="view"><text>&View</text>
<Separator/>
diff --git a/plan/planrc b/plan/calligraplanrc
similarity index 100%
rename from plan/planrc
rename to plan/calligraplanrc
diff --git a/plan/plansettings.kcfg b/plan/calligraplansettings.kcfg
similarity index 100%
rename from plan/plansettings.kcfg
rename to plan/calligraplansettings.kcfg
diff --git a/plan/plansettings.kcfgc b/plan/calligraplansettings.kcfgc
similarity index 62%
rename from plan/plansettings.kcfgc
rename to plan/calligraplansettings.kcfgc
index 63c1432..cfab166 100644
--- a/plan/plansettings.kcfgc
+++ b/plan/calligraplansettings.kcfgc
@@ -1,8 +1,8 @@
-File=plansettings.kcfg
+File=calligraplansettings.kcfg
ClassName=KPlatoSettings
-Singleton=true
+Singleton=true
Mutators=true
Inherits=KPlatoConfigSkeleton
IncludeFiles="kptconfigskeleton.h"
TranslationSystem=kde
-TranslationDomain=plan
+TranslationDomain=calligraplan
diff --git a/plan/kptaboutdata.h b/plan/kptaboutdata.h
index ca2c07e..a0396c9 100644
--- a/plan/kptaboutdata.h
+++ b/plan/kptaboutdata.h
@@ -32,7 +32,7 @@ namespace KPlato
KAboutData * newAboutData()
{
KAboutData *aboutData = new KAboutData(
- QStringLiteral("plan"),
+ QStringLiteral("calligraplan"),
i18nc("application name", "Plan"),
QStringLiteral(CALLIGRA_VERSION_STRING),
i18n("Project Planning and Management Tool"),
@@ -46,7 +46,7 @@ KAboutData * newAboutData()
aboutData->addAuthor(i18n("Raphael \
Langerhorst"),QString(),"raphael.langerhorst@kdemail.net");
aboutData->setProductName( "calligraplan" ); // for bugs.kde.org
- aboutData->setOrganizationDomain("calligra.org");
+ aboutData->setOrganizationDomain("kde.org");
return aboutData;
}
diff --git a/plan/kptfactory.cpp b/plan/kptfactory.cpp
index 196d766..6c86c9a 100644
--- a/plan/kptfactory.cpp
+++ b/plan/kptfactory.cpp
@@ -76,7 +76,7 @@ const KoComponentData &Factory::global()
s_global = new KoComponentData( *aboutData() );
// Add any application-specific resource directories here
- KoResourcePaths::addResourceType("plan_taskmodules", "data", \
"plan/taskmodules/"); + KoResourcePaths::addResourceType("plan_taskmodules", \
"data", "calligraplan/taskmodules/");
// Tell the iconloader about share/apps/calligra/icons
KIconLoader::global()->addAppDir("calligra");
diff --git a/plan/kptpart.cpp b/plan/kptpart.cpp
index 6d65a0d..9d47484 100644
--- a/plan/kptpart.cpp
+++ b/plan/kptpart.cpp
@@ -28,7 +28,7 @@
Part::Part(QObject *parent)
: KoPart(Factory::global(), parent)
{
- setTemplatesResourcePath(QLatin1String("plan/templates/"));
+ setTemplatesResourcePath(QLatin1String("calligraplan/templates/"));
}
Part::~Part()
diff --git a/plan/kptview.cpp b/plan/kptview.cpp
index 1c737ea..2a3cc37 100644
--- a/plan/kptview.cpp
+++ b/plan/kptview.cpp
@@ -211,9 +211,9 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent)
setComponentName(Factory::global().componentName(), \
Factory::global().componentDisplayName()); if ( !doc->isReadWrite() )
- setXMLFile( "plan_readonly.rc" );
+ setXMLFile( "calligraplan_readonly.rc" );
else
- setXMLFile( "plan.rc" );
+ setXMLFile( "calligraplan.rc" );
// new ViewAdaptor( this );
@@ -885,7 +885,7 @@ ViewBase *View::createTaskEditor( ViewListItem *cat, const \
QString &tag, const Q taskeditor->updateReadWrite( m_readWrite );
// last:
- taskeditor->setTaskModules( KoResourcePaths::findAllResources( \
"plan_taskmodules", QString(), KoResourcePaths::NoDuplicates ) ); + \
taskeditor->setTaskModules( KoResourcePaths::findAllResources( \
"calligraplan_taskmodules", QString(), KoResourcePaths::NoDuplicates ) ); return \
taskeditor; }
@@ -3020,7 +3020,7 @@ void View::slotCurrencyConfigFinished( int result )
void View::saveTaskModule( const QUrl &url, Project *project )
{
debugPlan<<url<<project;
- const QString dir = KoResourcePaths::saveLocation( "plan_taskmodules" );
+ const QString dir = KoResourcePaths::saveLocation( "calligraplan_taskmodules" );
debugPlan<<"dir="<<dir;
if ( ! dir.isEmpty() ) {
MainDocument part(getKoPart());
diff --git a/plan/libs/CMakeLists.txt b/plan/libs/CMakeLists.txt
index cd0336a..80a73ed 100644
--- a/plan/libs/CMakeLists.txt
+++ b/plan/libs/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_definitions(-DTRANSLATION_DOMAIN=\"planlibs\")
+add_definitions(-DTRANSLATION_DOMAIN=\"calligraplanlibs\")
add_subdirectory( kernel )
add_subdirectory( models )
diff --git a/plan/libs/Messages.sh b/plan/libs/Messages.sh
index bb1e702..2e40736 100755
--- a/plan/libs/Messages.sh
+++ b/plan/libs/Messages.sh
@@ -2,5 +2,5 @@
source ../../calligra_xgettext.sh
$EXTRACTRC `find . -name \*.ui` >> rc.cpp
-calligra_xgettext planlibs.pot `find . -name \*.cpp -o -name \*.h`
+calligra_xgettext calligraplanlibs.pot `find . -name \*.cpp -o -name \*.h`
rm -f rc.cpp
diff --git a/plan/plan.appdata.xml b/plan/org.kde.calligraplan.appdata.xml
similarity index 99%
rename from plan/plan.appdata.xml
rename to plan/org.kde.calligraplan.appdata.xml
index 663a2bb..8b8e2cd 100644
--- a/plan/plan.appdata.xml
+++ b/plan/org.kde.calligraplan.appdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
- <id>plan.desktop</id>
+ <id>org.kde.calligraplan.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>Plan</name>
diff --git a/plan/plan.desktop b/plan/org.kde.calligraplan.desktop
similarity index 98%
rename from plan/plan.desktop
rename to plan/org.kde.calligraplan.desktop
index 9438c0b..4f0cd5e 100644
--- a/plan/plan.desktop
+++ b/plan/org.kde.calligraplan.desktop
@@ -108,4 +108,4 @@ X-DocPath=http://userbase.kde.org/Plan/Manual
Categories=Qt;KDE;Office;
X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
-X-DBUS-ServiceName=org.calligra.plan
+X-DBUS-ServiceName=org.kde.calligraplan
diff --git a/plan/plugins/scripting/CMakeLists.txt \
b/plan/plugins/scripting/CMakeLists.txt index c9914a9..250d25c 100644
--- a/plan/plugins/scripting/CMakeLists.txt
+++ b/plan/plugins/scripting/CMakeLists.txt
@@ -44,4 +44,4 @@ target_link_libraries(krossmoduleplan
)
install(TARGETS krossmoduleplan DESTINATION \
${PLUGIN_INSTALL_DIR}/calligraplan/extensions)
-install(FILES scripting.rc DESTINATION ${DATA_INSTALL_DIR}/plan/viewplugins)
+install(FILES scripting.rc DESTINATION ${DATA_INSTALL_DIR}/calligraplan/viewplugins)
diff --git a/plan/plugins/scripting/ScriptingPart.cpp \
b/plan/plugins/scripting/ScriptingPart.cpp index 200c0b2..d159925 100644
--- a/plan/plugins/scripting/ScriptingPart.cpp
+++ b/plan/plugins/scripting/ScriptingPart.cpp
@@ -49,7 +49,7 @@ KPlatoScriptingPart::KPlatoScriptingPart(QObject *parent, const \
QVariantList &ar {
Q_UNUSED(args);
//setComponentData(ScriptingPart::componentData());
- setXMLFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"plan/viewplugins/scripting.rc"), true); + \
setXMLFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligraplan/viewplugins/scripting.rc"), true);
debugPlanScripting <<"PlanScripting plugin. Class:" << metaObject()->className() \
<<", Parent:" <<(parent?parent->metaObject()->className():"0");
}
diff --git a/plan/plugins/scripting/scripts/CMakeLists.txt \
b/plan/plugins/scripting/scripts/CMakeLists.txt index 1f6553e..28d0c9e 100644
--- a/plan/plugins/scripting/scripts/CMakeLists.txt
+++ b/plan/plugins/scripting/scripts/CMakeLists.txt
@@ -1,4 +1,4 @@
-install(FILES scripts.rc DESTINATION ${DATA_INSTALL_DIR}/plan/scripts)
+install(FILES scripts.rc DESTINATION ${DATA_INSTALL_DIR}/calligraplan/scripts)
install(FILES
resourcesimport.py
@@ -7,9 +7,9 @@ install(FILES
busyinfoclear.py
plan2csvexport.py
plan2odsexport.py
- DESTINATION ${DATA_INSTALL_DIR}/plan/scripts/extensions)
+ DESTINATION ${DATA_INSTALL_DIR}/calligraplan/scripts/extensions)
install(FILES
sample_project.py
sample_busyinfocheck.py
- DESTINATION ${DATA_INSTALL_DIR}/plan/scripts/samples)
+ DESTINATION ${DATA_INSTALL_DIR}/calligraplan/scripts/samples)
diff --git a/plan/templates/Simple/CMakeLists.txt \
b/plan/templates/Simple/CMakeLists.txt index f1a602e..6507c94 100644
--- a/plan/templates/Simple/CMakeLists.txt
+++ b/plan/templates/Simple/CMakeLists.txt
@@ -2,20 +2,20 @@ install( FILES
Plain.plant
8HourDay-40HourWeek.plant
Basicproject.plant
- DESTINATION ${DATA_INSTALL_DIR}/plan/templates/Simple/.source
+ DESTINATION ${DATA_INSTALL_DIR}/calligraplan/templates/Simple/.source
)
install( FILES
.directory
Plain.desktop
8HourDay-40HourWeek.desktop
Basicproject.desktop
- DESTINATION ${DATA_INSTALL_DIR}/plan/templates/Simple
+ DESTINATION ${DATA_INSTALL_DIR}/calligraplan/templates/Simple
)
ecm_install_icons( ICONS
48-actions-template_timechart.png
sc-actions-template_timechart.svgz
- DESTINATION ${DATA_INSTALL_DIR}/plan/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligraplan/icons
THEME hicolor
)
diff --git a/plan/toolbar/CMakeLists.txt b/plan/toolbar/CMakeLists.txt
index b3435be..90dbc70 100644
--- a/plan/toolbar/CMakeLists.txt
+++ b/plan/toolbar/CMakeLists.txt
@@ -2,6 +2,6 @@ ecm_install_icons( ICONS
22-actions-view-task-child-add.png
22-actions-view-time-schedule-insert.png
- DESTINATION ${DATA_INSTALL_DIR}/plan/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligraplan/icons
THEME hicolor
)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic