From 714298d5c1dc393b35ce906978909f9de94976b1 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 24 Jul 2020 11:50:33 +0200
Subject: [PATCH] mambabase: remove obsoleted group devel and extra skype and
 spotify

---
 mambabase/SelectExtraPage.ui  | 48 ++++++++---------------------------
 mambabase/SelectGroupsPage.ui | 31 +++++++---------------
 mambabase/WelcomePage.ui      |  2 +-
 mambabase/mambabase.py        | 10 ++++----
 4 files changed, 26 insertions(+), 65 deletions(-)

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);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>30</y>
+          <y>40</y>
           <width>491</width>
           <height>21</height>
          </rect>
         </property>
         <property name="text">
-         <string>NVIDIA proprietary video driver /autodetected) from openmamba.org</string>
+         <string>NVIDIA proprietary video driver (autodetected) from openmamba.org</string>
         </property>
         <property name="checked">
          <bool>false</bool>
@@ -98,7 +98,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>50</y>
+          <y>60</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -111,7 +111,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>70</y>
+          <y>80</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -124,7 +124,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>90</y>
+          <y>210</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -137,7 +137,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>110</y>
+          <y>230</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -163,7 +163,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>170</y>
+          <y>260</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -176,7 +176,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>190</y>
+          <y>280</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -189,7 +189,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>210</y>
+          <y>300</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -211,37 +211,11 @@ background-color: rgb(255, 255, 255);</string>
          <string>Pepper-Flash plugin for chromium from google.com</string>
         </property>
        </widget>
-       <widget class="QCheckBox" name="inst_skype">
-        <property name="geometry">
-         <rect>
-          <x>20</x>
-          <y>230</y>
-          <width>491</width>
-          <height>21</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Skype from skype.com</string>
-        </property>
-       </widget>
-       <widget class="QCheckBox" name="inst_spotify">
-        <property name="geometry">
-         <rect>
-          <x>20</x>
-          <y>250</y>
-          <width>491</width>
-          <height>21</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Spotify from spotify.com</string>
-        </property>
-       </widget>
        <widget class="QCheckBox" name="inst_virtualbox">
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>270</y>
+          <y>180</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -254,7 +228,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>290</y>
+          <y>110</y>
           <width>491</width>
           <height>21</height>
          </rect>
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);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>30</y>
+          <y>40</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -98,7 +98,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>60</y>
+          <y>70</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -111,7 +111,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>90</y>
+          <y>100</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -124,7 +124,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>120</y>
+          <y>130</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -137,7 +137,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>150</y>
+          <y>160</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -150,7 +150,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>180</y>
+          <y>190</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -163,7 +163,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>240</y>
+          <y>250</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -176,7 +176,7 @@ background-color: rgb(255, 255, 255);</string>
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>270</y>
+          <y>280</y>
           <width>491</width>
           <height>21</height>
          </rect>
@@ -185,24 +185,11 @@ background-color: rgb(255, 255, 255);</string>
          <string>Base server packages (Apache, PHP, MariaDB, ...)</string>
         </property>
        </widget>
-       <widget class="QCheckBox" name="inst_devel">
-        <property name="geometry">
-         <rect>
-          <x>20</x>
-          <y>300</y>
-          <width>491</width>
-          <height>21</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>Base development packages (gcc, glibc-devel, kernel headers, ...)</string>
-        </property>
-       </widget>
        <widget class="QCheckBox" name="inst_games">
         <property name="geometry">
          <rect>
           <x>20</x>
-          <y>210</y>
+          <y>220</y>
           <width>491</width>
           <height>21</height>
          </rect>
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 @@
         <item>
          <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;mambabase - Copyright (c) 2007-2019 by Silvan Calarco&lt;br/&gt;Released under the terms of the GNU GPL v3 license&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;mambabase - Copyright (c) 2007-2020 by Silvan Calarco&lt;br/&gt;Released under the terms of the GNU GPL v3 license&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
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 <silvan.calarco@mambasoft.it>
+# Copyright (c) 2019-2020 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # 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)