Skip to content

Commit

Permalink
Make columnWidth conditional on nr of columns
Browse files Browse the repository at this point in the history
  • Loading branch information
@torinfo
torinfo committed Jun 29, 2021
1 parent 143098a commit d975faa
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd
View file
Expand Up @@ -1542,13 +1542,13 @@
</cHotspot><connectorMenu menu="Connectors" menuItem="Menu Connector" hint="Generate a menu of all or a selected range of the pages in a project." icon="icConMenu" thumb="thumbs/connectorMenu.jpg" example="https://xot.xerte.org.uk/play_116?hide=bottom#menuconnector" remove="true">

<name label="Page Title" type="TextInput" wysiwyg="true"/>
<buttonWidth label="Button Width" type="TextInput" wysiwyg="true" optional="true" tooltip="The number indicates in percent how wide the buttons are. It can be used with and without the percent symbool(%) at the end."/>
<buttonWidth label="Button Width" condition="columns &lt; '2'" type="TextInput" wysiwyg="true" optional="true" tooltip="The number indicates in percent how wide the buttons are. It can be used with and without the percent symbool(%) at the end."/>
<text label="Page Text" type="TextArea" height="200" defaultValue="Enter text for the page here" optional="true" tooltip="Add text to the page"/>
<startPageID label="First Entry" type="pageList" defaultValue="" optional="true" tooltip="Include menu links from this page onwards"/>
<endPageID label="Last Entry" type="pageList" defaultValue="" optional="true" tooltip="Include menu links up to and including this page"/>
<pageTick label="Tick When Viewed" type="CheckBox" defaultValue="true" optional="true" tooltip="Links to previously viewed pages will be ticked"/>
<itemSpacingY label="Vertical Spacing" type="NumericStepper" min="5" max="35" step="1" width="100" defaultValue="5" optional="true" tooltip="Adjust the space between page links"/>
<columns label="Number of columns" type="NumericStepper" min="1" max="6" step="1" width="100" defaultValue="2" optional="true" tooltip="Automatically wrap into a set number of columns. Note: with this option set the optional 'button width' property will be ignored and the buttons will fill the width of each column."/>
<columns label="Number of columns" conditionTrigger="true" type="NumericStepper" min="1" max="6" step="1" width="100" defaultValue="2" optional="true" tooltip="Automatically wrap into a set number of columns. Note: with this option set the optional 'button width' property will be ignored and the buttons will fill the width of each column."/>
<itemHeight label="Menu Item Height" type="NumericStepper" min="25" max="35" step="1" width="100" defaultValue="25" optional="true" deprecated="This property is deprecated"/>
<itemSpacingX label="Horizontal Spacing" type="NumericStepper" min="10" max="30" step="1" width="100" defaultValue="10" optional="true" deprecated="This property is deprecated"/>
<menuLineCol label="Line Colour" type="ColourPicker" defaultValue="0x84A2C6" optional="true" deprecated="This property is deprecated"/>
Expand Down
4 changes: 2 additions & 2 deletions src/Nottingham/wizards/en-GB/connectorMenu_XOT.xwd
View file
Expand Up @@ -9,13 +9,13 @@
<connectorMenu menu="Connectors" menuItem="Menu Connector" hint="Generate a menu of all or a selected range of the pages in a project." icon="icConMenu" thumb="thumbs/connectorMenu.jpg" example="https://xot.xerte.org.uk/play_116?hide=bottom#menuconnector" remove="true">

