[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: [calligra] /: Consistently use "calligrastage" as id on the system
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2016-07-18 19:22:42
Message-ID: E1bPE7m-0005f7-S6 () code ! kde ! org
[Download RAW message or body]
Git commit d787479ba1cfcdbfa39204e67fe24755020fbdfb by Friedrich W. H. Kossebau.
Committed on 18/07/2016 at 17:33.
Pushed by kossebau into branch 'master'.
Consistently use "calligrastage" as id on the system
* rename share/stage -> share/calligrastage
* rename stagerc -> calligrastagerc
* rename stage.rc -> calligrastage.rc
* rename stage.appdata.xml -> org.kde.calligrastage.appdata.xml
* rename translation catalog stage.po -> calligrastage.po
CCMAIL:kde-i18n-doc@kde.org
M +1 -1 gemini/TemplatesModel.cpp
M +1 -1 stage/CMakeLists.txt
M +1 -1 stage/Messages.sh
M +3 -3 stage/app/CMakeLists.txt
R +2 -2 stage/app/org.kde.calligrastage.appdata.xml [from: \
stage/app/stage.appdata.xml - 099% similarity] R +1 -1 \
stage/app/org.kde.calligrastage.desktop [from: stage/app/stage.desktop - 099% \
similarity] M +6 -6 stage/part/CMakeLists.txt
M +3 -3 stage/part/KPrAboutData.h
M +1 -1 stage/part/KPrDocument.cpp
M +1 -1 stage/part/KPrFactory.cpp
M +2 -2 stage/part/KPrHtmlExport.cpp
M +1 -1 stage/part/KPrPart.cpp
M +1 -1 stage/part/KPrPresentationDrawStrategy.cpp
M +2 -2 stage/part/KPrView.cpp
R +1 -1 stage/part/calligrastage.rc [from: stage/part/stage.rc - 098% \
similarity] R +1 -1 stage/part/calligrastage_readonly.rc [from: \
stage/part/stage_readonly.rc - 081% similarity] R +0 -0 \
stage/part/calligrastagerc [from: stage/part/stagerc - 100% similarity] M +1 -1 \
stage/part/pagelayout/KPrPageLayout.cpp M +1 -1 \
stage/part/tools/animationtool/KPrPredefinedAnimationsLoader.cpp M +2 -2 \
stage/part/ui/KPrHtmlExportDialog.cpp M +3 -3 stage/pics/CMakeLists.txt
M +1 -1 stage/pics/animations/CMakeLists.txt
M +1 -1 stage/styles/CMakeLists.txt
M +1 -1 stage/templates/CMakeLists.txt
M +2 -2 stage/templates/Screen/CMakeLists.txt
M +1 -1 stage/templates/common_icon/CMakeLists.txt
M +2 -2 stage/templates/exportHTML/CMakeLists.txt
M +1 -1 stage/templates/exportHTML/templates/CMakeLists.txt
M +5 -5 stage/templates/odf/CMakeLists.txt
http://commits.kde.org/calligra/d787479ba1cfcdbfa39204e67fe24755020fbdfb
diff --git a/gemini/TemplatesModel.cpp b/gemini/TemplatesModel.cpp
index cbee4d3..f5be265 100644
--- a/gemini/TemplatesModel.cpp
+++ b/gemini/TemplatesModel.cpp
@@ -59,7 +59,7 @@ public:
if(templateType == WORDS_MIME_TYPE)
tree = new KoTemplateTree("calligrawords/templates/", true);
else if(templateType == STAGE_MIME_TYPE)
- tree = new KoTemplateTree("stage/templates/", true);
+ tree = new KoTemplateTree("calligrastage/templates/", true);
if(!tree)
return;
diff --git a/stage/CMakeLists.txt b/stage/CMakeLists.txt
index 6c5870e..74cf4a5 100644
--- a/stage/CMakeLists.txt
+++ b/stage/CMakeLists.txt
@@ -1,6 +1,6 @@
project(calligra-stage)
-add_definitions(-DTRANSLATION_DOMAIN=\"stage\")
+add_definitions(-DTRANSLATION_DOMAIN=\"calligrastage\")
include_directories(
${KOTEXT_INCLUDES}
diff --git a/stage/Messages.sh b/stage/Messages.sh
index 2076900..7bcc0d8 100755
--- a/stage/Messages.sh
+++ b/stage/Messages.sh
@@ -2,5 +2,5 @@
source ../calligra_xgettext.sh
$EXTRACTRC `find . -name "*.ui" -o -name "*.rc"` >> rc.cpp || exit 11
-calligra_xgettext stage.pot `find . -name \*.h -o -name \*.cpp`
+calligra_xgettext calligrastage.pot `find . -name \*.h -o -name \*.cpp`
rm -f rc.cpp
diff --git a/stage/app/CMakeLists.txt b/stage/app/CMakeLists.txt
index 346c4b4..6df207b 100644
--- a/stage/app/CMakeLists.txt
+++ b/stage/app/CMakeLists.txt
@@ -16,7 +16,7 @@ kf5_add_kdeinit_executable(calligrastage ${stage_KDEINIT_SRCS})
if (APPLE)
set_target_properties(calligrastage PROPERTIES MACOSX_BUNDLE_INFO_PLIST \
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
- set_target_properties(calligrastage PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER \
"org.calligra.stage") + set_target_properties(calligrastage PROPERTIES \
MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.calligrastage") \
set_target_properties(calligrastage PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Calligra \
Stage 2") install( FILES ${CMAKE_CURRENT_BINARY_DIR}/stage_KDEINIT_SRCS.icns \
DESTINATION ${BUNDLE_INSTALL_DIR}/calligrastage.app/Contents/Resources) endif ()
@@ -28,5 +28,5 @@ install(TARGETS kdeinit_calligrastage \
${INSTALL_TARGETS_DEFAULT_ARGS}) target_link_libraries(calligrastage \
kdeinit_calligrastage) install(TARGETS calligrastage \
${INSTALL_TARGETS_DEFAULT_ARGS})
-install( PROGRAMS stage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install( FILES stage.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+install( PROGRAMS org.kde.calligrastage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install( FILES org.kde.calligrastage.appdata.xml DESTINATION \
${SHARE_INSTALL_PREFIX}/appdata/)
diff --git a/stage/app/stage.appdata.xml \
b/stage/app/org.kde.calligrastage.appdata.xml similarity index 99%
rename from stage/app/stage.appdata.xml
rename to stage/app/org.kde.calligrastage.appdata.xml
index b04759d..240506e 100644
--- a/stage/app/stage.appdata.xml
+++ b/stage/app/org.kde.calligrastage.appdata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
- <id>stage.desktop</id>
+ <id>org.kde.calligrastage.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
- <name>Stage</name>
+ <name>Calligra Stage</name>
<name xml:lang="bs">Stage</name>
<name xml:lang="ca">Stage</name>
<name xml:lang="ca-valencia">Stage</name>
diff --git a/stage/app/stage.desktop b/stage/app/org.kde.calligrastage.desktop
similarity index 99%
rename from stage/app/stage.desktop
rename to stage/app/org.kde.calligrastage.desktop
index 1386955..63b606d 100644
--- a/stage/app/stage.desktop
+++ b/stage/app/org.kde.calligrastage.desktop
@@ -132,7 +132,7 @@ Icon=calligrastage
X-KDE-NativeMimeType=application/vnd.oasis.opendocument.presentation
X-Calligra-DefaultMimeTypes=application/vnd.oasis.opendocument.presentation,applicati \
on/vnd.oasis.opendocument.presentation-template,application/x-kpresenter,application/v \
nd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation,application/vnd.openxmlformats-officedocument.presentationml.template
X-DBUS-StartupType=multi
-X-DBUS-ServiceName=org.calligra.stage
+X-DBUS-ServiceName=org.kde.calligrastage
X-DocPath=stage/index.html
X-KDE-StartupNotify=true
Categories=Qt;KDE;Office;
diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
index 1c0f1b0..84135b1 100644
--- a/stage/part/CMakeLists.txt
+++ b/stage/part/CMakeLists.txt
@@ -185,14 +185,14 @@ target_link_libraries(calligrastagepart calligrastageprivate )
install(TARGETS calligrastagepart DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/parts)
### GUI files ###
-install( FILES stage.rc stage_readonly.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/stage)
+install( FILES calligrastage.rc calligrastage_readonly.rc DESTINATION \
${KXMLGUI_INSTALL_DIR}/calligrastage)
-install( FILES stagerc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES calligrastagerc DESTINATION ${CONFIG_INSTALL_DIR} )
### Predefined Animations ###
install(FILES
animations/animations.xml
- DESTINATION ${DATA_INSTALL_DIR}/stage/animations)
+ DESTINATION ${DATA_INSTALL_DIR}/calligrastage/animations)
### Include files ###
install( FILES
@@ -208,14 +208,14 @@ install( FILES
KPrShapeAnimations.h
KPrView.h
KPrViewModePresentation.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/stage/part)
+ DESTINATION ${INCLUDE_INSTALL_DIR}/calligrastage/part)
install( FILES
animations/KPrAnimationData.h
animations/KPrAnimationStep.h
animations/KPrShapeAnimation.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/stage/part/animations)
+ DESTINATION ${INCLUDE_INSTALL_DIR}/calligrastage/part/animations)
install( FILES
pagelayout/KPrPlaceholders.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/stage/part/pagelayout)
+ DESTINATION ${INCLUDE_INSTALL_DIR}/calligrastage/part/pagelayout)
diff --git a/stage/part/KPrAboutData.h b/stage/part/KPrAboutData.h
index 81b24f4..8c7dcc7 100644
--- a/stage/part/KPrAboutData.h
+++ b/stage/part/KPrAboutData.h
@@ -29,16 +29,16 @@
KAboutData * newKPresenterAboutData()
{
KAboutData *aboutData = new KAboutData(
- QStringLiteral("stage"),
+ QStringLiteral("calligrastage"),
i18nc("application name", "Calligra Stage"),
QStringLiteral(CALLIGRA_VERSION_STRING),
- i18n("Calligra Presentation Tool"),
+ i18n("Presentation Tool"),
KAboutLicense::LGPL,
i18n("Copyright 1998-%1, The Stage Team", QStringLiteral(CALLIGRA_YEAR)),
QString(),
QStringLiteral("https://www.calligra.org/stage/"));
aboutData->setProductName("calligrastage"); // for bugs.kde.org
- aboutData->setOrganizationDomain("calligra.org");
+ aboutData->setOrganizationDomain("kde.org");
aboutData->addAuthor(i18n("Thorsten Zachmann"), i18n("Maintainer"), \
"zachmann@kde.org");
aboutData->addAuthor(i18n("Laurent Montel"), i18n("Former maintainer"), \
"montel@kde.org");
aboutData->addAuthor(i18n("Reginald Stadlbauer"),i18n("Original author"), \
"reggie@kde.org");
diff --git a/stage/part/KPrDocument.cpp b/stage/part/KPrDocument.cpp
index 10441c2..b681c14 100644
--- a/stage/part/KPrDocument.cpp
+++ b/stage/part/KPrDocument.cpp
@@ -287,7 +287,7 @@ KoPageApp::PageType KPrDocument::pageType() const
void KPrDocument::initEmpty()
{
- QString fileName(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("stage/templates/Screen/.source/emptyLandscape.otp"))); + QString \
fileName(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("calligrastage/templates/Screen/.source/emptyLandscape.otp"))); \
setModified( true ); bool ok = loadNativeFormat( fileName );
if ( !ok ) {
diff --git a/stage/part/KPrFactory.cpp b/stage/part/KPrFactory.cpp
index 15dab1c..333f0d6 100644
--- a/stage/part/KPrFactory.cpp
+++ b/stage/part/KPrFactory.cpp
@@ -62,7 +62,7 @@ QObject* KPrFactory::create( const char* /*iface*/, QWidget* \
/*parentWidget*/, Q Q_UNUSED( keyword );
KPrPart *part = new KPrPart(parent);
KPrDocument *doc = new KPrDocument(part);
- doc->setDefaultStylesResourcePath(QLatin1String("stage/styles/"));
+ doc->setDefaultStylesResourcePath(QLatin1String("calligrastage/styles/"));
part->setDocument(doc);
return part;
}
diff --git a/stage/part/KPrHtmlExport.cpp b/stage/part/KPrHtmlExport.cpp
index 3790504..20a856d 100644
--- a/stage/part/KPrHtmlExport.cpp
+++ b/stage/part/KPrHtmlExport.cpp
@@ -94,7 +94,7 @@ void KPrHtmlExport::exportImageToTmpDir()
void KPrHtmlExport::generateHtml()
{
- QFile file(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("stage/templates/exportHTML/slides.html"))); + QFile \
file(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("calligrastage/templates/exportHTML/slides.html"))); \
file.open(QIODevice::ReadOnly); QString slideContent = file.readAll();
file.close();
@@ -123,7 +123,7 @@ void KPrHtmlExport::generateToc()
toc.append(QString("<li><a \
href=\"slide%1.html\">%2</a></li>").arg(i).arg(m_parameters.slidesNames.at(i))); }
toc.append("</ul>");
- QFile file(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("stage/templates/exportHTML/toc.html"))); + QFile \
file(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("calligrastage/templates/exportHTML/toc.html"))); \
file.open(QIODevice::ReadOnly); QString content = file.readAll();
file.close();
diff --git a/stage/part/KPrPart.cpp b/stage/part/KPrPart.cpp
index 65016d5..4c66f22 100644
--- a/stage/part/KPrPart.cpp
+++ b/stage/part/KPrPart.cpp
@@ -36,7 +36,7 @@
KPrPart::KPrPart(QObject *parent)
: KoPart(KPrFactory::componentData(), parent)
{
- setTemplatesResourcePath(QLatin1String("stage/templates/"));
+ setTemplatesResourcePath(QLatin1String("calligrastage/templates/"));
}
KPrPart::~KPrPart()
diff --git a/stage/part/KPrPresentationDrawStrategy.cpp \
b/stage/part/KPrPresentationDrawStrategy.cpp index 4acc5f0..59d572e 100644
--- a/stage/part/KPrPresentationDrawStrategy.cpp
+++ b/stage/part/KPrPresentationDrawStrategy.cpp
@@ -33,7 +33,7 @@ KPrPresentationDrawStrategy::KPrPresentationDrawStrategy( \
KPrPresentationTool * : KPrPresentationStrategyBase( tool )
{
m_widget = new KPrPresentationDrawWidget(canvas());
- QPixmap pix(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"stage/cursors/pen.png")); + QPixmap \
pix(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligrastage/cursors/pen.png")); const qreal factor = 1.2;
const int oldWidth = pix.width();
const int oldHeight = pix.height();
diff --git a/stage/part/KPrView.cpp b/stage/part/KPrView.cpp
index 20f3147..1949298 100644
--- a/stage/part/KPrView.cpp
+++ b/stage/part/KPrView.cpp
@@ -230,9 +230,9 @@ void KPrView::initActions()
{
setComponentName(KPrFactory::componentData().componentName(), \
KPrFactory::componentData().componentDisplayName()); if \
(!koDocument()->isReadWrite() )
- setXMLFile( "stage_readonly.rc" );
+ setXMLFile( "calligrastage_readonly.rc" );
else
- setXMLFile( "stage.rc" );
+ setXMLFile( "calligrastage.rc" );
// do special stage stuff here
m_actionExportHtml = new QAction(i18n("Export as HTML..."), this);
diff --git a/stage/part/stage.rc b/stage/part/calligrastage.rc
similarity index 98%
rename from stage/part/stage.rc
rename to stage/part/calligrastage.rc
index a61ba58..604e96f 100644
--- a/stage/part/stage.rc
+++ b/stage/part/calligrastage.rc
@@ -1,6 +1,6 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="stage" version="124" translationDomain="stage">
+<kpartgui name="stage" version="124" translationDomain="calligrastage">
<MenuBar>
<Menu name="file">
<Action name="file_export_html" />
diff --git a/stage/part/stage_readonly.rc b/stage/part/calligrastage_readonly.rc
similarity index 81%
rename from stage/part/stage_readonly.rc
rename to stage/part/calligrastage_readonly.rc
index d5e9213..2601cc5 100644
--- a/stage/part/stage_readonly.rc
+++ b/stage/part/calligrastage_readonly.rc
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="KPresenter" version="7" \
translationDomain="stage"> +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui \
name="KPresenter" version="7" translationDomain="calligrastage"> <ToolBar \
name="mainToolBar"> <Action name="view_zoom"/>
<Action name="view_zoom_out"/>
diff --git a/stage/part/stagerc b/stage/part/calligrastagerc
similarity index 100%
rename from stage/part/stagerc
rename to stage/part/calligrastagerc
diff --git a/stage/part/pagelayout/KPrPageLayout.cpp \
b/stage/part/pagelayout/KPrPageLayout.cpp index ef31cbc..efddbbc 100644
--- a/stage/part/pagelayout/KPrPageLayout.cpp
+++ b/stage/part/pagelayout/KPrPageLayout.cpp
@@ -139,7 +139,7 @@ QPixmap KPrPageLayout::thumbnail() const
QPainter p( &pic );
// TODO: use QStandardPaths for that instead
- QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("stage/pics/layout-elements.svg")); + QString file = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QStringLiteral("calligrastage/pics/layout-elements.svg")); if ( renderer.load( file \
) ) {
QList<KPrPlaceholder *>::const_iterator it( m_placeholders.begin() );
for ( ; it != m_placeholders.end(); ++it ) {
diff --git a/stage/part/tools/animationtool/KPrPredefinedAnimationsLoader.cpp \
b/stage/part/tools/animationtool/KPrPredefinedAnimationsLoader.cpp index \
ddb808f..f36dd28 100644
--- a/stage/part/tools/animationtool/KPrPredefinedAnimationsLoader.cpp
+++ b/stage/part/tools/animationtool/KPrPredefinedAnimationsLoader.cpp
@@ -228,7 +228,7 @@ void KPrPredefinedAnimationsLoader::readDefaultAnimations()
KoShapeLoadingContext shapeContext(context, 0);
KoXmlDocument doc;
- const QString filePath = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"stage/animations/animations.xml"); + const QString filePath = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"calligrastage/animations/animations.xml"); if (!filePath.isEmpty()) {
QFile file(filePath);
QString errorMessage;
diff --git a/stage/part/ui/KPrHtmlExportDialog.cpp \
b/stage/part/ui/KPrHtmlExportDialog.cpp index 6e6769d..11f89a1 100644
--- a/stage/part/ui/KPrHtmlExportDialog.cpp
+++ b/stage/part/ui/KPrHtmlExportDialog.cpp
@@ -134,7 +134,7 @@ void KPrHtmlExportDialog::generateSlidesNames(const \
QList<KoPAPageBase*> &slides void KPrHtmlExportDialog::loadTemplatesList()
{
const QStringList dirs = \
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
- \
QStringLiteral("stage/templates/exportHTML/templates"), + \
QStringLiteral("calligrastage/templates/exportHTML/templates"),
\
QStandardPaths::LocateDirectory);
for (QStringList::ConstIterator path=dirs.constBegin(); path!=dirs.constEnd(); \
++path) { QDir dir(*path);
@@ -293,7 +293,7 @@ bool KPrHtmlExportDialog::selectedTemplateIsSystemFavorite()
const QString writablePath = \
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
const QStringList paths = \
QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
- \
QStringLiteral("stage/templates/exportHTML"), + \
QStringLiteral("calligrastage/templates/exportHTML"),
\
QStandardPaths::LocateDirectory); foreach (const QString &path, paths) {
if (!path.startsWith(writablePath)) {
diff --git a/stage/pics/CMakeLists.txt b/stage/pics/CMakeLists.txt
index a690abb..963628a 100644
--- a/stage/pics/CMakeLists.txt
+++ b/stage/pics/CMakeLists.txt
@@ -2,18 +2,18 @@ add_subdirectory( animations )
install( FILES
layout-elements.svg
- DESTINATION ${DATA_INSTALL_DIR}/stage/pics)
+ DESTINATION ${DATA_INSTALL_DIR}/calligrastage/pics)
install( FILES
pen.png
- DESTINATION ${DATA_INSTALL_DIR}/stage/cursors
+ DESTINATION ${DATA_INSTALL_DIR}/calligrastage/cursors
)
ecm_install_icons( ICONS
16-actions-black.png
16-actions-highlight.png
- DESTINATION ${DATA_INSTALL_DIR}/stage/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligrastage/icons
THEME hicolor
)
diff --git a/stage/pics/animations/CMakeLists.txt \
b/stage/pics/animations/CMakeLists.txt index 8739c31..2a2db62 100644
--- a/stage/pics/animations/CMakeLists.txt
+++ b/stage/pics/animations/CMakeLists.txt
@@ -32,6 +32,6 @@ ecm_install_icons( ICONS
64-actions-vertical_animations.png
64-actions-zoom_animation.png
- DESTINATION ${DATA_INSTALL_DIR}/stage/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligrastage/icons
THEME hicolor
)
diff --git a/stage/styles/CMakeLists.txt b/stage/styles/CMakeLists.txt
index 2e20c0f..357bef5 100644
--- a/stage/styles/CMakeLists.txt
+++ b/stage/styles/CMakeLists.txt
@@ -1,3 +1,3 @@
install( FILES
defaultstyles.xml
- DESTINATION ${DATA_INSTALL_DIR}/stage/styles)
+ DESTINATION ${DATA_INSTALL_DIR}/calligrastage/styles)
diff --git a/stage/templates/CMakeLists.txt b/stage/templates/CMakeLists.txt
index df0393a..9d2c3d6 100644
--- a/stage/templates/CMakeLists.txt
+++ b/stage/templates/CMakeLists.txt
@@ -7,6 +7,6 @@ add_subdirectory( odf )
set(commondesktopfiles common_desktop/emptyLandscape.desktop \
common_desktop/emptyLandscapeWide.desktop)
foreach (_currentcommondesktopfiles ${commondesktopfiles})
- install(FILES ${_currentcommondesktopfiles} DESTINATION \
${DATA_INSTALL_DIR}/stage/templates/Screen/) + install(FILES \
${_currentcommondesktopfiles} DESTINATION \
${DATA_INSTALL_DIR}/calligrastage/templates/Screen/) \
endforeach(_currentcommondesktopfiles ${commondesktopfiles})
diff --git a/stage/templates/Screen/CMakeLists.txt \
b/stage/templates/Screen/CMakeLists.txt index d4a5d7e..56c49a9 100644
--- a/stage/templates/Screen/CMakeLists.txt
+++ b/stage/templates/Screen/CMakeLists.txt
@@ -1,3 +1,3 @@
-install( FILES emptyLandscape.otp emptyLandscapeWide.otp DESTINATION \
${DATA_INSTALL_DIR}/stage/templates/Screen/.source)
-install( FILES .directory DESTINATION ${DATA_INSTALL_DIR}/stage/templates/Screen/)
+install( FILES emptyLandscape.otp emptyLandscapeWide.otp DESTINATION \
${DATA_INSTALL_DIR}/calligrastage/templates/Screen/.source) +install( FILES \
.directory DESTINATION \
${DATA_INSTALL_DIR}/calligrastage/templates/Screen/)
diff --git a/stage/templates/common_icon/CMakeLists.txt \
b/stage/templates/common_icon/CMakeLists.txt index ac60cd2..6c98690 100644
--- a/stage/templates/common_icon/CMakeLists.txt
+++ b/stage/templates/common_icon/CMakeLists.txt
@@ -2,6 +2,6 @@ ecm_install_icons( ICONS
48-actions-template_emptylandscape.png
sc-actions-template_emptylandscape.svgz
- DESTINATION ${DATA_INSTALL_DIR}/stage/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligrastage/icons
THEME hicolor
)
diff --git a/stage/templates/exportHTML/CMakeLists.txt \
b/stage/templates/exportHTML/CMakeLists.txt index 11e1614..19e6566 100644
--- a/stage/templates/exportHTML/CMakeLists.txt
+++ b/stage/templates/exportHTML/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory( templates )
-install(FILES slides.html DESTINATION \
${DATA_INSTALL_DIR}/stage/templates/exportHTML/)
-install(FILES toc.html DESTINATION ${DATA_INSTALL_DIR}/stage/templates/exportHTML/)
+install(FILES slides.html DESTINATION \
${DATA_INSTALL_DIR}/calligrastage/templates/exportHTML/) +install(FILES toc.html \
DESTINATION ${DATA_INSTALL_DIR}/calligrastage/templates/exportHTML/)
diff --git a/stage/templates/exportHTML/templates/CMakeLists.txt \
b/stage/templates/exportHTML/templates/CMakeLists.txt index 55d460a..fd99426 100644
--- a/stage/templates/exportHTML/templates/CMakeLists.txt
+++ b/stage/templates/exportHTML/templates/CMakeLists.txt
@@ -1 +1 @@
-install(FILES stage.zip DESTINATION \
${DATA_INSTALL_DIR}/stage/templates/exportHTML/templates) +install(FILES stage.zip \
DESTINATION \
${DATA_INSTALL_DIR}/calligrastage/templates/exportHTML/templates)
diff --git a/stage/templates/odf/CMakeLists.txt b/stage/templates/odf/CMakeLists.txt
index 4a12f41..913bd73 100644
--- a/stage/templates/odf/CMakeLists.txt
+++ b/stage/templates/odf/CMakeLists.txt
@@ -69,10 +69,10 @@ set(thumbnail_FILES
#file(GLOB desktop_FILES *.desktop)
#file(GLOB otp_FILES *.otp)
-install( FILES ${desktop_FILES} DESTINATION ${DATA_INSTALL_DIR}/stage/templates/odf/ \
)
-install( FILES ${otp_FILES} DESTINATION \
${DATA_INSTALL_DIR}/stage/templates/odf/.source)
-install( FILES ${thumbnail_FILES} DESTINATION \
${DATA_INSTALL_DIR}/stage/templates/odf/.thumbnail)
-install( FILES .directory DESTINATION ${DATA_INSTALL_DIR}/stage/templates/odf/)
+install( FILES ${desktop_FILES} DESTINATION \
${DATA_INSTALL_DIR}/calligrastage/templates/odf/ ) +install( FILES ${otp_FILES} \
DESTINATION ${DATA_INSTALL_DIR}/calligrastage/templates/odf/.source) +install( FILES \
${thumbnail_FILES} DESTINATION \
${DATA_INSTALL_DIR}/calligrastage/templates/odf/.thumbnail) +install( FILES \
.directory DESTINATION ${DATA_INSTALL_DIR}/calligrastage/templates/odf/)
ecm_install_icons( ICONS
64-actions-blue_orange_vector.png
@@ -95,6 +95,6 @@ ecm_install_icons( ICONS
sc-actions-cohere-magenta.svgz
sc-actions-cohere-red.svgz
- DESTINATION ${DATA_INSTALL_DIR}/stage/icons
+ DESTINATION ${DATA_INSTALL_DIR}/calligrastage/icons
THEME hicolor
)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic