Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reorganize preferences dialog #447

Merged
merged 1 commit into from
Sep 5, 2021
Merged

Reorganize preferences dialog #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 83 additions & 70 deletions src/preferencesdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<widget class="QWidget" name="tab_1">
<attribute name="title">
<string>General</string>
</attribute>
<layout class="QFormLayout" name="formLayout">
<layout class="QFormLayout" name="formLayout_1">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
Expand All @@ -38,156 +38,169 @@
<widget class="QComboBox" name="iconTheme"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel" name="label_1">
<property name="text">
<string>Normal background color:</string>
<string>Maximum number of recent files:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Fm::ColorButton" name="bgColor">
<property name="text">
<string/>
</property>
</widget>
<widget class="QSpinBox" name="maxRecentFiles"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="thumbnailLabel">
<property name="text">
<string>Fullscreen background color:</string>
<string>Thumbnailer file size limit:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Fm::ColorButton" name="fullScreenBgColor">
<property name="text">
<string/>
<widget class="QSpinBox" name="thumbnailSpin">
<property name="suffix">
<string> MiB</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1024</number>
</property>
<property name="value">
<number>4</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<widget class="QLabel" name="thumbnailSizeLabel">
<property name="text">
<string>Maximum number of recent files:</string>
<string>Thumbnail image dimensions:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="maxRecentFiles"/>
<widget class="QComboBox" name="thumbnailSizeComboBox"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_3">
<widget class="QCheckBox" name="useTrashBox">
<property name="text">
<string>Slide show interval (seconds):</string>
<string>Use system Trash (and do not prompt)</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="slideShowInterval">
<property name="minimum">
<number>1</number>
</layout>
</widget>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Window</string>
</attribute>
<layout class="QFormLayout" name="formLayout_1">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="thumbnailBox">
<property name="text">
<string>Show thumbnails dock by default</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="oulineBox">
<item row="0" column="1">
<widget class="QComboBox" name="thumbnailsPositionComboBox"/>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="exifDataBox">
<property name="text">
<string>Show image outline by default</string>
<string>Show Exif data dock by default</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<item row="3" column="0">
<widget class="QCheckBox" name="toolbarBox">
<property name="text">
<string>Show main toolbar by default</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<item row="4" column="0">
<widget class="QCheckBox" name="annotationBox">
<property name="text">
<string>Show annotations toolbar by default</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QCheckBox" name="forceZoomFitBox">
<property name="text">
<string>Fit images when navigating</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="useTrashBox">
<property name="text">
<string>Use system Trash (and do not prompt)</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Thumbnails</string>
<string>Image</string>
</attribute>
<layout class="QFormLayout" name="formLayout_2">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="exifDataBox">
<widget class="QLabel" name="label_2a">
<property name="text">
<string>Show Exif data dock by default</string>
<string>Normal background color:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Fm::ColorButton" name="bgColor">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="thumbnailBox">
<widget class="QLabel" name="label_2b">
<property name="text">
<string>Show thumbnails dock by default</string>
<string>Fullscreen background color:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="thumbnailsPositionComboBox"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="thumbnailLabel">
<widget class="Fm::ColorButton" name="fullScreenBgColor">
<property name="text">
<string>Thumbnailer file size limit:</string>
<string/>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="thumbnailSpin">
<property name="suffix">
<string> MiB</string>
<item row="4" column="0">
<widget class="QLabel" name="label_2c">
<property name="text">
<string>Slide show interval (seconds):</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="slideShowInterval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1024</number>
</property>
<property name="value">
<number>4</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="thumbnailSizeLabel">
<item row="5" column="0">
<widget class="QCheckBox" name="oulineBox">
<property name="text">
<string>Thumbnail image dimensions:</string>
<string>Show image outline by default</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="thumbnailSizeComboBox"/>
<item row="6" column="0">
<widget class="QCheckBox" name="forceZoomFitBox">
<property name="text">
<string>Fit images when navigating</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<widget class="QWidget" name="tab_4">
<attribute name="title">
<string>Shortcuts</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QTableWidget" name="tableWidget">
<property name="editTriggers">
Expand Down
4 changes: 2 additions & 2 deletions src/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ bool Settings::load() {
rememberWindowSize_ = settings.value(QStringLiteral("RememberWindowSize"), true).toBool();
showOutline_ = settings.value(QStringLiteral("ShowOutline"), false).toBool();
showAnnotationsToolbar_ = settings.value(QStringLiteral("ShowAnnotationsToolbar"), false).toBool();
showExifData_ = settings.value(QStringLiteral("ShowExifData"), false).toBool();
showToolbar_ = settings.value(QStringLiteral("ShowToolbar"), true).toBool();
forceZoomFit_ = settings.value(QStringLiteral("ForceZoomFit"), false).toBool();
useTrash_ = settings.value(QStringLiteral("UseTrash"), true).toBool();
Expand All @@ -87,7 +88,6 @@ bool Settings::load() {
settings.endGroup();

settings.beginGroup(QStringLiteral("Thumbnail"));
showExifData_ = settings.value(QStringLiteral("ShowExifData"), false).toBool();
showThumbnails_ = settings.value(QStringLiteral("ShowThumbnails"), false).toBool();
setThumbnailsPosition(settings.value(QStringLiteral("ThumbnailsPosition")).toString());
setMaxThumbnailFileSize(qMax(settings.value(QStringLiteral("MaxThumbnailFileSize"), 4096).toInt(), 1024));
Expand Down Expand Up @@ -116,6 +116,7 @@ bool Settings::save() {
settings.setValue(QStringLiteral("RememberWindowSize"), rememberWindowSize_);
settings.setValue(QStringLiteral("ShowOutline"), showOutline_);
settings.setValue(QStringLiteral("ShowAnnotationsToolbar"), showAnnotationsToolbar_);
settings.setValue(QStringLiteral("ShowExifData"), showExifData_);
settings.setValue(QStringLiteral("ShowToolbar"), showToolbar_);
settings.setValue(QStringLiteral("ForceZoomFit"), forceZoomFit_);
settings.setValue(QStringLiteral("UseTrash"), useTrash_);
Expand All @@ -135,7 +136,6 @@ bool Settings::save() {
settings.endGroup();

settings.beginGroup(QStringLiteral("Thumbnail"));
settings.setValue(QStringLiteral("ShowExifData"), showExifData_);
settings.setValue(QStringLiteral("ShowThumbnails"), showThumbnails_);
settings.setValue(QStringLiteral("ThumbnailsPosition"), thumbnailsPosition_);
settings.setValue(QStringLiteral("MaxThumbnailFileSize"), maxThumbnailFileSize());
Expand Down