1
0
mirror of https://github.com/arsenetar/dupeguru.git synced 2026-01-22 06:37:17 +00:00

Merge branch 'master' into dev

This commit is contained in:
glubsy
2020-12-29 20:10:42 +01:00
24 changed files with 74 additions and 92 deletions

View File

@@ -69,21 +69,6 @@ class AboutBox(QDialog):
self.verticalLayout.addWidget(self.label_3)
self.label_3.setText(tr("Licensed under GPLv3"))
self.label = QLabel(self)
self.label_4 = QLabel(self)
self.label_4.setWordWrap(True)
self.label_4.setTextFormat(Qt.RichText)
self.label_4.setOpenExternalLinks(True)
self.label_4.setText(tr(
"""<img src=":/exchange" alt="Exchange" width="16" height="16"> icon
made by <a href="http://jasoncho.ca/"> Jason Cho</a> (used with permission).
<br>
<img src=":/zoom_in" alt="Zoom In" width="16" height="16">
<img src=":/zoom_out" alt="Zoom Out" width="16" height="16">
<img src=":/zoom_best_fit" alt="Zoomt Best Fit" width="16" height="16">
<img src=":/zoom_original" alt="Zoom Original" width="16" height="16">
icons made by <a href="https://findicons.com/pack/1035/human_o2">schollidesign</a>
(licensed under GPL)."""))
self.verticalLayout.addWidget(self.label_4)
font = QFont()
font.setWeight(75)
font.setBold(True)

View File

@@ -121,8 +121,10 @@ class Preferences(QObject):
self._settings.setValue(name, normalize_for_serialization(value))
def saveGeometry(self, name, widget):
# We save geometry under a 5-sized int array: first item is a flag for whether the widget
# is maximized and the other 4 are (x, y, w, h).
# We save geometry under a 7-sized int array: first item is a flag
# for whether the widget is maximized, second item is a flag for whether
# the widget is docked, third item is a Qt::DockWidgetArea enum value,
# and the other 4 are (x, y, w, h).
m = 1 if widget.isMaximized() else 0
d = 1 if isinstance(widget, QDockWidget) and not widget.isFloating() else 0
area = widget.parent.dockWidgetArea(widget) if d else 0