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

Preferences: simplification & layout fixes #12429

Merged
merged 2 commits into from
Dec 14, 2023
Merged

Preferences: simplification & layout fixes #12429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba3dd4f
Color preferences: remove unneeded group box
ronso0 Dec 12, 2023
814c0f9
Interface preferences: group into Skin and Misc, remove unneeded spacer
ronso0 Dec 12, 2023
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
195 changes: 96 additions & 99 deletions src/preferences/dialog/dlgprefcolorsdlg.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,105 +19,102 @@
<property name="windowTitle">
<string>Color Preferences</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QGroupBox" name="groupBoxPalettes">
<property name="title">
<string>Colors</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="0">
<widget class="QLabel" name="labelHotcueDefaultColor">
<property name="text">
<string>Hotcue default color</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="pushButtonReplaceCueColor">
<property name="text">
<string>Replace…</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButtonEditHotcuePalette">
<property name="text">
<string>Edit…</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBoxHotcueDefaultColor"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButtonEditTrackPalette">
<property name="text">
<string>Edit…</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBoxHotcueColors">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelHotcueColors">
<property name="text">
<string>Hotcue palette</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelTrackColors">
<property name="text">
<string>Track palette</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBoxTrackColors">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelLoopDefaultColor">
<property name="text">
<string>Loop default color</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="comboBoxLoopDefaultColor"/>
</item>
</layout>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
<layout class="QGridLayout" name="gridLayout">

<item row="0" column="0">
<widget class="QLabel" name="labelTrackColors">
<property name="text">
<string>Track palette</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBoxTrackColors">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButtonEditTrackPalette">
<property name="text">
<string>Edit…</string>
</property>
</widget>
</item>

<item row="1" column="0">
<widget class="QLabel" name="labelHotcueColors">
<property name="text">
<string>Hotcue palette</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="comboBoxHotcueColors">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButtonEditHotcuePalette">
<property name="text">
<string>Edit…</string>
</property>
</widget>
</item>

<item row="2" column="0">
<widget class="QLabel" name="labelHotcueDefaultColor">
<property name="text">
<string>Hotcue default color</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBoxHotcueDefaultColor"/>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pushButtonReplaceCueColor">
<property name="text">
<string>Replace…</string>
</property>
</widget>
</item>

<item row="3" column="0">
<widget class="QLabel" name="labelLoopDefaultColor">
<property name="text">
<string>Loop default color</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBoxLoopDefaultColor"/>
</item>

<item row="4" column="0" colspan="2">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>

</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
Expand Down
10 changes: 1 addition & 9 deletions src/preferences/dialog/dlgprefinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,7 @@ DlgPrefInterface::DlgPrefInterface(
warningLabel->setText(sizeWarningString);

ComboBoxSkinconf->clear();
// align left edge of preview image and skin description with comboboxes
skinPreviewLabel->setStyleSheet("QLabel { margin-left: 4px; }");
skinPreviewLabel->setText("");
skinDescriptionText->setStyleSheet("QLabel { margin-left: 2px; }");
skinDescriptionText->setText("");
skinDescriptionText->hide();

Expand Down Expand Up @@ -169,12 +166,7 @@ DlgPrefInterface::DlgPrefInterface(
this,
&DlgPrefInterface::slotSetScheme);
} else {
lableSkin_2->hide();
labelColorScheme->hide();
ComboBoxSkinconf->hide();
ComboBoxSchemeconf->hide();
skinDescriptionText->hide();
skinPreviewLabel->hide();
groupBoxSkinOptions->hide();
}

// Screensaver mode
Expand Down
Loading
Loading