diff --git a/mambabase/SelectExtraPage.ui b/mambabase/SelectExtraPage.ui index 39a2e29..67d19a4 100644 --- a/mambabase/SelectExtraPage.ui +++ b/mambabase/SelectExtraPage.ui @@ -82,13 +82,13 @@ background-color: rgb(255, 255, 255); 20 - 30 + 40 491 21 - NVIDIA proprietary video driver /autodetected) from openmamba.org + NVIDIA proprietary video driver (autodetected) from openmamba.org false @@ -98,7 +98,7 @@ background-color: rgb(255, 255, 255); 20 - 50 + 60 491 21 @@ -111,7 +111,7 @@ background-color: rgb(255, 255, 255); 20 - 70 + 80 491 21 @@ -124,7 +124,7 @@ background-color: rgb(255, 255, 255); 20 - 90 + 210 491 21 @@ -137,7 +137,7 @@ background-color: rgb(255, 255, 255); 20 - 110 + 230 491 21 @@ -163,7 +163,7 @@ background-color: rgb(255, 255, 255); 20 - 170 + 260 491 21 @@ -176,7 +176,7 @@ background-color: rgb(255, 255, 255); 20 - 190 + 280 491 21 @@ -189,7 +189,7 @@ background-color: rgb(255, 255, 255); 20 - 210 + 300 491 21 @@ -211,37 +211,11 @@ background-color: rgb(255, 255, 255); Pepper-Flash plugin for chromium from google.com - - - - 20 - 230 - 491 - 21 - - - - Skype from skype.com - - - - - - 20 - 250 - 491 - 21 - - - - Spotify from spotify.com - - 20 - 270 + 180 491 21 @@ -254,7 +228,7 @@ background-color: rgb(255, 255, 255); 20 - 290 + 110 491 21 diff --git a/mambabase/SelectGroupsPage.ui b/mambabase/SelectGroupsPage.ui index a5192ed..579bd29 100644 --- a/mambabase/SelectGroupsPage.ui +++ b/mambabase/SelectGroupsPage.ui @@ -82,7 +82,7 @@ background-color: rgb(255, 255, 255); 20 - 30 + 40 491 21 @@ -98,7 +98,7 @@ background-color: rgb(255, 255, 255); 20 - 60 + 70 491 21 @@ -111,7 +111,7 @@ background-color: rgb(255, 255, 255); 20 - 90 + 100 491 21 @@ -124,7 +124,7 @@ background-color: rgb(255, 255, 255); 20 - 120 + 130 491 21 @@ -137,7 +137,7 @@ background-color: rgb(255, 255, 255); 20 - 150 + 160 491 21 @@ -150,7 +150,7 @@ background-color: rgb(255, 255, 255); 20 - 180 + 190 491 21 @@ -163,7 +163,7 @@ background-color: rgb(255, 255, 255); 20 - 240 + 250 491 21 @@ -176,7 +176,7 @@ background-color: rgb(255, 255, 255); 20 - 270 + 280 491 21 @@ -185,24 +185,11 @@ background-color: rgb(255, 255, 255); Base server packages (Apache, PHP, MariaDB, ...) - - - - 20 - 300 - 491 - 21 - - - - Base development packages (gcc, glibc-devel, kernel headers, ...) - - 20 - 210 + 220 491 21 diff --git a/mambabase/WelcomePage.ui b/mambabase/WelcomePage.ui index a63c5b2..f23c470 100644 --- a/mambabase/WelcomePage.ui +++ b/mambabase/WelcomePage.ui @@ -90,7 +90,7 @@ - <html><head/><body><p><span style=" font-style:italic;">mambabase - Copyright (c) 2007-2019 by Silvan Calarco<br/>Released under the terms of the GNU GPL v3 license</span></p></body></html> + <html><head/><body><p><span style=" font-style:italic;">mambabase - Copyright (c) 2007-2020 by Silvan Calarco<br/>Released under the terms of the GNU GPL v3 license</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/mambabase/mambabase.py b/mambabase/mambabase.py index 1b7eb7b..f9c6efe 100755 --- a/mambabase/mambabase.py +++ b/mambabase/mambabase.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2019 by Silvan Calarco +# Copyright (c) 2019-2020 by Silvan Calarco # Release under the terms of the GPL version 3 license from PyQt5 import QtCore @@ -245,9 +245,9 @@ class SelectGroupsPage(QtWidgets.QWizardPage): 'graphics': self.inst_graphics, 'games': self.inst_games, 'virtualization': self.inst_virtualization, - 'server': self.inst_server, - 'devel': self.inst_devel + 'server': self.inst_server } + #'devel': self.inst_devel # Load packages group db into a dict result = subprocess.run([DATADIR + "mambabase-pkggroups-parser.sh"], stdout=subprocess.PIPE) @@ -305,11 +305,11 @@ class SelectExtraPage(QtWidgets.QWizardPage): 'msttcorefonts': self.inst_msttcf, 'win32codecs': self.inst_codecs, 'sun-java': self.inst_java, - 'skype': self.inst_skype, - 'spotify': self.inst_spotify, 'virtualbox-extension-pack': self.inst_virtualbox, 'chromium-widevine': self.inst_widevine } +# 'skype': self.inst_skype, +# 'spotify': self.inst_spotify, for extra in self.extra_checkboxes: result = subprocess.run(['/usr/bin/openmamba-netsrpms', '-c', extra], stdout=subprocess.PIPE)