Skip to content

Support hiding menubar and add menubarbutton #3189

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

Closed
poelzi wants to merge 22 commits into from
Closed

Support hiding menubar and add menubarbutton #3189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5bea607
[WIP] Support hiding menubar and add menubarbutton
poelzi Oct 19, 2020
8e554c5
Fix Load Track Menu entries.
poelzi Oct 19, 2020
6ec2855
Better handling of menubar
poelzi Oct 19, 2020
8ac3e22
Better skinning of menubarbutton on Deere
poelzi Oct 19, 2020
83e9ebe
Add menubutton to latenight skin
poelzi Oct 20, 2020
8954038
Remove unesarry functions, cleanup
poelzi Oct 20, 2020
7600835
Add shortcut for opening the hamburger menu
poelzi Oct 22, 2020
8a00de9
[WIP] fix menubar
poelzi Oct 24, 2020
efa0625
Move exit action into top level on menubotton dropdown
poelzi Nov 4, 2020
22655d2
Toggle mainmenu when toggeling fullscreen.
poelzi Nov 4, 2020
9d96e1e
fix formatting. Clarify comments to new workaround.
poelzi Nov 4, 2020
56f6176
Add tooltip to mainmenubar button
poelzi Nov 5, 2020
ea23a42
Fix desync between real fullscreen and internal state
poelzi Nov 5, 2020
9375b80
Never restore geometry in safe-mode
poelzi Nov 5, 2020
2d3cf2a
Redesign Mainmenu Architecture
poelzi Nov 8, 2020
85fbc0a
Use info not warning for skin COs
poelzi Nov 19, 2020
db0e39f
remove useless code
poelzi Nov 19, 2020
ff26a07
Use feature COs to detect skin features
poelzi Nov 21, 2020
bcc4930
Use feature flags in skin for detecting supported functionality
poelzi Nov 22, 2020
1e95655
Finish menubarbutton skinning
poelzi Nov 22, 2020
0921e95
Also guard vinylcontrols with feature flag
poelzi Dec 14, 2020
446a20d
Disable menubar by default
poelzi Dec 14, 2020
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
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
src/widget/wlibrarysidebar.cpp
src/widget/wlibrarytableview.cpp
src/widget/wlibrarytextbrowser.cpp
src/widget/wmainmenubar.cpp
src/widget/wmainmenu.cpp
src/widget/wmainmenubarbutton.cpp
src/widget/wnumber.cpp
src/widget/wnumberdb.cpp
src/widget/wnumberpos.cpp
Expand Down
3 changes: 2 additions & 1 deletion build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,7 @@ def sources(self, build):
"src/widget/wtracktext.cpp",
"src/widget/wnumber.cpp",
"src/widget/wbeatspinbox.cpp",
"src/widget/wmainmenubarbutton.cpp",
"src/widget/wnumberdb.cpp",
"src/widget/wnumberpos.cpp",
"src/widget/wnumberrate.cpp",
Expand Down Expand Up @@ -1010,7 +1011,7 @@ def sources(self, build):
"src/widget/wcolorpickeraction.cpp",
"src/widget/wcuemenupopup.cpp",
"src/widget/wsingletoncontainer.cpp",
"src/widget/wmainmenubar.cpp",
"src/widget/wmainmenu.cpp",

"src/musicbrainz/tagfetcher.cpp",
"src/musicbrainz/gzip.cpp",
Expand Down
6 changes: 6 additions & 0 deletions res/skins/Deere (64 Samplers)/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
<attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
<attribute persist="true" config_key="[Skin],show_starrating">1</attribute>
<attribute persist="true" config_key="[Skin],show_menubar">0</attribute>
<attribute persist="true" config_key="[Deere],show_track_info">1</attribute>
<attribute persist="true" config_key="[Deere],show_bpm_info">1</attribute>
<attribute persist="true" config_key="[Skin],timing_shift_buttons">0</attribute>
Expand Down Expand Up @@ -48,6 +49,11 @@

<attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>

<!-- Enable skin features -->
<attribute persist="false" config_key="[Skin],feature_hide_menubar">1</attribute>
<attribute persist="false" config_key="[Skin],feature_skin_settings">1</attribute>
<attribute persist="false" config_key="[Skin],feature_vinyl_control">1</attribute>

