diff options
| -rw-r--r-- | Edit/EditToolbars.py | 2 | ||||
| -rw-r--r-- | Edit/MainWindow.py | 11 | ||||
| -rw-r--r-- | icons/testMenu.svg | 43 |
3 files changed, 50 insertions, 6 deletions
diff --git a/Edit/EditToolbars.py b/Edit/EditToolbars.py index b99a387..c5e79a1 100644 --- a/Edit/EditToolbars.py +++ b/Edit/EditToolbars.py @@ -258,7 +258,7 @@ class propsPalette(Palette): self.filterTypeLabel = gtk.Label(_('Filter Type: ')) self.filterTypeComboBox = BigComboBox() for type in [_('Lowpass'),_('Bandpass'),_('Highpass')]: - self.filterTypeComboBox.append_item(0, type) + self.filterTypeComboBox.append_item(0, type, Config.TAM_TAM_ROOT + '/icons/testMenu.svg') self.filterTypeComboBox.set_active(0) self.filterTypeBox.pack_start(self.filterTypeLabel, False, False, padding = 5) self.filterTypeBox.pack_end(self.filterTypeComboBox, False, False, padding = 55) diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py index 13eedc1..cdefca8 100644 --- a/Edit/MainWindow.py +++ b/Edit/MainWindow.py @@ -1732,9 +1732,10 @@ class MainWindow( SubActivity ): #----------------------------------- def handleKeyboardShortcuts(self,event): key = event.hardware_keycode + keyval = event.keyval # backspace and del keys - if key == 22 or key == 107: + if keyval == 22 or key == 107: if self.context == CONTEXT.PAGE: self.pageDelete() if self.context == CONTEXT.TRACK: self.trackDelete() if self.context == CONTEXT.NOTE: self.noteDelete() @@ -1756,11 +1757,11 @@ class MainWindow( SubActivity ): if key == 102: self.trackInterface.noteStepDuration(1) else: # up/down arrows pitch - if key == 98: self.trackInterface.noteStepPitch(1) - if key == 104: self.trackInterface.noteStepPitch(-1) + if keyval == gtk.keysyms.uparrow: self.trackInterface.noteStepPitch(1) + if keyval == gtk.keysyms.downarrow: self.trackInterface.noteStepPitch(-1) # left/right arrows duration - if key == 100: self.trackInterface.noteStepOnset(-1) - if key == 102: self.trackInterface.noteStepOnset(1) + if keyval == gtk.keysyms.leftarrow: self.trackInterface.noteStepOnset(-1) + if keyval == gtk.keysyms.rightarrow: self.trackInterface.noteStepOnset(1) def onKeyPress(self,widget,event): diff --git a/icons/testMenu.svg b/icons/testMenu.svg new file mode 100644 index 0000000..05e8ec9 --- /dev/null +++ b/icons/testMenu.svg @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="80px" height="80px" viewBox="0 0 80 80" enable-background="new 0 0 80 80" xml:space="preserve">
+<g>
+ <path fill="#3399FF" stroke="#333333" stroke-linecap="round" stroke-linejoin="round" d="M10.901,25.5c0-8.282,6.719-15,15-15h30
+ c8.282,0,14.988,6.719,14.988,15v30.001c0,8.281-6.706,14.999-14.988,14.999h-30c-8.282,0-15-6.718-15-14.999V25.5z"/>
+</g>
+<line fill="none" stroke="#333333" stroke-linecap="square" stroke-linejoin="round" x1="17.915" y1="53.514" x2="57.852" y2="53.514"/>
+<g>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M19.588,54.376c4.095,0,3.258-24.79,6.252-23.952"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M32.136,54.376c-4.117,0-3.258-24.79-6.251-23.952"/>
+</g>
+<g>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M28.702,54.376c4.117,0,3.259-29.5,6.275-28.51"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M41.275,54.376c-4.119,0-3.26-29.5-6.276-28.51"/>
+</g>
+<g>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M37.839,54.376c4.116,0,3.26-16.511,6.273-15.96"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M50.386,54.376c-4.094,0-3.256-16.511-6.25-15.96"/>
+</g>
+<g>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M46.977,54.376c4.115,0,3.257-22.434,6.252-21.663"/>
+
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" d="
+ M59.523,54.376c-4.115,0-3.259-22.434-6.252-21.663"/>
+</g>
+</svg>
|
