comparison libgui/src/shortcut-manager.cc @ 18678:6113e0c6920b

maint: Clean up extra spaces before/after parentheses.
author Rik <rik@octave.org>
date Fri, 25 Apr 2014 13:25:25 -0700
parents 777281eeb3d4
children 7c78430535db
comparison
equal deleted inserted replaced
18677:f684f7075aee 18678:6113e0c6920b
80 shortcut_manager::do_init_data () 80 shortcut_manager::do_init_data ()
81 { 81 {
82 // actions of the main window 82 // actions of the main window
83 83
84 // file 84 // file
85 init (tr ("New File"), "main_file:new_file", QKeySequence::New ); 85 init (tr ("New File"), "main_file:new_file", QKeySequence::New);
86 init (tr ("New Function"), "main_file:new_function", QKeySequence ("Ctrl+Shift+N") ); 86 init (tr ("New Function"), "main_file:new_function",
87 init (tr ("New Figure"), "main_file:new_figure", QKeySequence () ); 87 QKeySequence ("Ctrl+Shift+N"));
88 init (tr ("Open File"), "main_file:open_file", QKeySequence::Open ); 88 init (tr ("New Figure"), "main_file:new_figure", QKeySequence ());
89 init (tr ("Load Workspace"), "main_file:load_workspace", QKeySequence () ); 89 init (tr ("Open File"), "main_file:open_file", QKeySequence::Open);
90 init (tr ("Save Workspace As"), "main_file:save_workspace", QKeySequence () ); 90 init (tr ("Load Workspace"), "main_file:load_workspace", QKeySequence ());
91 init (tr ("Preferences"), "main_file:preferences", QKeySequence () ); 91 init (tr ("Save Workspace As"), "main_file:save_workspace", QKeySequence ());
92 init (tr ("Exit Octave"), "main_file:exit", QKeySequence::Quit ); 92 init (tr ("Preferences"), "main_file:preferences", QKeySequence ());
93 init (tr ("Exit Octave"), "main_file:exit", QKeySequence::Quit);
93 94
94 // edit 95 // edit
95 init (tr ("Copy"), "main_edit:copy", QKeySequence::Copy); 96 init (tr ("Copy"), "main_edit:copy", QKeySequence::Copy);
96 init (tr ("Paste"), "main_edit:paste", QKeySequence::Paste); 97 init (tr ("Paste"), "main_edit:paste", QKeySequence::Paste);
97 init (tr ("Undo"), "main_edit:undo", QKeySequence::Undo); 98 init (tr ("Undo"), "main_edit:undo", QKeySequence::Undo);
98 init (tr ("Select All"), "main_edit:select_all", QKeySequence () ); 99 init (tr ("Select All"), "main_edit:select_all", QKeySequence ());
99 init (tr ("Clear Clipboard"), "main_edit:clear_clipboard", QKeySequence () ); 100 init (tr ("Clear Clipboard"), "main_edit:clear_clipboard", QKeySequence ());
100 init (tr ("Find in Files"), "main_edit:find_in_files", QKeySequence (Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_F) ); 101 init (tr ("Find in Files"), "main_edit:find_in_files",
101 init (tr ("Clear Command Window"), "main_edit:clear_command_window", QKeySequence () ); 102 QKeySequence (Qt::ControlModifier + Qt::ShiftModifier + Qt::Key_F));
102 init (tr ("Clear Command History"), "main_edit:clear_history", QKeySequence () ); 103 init (tr ("Clear Command Window"), "main_edit:clear_command_window",
103 init (tr ("Clear Workspace"), "main_edit:clear_workspace", QKeySequence () ); 104 QKeySequence ());
105 init (tr ("Clear Command History"), "main_edit:clear_history",
106 QKeySequence ());
107 init (tr ("Clear Workspace"), "main_edit:clear_workspace", QKeySequence ());
104 108
105 // actions of the editor 109 // actions of the editor
106 110
107 // file 111 // file
108 init (tr ("Edit Function"), "editor_file:edit_function", QKeySequence (Qt::ControlModifier + Qt::Key_E) ); 112 init (tr ("Edit Function"), "editor_file:edit_function",
109 init (tr ("Save File"), "editor_file:save", QKeySequence::Save ); 113 QKeySequence (Qt::ControlModifier + Qt::Key_E));
110 init (tr ("Save File As"), "editor_file:save_as", QKeySequence::SaveAs ); 114 init (tr ("Save File"), "editor_file:save", QKeySequence::Save);
111 init (tr ("Close"), "editor_file:close", QKeySequence::Close ); 115 init (tr ("Save File As"), "editor_file:save_as", QKeySequence::SaveAs);
112 init (tr ("Close All"), "editor_file:close_all", QKeySequence () ); 116 init (tr ("Close"), "editor_file:close", QKeySequence::Close);
113 init (tr ("Close Other"), "editor_file:close_other", QKeySequence () ); 117 init (tr ("Close All"), "editor_file:close_all", QKeySequence ());
114 init (tr ("Print"), "editor_file:print", QKeySequence::Print ); 118 init (tr ("Close Other"), "editor_file:close_other", QKeySequence ());
119 init (tr ("Print"), "editor_file:print", QKeySequence::Print);
115 120
116 // edit 121 // edit
117 init (tr ("Undo"), "editor_edit:undo", QKeySequence::Undo ); 122 init (tr ("Undo"), "editor_edit:undo", QKeySequence::Undo);
118 init (tr ("Redo"), "editor_edit:redo", QKeySequence::Redo ); 123 init (tr ("Redo"), "editor_edit:redo", QKeySequence::Redo);
119 init (tr ("Copy"), "editor_edit:copy", QKeySequence::Copy ); 124 init (tr ("Copy"), "editor_edit:copy", QKeySequence::Copy);
120 init (tr ("Cuy"), "editor_edit:cut", QKeySequence::Cut ); 125 init (tr ("Cuy"), "editor_edit:cut", QKeySequence::Cut);
121 init (tr ("Paste"), "editor_edit:paste", QKeySequence::Paste ); 126 init (tr ("Paste"), "editor_edit:paste", QKeySequence::Paste);
122 init (tr ("Select All"), "editor_edit:select_all", QKeySequence::SelectAll ); 127 init (tr ("Select All"), "editor_edit:select_all", QKeySequence::SelectAll);
123 init (tr ("Find and Replace"), "editor_edit:find_replace", QKeySequence::Find ); 128 init (tr ("Find and Replace"), "editor_edit:find_replace",
124 129 QKeySequence::Find);
125 init (tr ("Delete to Start of Word"), "editor_edit:delete_start_word", QKeySequence::DeleteStartOfWord ); 130
126 init (tr ("Delete to End of Word"), "editor_edit:delete_end_word", QKeySequence::DeleteEndOfWord ); 131 init (tr ("Delete to Start of Word"), "editor_edit:delete_start_word",
127 init (tr ("Delete to Start of Line"), "editor_edit:delete_start_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_Backspace) ); 132 QKeySequence::DeleteStartOfWord);
128 init (tr ("Delete to End of Line"), "editor_edit:delete_end_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_Delete) ); 133 init (tr ("Delete to End of Word"), "editor_edit:delete_end_word",
129 init (tr ("Delete Line"), "editor_edit:delete_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_L) ); 134 QKeySequence::DeleteEndOfWord);
130 init (tr ("Copy Line"), "editor_edit:copy_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_C) ); 135 init (tr ("Delete to Start of Line"), "editor_edit:delete_start_line",
131 init (tr ("Cut Line"), "editor_edit:cut_line", QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_X) ); 136 QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_Backspace));
132 init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection", QKeySequence (Qt::ControlModifier + Qt::Key_D) ); 137 init (tr ("Delete to End of Line"), "editor_edit:delete_end_line",
133 init (tr ("Transpose Line"), "editor_edit:transpose_line", QKeySequence (Qt::ControlModifier + Qt::Key_T) ); 138 QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_Delete));
134 init (tr ("Completion List"), "editor_edit:completion_list", QKeySequence (Qt::ControlModifier + Qt::Key_Space) ); 139 init (tr ("Delete Line"), "editor_edit:delete_line",
135 140 QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_L));
136 init (tr ("Comment Selection"), "editor_edit:comment_selection", QKeySequence (Qt::ControlModifier + Qt::Key_R) ); 141 init (tr ("Copy Line"), "editor_edit:copy_line",
137 init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection", QKeySequence (Qt::SHIFT + Qt::ControlModifier + Qt::Key_R) ); 142 QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_C));
138 init (tr ("Uppercase Selection"), "editor_edit:upper_case", QKeySequence (Qt::ControlModifier + Qt::Key_U) ); 143 init (tr ("Cut Line"), "editor_edit:cut_line",
139 init (tr ("Lowercase Selection"), "editor_edit:lower_case", QKeySequence (Qt::ControlModifier + Qt::AltModifier + Qt::Key_U) ); 144 QKeySequence (Qt::ControlModifier + Qt::SHIFT + Qt::Key_X));
140 init (tr ("Indent Selection"), "editor_edit:indent_selection", QKeySequence (Qt::ControlModifier + Qt::Key_Tab) ); 145 init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection",
141 init (tr ("Unindent Selection"), "editor_edit:unindent_selection", QKeySequence (Qt::SHIFT + Qt::ControlModifier + Qt::Key_Tab) ); 146 QKeySequence (Qt::ControlModifier + Qt::Key_D));
142 147 init (tr ("Transpose Line"), "editor_edit:transpose_line",
143 init (tr ("Goto Line"), "editor_edit:goto_line", QKeySequence (Qt::ControlModifier+ Qt::Key_G) ); 148 QKeySequence (Qt::ControlModifier + Qt::Key_T));
144 init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark", QKeySequence (Qt::Key_F7) ); 149 init (tr ("Completion List"), "editor_edit:completion_list",
145 init (tr ("Next Bookmark"), "editor_edit:next_bookmark", QKeySequence (Qt::Key_F2) ); 150 QKeySequence (Qt::ControlModifier + Qt::Key_Space));
146 init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark", QKeySequence (Qt::SHIFT + Qt::Key_F2) ); 151
147 init (tr ("Remove All Bookmark"), "editor_edit:remove_bookmark", QKeySequence () ); 152 init (tr ("Comment Selection"), "editor_edit:comment_selection",
148 153 QKeySequence (Qt::ControlModifier + Qt::Key_R));
149 init (tr ("Preferences"), "editor_edit:preferences", QKeySequence () ); 154 init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection",
150 init (tr ("Styles Preferences"), "editor_edit:styles_preferences", QKeySequence () ); 155 QKeySequence (Qt::SHIFT + Qt::ControlModifier + Qt::Key_R));
156 init (tr ("Uppercase Selection"), "editor_edit:upper_case",
157 QKeySequence (Qt::ControlModifier + Qt::Key_U));
158 init (tr ("Lowercase Selection"), "editor_edit:lower_case",
159 QKeySequence (Qt::ControlModifier + Qt::AltModifier + Qt::Key_U));
160 init (tr ("Indent Selection"), "editor_edit:indent_selection",
161 QKeySequence (Qt::ControlModifier + Qt::Key_Tab));
162 init (tr ("Unindent Selection"), "editor_edit:unindent_selection",
163 QKeySequence (Qt::SHIFT + Qt::ControlModifier + Qt::Key_Tab));
164
165 init (tr ("Goto Line"), "editor_edit:goto_line",
166 QKeySequence (Qt::ControlModifier+ Qt::Key_G));
167 init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark",
168 QKeySequence (Qt::Key_F7));
169 init (tr ("Next Bookmark"), "editor_edit:next_bookmark",
170 QKeySequence (Qt::Key_F2));
171 init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark",
172 QKeySequence (Qt::SHIFT + Qt::Key_F2));
173 init (tr ("Remove All Bookmark"), "editor_edit:remove_bookmark",
174 QKeySequence ());
175
176 init (tr ("Preferences"), "editor_edit:preferences", QKeySequence ());
177 init (tr ("Styles Preferences"), "editor_edit:styles_preferences",
178 QKeySequence ());
151 179
152 // view 180 // view
153 init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn ); 181 init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn);
154 init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut ); 182 init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut);
155 init (tr ("Zoom Normal"), "editor_view:zoom_normal", QKeySequence (Qt::ControlModifier + Qt::Key_Slash) ); 183 init (tr ("Zoom Normal"), "editor_view:zoom_normal",
184 QKeySequence (Qt::ControlModifier + Qt::Key_Slash));
156 185
157 // debug 186 // debug
158 init (tr ("Toggle Breakpoint"), "editor_debug:toggle_breakpoint", QKeySequence () ); 187 init (tr ("Toggle Breakpoint"), "editor_debug:toggle_breakpoint",
159 init (tr ("Next Breakpoint"), "editor_debug:next_breakpoint", QKeySequence () ); 188 QKeySequence ());
160 init (tr ("Previous Breakpoint"), "editor_debug:previous_breakpoint", QKeySequence () ); 189 init (tr ("Next Breakpoint"), "editor_debug:next_breakpoint",
161 init (tr ("Remove All Breakpoints"), "editor_debug:remove_breakpoints", QKeySequence () ); 190 QKeySequence ());
191 init (tr ("Previous Breakpoint"), "editor_debug:previous_breakpoint",
192 QKeySequence ());
193 init (tr ("Remove All Breakpoints"), "editor_debug:remove_breakpoints",
194 QKeySequence ());
162 195
163 // run 196 // run
164 init (tr ("Run File"), "editor_run:run_file", QKeySequence (Qt::Key_F5) ); 197 init (tr ("Run File"), "editor_run:run_file", QKeySequence (Qt::Key_F5));
165 init (tr ("Run Selection"), "editor_run:run_selection", QKeySequence (Qt::Key_F9) ); 198 init (tr ("Run Selection"), "editor_run:run_selection", QKeySequence (Qt::Key_F9));
166 199
167 // help 200 // help
168 init (tr ("Help on Keyword"), "editor_help:help_keyword", QKeySequence::HelpContents ); 201 init (tr ("Help on Keyword"), "editor_help:help_keyword", QKeySequence::HelpContents);
169 init (tr ("Document on Keyword"), "editor_help:doc_keyword", QKeySequence (Qt::SHIFT + Qt::Key_F1) ); 202 init (tr ("Document on Keyword"), "editor_help:doc_keyword", QKeySequence (Qt::SHIFT + Qt::Key_F1));
170 } 203 }
171 204
172 void 205 void
173 shortcut_manager::init (QString description, QString key, QKeySequence def_sc) 206 shortcut_manager::init (QString description, QString key, QKeySequence def_sc)
174 { 207 {
278 shortcut_manager::do_set_shortcut (QAction* action, const QString& key) 311 shortcut_manager::do_set_shortcut (QAction* action, const QString& key)
279 { 312 {
280 int index = _action_hash[key] - 1; 313 int index = _action_hash[key] - 1;
281 314
282 if (index > -1 && index < _sc.count ()) 315 if (index > -1 && index < _sc.count ())
283 action->setShortcut ( QKeySequence ( 316 action->setShortcut (QKeySequence (
284 _settings->value ("shortcuts/" + key, _sc.at (index).default_sc).toString ())); 317 _settings->value ("shortcuts/" + key, _sc.at (index).default_sc).toString ()));
285 else 318 else
286 qDebug () << "Key: " << key << " not found in _action_hash"; 319 qDebug () << "Key: " << key << " not found in _action_hash";
287 } 320 }
288 321