Skip to content

Commit

Permalink
Change some of the wording regarding tipping
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ryochan7
Ryochan7 committed Mar 18, 2018
1 parent 23b1968 commit 2dc0950
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 151 deletions.
1 change: 1 addition & 0 deletions DS4Windows/DS4Forms/Hotkeys.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

251 changes: 101 additions & 150 deletions DS4Windows/DS4Forms/Hotkeys.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
<value>21</value>
</data>
<data name="linkDonate.Text" xml:space="preserve">
<value>Donate via Paypal</value>
<value>Tip via Paypal</value>
</data>
<data name="&gt;&gt;linkDonate.Name" xml:space="preserve">
<value>linkDonate</value>
Expand All @@ -318,6 +318,40 @@
<data name="tPHotkeys.AutoScroll" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lbHotkeys.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="lbHotkeys.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lbHotkeys.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="lbHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>536, 464</value>
</data>
<data name="lbHotkeys.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
<data name="lbHotkeys.Text" xml:space="preserve">
<value>Hide DS4 Controller: Hides the DS4's regular input (Dinput) from other programs, check if you are getting double input in games or R2 pauses games
Click left side of touchpad: Left Touch
Click right side of touchpad: Right Touch
Click touchpad with 2 fingers: Multitouch
Click upper part of touchpad: Upper Touch
PS + Options or hold PS for 10 secs: Disconnect Controller (Only on Bluetooth)
Touch Touchpad + PS: Turn off touchpad movement (clicking still works)
Pad click on lower right: Right click (Best used when right side is used as a mouse button)
Two fingers up/down on touchpad*: Scroll Up/Down
Tap then hold touchpad*: Left mouse drag
2 finger touchpad swipe left or right: Cycle through profiles
Shift Modifer: Hold an action to use another set of controls
When mapping keyboard and mouse:
Toggle: The key will remain in a "held down" state until pressed again
Macro: Assign multiple keys to one input
Scan Code: Keys are interpreted differently. May be needed for certain games
*If enabled</value>
</data>
<data name="&gt;&gt;lbHotkeys.Name" xml:space="preserve">
<value>lbHotkeys</value>
</data>
Expand Down Expand Up @@ -1833,117 +1867,29 @@
<data name="&gt;&gt;tPCredits.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.Name" xml:space="preserve">
<value>flowLayoutPanel1</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.Type" xml:space="preserve">
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.Parent" xml:space="preserve">
<value>coinTP</value>
</data>
<data name="&gt;&gt;flowLayoutPanel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="coinTP.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>
<data name="coinTP.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="coinTP.Size" type="System.Drawing.Size, System.Drawing">
<value>559, 465</value>
</data>
<data name="coinTP.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="coinTP.Text" xml:space="preserve">
<value>Send Coin</value>
</data>
<data name="&gt;&gt;coinTP.Name" xml:space="preserve">
<value>coinTP</value>
</data>
<data name="&gt;&gt;coinTP.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;coinTP.Parent" xml:space="preserve">
<value>tCAbout</value>
</data>
<data name="&gt;&gt;coinTP.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="tCAbout.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="tCAbout.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 36</value>
</data>
<data name="tCAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>567, 491</value>
</data>
<data name="tCAbout.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
</data>
<data name="&gt;&gt;tCAbout.Name" xml:space="preserve">
<value>tCAbout</value>
</data>
<data name="&gt;&gt;tCAbout.Type" xml:space="preserve">
<value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tCAbout.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tCAbout.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lbHotkeys.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
<data name="lbHotkeys.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lbHotkeys.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 3</value>
</data>
<data name="lbHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>536, 464</value>
</data>
<data name="lbHotkeys.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
<data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lbHotkeys.Text" xml:space="preserve">
<value>Hide DS4 Controller: Hides the DS4's regular input (Dinput) from other programs, check if you are getting double input in games or R2 pauses games
Click left side of touchpad: Left Touch
Click right side of touchpad: Right Touch
Click touchpad with 2 fingers: Multitouch
Click upper part of touchpad: Upper Touch
PS + Options or hold PS for 10 secs: Disconnect Controller (Only on Bluetooth)
Touch Touchpad + PS: Turn off touchpad movement (clicking still works)
Pad click on lower right: Right click (Best used when right side is used as a mouse button)
Two fingers up/down on touchpad*: Scroll Up/Down
Tap then hold touchpad*: Left mouse drag
2 finger touchpad swipe left or right: Cycle through profiles
Shift Modifer: Hold an action to use another set of controls
When mapping keyboard and mouse:
Toggle: The key will remain in a "held down" state until pressed again
Macro: Assign multiple keys to one input
Scan Code: Keys are interpreted differently. May be needed for certain games
*If enabled</value>
<data name="textBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 4</value>
</data>
<data name="&gt;&gt;lbHotkeys.Name" xml:space="preserve">
<value>lbHotkeys</value>
<data name="textBox2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 4, 6, 2</value>
</data>
<data name="&gt;&gt;lbHotkeys.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="textBox2.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;lbHotkeys.Parent" xml:space="preserve">
<value>tPHotkeys</value>
<data name="textBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>547, 85</value>
</data>
<data name="&gt;&gt;lbHotkeys.ZOrder" xml:space="preserve">
<value>0</value>
<data name="textBox2.TabIndex" type="System.Int32, mscorlib">
<value>32</value>
</data>
<data name="flowLayoutPanel1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
<data name="textBox2.Text" xml:space="preserve">
<value>Bitcoin: 1DnMJwjdd7JRfHJap2mmTmADYm38SzR2z9
Dogecoin: D9fhbXp9bCHEhuS8vX1BmVu6t7Y2nVNUCK
Litecoin: La5mniW7SFMH2RhqDgUty3RwkBSYbjbnJ6
Monero: 49RvRMiMewaeez1Y2auxHmfMaAUYfhUpBem4ohzRJd9b5acPcxzh1icjnhZfjnYd1S7NQ57reQ7cP1swGre3rpfzUgJhEB7</value>
</data>
<data name="&gt;&gt;textBox2.Name" xml:space="preserve">
<value>textBox2</value>
Expand All @@ -1957,6 +1903,21 @@ Scan Code: Keys are interpreted differently. May be needed for certain games
<data name="&gt;&gt;textBox2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="makerSupportLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 108</value>
</data>
<data name="makerSupportLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 3, 3</value>
</data>
<data name="makerSupportLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 14</value>
</data>
<data name="makerSupportLinkLabel.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
</data>
<data name="makerSupportLinkLabel.Text" xml:space="preserve">
<value>MakerSupport</value>
</data>
<data name="&gt;&gt;makerSupportLinkLabel.Name" xml:space="preserve">
<value>makerSupportLinkLabel</value>
</data>
Expand Down Expand Up @@ -1996,66 +1957,56 @@ Scan Code: Keys are interpreted differently. May be needed for certain games
<data name="&gt;&gt;flowLayoutPanel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="textBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 4</value>
</data>
<data name="textBox2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 4, 6, 2</value>
</data>
<data name="textBox2.Multiline" type="System.Boolean, mscorlib">
<value>True</value>
<data name="coinTP.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>
<data name="textBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>547, 85</value>
<data name="coinTP.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="textBox2.TabIndex" type="System.Int32, mscorlib">
<value>32</value>
<data name="coinTP.Size" type="System.Drawing.Size, System.Drawing">
<value>559, 465</value>
</data>
<data name="textBox2.Text" xml:space="preserve">
<value>Bitcoin: 1DnMJwjdd7JRfHJap2mmTmADYm38SzR2z9
Dogecoin: D9fhbXp9bCHEhuS8vX1BmVu6t7Y2nVNUCK
Litecoin: La5mniW7SFMH2RhqDgUty3RwkBSYbjbnJ6
Monero: 49RvRMiMewaeez1Y2auxHmfMaAUYfhUpBem4ohzRJd9b5acPcxzh1icjnhZfjnYd1S7NQ57reQ7cP1swGre3rpfzUgJhEB7
</value>
<data name="coinTP.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;textBox2.Name" xml:space="preserve">
<value>textBox2</value>
<data name="coinTP.Text" xml:space="preserve">
<value>Tip Jar</value>
</data>
<data name="&gt;&gt;textBox2.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;coinTP.Name" xml:space="preserve">
<value>coinTP</value>
</data>
<data name="&gt;&gt;textBox2.Parent" xml:space="preserve">
<value>flowLayoutPanel1</value>
<data name="&gt;&gt;coinTP.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;textBox2.ZOrder" xml:space="preserve">
<value>0</value>
<data name="&gt;&gt;coinTP.Parent" xml:space="preserve">
<value>tCAbout</value>
</data>
<data name="makerSupportLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 108</value>
<data name="&gt;&gt;coinTP.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="makerSupportLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 0, 3, 3</value>
<data name="tCAbout.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="makerSupportLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>74, 14</value>
<data name="tCAbout.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 36</value>
</data>
<data name="makerSupportLinkLabel.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
<data name="tCAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>567, 491</value>
</data>
<data name="makerSupportLinkLabel.Text" xml:space="preserve">
<value>MakerSupport</value>
<data name="tCAbout.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
</data>
<data name="&gt;&gt;makerSupportLinkLabel.Name" xml:space="preserve">
<value>makerSupportLinkLabel</value>
<data name="&gt;&gt;tCAbout.Name" xml:space="preserve">
<value>tCAbout</value>
</data>
<data name="&gt;&gt;makerSupportLinkLabel.Type" xml:space="preserve">
<value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;tCAbout.Type" xml:space="preserve">
<value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;makerSupportLinkLabel.Parent" xml:space="preserve">
<value>flowLayoutPanel1</value>
<data name="&gt;&gt;tCAbout.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;makerSupportLinkLabel.ZOrder" xml:space="preserve">
<value>2</value>
<data name="&gt;&gt;tCAbout.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ be made during code review to try to tweak the changes in order to improve
application performance. However, there is a chance that a pull request will be
rejected if no reasonable solution can be found to incorporate code changes.

## Sending Coin
## Tip Jar

If you would like to send some coin my way, here are some means by
which to do so.
Expand Down

0 comments on commit 2dc0950

Please sign in to comment.