diff --git a/Changelog b/Changelog index 70dec23..4b248f3 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,7 @@ +2015-10-10 version 0.1.8 +1.修改了背景颜色,与mac版同步 +2.同步了mac版的两款(Cherry)新音效 + 2015-09-05 version 0.1.7 1.增加了检查更新的功能 diff --git a/tickeys/CLI.py b/tickeys/CLI.py index 4e3235c..b7a9eac 100644 --- a/tickeys/CLI.py +++ b/tickeys/CLI.py @@ -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] diff --git a/tickeys/GUI.py b/tickeys/GUI.py index ed732b4..e5bb85c 100644 --- a/tickeys/GUI.py +++ b/tickeys/GUI.py @@ -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 @@ -55,7 +55,7 @@ font_size: 25 size_hint_x: None width: 250 - text: 'Vol:' + text: 'Volume:' Slider: min: 0.0 max: 1.0 @@ -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() @@ -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',] : Label: @@ -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: diff --git a/tickeys/Resources/data/Cherry_G80_3000/G80-3000.wav b/tickeys/Resources/data/Cherry_G80_3000/G80-3000.wav new file mode 100644 index 0000000..79c5695 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3000/G80-3000.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3000/G80-3000_fast1.wav b/tickeys/Resources/data/Cherry_G80_3000/G80-3000_fast1.wav new file mode 100644 index 0000000..a648e79 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3000/G80-3000_fast1.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3000/G80-3000_fast2.wav b/tickeys/Resources/data/Cherry_G80_3000/G80-3000_fast2.wav new file mode 100644 index 0000000..332ed15 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3000/G80-3000_fast2.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3000/G80-3000_slow1.wav b/tickeys/Resources/data/Cherry_G80_3000/G80-3000_slow1.wav new file mode 100644 index 0000000..1842fd3 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3000/G80-3000_slow1.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3000/G80-3000_slow2.wav b/tickeys/Resources/data/Cherry_G80_3000/G80-3000_slow2.wav new file mode 100644 index 0000000..b90f06c Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3000/G80-3000_slow2.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3494/G80-3494.wav b/tickeys/Resources/data/Cherry_G80_3494/G80-3494.wav new file mode 100644 index 0000000..ae99ee1 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3494/G80-3494.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3494/G80-3494_backspace.wav b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_backspace.wav new file mode 100644 index 0000000..f7b2b07 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_backspace.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3494/G80-3494_enter.wav b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_enter.wav new file mode 100644 index 0000000..aed2042 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_enter.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3494/G80-3494_fast1.wav b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_fast1.wav new file mode 100644 index 0000000..96c41bd Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_fast1.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3494/G80-3494_slow1.wav b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_slow1.wav new file mode 100644 index 0000000..00abba0 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_slow1.wav differ diff --git a/tickeys/Resources/data/Cherry_G80_3494/G80-3494_space.wav b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_space.wav new file mode 100644 index 0000000..d77df95 Binary files /dev/null and b/tickeys/Resources/data/Cherry_G80_3494/G80-3494_space.wav differ diff --git a/tickeys/Resources/data/schemes.json b/tickeys/Resources/data/schemes.json index 0b95b3f..c1d9f9f 100644 --- a/tickeys/Resources/data/schemes.json +++ b/tickeys/Resources/data/schemes.json @@ -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} } ] \ No newline at end of file diff --git a/tickeys/__init__.py b/tickeys/__init__.py index 173a37e..e4c8599 100644 --- a/tickeys/__init__.py +++ b/tickeys/__init__.py @@ -1,6 +1,6 @@ __author__ = 'Huang Xiongbiao' __email__ = 'billo@qq.com' -__version__ = '0.1.7' +__version__ = '0.1.8' from run import main