Manager revival #52
Merged
Manager revival #52
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Everything that should work works. Further improvements that would be nice: - replace untidy multitude of QtGui Items with one generic type - restore Qubes Network functionality - add Boot From Device action (and easy way to install windows tool from there) fixes QubesOS/qubes-issues#2966 QubesOS/qubes-issues#2132
Renamed 'VM' to 'Qube' in the user interface for Qube Manager.
Removed errors discovered by pylint, or told it to be quiet when needed.
Changed "size on disk" widget to display only two decimal places.
Surprisingly, it has not been touched since 3.2. It should work now.
marmarta
force-pushed
the
manager-revival
branch
from
5ad8aaa to
1cee3a5
Compare
marmarek
requested changes
Jan 9, 2018
qubesmanager/log_dialog.py
Outdated
| self.__init_log_text__() | ||
|
|
||
| def __init_log_text__(self): | ||
| self.displayed_text = "" | ||
| log = open(self.log_path) | ||
| log.seek(0, os.SEEK_END) | ||
| log.seek(0, clipboard.os.SEEK_END) |
qubesmanager/log_dialog.py
Outdated
| log.seek(-LOG_DISPLAY_SIZE, os.SEEK_END) | ||
| self.displayed_text = self.tr( | ||
| "(Showing only last %d bytes of file)\n") % LOG_DISPLAY_SIZE | ||
| log.seek(-LOG_DISPLAY_SIZE, clipboard.os.SEEK_END) |
qubesmanager/qube_manager.py
Outdated
| vm = self.vm | ||
| vm_is_running = vm.is_running() | ||
| vm_start_time = datetime.fromtimestamp( | ||
| float(getattr(vm, 'start_time', None))) |
There was a problem hiding this comment.
None isn't the best choice here - float(None) throws TypeError. Alternatively wrap this in try/except TypeError.
qubesmanager/qube_manager.py
Outdated
| vm_is_running = vm.is_running() | ||
| vm_start_time = datetime.fromtimestamp( | ||
| float(getattr(vm, 'start_time', None))) | ||
| if vm_is_running and vm_start_time \ |
There was a problem hiding this comment.
Here you check if vm_start_time is not false (so, not None, or 0 in practice). So, maybe use some of those if start_time attribute is inaccessible.
qubesmanager/qube_manager.py
Outdated
| # pylint: disable=unused-argument | ||
| super(VmManagerWindow, self).__init__() | ||
| self.setupUi(self) | ||
| self.toolbar = self.toolBar |
|
|
||
| row_no += 1 | ||
|
|
||
| self.table.setRowCount(row_no) |
qubesmanager/qube_manager.py
Outdated
| for row_no in range(self.table.rowCount()): | ||
| widget = self.table.cellWidget(row_no, | ||
| self.columns_indices["State"]) | ||
| show = (self.search in widget.vm.name or not self.search) |
There was a problem hiding this comment.
not self.search is always false here, see top if in the function.
qubesmanager/qube_manager.py
Outdated
| and vm.klass != 'AdminVM') | ||
| self.action_restartvm.setEnabled( | ||
| vm.is_running() and vm.get_power_state() != "Paused" | ||
| and vm.klass != 'AdminVM' and vm.klass != 'DisposableVM') |
qubesmanager/qube_manager.py
Outdated
| and vm.klass != 'AdminVM') | ||
|
|
||
| self.action_appmenus.setEnabled( | ||
| vm.klass != 'AdminVM' and vm.klass != 'DisposableMV' |
qubesmanager/table_widgets.py
Outdated
|
|
||
| def update(self): | ||
| if self.previous_power_state != self.vm.last_power_state: | ||
| self.previous_power_state = self.vm.get_power_state() |
There was a problem hiding this comment.
This looks wrong, you check for "previous" value a line below.
As requested by @marmarek
marmarta
force-pushed
the
manager-revival
branch
from
0d645e1 to
b1dc245
Compare
marmarek
approved these changes
Jan 10, 2018
Because I forgot it the first time round. Sorry.
marmarta
force-pushed
the
manager-revival
branch
from
e370c18 to
5c2f3b4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Revived old Qubes Manager in a slimmer, lighter, less horrifyingly complex form.
Remaining recommended fixes:
fixes QubesOS/qubes-issues#2966
QubesOS/qubes-issues#2132