<name label="Page Title" type="TextInput" wysiwyg="true" />
<buttonWidth label="Button Width" type="TextInput" wysiwyg="true" optional="true" tooltip="The number indicates in percent how wide the buttons are. It can be used with and without the percent symbool(%) at the end."/>
<buttonWidth label="Button Width" condition="columns &lt; '2'" type="TextInput" wysiwyg="true" optional="true" tooltip="The number indicates in percent how wide the buttons are. It can be used with and without the percent symbool(%) at the end."/>
<text label="Page Text" type="TextArea" height="200" defaultValue="Enter text for the page here" optional="true" tooltip="Add text to the page"/>
<startPageID label="First Entry" type="pageList" defaultValue="" optional="true" tooltip="Include menu links from this page onwards"/>
<endPageID label="Last Entry" type="pageList" defaultValue="" optional="true" tooltip="Include menu links up to and including this page"/>
<pageTick label="Tick When Viewed" type="CheckBox" defaultValue="true" optional="true" tooltip="Links to previously viewed pages will be ticked"/>
<itemSpacingY label="Vertical Spacing" type="NumericStepper" min="5" max="35" step="1" width="100" defaultValue="5" optional="true" tooltip="Adjust the space between page links"/>
<columns label="Number of columns" type="NumericStepper" min="1" max="6" step="1" width="100" defaultValue="2" optional="true" tooltip="Automatically wrap into a set number of columns. Note: with this option set the optional 'button width' property will be ignored and the buttons will fill the width of each column."/>
<columns label="Number of columns" conditionTrigger="true" type="NumericStepper" min="1" max="6" step="1" width="100" defaultValue="2" optional="true" tooltip="Automatically wrap into a set number of columns. Note: with this option set the optional 'button width' property will be ignored and the buttons will fill the width of each column."/>
<itemHeight label="Menu Item Height" type="NumericStepper" min="25" max="35" step="1" width="100" defaultValue="25" optional="true" deprecated="This property is deprecated"/>
<itemSpacingX label="Horizontal Spacing" type="NumericStepper" min="10" max="30" step="1" width="100" defaultValue="10" optional="true" deprecated="This property is deprecated"/>
<menuLineCol label="Line Colour" type="ColourPicker" defaultValue="0x84A2C6" optional="true" deprecated="This property is deprecated"/>
Expand Down
4 changes: 2 additions & 2 deletions src/Nottingham/wizards/en-GB/template.xwd
View file
Expand Up @@ -1542,13 +1542,13 @@
</cHotspot><connectorMenu menu="Connectors" menuItem="Menu Connector" hint="Generate a menu of all or a selected range of the pages in a project." icon="icConMenu" thumb="thumbs/connectorMenu.jpg" example="https://xot.xerte.org.uk/play_116?hide=bottom#menuconnector" remove="true">

<name label="Page Title" type="TextInput" wysiwyg="true"/>
<buttonWidth label="Button Width" type="TextInput" wysiwyg="true" optional="true" tooltip="The number indicates in percent how wide the buttons are. It can be used with and without the percent symbool(%) at the end."/>
<buttonWidth label="Button Width" condition="columns &lt; '2'" type="TextInput" wysiwyg="true" optional="true" tooltip="The number indicates in percent how wide the buttons are. It can be used with and without the percent symbool(%) at the end."/>
<text label="Page Text" type="TextArea" height="200" defaultValue="Enter text for the page here" optional="true" tooltip="Add text to the page"/>
<startPageID label="First Entry" type="pageList" defaultValue="" optional="true" tooltip="Include menu links from this page onwards"/>
<endPageID label="Last Entry" type="pageList" defaultValue="" optional="true" tooltip="Include menu links up to and including this page"/>
<pageTick label="Tick When Viewed" type="CheckBox" defaultValue="true" optional="true" tooltip="Links to previously viewed pages will be ticked"/>
<itemSpacingY label="Vertical Spacing" type="NumericStepper" min="5" max="35" step="1" width="100" defaultValue="5" optional="true" tooltip="Adjust the space between page links"/>
<columns label="Number of columns" type="NumericStepper" min="1" max="6" step="1" width="100" defaultValue="2" optional="true" tooltip="Automatically wrap into a set number of columns. Note: with this option set the optional 'button width' property will be ignored and the buttons will fill the width of each column."/>
<columns label="Number of columns" conditionTrigger="true" type="NumericStepper" min="1" max="6" step="1" width="100" defaultValue="2" optional="true" tooltip="Automatically wrap into a set number of columns. Note: with this option set the optional 'button width' property will be ignored and the buttons will fill the width of each column."/>
<itemHeight label="Menu Item Height" type="NumericStepper" min="25" max="35" step="1" width="100" defaultValue="25" optional="true" deprecated="This property is deprecated"/>
<itemSpacingX label="Horizontal Spacing" type="NumericStepper" min="10" max="30" step="1" width="100" defaultValue="10" optional="true" deprecated="This property is deprecated"/>
<menuLineCol label="Line Colour" type="ColourPicker" defaultValue="0x84A2C6" optional="true" deprecated="This property is deprecated"/>
Expand Down

0 comments on commit d975faa

Please sign in to comment.