mambabase: details window improvement and other minor layout fixes
This commit is contained in:
parent
3561b9b2c5
commit
830fd474d1
@ -108,15 +108,31 @@ background-color: rgb(255, 255, 255);</string>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<y>30</y>
|
||||
<width>491</width>
|
||||
<height>211</height>
|
||||
<height>201</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="documentTitle">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="acceptRichText">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>481</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-weight:600;">Installation details:</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
|
@ -82,7 +82,7 @@
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>80</y>
|
||||
<width>511</width>
|
||||
<width>531</width>
|
||||
<height>72</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -90,7 +90,7 @@
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string><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></string>
|
||||
<string><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></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
@ -134,12 +134,15 @@
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>511</width>
|
||||
<height>81</height>
|
||||
<height>131</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><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></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
|
@ -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({
|
||||
|
Loading…
Reference in New Issue
Block a user