diff options
Diffstat (limited to 'src/modules/pacstrap-gui/pacstrap-gui.cpp')
| -rw-r--r-- | src/modules/pacstrap-gui/pacstrap-gui.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/modules/pacstrap-gui/pacstrap-gui.cpp b/src/modules/pacstrap-gui/pacstrap-gui.cpp index a21d3a022..c0c20fdaa 100644 --- a/src/modules/pacstrap-gui/pacstrap-gui.cpp +++ b/src/modules/pacstrap-gui/pacstrap-gui.cpp @@ -34,10 +34,13 @@ PacstrapGuiJob::PacstrapGuiJob(QObject* parent) : PacstrapCppJob(tr(GUI_JOB_NAME QString PacstrapGuiJob::getPackageList() { -globalStorage->insert(GS::DESKTOP_PACKAGES_KEY , MATE_PACKAGES_KEY) ; // TODO: per user option via globalStorage -DEBUG_TRACE_DESKTOPPACKAGES + QString init_key = this->globalStorage->value(GS::INITSYSTEM_KEY).toString() ; + QString desktop_key = this->globalStorage->value(GS::DESKTOP_KEY ).toString() ; + QString locale = this->globalStorage->value(GS::LOCALE_KEY ).toMap() + .value(GS::LANG_KEY ).toString() ; + QStringList language_packs = LANGUAGE_PACKS.values(locale) ; - QString desktop = this->globalStorage->value(GS::DESKTOP_PACKAGES_KEY).toString() ; +DEBUG_TRACE_DESKTOPPACKAGES return (this->localStorage.value(APPLICATIONS_PACKAGES_KEY).toStringList() + this->localStorage.value(MULTIMEDIA_PACKAGES_KEY ).toStringList() + @@ -45,7 +48,9 @@ DEBUG_TRACE_DESKTOPPACKAGES this->localStorage.value(THEMES_PACKAGES_KEY ).toStringList() + this->localStorage.value(UTILITIES_PACKAGES_KEY ).toStringList() + this->localStorage.value(XSERVER_PACKAGES_KEY ).toStringList() + - this->localStorage.value(desktop ).toStringList() ).join(' ') ; + this->localStorage.value(init_key ).toStringList() + + this->localStorage.value(desktop_key ).toStringList() + + language_packs ).join(' ') ; } |