projects / synfig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a8a8da0)
Fix ACCEL keys.
authorCarlos Lopez <carlos@pcnuevo.(none)>
Mon, 14 Sep 2009 18:29:59 +0000 (20:29 +0200)
committerCarlos Lopez <carlos@pcnuevo.(none)>
Mon, 14 Sep 2009 18:29:59 +0000 (20:29 +0200)
For some reason the Raise and Lower Layer seems not to work with the fix.

synfig-studio/src/gtkmm/app.cpp patch | blob | history
synfig-studio/src/gtkmm/canvasview.cpp patch | blob | history

diff --git a/synfig-studio/src/gtkmm/app.cpp b/synfig-studio/src/gtkmm/app.cpp
index c25749b..47776c6 100644 (file)
--- a/synfig-studio/src/gtkmm/app.cpp
+++ b/synfig-studio/src/gtkmm/app.cpp
@@ -1059,79 +1059,79 @@ init_ui_manager()
        }
 
        // the toolbox
-       ACCEL("<Mod1>a",                                                                                                        "<Actions>//state-normal"                                       );
-       ACCEL("<Mod1>v",                                                                                                        "<Actions>//state-smooth_move"                          );
-       ACCEL("<Mod1>s",                                                                                                        "<Actions>//state-scale"                                        );
-       ACCEL("<Mod1>t",                                                                                                        "<Actions>//state-rotate"                                       );
-       ACCEL("<Mod1>m",                                                                                                        "<Actions>//state-mirror"                                       );
-       ACCEL("<Mod1>c",                                                                                                        "<Actions>//state-circle"                                       );
-       ACCEL("<Mod1>r",                                                                                                        "<Actions>//state-rectangle"                            );
-       ACCEL("<Mod1>q",                                                                                                        "<Actions>//state-star"                                         );
-       ACCEL("<Mod1>g",                                                                                                        "<Actions>//state-gradient"                                     );
-       ACCEL("<Mod1>p",                                                                                                        "<Actions>//state-polygon"                                      );
-       ACCEL("<Mod1>b",                                                                                                        "<Actions>//state-bline"                                        );
-       ACCEL("<Mod1>x",                                                                                                        "<Actions>//state-text"                                         );
-       ACCEL("<Mod1>f",                                                                                                        "<Actions>//state-fill"                                         );
-       ACCEL("<Mod1>e",                                                                                                        "<Actions>//state-eyedrop"                                      );
-       ACCEL("<Mod1>z",                                                                                                        "<Actions>//state-zoom"                                         );
-       ACCEL("<Mod1>d",                                                                                                        "<Actions>//state-draw"                                         );
-       ACCEL("<Mod1>k",                                                                                                        "<Actions>//state-sketch"                                       );
-       ACCEL("<Mod1>w",                                                                                                        "<Actions>//state-width"                                        );
+       ACCEL("<Mod1>a",                                                                                                        "<Actions>/action_group_state_manager/state-normal"                                     );
+       ACCEL("<Mod1>v",                                                                                                        "<Actions>/action_group_state_manager/state-smooth_move"                                );
+       ACCEL("<Mod1>s",                                                                                                        "<Actions>/action_group_state_manager/state-scale"                                      );
+       ACCEL("<Mod1>t",                                                                                                        "<Actions>/action_group_state_manager/state-rotate"                                     );
+       ACCEL("<Mod1>m",                                                                                                        "<Actions>/action_group_state_manager/state-mirror"                                     );
+       ACCEL("<Mod1>c",                                                                                                        "<Actions>/action_group_state_manager/state-circle"                                     );
+       ACCEL("<Mod1>r",                                                                                                        "<Actions>/action_group_state_manager/state-rectangle"                          );
+       ACCEL("<Mod1>q",                                                                                                        "<Actions>/action_group_state_manager/state-star"                                               );
+       ACCEL("<Mod1>g",                                                                                                        "<Actions>/action_group_state_manager/state-gradient"                                   );
+       ACCEL("<Mod1>p",                                                                                                        "<Actions>/action_group_state_manager/state-polygon"                                    );
+       ACCEL("<Mod1>b",                                                                                                        "<Actions>/action_group_state_manager/state-bline"                                      );
+       ACCEL("<Mod1>x",                                                                                                        "<Actions>/action_group_state_manager/state-text"                                               );
+       ACCEL("<Mod1>f",                                                                                                        "<Actions>/action_group_state_manager/state-fill"                                               );
+       ACCEL("<Mod1>e",                                                                                                        "<Actions>/action_group_state_manager/state-eyedrop"                                    );
+       ACCEL("<Mod1>z",                                                                                                        "<Actions>/action_group_state_manager/state-zoom"                                               );
+       ACCEL("<Mod1>d",                                                                                                        "<Actions>/action_group_state_manager/state-draw"                                               );
+       ACCEL("<Mod1>k",                                                                                                        "<Actions>/action_group_state_manager/state-sketch"                                     );
+       ACCEL("<Mod1>w",                                                                                                        "<Actions>/action_group_state_manager/state-width"                                      );
 
        // everything else
