From dd6ffe08d7b61d95a9bb0ce250e77109f74d4821 Mon Sep 17 00:00:00 2001 From: glubsy Date: Fri, 31 Jul 2020 01:32:29 +0200 Subject: [PATCH] Add option to place tab bar below main menu --- qt/app.py | 4 ++-- qt/preferences.py | 4 +++- qt/preferences_dialog.py | 8 +++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/qt/app.py b/qt/app.py index 6ed0df31..7869b382 100644 --- a/qt/app.py +++ b/qt/app.py @@ -35,7 +35,7 @@ from .se.preferences_dialog import PreferencesDialog as PreferencesDialogStandar from .me.preferences_dialog import PreferencesDialog as PreferencesDialogMusic from .pe.preferences_dialog import PreferencesDialog as PreferencesDialogPicture from .pe.photo import File as PlatSpecificPhoto -from .tabbed_window import TabBarWindow +from .tabbed_window import TabBarWindow, TabWindow tr = trget("ui") @@ -64,7 +64,7 @@ class DupeGuru(QObject): self.resultWindow = None self.details_dialog = None if self.use_tabs: - self.main_window = TabBarWindow(self) + self.main_window = TabBarWindow(self) if not self.prefs.tabs_default_pos else TabWindow(self) parent_window = self.main_window self.directories_dialog = self.main_window.createPage("DirectoriesDialog", app=self) self.main_window.addTab( diff --git a/qt/preferences.py b/qt/preferences.py index 009bab13..0b2db472 100644 --- a/qt/preferences.py +++ b/qt/preferences.py @@ -45,7 +45,7 @@ class Preferences(PreferencesBase): self.recentResults = get("RecentResults", self.recentResults) self.recentFolders = get("RecentFolders", self.recentFolders) - + self.tabs_default_pos = get("TabsDefaultPosition", self.tabs_default_pos) self.word_weighting = get("WordWeighting", self.word_weighting) self.match_similar = get("MatchSimilar", self.match_similar) self.ignore_small_files = get("IgnoreSmallFiles", self.ignore_small_files) @@ -80,6 +80,7 @@ class Preferences(PreferencesBase): self.recentResults = [] self.recentFolders = [] + self.tabs_default_pos = False self.word_weighting = True self.match_similar = False self.ignore_small_files = True @@ -115,6 +116,7 @@ class Preferences(PreferencesBase): set_("RecentResults", self.recentResults) set_("RecentFolders", self.recentFolders) + set_("TabsDefaultPosition", self.tabs_default_pos) set_("WordWeighting", self.word_weighting) set_("MatchSimilar", self.match_similar) set_("IgnoreSmallFiles", self.ignore_small_files) diff --git a/qt/preferences_dialog.py b/qt/preferences_dialog.py index eb3462e3..289ae926 100644 --- a/qt/preferences_dialog.py +++ b/qt/preferences_dialog.py @@ -117,8 +117,12 @@ class PreferencesDialogBase(QDialog): self.widgetsVLayout.addLayout( horizontalWrap([self.fontSizeLabel, self.fontSizeSpinBox, None]) ) - self._setupAddCheckbox("reference_bold_font", tr("Bold font for reference.")) + self._setupAddCheckbox("reference_bold_font", tr("Bold font for reference")) self.widgetsVLayout.addWidget(self.reference_bold_font) + self._setupAddCheckbox("tabs_default_pos", tr("Use default position for tab bar (requires restart)")) + self.tabs_default_pos.setToolTip(tr("Place the tab bar below the main menu instead of next to it")) + self.widgetsVLayout.addWidget(self.tabs_default_pos) + self.languageLabel = QLabel(tr("Language:"), self) self.languageComboBox = QComboBox(self) for lang in self.supportedLanguages: @@ -190,6 +194,7 @@ class PreferencesDialogBase(QDialog): setchecked(self.ignoreHardlinkMatches, prefs.ignore_hardlink_matches) setchecked(self.debugModeBox, prefs.debug_mode) setchecked(self.reference_bold_font, prefs.reference_bold_font) + setchecked(self.tabs_default_pos, prefs.tabs_default_pos) self.copyMoveDestinationComboBox.setCurrentIndex(prefs.destination_type) self.customCommandEdit.setText(prefs.custom_command) self.fontSizeSpinBox.setValue(prefs.tableFontSize) @@ -213,6 +218,7 @@ class PreferencesDialogBase(QDialog): prefs.destination_type = self.copyMoveDestinationComboBox.currentIndex() prefs.custom_command = str(self.customCommandEdit.text()) prefs.tableFontSize = self.fontSizeSpinBox.value() + prefs.tabs_default_pos = ischecked(self.tabs_default_pos) lang = self.supportedLanguages[self.languageComboBox.currentIndex()] oldlang = self.app.prefs.language if oldlang not in self.supportedLanguages: