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

Add keyboard shortcut to maximize library view #519

Merged
merged 11 commits into from Apr 22, 2015
Merged

Add keyboard shortcut to maximize library view #519

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
645d70b
Shade skin: Add new [Master],maximize_library connections. Makes the …
esbrandt Mar 11, 2015
779bd7e
Latenight skin: Rename existing [Library],unshow_big connections to […
esbrandt Mar 11, 2015
5694a8f
Deere skin: Rename existing [Master],show_library connections to [Mas…
esbrandt Mar 11, 2015
b992f8d
Update the TooltipID and text for maximizing the library.
esbrandt Mar 11, 2015
912b433
Use new TooltipID for maximizing the library in skin.xml
esbrandt Mar 11, 2015
ca60784
Add [Master],maximize_library to all *.kbd.cfg , use the ``Space`` ba…
esbrandt Mar 11, 2015
ddb940a
Skins: maximize_library option dont persist anymore so users cant get…
esbrandt Mar 12, 2015
827ab4d
Shade skin: maximize_library now respects the current toggle state of…
esbrandt Mar 12, 2015
38c62b7
Add maximize_library to the User Interface section of the Midi Wizard
esbrandt Mar 12, 2015
9e6b450
Add maximize_library option to the view menu in the menubar
esbrandt Mar 12, 2015
fc94562
Update *.kbd.cfg to use menubar shortcuts for maximize_library
esbrandt Mar 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions res/keyboard/cs_CZ.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover \
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/da_DK.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover <
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/de_CH.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover <
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/de_DE.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover <
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/el_GR.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up η
crossfader_down γ
crossfader_up_small Shift+Η
crossfader_down_small Shift+Γ
maximize_library space

[Microphone]
talkover `
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/en_US.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover `
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/es_ES.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover <
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/fi_FI.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover <
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/fr_CH.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover <
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/fr_FR.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover <
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/it_IT.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up h
crossfader_down g
crossfader_up_small Shift+h
crossfader_down_small Shift+g
maximize_library space

[Microphone]
talkover <
Expand Down
1 change: 1 addition & 0 deletions res/keyboard/ru_RU.kbd.cfg
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ crossfader_up р
crossfader_down п
crossfader_up_small Shift+Р
crossfader_down_small Shift+П
maximize_library space

[Microphone]
talkover ]
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/effect_rack.xml
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@
</WidgetStack>
</Children>
<Connection>
<ConfigKey persist="true">[Master],show_library</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/main_decks.xml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
<Template src="skin:right_gutter.xml"/>
</Children>
<Connection>
<ConfigKey persist="true">[Master],show_library</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/microphone_rack.xml
View file
Open in desktop
Expand Up @@ -77,7 +77,7 @@
</WidgetStack>
</Children>
<Connection>
<ConfigKey persist="true">[Master],show_library</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Deere/sample_decks.xml
View file
Open in desktop
Expand Up @@ -121,7 +121,7 @@
</WidgetStack>
</Children>
<Connection>
<ConfigKey persist="true">[Master],show_library</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
Expand Down
4 changes: 2 additions & 2 deletions res/skins/Deere/tool_bar.xml
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@
</PushButton>

<PushButton>
<TooltipId>toggle_expanded_library</TooltipId>
<TooltipId>maximize_library</TooltipId>
<Size>40f,20f</Size>
<NumberStates>2</NumberStates>
<State>
Expand All @@ -73,7 +73,7 @@
<Text>-LIBRARY</Text>
</State>
<Connection>
<ConfigKey persist="true">[Master],show_library</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
</Connection>
</PushButton>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/fx_samplers_container_full.xml
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
<Children>
<WidgetStack currentpage="[Library],show_big_current" persist="true">
<Children>
<WidgetGroup trigger="[Library],unshow_big">
<WidgetGroup trigger="[Master],maximize_library">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you will probably have to invert all of these with a connection modifier thing because unshow_big means "don't show the maximized library"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I`ll take a look.
Seems to work ok for now, but will test a bit more.

There is a logic error with the skin (in master), where you can end up with no widgets at all. Toggle the Library button and then Big Library. Not yet sure how to solve that.

<Layout>vertical</Layout>
<Children>
<WidgetStack currentpage="[Samplers],current" persist="true">
Expand Down
2 changes: 1 addition & 1 deletion res/skins/LateNight/skin.xml
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@
<Children>
<WidgetStack currentpage="[Library],show_big_current" persist="true">
<Children>
<WidgetGroup trigger="[Library],unshow_big">
<WidgetGroup trigger="[Master],maximize_library">
<Layout>horizontal</Layout>
<SizePolicy>i,max</SizePolicy>
<!-- <MinimumSize>1280,525</MinimumSize>-->
Expand Down
6 changes: 3 additions & 3 deletions res/skins/LateNight/toolbar_full.xml
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@
is the pushed state. So we have to invert everything so the
default is 'don't make the library huge' -->
<Size>80f,20f</Size>
<TooltipId>toggle_expanded_library</TooltipId>
<TooltipId>maximize_library</TooltipId>
<ObjectName>GuiToggleButtonInverted</ObjectName>
<NumberStates>2</NumberStates>
<State>
Expand All @@ -116,11 +116,11 @@
<Text>BIG LIBRARY</Text>
</State>
<Connection>
<ConfigKey persist="true">[Library],unshow_big</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
<Connection>
<ConfigKey persist="true">[Library],unshow_big</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
</Connection>
</PushButton>
</Children>
Expand Down
6 changes: 3 additions & 3 deletions res/skins/LateNight/toolbar_med.xml
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@
is the pushed state. So we have to invert everything so the
default is 'don't make the library huge' -->
<Size>80f,20f</Size>
<TooltipId>toggle_expanded_library</TooltipId>
<TooltipId>maximize_library</TooltipId>
<ObjectName>GuiToggleButtonInverted</ObjectName>
<NumberStates>2</NumberStates>
<State>
Expand All @@ -116,11 +116,11 @@
<Text>BIG LIBRARY</Text>
</State>
<Connection>
<ConfigKey persist="true">[Library],unshow_big</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
<Connection>
<ConfigKey persist="true">[Library],unshow_big</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
</Connection>
</PushButton>
</Children>
Expand Down
6 changes: 3 additions & 3 deletions res/skins/LateNight/toolbar_small.xml
View file
Open in desktop
Expand Up @@ -108,7 +108,7 @@
is the pushed state. So we have to invert everything so the
default is 'don't make the library huge' -->
<Size>80f,20f</Size>
<TooltipId>toggle_expanded_library</TooltipId>
<TooltipId>maximize_library</TooltipId>
<ObjectName>GuiToggleButtonInverted</ObjectName>
<NumberStates>2</NumberStates>
<State>
Expand All @@ -120,11 +120,11 @@
<Text>BIG LIBRARY</Text>
</State>
<Connection>
<ConfigKey persist="true">[Library],unshow_big</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
<Connection>
<ConfigKey persist="true">[Library],unshow_big</ConfigKey>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
</Connection>
</PushButton>
</Children>
Expand Down
30 changes: 25 additions & 5 deletions res/skins/Shade/skin.xml
View file
Open in desktop
Expand Up @@ -242,8 +242,15 @@
</Children>
</WidgetGroup>
</Children>
</WidgetGroup>

<Connection>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
</Transform>
</Connection>
</WidgetGroup>

<!--
############################################################################################
############################################################################################
Expand Down Expand Up @@ -282,9 +289,15 @@
<ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Connection>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
</Transform>
</Connection>
</WidgetGroup>



<!-- EffectRack1 sub-widget -->
<WidgetGroup>
<Size>i,m</Size>
Expand All @@ -293,7 +306,7 @@
<Children>
<Template src="skin:effectunit.xml">
<SetVariable name="effectunitnum">1</SetVariable>
</Template>
</Template>
<Template src="skin:effectunit.xml">
<SetVariable name="effectunitnum">2</SetVariable>
</Template>
Expand All @@ -302,6 +315,13 @@
<ConfigKey persist="true">[EffectRack1],show</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
<Connection>
<ConfigKey persist="true">[Master],maximize_library</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform>
<Not/>
</Transform>
</Connection>
</WidgetGroup>

<!--
Expand Down
6 changes: 3 additions & 3 deletions src/skin/tooltips.cpp
View file
Open in desktop
Expand Up @@ -184,9 +184,9 @@ void Tooltips::addStandardTooltips() {
<< tr("Show Effect Rack")
<< tr("Show or hide the effect rack.");

add("toggle_expanded_library")
<< tr("Toggle Big Library")
<< tr("Makes the library fill the screen.");
add("maximize_library")
<< tr("Maximize Library")
<< tr("Maximize the track library to take up all the available screen space.");

add("show_mixer")
<< tr("Toggle Mixer")
Expand Down