<!-- Library -->
<attribute config_key="[Skin],show_library">1</attribute>
<attribute config_key="[Master],maximize_library">0</attribute>
Expand Down
21 changes: 21 additions & 0 deletions res/skins/Deere/icon/ic_mainmenu.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions res/skins/Deere/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
<attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
<attribute persist="true" config_key="[Skin],show_starrating">1</attribute>
<attribute persist="true" config_key="[Skin],show_menubar">0</attribute>
<attribute persist="true" config_key="[Deere],show_track_info">1</attribute>
<attribute persist="true" config_key="[Deere],show_bpm_info">1</attribute>
<attribute persist="true" config_key="[Skin],timing_shift_buttons">0</attribute>
Expand Down Expand Up @@ -48,6 +49,11 @@

<attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>

<!-- Enable skin features -->
<attribute persist="false" config_key="[Skin],feature_hide_menubar">1</attribute>
<attribute persist="false" config_key="[Skin],feature_skin_settings">1</attribute>
<attribute persist="false" config_key="[Skin],feature_vinyl_control">1</attribute>

<!-- Library -->
<attribute config_key="[Skin],show_library">1</attribute>
<attribute config_key="[Master],maximize_library">0</attribute>
Expand Down
16 changes: 16 additions & 0 deletions res/skins/Deere/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2243,3 +2243,19 @@ WEffectSelector {
#CueDeleteButton:hover {
background-color: #4B4B4B;
}

WMainMenuBarButton {
color: rgba(151,151,151,0);;
background-color: #5a5a5a;
border: 3px solid #4B4B4B;
border-radius: 3px;
image: url(skin:/icon/ic_mainmenu.svg);
}

WMainMenuBarButton::menu-indicator, WMainMenuBarButton::menu-indicator:pressed, WMainMenuBarButton::menu-indicator:open {
width: 0;
height: 0;
}
/* WMainMenuBarButton::menu-indicator {

} */
25 changes: 25 additions & 0 deletions res/skins/Deere/tool_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,31 @@
<SizePolicy>min,f</SizePolicy>
<Children>

<MainMenuButton>
<ObjectName>MainMenuButton</ObjectName>
<Size>40f,24f</Size>
<SizePolicy>f,f</SizePolicy>
<Connection>
<ConfigKey>[Skin],show_menubar</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
</Transform>
</Connection>
</MainMenuButton>

<WidgetGroup>
<ObjectName>ToolbarSeparator</ObjectName>
<Size>4f,0min</Size>
<Connection>
<ConfigKey>[Skin],show_menubar</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
</Transform>
</Connection>
</WidgetGroup>

<Battery>
<ObjectName>Battery</ObjectName>
<Size>24,24</Size>
Expand Down
21 changes: 21 additions & 0 deletions res/skins/LateNight/classic/buttons/btn__mainmenu.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions res/skins/LateNight/palemoon/buttons/btn__mainmenu.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions res/skins/LateNight/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
<attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
<attribute persist="true" config_key="[Skin],show_big_spinny_coverart">0</attribute>
<attribute persist="true" config_key="[Skin],show_menubar">0</attribute>
<!-- ToDo: deck-independent vinyl controls? -->
<attribute persist="true" config_key="[VinylControl],show_vinylcontrol">0</attribute>
<!-- Deck variant that is shown as soon as the mixer is hidden, see deck.xm
Expand Down Expand Up @@ -89,6 +90,12 @@
<attribute persist="true" config_key="[LateNight],expand_samplers_9-16">0</attribute>
<!-- Mic / Aux -->
<attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>

<!-- Enable skin features -->
<attribute persist="false" config_key="[Skin],feature_hide_menubar">1</attribute>
<attribute persist="false" config_key="[Skin],feature_skin_settings">1</attribute>
<attribute persist="false" config_key="[Skin],feature_vinyl_control">1</attribute>

<!-- Library -->
<attribute config_key="[Master],maximize_library">0</attribute>
<attribute persist="true" config_key="[LateNight],max_lib_show_decks">1</attribute>
Expand Down
5 changes: 5 additions & 0 deletions res/skins/LateNight/style.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,3 +887,8 @@ WLibrary QRadioButton {
#Border58 {
border: 1px solid #585858;
}

