1
0
mirror of https://github.com/arsenetar/dupeguru.git synced 2026-01-22 14:41:39 +00:00

First pass code cleanup in qt/qtlib

This commit is contained in:
2021-08-24 00:12:23 -05:00
parent d576a7043c
commit f9085386a6
25 changed files with 195 additions and 233 deletions

View File

@@ -24,7 +24,7 @@ from PyQt5.QtWidgets import (
)
from hscommon.trans import trget
from qtlib.util import moveToScreenCenter, horizontalWrap, createActions
from qtlib.util import move_to_screen_center, horizontal_wrap, create_actions
from qtlib.search_edit import SearchEdit
from core.app import AppMode
@@ -204,7 +204,7 @@ class ResultWindow(QMainWindow):
self.app.invokeCustomCommand,
),
]
createActions(ACTIONS, self)
create_actions(ACTIONS, self)
self.actionDelta.setCheckable(True)
self.actionPowerMarker.setCheckable(True)
@@ -306,21 +306,21 @@ class ResultWindow(QMainWindow):
action.item_index = -1
# Action menu
actionMenu = QMenu(tr("Actions"), menubar)
actionMenu.addAction(self.actionDeleteMarked)
actionMenu.addAction(self.actionMoveMarked)
actionMenu.addAction(self.actionCopyMarked)
actionMenu.addAction(self.actionRemoveMarked)
actionMenu.addSeparator()
actionMenu.addAction(self.actionRemoveSelected)
actionMenu.addAction(self.actionIgnoreSelected)
actionMenu.addAction(self.actionMakeSelectedReference)
actionMenu.addSeparator()
actionMenu.addAction(self.actionOpenSelected)
actionMenu.addAction(self.actionRevealSelected)
actionMenu.addAction(self.actionInvokeCustomCommand)
actionMenu.addAction(self.actionRenameSelected)
self.actionActions.setMenu(actionMenu)
action_menu = QMenu(tr("Actions"), menubar)
action_menu.addAction(self.actionDeleteMarked)
action_menu.addAction(self.actionMoveMarked)
action_menu.addAction(self.actionCopyMarked)
action_menu.addAction(self.actionRemoveMarked)
action_menu.addSeparator()
action_menu.addAction(self.actionRemoveSelected)
action_menu.addAction(self.actionIgnoreSelected)
action_menu.addAction(self.actionMakeSelectedReference)
action_menu.addSeparator()
action_menu.addAction(self.actionOpenSelected)
action_menu.addAction(self.actionRevealSelected)
action_menu.addAction(self.actionInvokeCustomCommand)
action_menu.addAction(self.actionRenameSelected)
self.actionActions.setMenu(action_menu)
self.actionsButton.setMenu(self.actionActions.menu())
def _setupUi(self):
@@ -336,7 +336,7 @@ class ResultWindow(QMainWindow):
self.deltaValuesCheckBox = QCheckBox(tr("Delta Values"))
self.searchEdit = SearchEdit()
self.searchEdit.setMaximumWidth(300)
self.horizontalLayout = horizontalWrap(
self.horizontalLayout = horizontal_wrap(
[
self.actionsButton,
self.detailsButton,
@@ -379,12 +379,12 @@ class ResultWindow(QMainWindow):
# moves to center of closest screen if partially off screen
frame = self.frameGeometry()
if QDesktopWidget().screenNumber(self) == -1:
moveToScreenCenter(self)
move_to_screen_center(self)
elif QDesktopWidget().availableGeometry(self).contains(frame) is False:
frame.moveCenter(QDesktopWidget().availableGeometry(self).center())
self.move(frame.topLeft())
else:
moveToScreenCenter(self)
move_to_screen_center(self)
# --- Private
def _update_column_actions_status(self):