[aseprite] 07/134: Add Cmd+, and Ctrl+K keyboard shortcuts to open preferences

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 21b0f64a34f8a151a19900d43e0f7dee573153d5
Author: David Capello <davidcapello at gmail.com>
Date:   Sat Oct 25 11:49:24 2014 -0300

    Add Cmd+, and Ctrl+K keyboard shortcuts to open preferences
---
 data/gui.xml             | 7 ++++---
 data/widgets/options.xml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/gui.xml b/data/gui.xml
index e55916c..934758d 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -49,7 +49,8 @@
       <key command="ColorCurve" shortcut="Ctrl+M" mac="Cmd+M" />
       <key command="ColorCurve" shortcut="F10" />
       <key command="ConfigureTools" shortcut="C" />
-      <key command="Options" shortcut="Ctrl+Shift+O" mac="Cmd+Shift+O" />
+      <key command="Options" shortcut="Ctrl+K" mac="Cmd+," />
+      <key command="Options" shortcut="Ctrl+Shift+O" mac="Cmd+Shift+O" /> <!-- TODO remove this shortcut in v1.1 -->
       <!-- Sprite -->
       <key command="SpriteProperties" shortcut="Ctrl+P" mac="Cmd+P" />
       <!-- Layer -->
@@ -433,8 +434,8 @@
           <item command="Despeckle" text="&Despeckle (median filter)" />
         </menu>
         <separator />
-        <item command="ConfigureTools" text="Tool&s" />
-        <item command="Options" text="&Options" />
+        <item command="ConfigureTools" text="Tool&s..." />
+        <item command="Options" text="Pre&ferences..." />
       </menu>
       <menu text="&Sprite">
         <item command="SpriteProperties" text="&Properties..." />
diff --git a/data/widgets/options.xml b/data/widgets/options.xml
index 3659d0f..344e5d1 100644
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@ -1,7 +1,7 @@
 <!-- Aseprite -->
 <!-- Copyright (C) 2001-2014 by David Capello -->
 <gui>
-  <window id="options" text="Options">
+  <window id="options" text="Preferences">
   <vbox>
     <hbox>
       <view maxsize="true">

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git