Skip to content

Commit

Permalink
2015-10-10 version 0.1.8
Browse files Browse the repository at this point in the history
1.修改了背景颜色,与mac版同步
2.同步了mac版的两款(Cherry)新音效
  • Loading branch information
BillBillBillBill committed Oct 10, 2015
1 parent dfbd163 commit b594b8a
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 10 deletions.
4 changes: 4 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2015-10-10 version 0.1.8
1.修改了背景颜色,与mac版同步
2.同步了mac版的两款(Cherry)新音效

2015-09-05 version 0.1.7
1.增加了检查更新的功能

Expand Down
8 changes: 4 additions & 4 deletions tickeys/CLI.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ def help_setstyle(self):
def do_setstyle(self, arg):
style_index = raw_input(
"Input the effect style "
"(0:bubble 1:mechanical 2:sword 3:typewriter) you want:")
style_list = ['bubble', 'mechanical', 'sword', 'typewriter']
"(0:bubble 1:mechanical 2:sword 3:typewriter 4:Cherry_G80_3000 5:Cherry_G80_3494) you want:")
style_list = ['bubble', 'mechanical', 'sword', 'typewriter', 'Cherry_G80_3000', 'Cherry_G80_3494']

try:
style_index = int(style_index)
assert(0 <= style_index <= 3)
assert(0 <= style_index <= 5)
except Exception:
print "Input must between 0~3!!"
print "Input must between 0~5!!"
return

self.style = style_list[style_index]
Expand Down
10 changes: 5 additions & 5 deletions tickeys/GUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
canvas:
Color:
rgb: 0.42, 0.42, 0.42, 1
rgb: 0.368, 0.384, 0.447, 1
Rectangle:
pos: 0,0
size: self.size
Expand All @@ -55,7 +55,7 @@
font_size: 25
size_hint_x: None
width: 250
text: 'Vol:'
text: 'Volume:'
Slider:
min: 0.0
max: 1.0
Expand Down Expand Up @@ -85,7 +85,7 @@
color: 1, 1, 1, 1
font_size: 25
size_hint_x: None
text: "Sound Effect:"
text: "Sound:"
width: 250
EffectSpinner:
on_text: root.change_style()
Expand All @@ -97,7 +97,7 @@
text: root.parent.parent.Configer.style
background_color: 2, 2, 2, 1
color: 0.1, 0.67, 0.93, 1
values:['bubble', 'mechanical', 'sword', 'typewriter',]
values:['bubble', 'mechanical', 'sword', 'typewriter', 'Cherry_G80_3000', 'Cherry_G80_3494',]
<ExitAndSwitchRow>:
Label:
Expand All @@ -123,7 +123,7 @@
width: 150
background_color: 2, 2, 2, 1
bold: True
text: "EXIT"
text: "QUIT"
color: 0,0,0,1
on_press: root.Exit()
Label:
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 16 additions & 0 deletions tickeys/Resources/data/schemes.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,21 @@
"files": ["1.wav", "2.wav", "3.wav", "4.wav", "5.wav", "6.wav", "back.wav", "enter.wav", "space.wav"],
"non_unique_count": 6,
"key_audio_map":{"28": 7,"96": 7,"14":6, "57": 8}
},

{
"name": "Cherry_G80_3000",
"display_name": "Cherry G80-3000",
"files": ["G80-3000.wav", "G80-3000_fast1.wav", "G80-3000_slow1.wav", "G80-3000_fast2.wav","G80-3000_slow2.wav"],
"non_unique_count": 5,
"key_audio_map":{"28": 4, "49": 4}
},

{
"name": "Cherry_G80_3494",
"display_name": "Cherry G80-3494",
"files": ["G80-3494.wav", "G80-3494_fast1.wav", "G80-3494_slow1.wav", "G80-3494_enter.wav", "G80-3494_space.wav", "G80-3494_backspace.wav"],
"non_unique_count": 3,
"key_audio_map":{"28": 3, "49": 4, "51": 5}
}
]
2 changes: 1 addition & 1 deletion tickeys/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__author__ = 'Huang Xiongbiao'
__email__ = '[email protected]'
__version__ = '0.1.7'
__version__ = '0.1.8'

from run import main

Expand Down

0 comments on commit b594b8a

Please sign in to comment.