diff --git a/mambabase/SelectExtraPage.ui b/mambabase/SelectExtraPage.ui index a40ec37..874adc7 100644 --- a/mambabase/SelectExtraPage.ui +++ b/mambabase/SelectExtraPage.ui @@ -38,10 +38,10 @@ - QFrame::StyledPanel + QFrame::Shape::StyledPanel - QFrame::Raised + QFrame::Shadow::Raised @@ -69,13 +69,13 @@ - Proprietary software installations/updates + Extra software installations/updates 20 - 140 + 30 491 21 @@ -91,7 +91,7 @@ 20 - 190 + 180 491 21 @@ -104,7 +104,7 @@ 20 - 240 + 230 491 21 @@ -117,7 +117,7 @@ 20 - 290 + 280 491 21 @@ -130,7 +130,7 @@ 20 - 90 + 80 491 21 @@ -139,17 +139,17 @@ VirtualBox extension pack from virtualbox.org - + 20 - 40 + 130 491 21 - Widevine extension from google.com + Wine (32 bit) from openmamba.org diff --git a/mambabase/mambabase.py b/mambabase/mambabase.py index c926d44..4376760 100755 --- a/mambabase/mambabase.py +++ b/mambabase/mambabase.py @@ -191,6 +191,10 @@ class InstallThread(QtCore.QThread): '/usr/share/mambabase/nvidia-autoselect-driver', '-i'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + elif extra == 'wine': + result = subprocess.run([ + '/usr/bin/pkcon', 'install', 'wine-common.i586'], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) else: result = subprocess.run(['/usr/bin/netsrpms', extra], stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -326,13 +330,15 @@ class SelectExtraPage(QtWidgets.QWizardPage): def setExtras(self): self.extra_checkboxes = { 'nvidia': self.inst_nvidia, + 'wine': self.inst_wine, 'broadcom_sta': self.inst_broadcom_sta, 'b43-firmware': self.inst_b43, 'msttcorefonts': self.inst_msttcf, - 'virtualbox-extension-pack': self.inst_virtualbox, - 'chromium-widevine': self.inst_widevine + 'virtualbox-extension-pack': self.inst_virtualbox } for extra in self.extra_checkboxes: + if extra in ["nvidia", "wine"]: + continue result = subprocess.run(['/usr/bin/netsrpms', '-c', extra], stdout=subprocess.PIPE) if result.returncode < 2: diff --git a/mambabase/mambabase_it.ts b/mambabase/mambabase_it.ts index cb6048a..48774ad 100644 --- a/mambabase/mambabase_it.ts +++ b/mambabase/mambabase_it.ts @@ -40,8 +40,8 @@ - Proprietary software installations/updates - Installazione/aggiornamento di componenti software proprietari + Extra software installations/updates + Installazione/aggiornamento di componenti aggiuntivi