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

Library features: move buttons close to tree view #1934

Merged
merged 2 commits into from
Dec 27, 2018
Merged

Library features: move buttons close to tree view #1934

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
b8889b9
move library feature buttons next to tree view
ronso0 Dec 6, 2018
cb29c5f
adapt lib feature qss for Tango
ronso0 Dec 6, 2018
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
22 changes: 15 additions & 7 deletions res/skins/Tango/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2331,18 +2331,26 @@ WLibrary QPushButton {
QPushButton#btnUnhide {
font-weight: bold;
}

/* 'Enable AutoDJ' button */

/* Colored highlight for action buttons:
- Purge
- Unhide buttons
- Enable AutoDJ
- Analyze */
QPushButton#btnPurge:hover,
QPushButton#btnUnhide:hover,
QPushButton#pushButtonAutoDJ:hover,
QPushButton#pushButtonRecording:hover,
QPushButton#pushButtonAnalyze:hover {
border: 1px solid #ff6600;
}
/* Push buttons at far right away from skin border */

/* Increased margin for action buttons */
QPushButton#pushButtonAutoDJ,
QPushButton#pushButtonRecording,
QPushButton#Analyze {
margin: 1px 9px 4px 1px;
QPushButton#pushButtonRecording {
margin: 1px 5px 4px 1px;
}
QPushButton#btnPurge {
margin: 1px 1px 4px 5px;
}
QPushButton#pushButtonRecording:unchecked {
color: #888;
Expand Down
88 changes: 44 additions & 44 deletions src/library/autodj/dlgautodj.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,39 +47,47 @@
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="pushButtonShuffle">
<widget class="QPushButton" name="pushButtonAutoDJ">
<property name="toolTip">
<string>Shuffle the content of the Auto DJ queue.</string>
<string>Turn Auto DJ on or off.</string>
</property>
<property name="text">
<string>Shuffle</string>
<string>Enable Auto DJ</string>
</property>
<property name="checkable">
<bool>false</bool>
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonAddRandom">
<widget class="QSpinBox" name="spinBoxTransition">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Adds a random track from track sources (crates) to the Auto DJ queue.
If no track sources are configured, the track is added from the library instead.</string>
<string>Determines the duration of the transition.</string>
</property>
<property name="text">
<string>Add Random</string>
<property name="frame">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="minimum">
<number>-9</number>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonSkipNext">
<widget class="QLabel" name="labelTransitionAppendix">
<property name="toolTip">
<string>Skip the next track in the Auto DJ queue.</string>
<string comment="&quot;sec.&quot; as in seconds">Seconds</string>
</property>
<property name="text">
<string>Skip Track</string>
</property>
<property name="checkable">
<bool>false</bool>
<string>sec.</string>
</property>
</widget>
</item>
Expand All @@ -94,34 +102,39 @@ If no track sources are configured, the track is added from the library instead.
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBoxTransition">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<widget class="QPushButton" name="pushButtonSkipNext">
<property name="toolTip">
<string>Determines the duration of the transition.</string>
<string>Skip the next track in the Auto DJ queue.</string>
</property>
<property name="frame">
<property name="text">
<string>Skip Track</string>
</property>
<property name="checkable">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonShuffle">
<property name="toolTip">
<string>Shuffle the content of the Auto DJ queue.</string>
</property>
<property name="minimum">
<number>-9</number>
<property name="text">
<string>Shuffle</string>
</property>
<property name="checkable">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelTransitionAppendix">
<widget class="QPushButton" name="pushButtonAddRandom">
<property name="toolTip">
<string comment="&quot;sec.&quot; as in seconds">Seconds</string>
<string>Adds a random track from track sources (crates) to the Auto DJ queue.
If no track sources are configured, the track is added from the library instead.</string>
</property>
<property name="text">
<string>sec.</string>
<string>Add Random</string>
</property>
</widget>
</item>
Expand All @@ -145,19 +158,6 @@ If no track sources are configured, the track is added from the library instead.
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonAutoDJ">
<property name="toolTip">
<string>Turn Auto DJ on or off.</string>
</property>
<property name="text">
<string>Enable Auto DJ</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
Expand Down
40 changes: 20 additions & 20 deletions src/library/dlganalysis.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,6 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelProgress">
<property name="text">
<string>Progress</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonSelectAll">
<property name="toolTip">
Expand All @@ -106,6 +86,26 @@
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelProgress">
<property name="text">
<string>Progress</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down
26 changes: 13 additions & 13 deletions src/library/dlghidden.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,6 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnSelect">
<property name="toolTip">
Expand Down Expand Up @@ -98,6 +85,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down
26 changes: 13 additions & 13 deletions src/library/dlgmissing.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,6 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnSelect">
<property name="toolTip">
Expand All @@ -82,6 +69,19 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
Expand Down
30 changes: 15 additions & 15 deletions src/library/recording/dlgrecording.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,14 @@
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<widget class="QPushButton" name="pushButtonRecording">
<property name="text">
<string>Start Recording</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
<property name="checkable">
<bool>true</bool>
</property>
</spacer>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
Expand All @@ -67,14 +64,17 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonRecording">
<property name="text">
<string>Start Recording</string>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="checkable">
<bool>true</bool>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</widget>
</spacer>
</item>
</layout>
</item>
Expand Down