-       ACCEL("<Control>a",                                                                                                     "<Actions>//select-all-ducks"                           );
-       ACCEL("<Control>d",                                                                                                     "<Actions>//unselect-all-ducks"                         );
-       ACCEL("<Control><Shift>a",                                                                                      "<Actions>//select-all-layers"                          );
-       ACCEL("<Control><Shift>d",                                                                                      "<Actions>//unselect-all-layers"                        );
-       ACCEL("F9",                                                                                                                     "<Actions>//render"                                                     );
-       ACCEL("F11",                                                                                                            "<Actions>//preview"                                            );
-       ACCEL("F8",                                                                                                                     "<Actions>//properties"                                         );
-       ACCEL("F12",                                                                                                            "<Actions>//options"                                            );
-       ACCEL("<control>i",                                                                                                     "<Actions>//import"                                                     );
-       ACCEL2(Gtk::AccelKey(GDK_Escape,static_cast<Gdk::ModifierType>(0),      "<Actions>//stop"                                                       ));
-       ACCEL("<Control>g",                                                                                                     "<Actions>//toggle-grid-show"                           );
-       ACCEL("<Control>l",                                                                                                     "<Actions>//toggle-grid-snap"                           );
-       ACCEL2(Gtk::AccelKey('`',Gdk::CONTROL_MASK,                                                     "<Actions>//toggle-low-res"                                     ));
-       ACCEL("<Mod1>1",                                                                                                        "<Actions>//mask-position-ducks"                        );
-       ACCEL("<Mod1>2",                                                                                                        "<Actions>//mask-vertex-ducks"                          );
-       ACCEL("<Mod1>3",                                                                                                        "<Actions>//mask-tangent-ducks"                         );
-       ACCEL("<Mod1>4",                                                                                                        "<Actions>//mask-radius-ducks"                          );
-       ACCEL("<Mod1>5",                                                                                                        "<Actions>//mask-width-ducks"                           );
-       ACCEL("<Mod1>6",                                                                                                        "<Actions>//mask-angle-ducks"                           );
-       ACCEL2(Gtk::AccelKey(GDK_Page_Up,Gdk::SHIFT_MASK,                                       "<Actions>//action-LayerRaise"                          ));
-       ACCEL2(Gtk::AccelKey(GDK_Page_Down,Gdk::SHIFT_MASK,                                     "<Actions>//action-LayerLower"                          ));
-       ACCEL("<Control>1",                                                                                                     "<Actions>//quality-01"                                         );
-       ACCEL("<Control>2",                                                                                                     "<Actions>//quality-02"                                         );
-       ACCEL("<Control>3",                                                                                                     "<Actions>//quality-03"                                         );
-       ACCEL("<Control>4",                                                                                                     "<Actions>//quality-04"                                         );
-       ACCEL("<Control>5",                                                                                                     "<Actions>//quality-05"                                         );
-       ACCEL("<Control>6",                                                                                                     "<Actions>//quality-06"                                         );
-       ACCEL("<Control>7",                                                                                                     "<Actions>//quality-07"                                         );
-       ACCEL("<Control>8",                                                                                                     "<Actions>//quality-08"                                         );
-       ACCEL("<Control>9",                                                                                                     "<Actions>//quality-09"                                         );
-       ACCEL("<Control>0",                                                                                                     "<Actions>//quality-10"                                         );
-       ACCEL("<Control>z",                                                                                                     "<Actions>//undo"                                                       );
-       ACCEL("<Control>r",                                                                                                     "<Actions>//redo"                                                       );
-       ACCEL2(Gtk::AccelKey(GDK_Delete,Gdk::CONTROL_MASK,                                      "<Actions>//action-LayerRemove"                         ));
-       ACCEL2(Gtk::AccelKey('(',Gdk::CONTROL_MASK,                                                     "<Actions>//decrease-low-res-pixel-size"        ));
-       ACCEL2(Gtk::AccelKey(')',Gdk::CONTROL_MASK,                                                     "<Actions>//increase-low-res-pixel-size"        ));
-       ACCEL2(Gtk::AccelKey('(',Gdk::MOD1_MASK|Gdk::CONTROL_MASK,                      "<Actions>//amount-dec"                                         ));
-       ACCEL2(Gtk::AccelKey(')',Gdk::MOD1_MASK|Gdk::CONTROL_MASK,                      "<Actions>//amount-inc"                                         ));
-       ACCEL2(Gtk::AccelKey(']',Gdk::CONTROL_MASK,                                                     "<Actions>//jump-next-keyframe"                         ));
-       ACCEL2(Gtk::AccelKey('[',Gdk::CONTROL_MASK,                                                     "<Actions>//jump-prev-keyframe"                         ));
-       ACCEL2(Gtk::AccelKey('=',Gdk::CONTROL_MASK,                                                     "<Actions>//canvas-zoom-in"                                     ));
-       ACCEL2(Gtk::AccelKey('-',Gdk::CONTROL_MASK,                                                     "<Actions>//canvas-zoom-out"                            ));
-       ACCEL2(Gtk::AccelKey('+',Gdk::CONTROL_MASK,                                                     "<Actions>//time-zoom-in"                                       ));
-       ACCEL2(Gtk::AccelKey('_',Gdk::CONTROL_MASK,                                                     "<Actions>//time-zoom-out"                                      ));
-       ACCEL2(Gtk::AccelKey('.',Gdk::CONTROL_MASK,                                                     "<Actions>//seek-next-frame"                            ));
-       ACCEL2(Gtk::AccelKey(',',Gdk::CONTROL_MASK,                                                     "<Actions>//seek-prev-frame"                            ));
-       ACCEL2(Gtk::AccelKey('>',Gdk::CONTROL_MASK,                                                     "<Actions>//seek-next-second"                           ));
-       ACCEL2(Gtk::AccelKey('<',Gdk::CONTROL_MASK,                                                     "<Actions>//seek-prev-second"                           ));
-       ACCEL("<Mod1>o",                                                                                                        "<Actions>//toggle-onion-skin"                          );
-       ACCEL("<Control><Shift>z",                                                                                      "<Actions>//canvas-zoom-fit"                            );
-       ACCEL("<Control>p",                                                                                                     "<Actions>//play"                                                       );
-       ACCEL("Home",                                                                                                           "<Actions>//seek-begin"                                         );
-       ACCEL("End",                                                                                                            "<Actions>//seek-end"                                           );
+       ACCEL("<Control>a",                                                                                                     "<Actions>/canvasview/select-all-ducks"                         );
+       ACCEL("<Control>d",                                                                                                     "<Actions>/canvasview/unselect-all-ducks"                               );
+       ACCEL("<Control><Shift>a",                                                                                      "<Actions>/canvasview/select-all-layers"                                );
+       ACCEL("<Control><Shift>d",                                                                                      "<Actions>/canvasview/unselect-all-layers"                      );
+       ACCEL("F9",                                                                                                                     "<Actions>/canvasview/render"                                                   );
+       ACCEL("F11",                                                                                                            "<Actions>/canvasview/preview"                                          );
+       ACCEL("F8",                                                                                                                     "<Actions>/canvasview/properties"                                               );
+       ACCEL("F12",                                                                                                            "<Actions>/canvasview/options"                                          );
+       ACCEL("<control>i",                                                                                                     "<Actions>/canvasview/import"                                                   );
+       ACCEL2(Gtk::AccelKey(GDK_Escape,static_cast<Gdk::ModifierType>(0),      "<Actions>/canvasview/stop"                                                     ));
+       ACCEL("<Control>g",                                                                                                     "<Actions>/canvasview/toggle-grid-show"                         );
+       ACCEL("<Control>l",                                                                                                     "<Actions>/canvasview/toggle-grid-snap"                         );
+       ACCEL2(Gtk::AccelKey('`',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/toggle-low-res"                                   ));
+       ACCEL("<Mod1>1",                                                                                                        "<Actions>/canvasview/mask-position-ducks"                      );
+       ACCEL("<Mod1>2",                                                                                                        "<Actions>/canvasview/mask-vertex-ducks"                                );
+       ACCEL("<Mod1>3",                                                                                                        "<Actions>/canvasview/mask-tangent-ducks"                               );
+       ACCEL("<Mod1>4",                                                                                                        "<Actions>/canvasview/mask-radius-ducks"                                );
+       ACCEL("<Mod1>5",                                                                                                        "<Actions>/canvasview/mask-width-ducks"                         );
+       ACCEL("<Mod1>6",                                                                                                        "<Actions>/canvasview/mask-angle-ducks"                         );
+       ACCEL2(Gtk::AccelKey(GDK_Page_Up,Gdk::SHIFT_MASK,                                       "<Actions>/action_group_layer_ops/action-LayerRaise"                            ));
+       ACCEL2(Gtk::AccelKey(GDK_Page_Down,Gdk::SHIFT_MASK,                                     "<Actions>/action_group_layer_ops/action-LayerLower"                            ));
+       ACCEL("<Control>1",                                                                                                     "<Actions>/canvasview/quality-01"                                               );
+       ACCEL("<Control>2",                                                                                                     "<Actions>/canvasview/quality-02"                                               );
+       ACCEL("<Control>3",                                                                                                     "<Actions>/canvasview/quality-03"                                               );
+       ACCEL("<Control>4",                                                                                                     "<Actions>/canvasview/quality-04"                                               );
+       ACCEL("<Control>5",                                                                                                     "<Actions>/canvasview/quality-05"                                               );
+       ACCEL("<Control>6",                                                                                                     "<Actions>/canvasview/quality-06"                                               );
+       ACCEL("<Control>7",                                                                                                     "<Actions>/canvasview/quality-07"                                               );
+       ACCEL("<Control>8",                                                                                                     "<Actions>/canvasview/quality-08"                                               );
+       ACCEL("<Control>9",                                                                                                     "<Actions>/canvasview/quality-09"                                               );
+       ACCEL("<Control>0",                                                                                                     "<Actions>/canvasview/quality-10"                                               );
+       ACCEL("<Control>z",                                                                                                     "<Actions>/action_group_dock_history/undo"                                                      );
+       ACCEL("<Control>r",                                                                                                     "<Actions>/action_group_dock_history/redo"                                                      );
+       ACCEL2(Gtk::AccelKey(GDK_Delete,Gdk::CONTROL_MASK,                                      "<Actions>/action_group_layer_action_manager/action-LayerRemove"                                ));
+       ACCEL2(Gtk::AccelKey('(',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/decrease-low-res-pixel-size"      ));
+       ACCEL2(Gtk::AccelKey(')',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/increase-low-res-pixel-size"      ));
+       ACCEL2(Gtk::AccelKey('(',Gdk::MOD1_MASK|Gdk::CONTROL_MASK,                      "<Actions>/action_group_layer_action_manager/amount-dec"                                                ));
+       ACCEL2(Gtk::AccelKey(')',Gdk::MOD1_MASK|Gdk::CONTROL_MASK,                      "<Actions>/action_group_layer_action_manager/amount-inc"                                                ));
+       ACCEL2(Gtk::AccelKey(']',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/jump-next-keyframe"                               ));
+       ACCEL2(Gtk::AccelKey('[',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/jump-prev-keyframe"                               ));
+       ACCEL2(Gtk::AccelKey('=',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/canvas-zoom-in"                                   ));
+       ACCEL2(Gtk::AccelKey('-',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/canvas-zoom-out"                          ));
+       ACCEL2(Gtk::AccelKey('+',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/time-zoom-in"                                     ));
+       ACCEL2(Gtk::AccelKey('_',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/time-zoom-out"                                    ));
+       ACCEL2(Gtk::AccelKey('.',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/seek-next-frame"                          ));
+       ACCEL2(Gtk::AccelKey(',',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/seek-prev-frame"                          ));
+       ACCEL2(Gtk::AccelKey('>',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/seek-next-second"                         ));
+       ACCEL2(Gtk::AccelKey('<',Gdk::CONTROL_MASK,                                                     "<Actions>/canvasview/seek-prev-second"                         ));
+       ACCEL("<Mod1>o",                                                                                                        "<Actions>/canvasview/toggle-onion-skin"                                );
+       ACCEL("<Control><Shift>z",                                                                                      "<Actions>/canvasview/canvas-zoom-fit"                          );
+       ACCEL("<Control>p",                                                                                                     "<Actions>/canvasview/play"                                                     );
+       ACCEL("Home",                                                                                                           "<Actions>/canvasview/seek-begin"                                               );
+       ACCEL("End",                                                                                                            "<Actions>/canvasview/seek-end"                                         );
 
 #undef ACCEL
 }
diff --git a/synfig-studio/src/gtkmm/canvasview.cpp b/synfig-studio/src/gtkmm/canvasview.cpp
index e7eeab4..bc0cde5 100644 (file)
--- a/synfig-studio/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/src/gtkmm/canvasview.cpp
@@ -1425,7 +1425,7 @@ CanvasView::init_menus()
        - canvasmenu
        - viewmenu
        */
-       action_group = Gtk::ActionGroup::create("mainmenu");
+       action_group = Gtk::ActionGroup::create("canvasview");
 
        //action_group->add( Gtk::Action::create("MenuFile", _("_File")) );
        action_group->add( Gtk::Action::create("new", Gtk::Stock::NEW),
Synfig (Bombe’s repository)