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

Kill buttons2 #357

Merged
merged 41 commits into from
Nov 10, 2014
Merged

Kill buttons2 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b9fc971
Move slotValueChanged from the base class to its children
badescunicu Jul 22, 2014
302f536
Add Kill buttons to ButterworthEQ
badescunicu Jul 22, 2014
93f6573
Removed valueHint from effect parameter and turn all values form QVar…
daschuer Oct 6, 2014
80e9ed8
Merge remote-tracking branch 'badescunicu/butterworth_kill_buttons'
daschuer Oct 7, 2014
a6bd2d6
Added effect parameter buttons to Shade skin
daschuer Oct 7, 2014
86951e5
Added Kill buttons to LV-Mix EQs
daschuer Oct 7, 2014
9df18f0
Merge remote-tracking branch 'upstream/master' into kill_buttons2
daschuer Oct 8, 2014
de22187
renamed slotLinkTypeChanged to slotLinkTypeChanging
daschuer Oct 8, 2014
9d41cf0
Merge remote-tracking branch 'upstream/master' into rm_value_hint
daschuer Oct 8, 2014
54054f1
Added ahelper function for retreving bool and int. Inline these funct…
daschuer Oct 9, 2014
cb21ff5
Add another ValueHint for enumerations
badescunicu Jul 25, 2014
46c8514
Add a list of options for enumeration parameters to EffectManifestPar…
badescunicu Jul 26, 2014
0cab238
Add a special case for EffectManifestParameter::VALUE_ENUMERATION
badescunicu Aug 1, 2014
55c4ae2
Make getOptions() method const because it is being called on a const …
badescunicu Aug 1, 2014
d9fc071
Set the number of states for each EffectButtonParameterSlot
badescunicu Aug 1, 2014
e76ecda
Add special treatment for EffectManifestParameter::VALUE_ENUMERATION …
badescunicu Aug 1, 2014
69059d7
Add getManifest() method to EffectParameterSlotBase
badescunicu Aug 4, 2014
4f711fb
Add a new widget derived from WPushButton which displays a QMenu with…
badescunicu Aug 4, 2014
204a6c5
Add WEffectPushButton to depends.py
badescunicu Aug 4, 2014
6f325ac
Write a new method for parsing an EffectPushButton skin node
badescunicu Aug 4, 2014
bcb35cb
Introduce a list which is responsible for remapping indices of active…
badescunicu Aug 5, 2014
ccca041
Use the remapping provided by the EffectManifest
badescunicu Aug 5, 2014
ffa9a82
Add information about active button parameters inside EffectManifest
badescunicu Aug 8, 2014
2632b17
Use the mapping provided by the EffectManifest when asking for a butt…
badescunicu Aug 8, 2014
3d23f1b
Remove the hard coded mapping function from EffectManifest's constructor
badescunicu Aug 10, 2014
727c5bf
Replace getParameter and getButtonParameter methods with getParameter…
badescunicu Aug 10, 2014
a902f98
Use the newly added methods for retrieving the appropriate EffectPara…
badescunicu Aug 10, 2014
b836da6
Replace all occurrences of parameterNumber with parameterSlotNumber
badescunicu Aug 10, 2014
a4121f1
renamed helper to toXXX to match function names elsewhere
daschuer Oct 11, 2014
3700b9a
Merge branch 'rm_value_hint' into effect_parameter
daschuer Oct 11, 2014
957a283
Renamed m_enumerationOptions to m_steps, Introduced two new ControlHi…
daschuer Oct 11, 2014
18208e7
Merge list of EffectButtonParameters to EffectParameters, assigne con…
daschuer Oct 12, 2014
2586bde
move "active" List to parameter manifest as showInParameterSlot
daschuer Oct 12, 2014
d5b0e6b
cleaned up parameter templates
daschuer Oct 13, 2014
8d0e8d7
Make use of new button widgets
daschuer Oct 13, 2014
468a365
Shade: Fixed effect button lable
daschuer Oct 13, 2014
acb62b6
Fixed parameter slot asigning
daschuer Oct 13, 2014
dd6c425
Fixed some WEffectPushButton Issues
daschuer Oct 13, 2014
f2c5550
Merge remote-tracking branch 'upstream/master' into kill_buttons2
daschuer Nov 5, 2014
d66fd42
Shade; an other indentation fix
daschuer Nov 6, 2014
588772a
reduce code duplication by at getKnobParameterForSlot and getButtonPa…
daschuer Nov 6, 2014
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
1 change: 1 addition & 0 deletions build/depends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ def sources(self, build):
"widget/wdisplay.cpp",
"widget/wvumeter.cpp",
"widget/wpushbutton.cpp",
"widget/weffectpushbutton.cpp",
"widget/wslidercomposed.cpp",
"widget/wstatuslight.cpp",
"widget/woverview.cpp",
Expand Down
74 changes: 74 additions & 0 deletions res/skins/Shade/effect_parameter_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<!DOCTYPE template>
<!--
Description:
An effect parameter knob.
Variables:
EffectRack: the rack
EffectUnit: the chain
Effect: the effect
EffectParameter: the parameter
-->
<Template>
<WidgetGroup>
<ObjectName>EffectParameterButton</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,f</SizePolicy>
<MinimumSize>-1,45</MinimumSize>
<MaximumSize>-1,45</MaximumSize>
<Children>
<EffectButtonParameterName>
<MinimumSize>38f,8f</MinimumSize>
<Style>
WEffectButtonParameter {
font: 10px/8px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
background-color: transparent;
color: #191F24;
padding-left: 1px;
}
QLabel { qproperty-alignment: AlignCenter; }
</Style>
<ObjectName>ButtonLabel</ObjectName>
<EffectRack>1</EffectRack>
<EffectUnit><Variable name="effectunitnum"/></EffectUnit>
<Effect><Variable name="effectnum"/></Effect>
<EffectButtonParameter><Variable name="effectparameternum"/></EffectButtonParameter>
</EffectButtonParameterName>
<WidgetGroup>
<Layout>vertical</Layout>
<Size>38,26</Size>
<Children>
<EffectPushButton>
<TooltipId></TooltipId>
<Style></Style>

