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

mambabase: remove final page and other fixes/improvements

Browse Source
This commit is contained in:
Silvan Calarco 2019-10-24 18:41:14 +02:00
parent 2ee7762745
commit deba5ae309
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mambabase/InstallationPage.ui
View File

@ -47,12 +47,12 @@ background-color: rgb(255, 255, 255);</string>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="installPageTitle">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>531</width> <width>521</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
@ -67,7 +67,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>50</y>
<width>511</width> <width>511</width>
<height>41</height> <height>41</height>
</rect> </rect>
@ -80,7 +80,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>90</y>
<width>511</width> <width>511</width>
<height>21</height> <height>21</height>
</rect> </rect>
@ -93,9 +93,9 @@ 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>130</y>
<width>511</width> <width>511</width>
<height>201</height> <height>241</height>
</rect> </rect>
</property> </property>
<property name="frameShape"> <property name="frameShape">
@ -110,9 +110,12 @@ background-color: rgb(255, 255, 255);</string>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>491</width> <width>491</width>
<height>181</height> <height>211</height>
</rect> </rect>
</property> </property>
<property name="acceptRichText">
<bool>false</bool>
</property>
</widget> </widget>
</widget> </widget>
</widget> </widget>

2
mambabase/WelcomePage.ui
View File

@ -138,7 +138,7 @@
</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 later 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="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

29
mambabase/mambabase.py
View File

@ -30,8 +30,6 @@ class MambabaseWizard(QtWidgets.QWizard):
self.addPage(self.selectExtraPage) self.addPage(self.selectExtraPage)
self.installationPage = InstallationPage(self) self.installationPage = InstallationPage(self)
self.addPage(self.installationPage) self.addPage(self.installationPage)
self.finishPage = FinishPage(self)
self.addPage(self.finishPage)
self.setWindowTitle(_("openmamba base network installations") + self.setWindowTitle(_("openmamba base network installations") +
" - openmamba.org") " - openmamba.org")
self.setFixedSize(571,465) self.setFixedSize(571,465)
@ -146,18 +144,23 @@ 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 packages..." % inst),
'details': _("Installing %s 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)
pkgs = result.get_package_array() pkgs = result.get_package_array()
for p in pkgs: for p in pkgs:
if 'installed' in p.get_data().split(':'): if 'installed' in p.get_data().split(':'):
self.updateProgressSignal.emit({
'details': _("Package %s is already installed" % pkg)})
break break
if p.get_arch() != arch: if p.get_arch() != arch:
continue continue
packageid = p.get_name() + ';' + p.get_version() + ';' \ packageid = p.get_name() + ';' + p.get_version() + ';' \
+ p.get_arch() + ';' + p.get_data() + p.get_arch() + ';' + p.get_data()
self.updateProgressSignal.emit({
'details': _("Installing package %s" % pkg)})
client.install_packages(False, (packageid, ), None, client.install_packages(False, (packageid, ), None,
self.packagekit_progress_cb, p.get_name()) self.packagekit_progress_cb, p.get_name())
@ -170,7 +173,8 @@ class InstallThread(QtCore.QThread):
for extra in install_extras: for extra in install_extras:
if install_extras[extra]: if install_extras[extra]:
self.updateProgressSignal.emit({ self.updateProgressSignal.emit({
'label': _("Installing %s extra component..." % extra)}) 'label': _("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)
if result.returncode == 0: if result.returncode == 0:
@ -185,7 +189,8 @@ class InstallThread(QtCore.QThread):
# Finished # Finished
self.updateProgressSignal.emit({ 'value': 100, self.updateProgressSignal.emit({ 'value': 100,
'label': _("Installation finished!")}) 'label': _("Installation finished!"),
'details': _("Installation finished!")})
# Enable back and next buttons # Enable back and next buttons
parent.installationPage.done = True parent.installationPage.done = True
@ -320,6 +325,11 @@ class InstallationPage(QtWidgets.QWizardPage):
self.show() self.show()
def isComplete(self): def isComplete(self):
if self.done:
self.installPageTitle.setText(
_('<html><head/><body><p align="center">' +
'<span style="font-size:14pt; font-weight:600;">' +
'All done!</span></p></body></html>'))
return self.done return self.done
@QtCore.pyqtSlot(dict) @QtCore.pyqtSlot(dict)
@ -329,14 +339,7 @@ class InstallationPage(QtWidgets.QWizardPage):
if 'label' in dict: if 'label' in dict:
self.progressLabel.setText(dict['label']) self.progressLabel.setText(dict['label'])
if 'details' in dict: if 'details' in dict:
self.progressDetails.setText(dict['details']) self.progressDetails.append("<br/>" + dict['details'])
class FinishPage(QtWidgets.QWizardPage):
def __init__(self, parent=None):
super(FinishPage, self).__init__(parent)
uic.loadUi(DATADIR + "FinishPage.ui", self)
self.show()
if __name__ == '__main__': if __name__ == '__main__':