diff --git a/mambabase/InstallationPage.ui b/mambabase/InstallationPage.ui index d457da9..e65b92a 100644 --- a/mambabase/InstallationPage.ui +++ b/mambabase/InstallationPage.ui @@ -108,15 +108,31 @@ background-color: rgb(255, 255, 255); 10 - 10 + 30 491 - 211 + 201 + + + false + + + + 10 + 10 + 481 + 20 + + + + <html><head/><body><p><span style=" font-weight:600;">Installation details:</span></p></body></html> + + diff --git a/mambabase/WelcomePage.ui b/mambabase/WelcomePage.ui index b5691b4..a63c5b2 100644 --- a/mambabase/WelcomePage.ui +++ b/mambabase/WelcomePage.ui @@ -82,7 +82,7 @@ 10 80 - 511 + 531 72 @@ -90,7 +90,7 @@ - <html><head/><body><p><span style=" font-style:italic;">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-2019 by Silvan Calarco<br/>Released under the terms of the GNU GPL v3 license</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -134,12 +134,15 @@ 10 10 511 - 81 + 131 <html><head/><body><p>This program will complete the installation by adding the minimum recommended set of packages to the system. Additionally it will let you install, upon selection, macro-group of packages and proprietary software components.</p><p><span style=" font-weight:600;">TIP</span>: you may run this program at any time from the <span style=" font-style:italic;">openmamba control center</span> on the tray icon bar.</p></body></html> + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + true diff --git a/mambabase/mambabase.py b/mambabase/mambabase.py index 5cc38ee..1b7eb7b 100755 --- a/mambabase/mambabase.py +++ b/mambabase/mambabase.py @@ -94,11 +94,13 @@ class InstallThread(QtCore.QThread): parent.installationPage.done = False self.doneSignal.emit() self.updateProgressSignal.emit( - { 'value': 1, 'label': _("Starting installation...")}) + { 'value': 1, 'label': _("Starting installation..."), + 'details': _("Starting installation...")}) # Update packages list self.updateProgressSignal.emit({ 'value': 5, - 'label': _("Updating packages list...")}) + 'label': _("Updating packages list..."), + 'details': _("Updating packages list...")}) result = subprocess.run(['pkcon', 'refresh'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -113,7 +115,8 @@ class InstallThread(QtCore.QThread): # Perform system update self.updateProgressSignal.emit({ 'value': 10, - 'label': _("Updating installed packages...")}) + 'label': _("Updating installed packages..."), + 'details': _("Updating installed packages...")}) result = subprocess.run(['pkcon', 'update', '-y'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -144,8 +147,8 @@ class InstallThread(QtCore.QThread): for inst in install: if install[inst]: self.updateProgressSignal.emit({ - 'label': _("Installing %s packages..." % inst), - 'details': _("Installing %s packages..." % inst)}) + 'label': _("Installing %s group packages..." % inst), + 'details': _("Installing %s group packages..." % inst)}) for pkg in self.pkggroups[inst].split(): result =client.resolve(0, (pkg,), None, self.packagekit_progress_cb, None) @@ -176,7 +179,7 @@ class InstallThread(QtCore.QThread): 'label': _("Installing %s extra component..." % extra), 'details': _("Installing %s extra component..." % extra)}) result = subprocess.run(['/usr/bin/openmamba-netsrpms', extra], - stdout=subprocess.PIPE) + stdout=subprocess.PIPE, stderr=subprocess.PIPE) if result.returncode == 0: if result.stdout: self.updateProgressSignal.emit({