<EffectRack>1</EffectRack>
<EffectUnit><Variable name="effectunitnum"/></EffectUnit>
<Effect><Variable name="effectnum"/></Effect>
<EffectButtonParameter><Variable name="effectparameternum"/></EffectButtonParameter>

<NumberStates>2</NumberStates>
<State>
<Number>0</Number>
<Pressed>btn_kill_down.png</Pressed>
<Unpressed>btn_kill.png</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>btn_kill_overdown.png</Pressed>
<Unpressed>btn_kill_over.png</Unpressed>
</State>
<Pos>11,57</Pos>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],button_parameter<Variable name="effectparameternum"/></ConfigKey>
<ButtonState>LeftButton</ButtonState>
</Connection>
</EffectPushButton>
</Children>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],button_parameter<Variable name="effectparameternum"/>_loaded</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
108 changes: 54 additions & 54 deletions res/skins/Shade/effect_parameter_knob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,35 @@
EffectParameter: the parameter
-->
<Template>
<WidgetGroup>
<ObjectName>EffectParameterKnob</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,f</SizePolicy>
<MinimumSize>-1,45</MinimumSize>
<MaximumSize>-1,45</MaximumSize>
<Children>
<EffectParameterName>
<MinimumSize>38f,8f</MinimumSize>
<Style>
WEffectParameter {
<WidgetGroup>
<ObjectName>EffectParameterKnob</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,f</SizePolicy>
<MinimumSize>-1,45</MinimumSize>
<MaximumSize>-1,45</MaximumSize>
<Children>
<EffectParameterName>
<MinimumSize>38f,8f</MinimumSize>
<Style>
WEffectParameter {
font: 10px/8px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
background-color: transparent;
color: #191F24;
padding-left: 1px;
}
QLabel { qproperty-alignment: AlignCenter; }
</Style>
<ObjectName>KnobLabel</ObjectName>
<EffectRack>1</EffectRack>
<EffectUnit><Variable name="effectunitnum"/></EffectUnit>
<Effect><Variable name="effectnum"/></Effect>
<EffectParameter><Variable name="effectparameternum"/></EffectParameter>
</EffectParameterName>
<WidgetGroup>
<Layout>vertical</Layout>
<Size>38,26</Size>
<Children>
<Knob>
QLabel { qproperty-alignment: AlignCenter; }
</Style>
<ObjectName>KnobLabel</ObjectName>
<EffectRack>1</EffectRack>
<EffectUnit><Variable name="effectunitnum"/></EffectUnit>
<Effect><Variable name="effectnum"/></Effect>
<EffectParameter><Variable name="effectparameternum"/></EffectParameter>
</EffectParameterName>
<WidgetGroup>
<Layout>vertical</Layout>
<Size>38,26</Size>
<Children>
<Knob>
<TooltipId>master_volume</TooltipId>
<Style></Style>
<NumberStates>64</NumberStates>
Expand All @@ -47,44 +47,44 @@
</Connection>
</Knob>
<PushButton>
<Size>38f,8f</Size>
<NumberStates>5</NumberStates>
<State>
<Number>0</Number>
<Pressed>btn_link_type/btn_link_type_none.png</Pressed>
<Size>38f,8f</Size>
<NumberStates>5</NumberStates>
<State>
<Number>0</Number>
<Pressed>btn_link_type/btn_link_type_none.png</Pressed>
<Unpressed>btn_link_type/btn_link_type_none.png</Unpressed>
</State>
<State>
<Number>1</Number>
<Pressed>btn_link_type/btn_link_type_linked.png</Pressed>
</State>
<State>
<Number>1</Number>
<Pressed>btn_link_type/btn_link_type_linked.png</Pressed>
<Unpressed>btn_link_type/btn_link_type_linked.png</Unpressed>
</State>
<State>
<Number>2</Number>
<Pressed>btn_link_type/btn_link_type_left.png</Pressed>
</State>
<State>
<Number>2</Number>
<Pressed>btn_link_type/btn_link_type_left.png</Pressed>
<Unpressed>btn_link_type/btn_link_type_left.png</Unpressed>
</State>
<State>
<Number>3</Number>
<Pressed>btn_link_type/btn_link_type_right.png</Pressed>
</State>
<State>
<Number>3</Number>
<Pressed>btn_link_type/btn_link_type_right.png</Pressed>
<Unpressed>btn_link_type/btn_link_type_right.png</Unpressed>
</State>
<State>
<Number>4</Number>
<Pressed>btn_link_type/btn_link_type_left_right.png</Pressed>
</State>
<State>
<Number>4</Number>
<Pressed>btn_link_type/btn_link_type_left_right.png</Pressed>
<Unpressed>btn_link_type/btn_link_type_left_right.png</Unpressed>
</State>
<Connection>
</State>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_link_type</ConfigKey>
<ButtonState>LeftButton</ButtonState>
<ButtonState>LeftButton</ButtonState>
Copy link
Member

Choose a reason for hiding this comment

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

do you have some problems with your tab settings in xml files?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. This was an indentation fix.

</Connection>
</PushButton>
</Children>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_loaded</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/>_loaded</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Template>
68 changes: 46 additions & 22 deletions res/skins/Shade/effect_parameters.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,53 @@
</Style>
<Children>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">1</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">2</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">3</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">4</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">5</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">6</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">7</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">8</SetVariable>
<SetVariable name="effectparameternum">1</SetVariable>
</Template>
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="effectparameternum">1</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">2</SetVariable>
</Template>
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="effectparameternum">2</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">3</SetVariable>
</Template>
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="effectparameternum">3</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">4</SetVariable>
</Template>
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="effectparameternum">4</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">5</SetVariable>
</Template>
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="effectparameternum">5</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">6</SetVariable>
</Template>
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="effectparameternum">6</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">7</SetVariable>
</Template>
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="effectparameternum">7</SetVariable>
</Template>
<Template src="skin:effect_parameter_knob.xml">
<SetVariable name="effectparameternum">8</SetVariable>
</Template>
<Template src="skin:effect_parameter_button.xml">
<SetVariable name="effectparameternum">8</SetVariable>
</Template>
</Children>
</WidgetGroup>
</Template>
Loading