Skip to content

Commit

Permalink
Fixed 'About' window
Browse files Browse the repository at this point in the history
Surprisingly, it has not been touched since 3.2. It should work now.
  • Loading branch information
marmarta committed Jan 8, 2018
1 parent 5ecdbae commit 5ad8aaa
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 21 deletions.
12 changes: 5 additions & 7 deletions qubesmanager/about.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/python2
#!/usr/bin/python3
# coding=utf-8
# pylint: skip-file
#
# The Qubes OS Project, http://www.qubes-os.org
#
Expand All @@ -21,16 +20,15 @@
# with this program; if not, see <http://www.gnu.org/licenses/>.
#
#
from PyQt4.QtCore import SIGNAL, SLOT
from PyQt4.QtGui import QDialog, QIcon
from PyQt4.QtCore import SIGNAL, SLOT # pylint: disable=import-error
from PyQt4.QtGui import QDialog, QIcon # pylint: disable=import-error
from qubesmanager.releasenotes import ReleaseNotesDialog
from qubesmanager.informationnotes import InformationNotesDialog

from .ui_about import *
from . import ui_about # pylint: disable=no-name-in-module



class AboutDialog(Ui_AboutDialog, QDialog):
class AboutDialog(ui_about.Ui_AboutDialog, QDialog):
def __init__(self):
super(AboutDialog, self).__init__()

Expand Down
17 changes: 9 additions & 8 deletions qubesmanager/informationnotes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/python2
#!/usr/bin/python3
# coding=utf-8
# pylint: skip-file
#
# The Qubes OS Project, http://www.qubes-os.org
#
Expand All @@ -21,17 +20,19 @@
# with this program; if not, see <http://www.gnu.org/licenses/>.
#
#
from PyQt4.QtCore import SIGNAL
from PyQt4.QtGui import QDialog, QIcon
from PyQt4.QtGui import QDialog # pylint: disable=import-error

from .ui_informationnotes import *
from . import ui_informationnotes # pylint: disable=no-name-in-module
import subprocess


class InformationNotesDialog(Ui_InformationNotesDialog, QDialog):
class InformationNotesDialog(ui_informationnotes.Ui_InformationNotesDialog,
QDialog):
# pylint: disable=too-few-public-methods
def __init__(self):
super(InformationNotesDialog, self).__init__()

self.setupUi(self)
details = subprocess.check_output(['/usr/libexec/qubes-manager/qvm_about.sh'])
self.informationNotes.setText(details)
details = subprocess.check_output(
['/usr/libexec/qubes-manager/qvm_about.sh'])
self.informationNotes.setText(details.decode())
11 changes: 5 additions & 6 deletions qubesmanager/releasenotes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/python2
#!/usr/bin/python3
# coding=utf-8
# pylint: skip-file
#
# The Qubes OS Project, http://www.qubes-os.org
#
Expand All @@ -21,13 +20,13 @@
# with this program; if not, see <http://www.gnu.org/licenses/>.
#
#
from PyQt4.QtCore import SIGNAL
from PyQt4.QtGui import QDialog, QIcon
from PyQt4.QtGui import QDialog # pylint: disable=import-error

from .ui_releasenotes import *
from . import ui_releasenotes # pylint: disable=no-name-in-module


class ReleaseNotesDialog(Ui_ReleaseNotesDialog, QDialog):
class ReleaseNotesDialog(ui_releasenotes.Ui_ReleaseNotesDialog, QDialog):
# pylint: disable=too-few-public-methods
def __init__(self):
super(ReleaseNotesDialog, self).__init__()

Expand Down

0 comments on commit 5ad8aaa

Please sign in to comment.