kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity

Improve appearance of buttons bottom right

Browse Source
This commit is contained in:
Keith Edmunds 2021-04-10 15:06:21 +01:00
parent 6adaa844e1
commit 79b3071170
8 changed files with 3453 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/musicmuster.py
View File

@ -111,11 +111,11 @@ class Window(QMainWindow, Ui_MainWindow):
self.actionSkipToEnd.triggered.connect(self.test_skip_to_end)
self.actionSkipToFade.triggered.connect(self.test_skip_to_fade)
self.actionTestFunction.triggered.connect(self.test_function)
self.btnAddFile.clicked.connect(self.add_file)
self.btnInsertNote.clicked.connect(self.insert_note)
self.cmdAddFile.clicked.connect(self.add_file)
self.cmdAddNote.clicked.connect(self.insert_note)
self.btnPrevious.clicked.connect(self.play_previous)
self.btnSearchDatabase.clicked.connect(self.search_database)
self.btnSetNextTrack.clicked.connect(self.set_next_track)
self.cmdDatabase.clicked.connect(self.search_database)
self.cmdSetNext.clicked.connect(self.set_next_track)
self.btnSkipNext.clicked.connect(self.play_next)
self.btnStop.clicked.connect(self.playlist.fade)

BIN
app/ui/btn_next.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
app/ui/btn_note.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
app/ui/icon_next.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/ui/icon_note.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

7
app/ui/icons.qrc
View File

@ -1,6 +1,9 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<RCC>
<qresource prefix="icons">
<file alias="search_db">icon_search_database.png</file>
<file alias="open_file">icon_open_file.png</file>
<file alias="set_next">btn_next.png</file>
<file alias="note">btn_note.png</file>
<file alias="next">next.png</file>
<file alias="previous">previous.png</file>
<file alias="stop">stop.png</file>

3376
app/ui/icons_rc.py
View File

File diff suppressed because it is too large Load Diff

193
app/ui/main_window.ui
View File

@ -6,15 +6,18 @@
<rect>
<x>0</x>
<y>0</y>
<width>931</width>
<height>600</height>
<width>989</width>
<height>636</height>
</rect>
</property>
<property name="windowTitle">
<string>Music Muster</string>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
@ -330,7 +333,7 @@ border: 1px solid rgb(85, 87, 83);</string>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
@ -421,19 +424,6 @@ border: 1px solid rgb(85, 87, 83);</string>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>13</width>
<height>60</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="frame_elapsed">
<property name="styleSheet">
@ -477,19 +467,6 @@ border: 1px solid rgb(85, 87, 83);</string>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>13</width>
<height>60</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="frame_fade">
<property name="styleSheet">
@ -533,19 +510,6 @@ border: 1px solid rgb(85, 87, 83);</string>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>13</width>
<height>60</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="frame_silent">
<property name="styleSheet">
@ -589,19 +553,6 @@ border: 1px solid rgb(85, 87, 83);</string>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>13</width>
<height>60</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="frame_end">
<property name="styleSheet">
@ -646,54 +597,104 @@ border: 1px solid rgb(85, 87, 83);</string>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QCommandLinkButton" name="cmdSetNext">
<property name="maximumSize">
<size>
<width>40</width>
<height>20</height>
<width>150</width>
<height>60</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="btnAddFile">
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background: rgb(255, 243, 205)</string>
</property>
<property name="text">
<string>Add &amp;file...</string>
<string>Set &amp;next</string>
</property>
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/set_next</normaloff>:/icons/set_next</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnSearchDatabase">
<item row="0" column="1">
<widget class="QCommandLinkButton" name="cmdDatabase">
<property name="maximumSize">
<size>
<width>150</width>
<height>60</height>
</size>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background: rgb(255, 243, 205)</string>
</property>
<property name="text">
<string>Search &amp;database</string>
<string>&amp;Database</string>
</property>
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/search_db</normaloff>:/icons/search_db</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<widget class="QPushButton" name="btnSetNextTrack">
<item row="1" column="0">
<widget class="QCommandLinkButton" name="cmdAddNote">
<property name="maximumSize">
<size>
<width>150</width>
<height>60</height>
</size>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background: rgb(255, 243, 205)</string>
</property>
<property name="text">
<string>Set &amp;next track</string>
<string>Add no&amp;te</string>
</property>
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/note</normaloff>:/icons/note</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnInsertNote">
<property name="enabled">
<bool>true</bool>
<item row="1" column="1">
<widget class="QCommandLinkButton" name="cmdAddFile">
<property name="maximumSize">
<size>
<width>150</width>
<height>60</height>
</size>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background: rgb(255, 243, 205)</string>
</property>
<property name="text">
<string>Insert no&amp;te</string>
<string>Add &amp;file</string>
</property>
<property name="icon">
<iconset resource="icons.qrc">
<normaloff>:/icons/open_file</normaloff>:/icons/open_file</iconset>
</property>
</widget>
</item>
@ -702,15 +703,13 @@ border: 1px solid rgb(85, 87, 83);</string>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QMenuBar" name="menubar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>931</width>
<width>989</width>
<height>18</height>
</rect>
</property>
@ -743,7 +742,7 @@ border: 1px solid rgb(85, 87, 83);</string>
</widget>
<widget class="QMenu" name="menuTest">
<property name="title">
<string>TestMode</string>
<string>TestMo&amp;de</string>
</property>
<addaction name="actionTestFunction"/>
<addaction name="separator"/>
@ -795,6 +794,9 @@ border: 1px solid rgb(85, 87, 83);</string>
<property name="text">
<string>Search &amp;database</string>
</property>
<property name="shortcut">
<string>Ctrl+D</string>
</property>
</action>
<action name="actionAdd_file">
<property name="icon">
@ -804,6 +806,9 @@ border: 1px solid rgb(85, 87, 83);</string>
<property name="text">
<string>Add &amp;file</string>
</property>
<property name="shortcut">
<string>Ctrl+F</string>
</property>
</action>
<action name="actionFade">
<property name="icon">
@ -865,17 +870,17 @@ border: 1px solid rgb(85, 87, 83);</string>
</action>
<action name="actionTestFunction">
<property name="text">
<string>Test function</string>
<string>&amp;Test function</string>
</property>
</action>
<action name="actionSkipToFade">
<property name="text">
<string>Skip to start of fade</string>
<string>&amp;Skip to start of fade</string>
</property>
</action>
<action name="actionSkipToEnd">
<property name="text">
<string>Skip to end of track</string>
<string>Skip to &amp;end of track</string>
</property>
</action>
</widget>