Merge branch 'scratch'

pull/1/head
Michail Vourlakos 8 years ago
commit 01b14c01e8

@ -2,10 +2,10 @@ project(lattedock)
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
set (CMAKE_CXX_STANDARD 11)
set(VERSION 0.5.88)
set(VERSION 0.5.89)
set(AUTHOR "Michail Vourlakos")
set(EMAIL "mvourlakos@gmail.com")
set(WEBSITE "https://store.kde.org/p/1154578/")
set(WEBSITE "https://github.com/psifidotos/Latte-Dock")
set(QT_MIN_VERSION "5.6.0")
set(KF5_MIN_VERSION "5.26.0")
@ -96,25 +96,25 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
# ENDIF( _langCode )
#ENDFOREACH(_poFile ${PO_FILES})
#corona translations
SET(catalogname-corona latte-dock)
ADD_CUSTOM_TARGET(translations-corona ALL)
#app translations
SET(catalogname-app latte-dock)
ADD_CUSTOM_TARGET(translations-app ALL)
FILE(GLOB PO_FILES_CORONA po/corona/*.po)
FILE(GLOB PO_FILES_CORONA po/app/*.po)
FOREACH(_poFile ${PO_FILES_CORONA})
GET_FILENAME_COMPONENT(_poFileName ${_poFile} NAME)
STRING(REGEX REPLACE "^${catalogname-corona}_?" "" _langCode ${_poFileName} )
STRING(REGEX REPLACE "^${catalogname-app}_?" "" _langCode ${_poFileName} )
STRING(REGEX REPLACE "\\.po$" "" _langCode ${_langCode} )
IF( _langCode )
GET_FILENAME_COMPONENT(_lang ${_poFile} NAME_WE)
SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/corona/${_lang}.gmo)
SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/app/${_lang}.gmo)
ADD_CUSTOM_COMMAND(TARGET translations-corona
ADD_CUSTOM_COMMAND(TARGET translations-app
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
DEPENDS ${_poFile})
INSTALL(FILES ${_gmoFile} DESTINATION ${LOCALE_INSTALL_DIR}/kf5/${_langCode}/LC_MESSAGES/ RENAME ${catalogname-corona}.mo)
INSTALL(FILES ${_gmoFile} DESTINATION ${LOCALE_INSTALL_DIR}/kf5/${_langCode}/LC_MESSAGES/ RENAME ${catalogname-app}.mo)
ENDIF( _langCode )
ENDFOREACH(_poFile ${PO_FILES})
@ -129,7 +129,7 @@ plasma_install_package(build/plasmoid/release org.kde.store.nowdock.plasmoid)
add_subdirectory(shell)
plasma_install_package(build/shell/release org.kde.latte.shell shells shell)
add_subdirectory(corona)
add_subdirectory(app)
add_subdirectory(icons)

@ -14,9 +14,9 @@ PROJECTSHELL="plasma_shell_org.kde.latte.shell" # project name
PROJECTPATHSHELL="../../shell" # project path
WDIRSHELL="`pwd`/shell" # working dir
PROJECTCORONA="latte-dock" # project name
PROJECTPATHCORONA="../../corona" # project path
WDIRCORONA="`pwd`/corona" # working dir
PROJECTAPP="latte-dock" # project name
PROJECTPATHAPP="../../app" # project path
WDIRAPP="`pwd`/app" # working dir
echo "Preparing rc files for panel"
@ -156,49 +156,49 @@ echo "Done"
#---------------------- Corona Section ----------------#
echo "Preparing rc files for corona"
cd ../corona
echo "Preparing rc files for app"
cd ../app
# we use simple sorting to make sure the lines do not jump around too much from system to system
find "${PROJECTPATHSHELL}" -name '*.rc' -o -name '*.ui' -o -name '*.kcfg' | sort > "${WDIRSCORONA}/rcfiles.list"
find "${PROJECTPATHCORONA}" -name '*.rc' -o -name '*.ui' -o -name '*.kcfg' | sort >> "${WDIRCORONA}/rcfiles.list"
xargs --arg-file="${WDIRCORONA}/rcfiles.list" extractrc > "${WDIRCORONA}/rc.cpp"
find "${PROJECTPATHSHELL}" -name '*.rc' -o -name '*.ui' -o -name '*.kcfg' | sort > "${WDIRAPP}/rcfiles.list"
find "${PROJECTPATHAPP}" -name '*.rc' -o -name '*.ui' -o -name '*.kcfg' | sort >> "${WDIRAPP}/rcfiles.list"
xargs --arg-file="${WDIRAPP}/rcfiles.list" extractrc > "${WDIRAPP}/rc.cpp"
intltool-extract --quiet --type=gettext/ini ../../latte-dock.desktop.template
cat ../../latte-dock.desktop.template.h >> ${WDIRCORONA}/rc.cpp
cat ../../latte-dock.desktop.template.h >> ${WDIRAPP}/rc.cpp
rm ../../latte-dock.desktop.template.h
echo "Done preparing rc files for corona"
echo "Extracting messages for corona"
echo "Done preparing rc files for app"
echo "Extracting messages for app"
# see above on sorting
find "${PROJECTPATHSHELL}" -name '*.cpp' -o -name '*.h' -o -name '*.c' -o -name '*.qml' -o -name '*.qml.cmake' | sort > "${WDIRCORONA}/infiles.list"
find "${PROJECTPATHCORONA}" -name '*.cpp' -o -name '*.h' -o -name '*.c' -o -name '*.qml' -o -name '*.qml.cmake' | sort >> "${WDIRCORONA}/infiles.list"
echo "rc.cpp" >> "${WDIRCORONA}/infiles.list"
find "${PROJECTPATHSHELL}" -name '*.cpp' -o -name '*.h' -o -name '*.c' -o -name '*.qml' -o -name '*.qml.cmake' | sort > "${WDIRAPP}/infiles.list"
find "${PROJECTPATHAPP}" -name '*.cpp' -o -name '*.h' -o -name '*.c' -o -name '*.qml' -o -name '*.qml.cmake' | sort >> "${WDIRAPP}/infiles.list"
echo "rc.cpp" >> "${WDIRAPP}/infiles.list"
xgettext --from-code=UTF-8 -C -kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 \
-ktr2i18n:1 -kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kN_:1 -kaliasLocale -kki18n:1 -kki18nc:1c,2 \
-kki18np:1,2 -kki18ncp:1c,2,3 --msgid-bugs-address="${BUGADDR}" --files-from=infiles.list \
-D "${BASEDIR}" -D "${WDIRCORONA}" -o "${PROJECTCORONA}.pot" || \
-D "${BASEDIR}" -D "${WDIRAPP}" -o "${PROJECTAPP}.pot" || \
{ echo "error while calling xgettext. aborting."; exit 1; }
echo "Done extracting messages for corona"
echo "Done extracting messages for app"
echo "Merging translations for corona"
echo "Merging translations for app"
catalogs=`find . -name '*.po'`
for cat in $catalogs; do
echo "$cat"
msgmerge -o "$cat.new" "$cat" "${WDIRCORONA}/${PROJECTCORONA}.pot"
msgmerge -o "$cat.new" "$cat" "${WDIRAPP}/${PROJECTAPP}.pot"
mv "$cat.new" "$cat"
done
intltool-merge --quiet --desktop-style . ../../latte-dock.desktop.template "${PROJECTPATHCORONA}"/latte-dock.desktop
intltool-merge --quiet --desktop-style . ../../latte-dock.desktop.template "${PROJECTPATHAPP}"/latte-dock.desktop
echo "Done merging translations for corona"
echo "Cleaning up for corona"
#rm "${WDIRCORONA}/rcfiles.list"
#rm "${WDIRCORONA}/infiles.list"
#rm "${WDIRCORONA}/rc.cpp"
echo "Done merging translations for app"
echo "Cleaning up for app"
rm "${WDIRAPP}/rcfiles.list"
rm "${WDIRAPP}/infiles.list"
rm "${WDIRAPP}/rc.cpp"
echo "Done"

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-12-28 18:07+0200\n"
"Last-Translator: Michail Vοurlakos <mvourlakos@gmail.com>\n"
"Language-Team: Greek <kde-i18n-doc@kde.org>\n"
@ -126,16 +126,16 @@ msgstr "Προσθήκη Πίνακα"
msgid "Remove Dock"
msgstr "Αφαίρεση Πίνακα"
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:22
#: ../../app/packageplugins/shell/nowdockpackage.cpp:21
#, fuzzy
msgid "Now Dock panel"
msgstr "Now Dock Πίνακας"
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:24
#: ../../app/packageplugins/shell/nowdockpackage.cpp:23
msgid "Dock configuration UI"
msgstr "Παράθυρο ρυθμίσεων"
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:25
#: ../../app/packageplugins/shell/nowdockpackage.cpp:24
msgid "Config model"
msgstr "Μοντέλο ρυθμίσεων"

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -126,15 +126,15 @@ msgstr ""
msgid "Remove Dock"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:22
#: ../../app/packageplugins/shell/nowdockpackage.cpp:21
msgid "Now Dock panel"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:24
#: ../../app/packageplugins/shell/nowdockpackage.cpp:23
msgid "Dock configuration UI"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:25
#: ../../app/packageplugins/shell/nowdockpackage.cpp:24
msgid "Config model"
msgstr ""

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-10-14 14:20+0100\n"
"Last-Translator: Damian Kopeć <damikope@gmail.com>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@ -128,16 +128,16 @@ msgstr ""
msgid "Remove Dock"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:22
#: ../../app/packageplugins/shell/nowdockpackage.cpp:21
#, fuzzy
msgid "Now Dock panel"
msgstr "Panel Now Dock"
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:24
#: ../../app/packageplugins/shell/nowdockpackage.cpp:23
msgid "Dock configuration UI"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:25
#: ../../app/packageplugins/shell/nowdockpackage.cpp:24
msgid "Config model"
msgstr ""

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-09-25 04:15+0300\n"
"Last-Translator: Viorel-Cătălin Răpițeanu <rapiteanu DOT catalin AT gmail "
"DOT com>\n"
@ -129,16 +129,16 @@ msgstr ""
msgid "Remove Dock"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:22
#: ../../app/packageplugins/shell/nowdockpackage.cpp:21
#, fuzzy
msgid "Now Dock panel"
msgstr "Panou Now Dock"
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:24
#: ../../app/packageplugins/shell/nowdockpackage.cpp:23
msgid "Dock configuration UI"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:25
#: ../../app/packageplugins/shell/nowdockpackage.cpp:24
msgid "Config model"
msgstr ""

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-11-26 17:31+0800\n"
"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
"Language-Team: Chinese <kde-i18n-doc@kde.org>\n"
@ -128,16 +128,16 @@ msgstr ""
msgid "Remove Dock"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:22
#: ../../app/packageplugins/shell/nowdockpackage.cpp:21
#, fuzzy
msgid "Now Dock panel"
msgstr "Now Dock 面板"
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:24
#: ../../app/packageplugins/shell/nowdockpackage.cpp:23
msgid "Dock configuration UI"
msgstr ""
#: ../../corona/packageplugins/shell/nowdockpackage.cpp:25
#: ../../app/packageplugins/shell/nowdockpackage.cpp:24
msgid "Config model"
msgstr ""

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

@ -1,22 +0,0 @@
../../shell/contents/configuration/config.qml
../../shell/contents/configuration/LatteDockConfiguration.qml.cmake
../../shell/contents/views/Panel.qml
../../corona/abstractinterface.cpp
../../corona/abstractinterface.h
../../corona/main.cpp
../../corona/nowdockconfigview.cpp
../../corona/nowdockconfigview.h
../../corona/nowdockcorona.cpp
../../corona/nowdockcorona.h
../../corona/nowdockview.cpp
../../corona/nowdockview.h
../../corona/packageplugins/shell/nowdockpackage.cpp
../../corona/packageplugins/shell/nowdockpackage.h
../../corona/plasmaquick/configview.h
../../corona/plasmaquick/containmentview.h
../../corona/plasmaquick/view.h
../../corona/visibilitymanager.cpp
../../corona/visibilitymanager.h
../../corona/xwindowinterface.cpp
../../corona/xwindowinterface.h
rc.cpp

@ -1,3 +0,0 @@
char *s = N_("Latte");
char *s = N_("Dock for the masses");
char *s = N_("Dock");

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-11-25 00:01+0200\n"
"Last-Translator: Michail Vοurlakos <mvourlakos@gmail.com>\n"
"Language-Team: Greek <kde-i18n-doc@kde.org>\n"

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-10-16 13:14+0100\n"
"Last-Translator: Damian Kopeć <damikope@gmail.com>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-11-26 17:34+0800\n"
"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
"Language-Team: Chinese <kde-i18n-doc@kde.org>\n"

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-12-25 18:54+0200\n"
"Last-Translator: Michail Vοurlakos <mvourlakos@gmail.com>\n"
"Language-Team: Greek <kde-i18n-doc@kde.org>\n"

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-10-14 14:20+0100\n"
"Last-Translator: Damian Kopeć <damikope@gmail.com>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-09-25 04:15+0300\n"
"Last-Translator: Viorel-Cătălin Răpițeanu <rapiteanu DOT catalin AT gmail "
"DOT com>\n"

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/psifidotos/latte-dock/\n"
"POT-Creation-Date: 2016-12-28 16:37+0200\n"
"POT-Creation-Date: 2016-12-28 22:42+0200\n"
"PO-Revision-Date: 2016-11-26 17:31+0800\n"
"Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
"Language-Team: Chinese <kde-i18n-doc@kde.org>\n"

@ -3,7 +3,7 @@
PROJECTPATHCONTAINMENT="../../containment" # containment path
PROJECTPATHPLASMOID="../../plasmoid" # plasmoid path
PROJECTPATHSHELL="../../shell" # shell path
PROJECTPATHCORONA="../../corona" # corona path
PROJECTPATHAPP="../../app" # app path
BUGADDR="https://github.com/psifidotos/latte-dock/" # MSGID-Bugs
@ -19,8 +19,8 @@ cd ../shell
intltool-merge --quiet --desktop-style . ../../shell.metadata.desktop.template "${PROJECTPATHSHELL}"/metadata.desktop.cmake
echo "metadata.desktop file for shell was updated..."
cd ../corona
intltool-merge --quiet --desktop-style . ../../latte-dock.desktop.template "${PROJECTPATHCORONA}"/latte-dock.desktop
echo "latte-dock.desktop file for corona was updated..."
cd ../app
intltool-merge --quiet --desktop-style . ../../latte-dock.desktop.template "${PROJECTPATHAPP}"/latte-dock.desktop
echo "latte-dock.desktop file for app was updated..."

Loading…
Cancel
Save