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

mambabase: details window improvement and other minor layout fixes

Browse Source
This commit is contained in:
Silvan Calarco 2019-10-25 08:54:59 +02:00
parent 3561b9b2c5
commit 830fd474d1
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mambabase/InstallationPage.ui
View File

@ -108,15 +108,31 @@ background-color: rgb(255, 255, 255);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>30</y>
<width>491</width> <width>491</width>
<height>211</height> <height>201</height>
</rect> </rect>
</property> </property>
<property name="documentTitle">
<string/>
</property>
<property name="acceptRichText"> <property name="acceptRichText">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Installation details:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</widget> </widget>
</widget> </widget>
</item> </item>

9
mambabase/WelcomePage.ui
View File

@ -82,7 +82,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>80</y> <y>80</y>
<width>511</width> <width>531</width>
<height>72</height> <height>72</height>
</rect> </rect>
</property> </property>
@ -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;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-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>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -134,12 +134,15 @@
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>511</width> <width>511</width>
<height>81</height> <height>131</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;TIP&lt;/span&gt;: you may run this program at any time from the &lt;span style=&quot; font-style:italic;&quot;&gt;openmamba control center&lt;/span&gt; on the tray icon bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;TIP&lt;/span&gt;: you may run this program at any time from the &lt;span style=&quot; font-style:italic;&quot;&gt;openmamba control center&lt;/span&gt; on the tray icon bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>

15
mambabase/mambabase.py
View File

@ -94,11 +94,13 @@ class InstallThread(QtCore.QThread):
parent.installationPage.done = False parent.installationPage.done = False
self.doneSignal.emit() self.doneSignal.emit()
self.updateProgressSignal.emit( self.updateProgressSignal.emit(
{ 'value': 1, 'label': _("Starting installation...")}) { 'value': 1, 'label': _("Starting installation..."),
'details': _("Starting installation...")})
# Update packages list # Update packages list
self.updateProgressSignal.emit({ 'value': 5, self.updateProgressSignal.emit({ 'value': 5,
'label': _("Updating packages list...")}) 'label': _("Updating packages list..."),
'details': _("Updating packages list...")})
result = subprocess.run(['pkcon', 'refresh'], result = subprocess.run(['pkcon', 'refresh'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -113,7 +115,8 @@ class InstallThread(QtCore.QThread):
# Perform system update # Perform system update
self.updateProgressSignal.emit({ 'value': 10, self.updateProgressSignal.emit({ 'value': 10,
'label': _("Updating installed packages...")}) 'label': _("Updating installed packages..."),
'details': _("Updating installed packages...")})
result = subprocess.run(['pkcon', 'update', '-y'], result = subprocess.run(['pkcon', 'update', '-y'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -144,8 +147,8 @@ class InstallThread(QtCore.QThread):
for inst in install: for inst in install:
if install[inst]: if install[inst]:
self.updateProgressSignal.emit({ self.updateProgressSignal.emit({
'label': _("Installing %s packages..." % inst), 'label': _("Installing %s group packages..." % inst),
'details': _("Installing %s packages..." % inst)}) 'details': _("Installing %s group packages..." % inst)})
for pkg in self.pkggroups[inst].split(): for pkg in self.pkggroups[inst].split():
result =client.resolve(0, (pkg,), None, result =client.resolve(0, (pkg,), None,
self.packagekit_progress_cb, None) self.packagekit_progress_cb, None)
@ -176,7 +179,7 @@ class InstallThread(QtCore.QThread):
'label': _("Installing %s extra component..." % extra), 'label': _("Installing %s extra component..." % extra),
'details': _("Installing %s extra component..." % extra)}) 'details': _("Installing %s extra component..." % extra)})
result = subprocess.run(['/usr/bin/openmamba-netsrpms', extra], result = subprocess.run(['/usr/bin/openmamba-netsrpms', extra],
stdout=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if result.returncode == 0: if result.returncode == 0:
if result.stdout: if result.stdout:
self.updateProgressSignal.emit({ self.updateProgressSignal.emit({