openmamba/desktop-base-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mambabase: remove obsoleted group devel and extra skype and spotify

Browse Source
This commit is contained in:
Silvan Calarco 2020-07-24 11:50:33 +02:00
parent 58d434e229
commit 714298d5c1
4 changed files with 26 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mambabase/SelectExtraPage.ui
View File

@ -82,13 +82,13 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>30</y> <y>40</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>
<property name="text"> <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>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
@ -98,7 +98,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>50</y> <y>60</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -111,7 +111,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>70</y> <y>80</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -124,7 +124,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>90</y> <y>210</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -137,7 +137,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>110</y> <y>230</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -163,7 +163,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>170</y> <y>260</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -176,7 +176,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>190</y> <y>280</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -189,7 +189,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>210</y> <y>300</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -211,37 +211,11 @@ background-color: rgb(255, 255, 255);</string>
<string>Pepper-Flash plugin for chromium from google.com</string> <string>Pepper-Flash plugin for chromium from google.com</string>
</property> </property>
</widget> </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"> <widget class="QCheckBox" name="inst_virtualbox">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>270</y> <y>180</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -254,7 +228,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>290</y> <y>110</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>

31
mambabase/SelectGroupsPage.ui
View File

@ -82,7 +82,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>30</y> <y>40</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -98,7 +98,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>60</y> <y>70</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -111,7 +111,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>90</y> <y>100</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -124,7 +124,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>120</y> <y>130</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -137,7 +137,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>150</y> <y>160</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -150,7 +150,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>180</y> <y>190</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -163,7 +163,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>240</y> <y>250</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -176,7 +176,7 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>270</y> <y>280</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -185,24 +185,11 @@ background-color: rgb(255, 255, 255);</string>
<string>Base server packages (Apache, PHP, MariaDB, ...)</string> <string>Base server packages (Apache, PHP, MariaDB, ...)</string>
</property> </property>
</widget> </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"> <widget class="QCheckBox" name="inst_games">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>210</y> <y>220</y>
<width>491</width> <width>491</width>
<height>21</height> <height>21</height>
</rect> </rect>

2
mambabase/WelcomePage.ui
View File

@ -90,7 +90,7 @@
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <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>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

10
mambabase/mambabase.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/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 # Release under the terms of the GPL version 3 license
from PyQt5 import QtCore from PyQt5 import QtCore
@ -245,9 +245,9 @@ class SelectGroupsPage(QtWidgets.QWizardPage):
'graphics': self.inst_graphics, 'graphics': self.inst_graphics,
'games': self.inst_games, 'games': self.inst_games,
'virtualization': self.inst_virtualization, 'virtualization': self.inst_virtualization,
'server': self.inst_server, 'server': self.inst_server
'devel': self.inst_devel
} }
#'devel': self.inst_devel
# Load packages group db into a dict # Load packages group db into a dict
result = subprocess.run([DATADIR + "mambabase-pkggroups-parser.sh"], result = subprocess.run([DATADIR + "mambabase-pkggroups-parser.sh"],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
@ -305,11 +305,11 @@ class SelectExtraPage(QtWidgets.QWizardPage):
'msttcorefonts': self.inst_msttcf, 'msttcorefonts': self.inst_msttcf,
'win32codecs': self.inst_codecs, 'win32codecs': self.inst_codecs,
'sun-java': self.inst_java, 'sun-java': self.inst_java,
'skype': self.inst_skype,
'spotify': self.inst_spotify,
'virtualbox-extension-pack': self.inst_virtualbox, 'virtualbox-extension-pack': self.inst_virtualbox,
'chromium-widevine': self.inst_widevine 'chromium-widevine': self.inst_widevine
} }
# 'skype': self.inst_skype,
# 'spotify': self.inst_spotify,
for extra in self.extra_checkboxes: for extra in self.extra_checkboxes:
result = subprocess.run(['/usr/bin/openmamba-netsrpms', '-c', extra], result = subprocess.run(['/usr/bin/openmamba-netsrpms', '-c', extra],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)