WMainMenuBarButton::menu-indicator, WMainMenuBarButton::menu-indicator:pressed, WMainMenuBarButton::menu-indicator:open {
width: 0;
height: 0;
}
8 changes: 8 additions & 0 deletions res/skins/LateNight/style_classic.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,13 @@ WLibrary,
border-top-right-radius: 0px;
}

WMainMenuBarButton {
color: rgba(151,151,151,0);;
border: 3px solid #4B4B4B;
border-radius: 3px;
image: url(skin:/classic/buttons/btn__mainmenu.svg);
}


/************ separator lines & borders within containers ***********/
#DeckRows2345,
Expand Down Expand Up @@ -1358,6 +1365,7 @@ WPushButton#SyncDeck[value="0"],
#Sampler WPushButton[displayValue="0"],
#MicAuxRack WPushButton[displayValue="0"],
/* library buttons */
WMainMenuBarButton,
QPushButton#pushButtonAutoDJ:enabled:!checked,
#DlgMissing > QPushButton:enabled,
#DlgHidden > QPushButton:enabled,
Expand Down
8 changes: 7 additions & 1 deletion res/skins/LateNight/style_palemoon.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1785,7 +1785,8 @@ WPushButton#FxSuperLinkInvertButton[displayValue="0"] {

/* Grey for GUI toggles */
#GuiToggleButton[displayValue="1"],
#SkinSettingsToggle[displayValue="1"] { /*
#SkinSettingsToggle[displayValue="1"],
WMainMenuBarButton { /*
background-color: #216e75; Pale blue */
background-color: #555;
}
Expand Down Expand Up @@ -1824,6 +1825,10 @@ WPushButton#RecButton[displayValue="1"],
background-color: transparent;
}

WMainMenuBarButton {
color: rgba(151,151,151,0);
image: url(skin:/classic/buttons/btn__mainmenu.svg);
}


/************** Button icons **************************************************/
Expand Down Expand Up @@ -2900,6 +2905,7 @@ WCueMenuPopup,
WCueMenuPopup QMenu,
WCoverArtMenu,
WTrackMenu,
WMainMenuBarButton,
WTrackMenu QMenu {
padding: 3px;
border: 1px solid #333;
Expand Down
25 changes: 25 additions & 0 deletions res/skins/LateNight/toolbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,31 @@
<SizePolicy>e,min</SizePolicy>
<Children>

<MainMenuButton>
<ObjectName>MainMenuButton</ObjectName>
<Size>60f,20f</Size>
<SizePolicy>f,f</SizePolicy>
<Connection>
<ConfigKey>[Skin],show_menubar</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
</Transform>
</Connection>
</MainMenuButton>

<WidgetGroup>
<ObjectName>ToolbarSeparator</ObjectName>
<Size>4f,0min</Size>
<Connection>
<ConfigKey>[Skin],show_menubar</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
</Transform>
</Connection>
</WidgetGroup>

<Template src="skin:/controls/button_2state.xml">
<SetVariable name="TooltipId">maximize_library</SetVariable>
<SetVariable name="ObjectName">GuiToggleButton</SetVariable>
Expand Down
6 changes: 6 additions & 0 deletions res/skins/Tango (64 Samplers)/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
<attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
<attribute persist="true" config_key="[Skin],show_big_spinny_coverart">1</attribute>
<attribute persist="true" config_key="[Skin],show_menubar">0</attribute>
<attribute persist="true" config_key="[Tango],vinylControlsDeck1">0</attribute>
<attribute persist="true" config_key="[Tango],vinylControlsDeck2">0</attribute>
<attribute persist="true" config_key="[Tango],vinylControlsDeck3">0</attribute>
Expand Down Expand Up @@ -97,6 +98,11 @@

<attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>

<!-- Enable skin features -->
<attribute persist="false" config_key="[Skin],feature_hide_menubar">1</attribute>
<attribute persist="false" config_key="[Skin],feature_skin_settings">1</attribute>
<attribute persist="false" config_key="[Skin],feature_vinyl_control">1</attribute>

<!-- Library -->
<attribute config_key="[Master],maximize_library">0</attribute>
<attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
Expand Down
Loading