diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-06-20 13:38:38 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-06-20 13:38:38 -0400 |
| commit | 7f92e574ec375bb323808f69afbab91351971f9b (patch) | |
| tree | d1b69fd1e6fbc6054f2903d4aaf01847796ef6f0 /src-qt5/core-utils | |
| parent | Update the README a bit. (diff) | |
| download | lumina-7f92e574ec375bb323808f69afbab91351971f9b.tar.gz lumina-7f92e574ec375bb323808f69afbab91351971f9b.tar.bz2 lumina-7f92e574ec375bb323808f69afbab91351971f9b.zip | |
Fix where localization files get installed via the main source tree (accounts for the change to SHARE/lumina-desktop rather than SHARE/Lumina-DE).
Also fix the wallpaper dir detection routine within lumina-config (same issue - install dir change broke the path detection).
Diffstat (limited to 'src-qt5/core-utils')
4 files changed, 9 insertions, 9 deletions
diff --git a/src-qt5/core-utils/lumina-config/lumina-config.pro b/src-qt5/core-utils/lumina-config/lumina-config.pro index 5beb22a8..307cd765 100644 --- a/src-qt5/core-utils/lumina-config/lumina-config.pro +++ b/src-qt5/core-utils/lumina-config/lumina-config.pro @@ -106,8 +106,8 @@ TRANSLATIONS = i18n/lumina-config_af.ts \ i18n/lumina-config_zh_TW.ts \ i18n/lumina-config_zu.ts -dotrans.path=$${L_SHAREDIR}/Lumina-DE/i18n/ -dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/i18n/ +dotrans.path=$${L_SHAREDIR}/lumina-desktop/i18n/ +dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/ desktop.files=lumina-config.desktop desktop.path=$${L_SHAREDIR}/applications/ diff --git a/src-qt5/core-utils/lumina-config/mainUI.cpp b/src-qt5/core-utils/lumina-config/mainUI.cpp index 4bb07c9a..36e45a9e 100644 --- a/src-qt5/core-utils/lumina-config/mainUI.cpp +++ b/src-qt5/core-utils/lumina-config/mainUI.cpp @@ -711,7 +711,7 @@ void MainUI::deskbgremoved(){ void MainUI::deskbgadded(){ //Prompt the user to find an image file to use for a background - QString dir = LOS::LuminaShare().section("/Lumina-DE",0,0)+"/wallpapers/Lumina-DE"; + QString dir = LOS::LuminaShare().section("/lumina-desktop",0,0)+"/wallpapers/Lumina-DE"; qDebug() << "Looking for wallpaper dir:" << dir; if( !QFile::exists(dir) ){ dir = QDir::homePath(); } QStringList imgs = LUtils::imageExtensions(); @@ -746,7 +746,7 @@ void MainUI::deskbgcoloradded(){ void MainUI::deskbgdiradded(){ //Add the files from a single directory - QString dir = LOS::LuminaShare().section("/Lumina-DE",0,0)+"/wallpapers/Lumina-DE"; + QString dir = LOS::LuminaShare().section("/lumina-desktop",0,0)+"/wallpapers/Lumina-DE"; qDebug() << "Looking for wallpaper dir:" << dir; if( !QFile::exists(dir) ){ dir = QDir::homePath(); } dir = QFileDialog::getExistingDirectory(this, tr("Find Background Image Directory"), dir, QFileDialog::ReadOnly); @@ -772,7 +772,7 @@ void MainUI::deskbgdiradded(){ void MainUI::deskbgdirradded(){ //Recursively add files from a directory - QString dir = LOS::LuminaShare().section("/Lumina-DE",0,0)+"/wallpapers/Lumina-DE"; + QString dir = LOS::LuminaShare().section("/lumina-desktop",0,0)+"/wallpapers/Lumina-DE"; qDebug() << "Looking for wallpaper dir:" << dir; if( !QFile::exists(dir) ){ dir = QDir::homePath(); } dir = QFileDialog::getExistingDirectory(this, tr("Find Background Image Directory"), dir, QFileDialog::ReadOnly); diff --git a/src-qt5/core-utils/lumina-search/lumina-search.pro b/src-qt5/core-utils/lumina-search/lumina-search.pro index 72dd75e6..e42142c6 100644 --- a/src-qt5/core-utils/lumina-search/lumina-search.pro +++ b/src-qt5/core-utils/lumina-search/lumina-search.pro @@ -89,8 +89,8 @@ TRANSLATIONS = i18n/lumina-search_af.ts \ i18n/lumina-search_zh_TW.ts \ i18n/lumina-search_zu.ts -dotrans.path=$${L_SHAREDIR}/Lumina-DE/i18n/ -dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/i18n/ +dotrans.path=$${L_SHAREDIR}/lumina-desktop/i18n/ +dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/ desktop.files=lumina-search.desktop desktop.path=$${L_SHAREDIR}/applications/ diff --git a/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro b/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro index 22a47d8a..a7a34fe9 100644 --- a/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro +++ b/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro @@ -87,8 +87,8 @@ TRANSLATIONS = i18n/lumina-xconfig_af.ts \ i18n/lumina-xconfig_zh_TW.ts \ i18n/lumina-xconfig_zu.ts -dotrans.path=$${L_SHAREDIR}/Lumina-DE/i18n/ -dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/i18n/ +dotrans.path=$${L_SHAREDIR}/lumina-desktop/i18n/ +dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/ desktop.files=lumina-xconfig.desktop desktop.path=$${L_SHAREDIR}/applications/ |