← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/editors/space_sequencer/sequencer_ops.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_sequencer/sequencer_ops.c
43
43
#include "WM_api.h"
44
44
#include "WM_types.h"
45
45
 
 
46
#include "ED_sequencer.h"
46
47
#include "ED_markers.h"
47
48
#include "ED_transform.h" /* transform keymap */
48
49
 
72
73
        WM_operatortype_append(SEQUENCER_OT_meta_make);
73
74
        WM_operatortype_append(SEQUENCER_OT_meta_separate);
74
75
        WM_operatortype_append(SEQUENCER_OT_snap);
75
 
        WM_operatortype_append(SEQUENCER_OT_next_edit);
76
 
        WM_operatortype_append(SEQUENCER_OT_previous_edit);
 
76
        WM_operatortype_append(SEQUENCER_OT_strip_jump);
77
77
        WM_operatortype_append(SEQUENCER_OT_swap);
78
78
        WM_operatortype_append(SEQUENCER_OT_swap_data);
79
79
        WM_operatortype_append(SEQUENCER_OT_rendersize);
80
80
 
 
81
        WM_operatortype_append(SEQUENCER_OT_copy);
 
82
        WM_operatortype_append(SEQUENCER_OT_paste);
 
83
 
81
84
        WM_operatortype_append(SEQUENCER_OT_view_all);
82
85
        WM_operatortype_append(SEQUENCER_OT_view_selected);
83
86
        WM_operatortype_append(SEQUENCER_OT_view_all_preview);
105
108
        /* sequencer_add.c */
106
109
        WM_operatortype_append(SEQUENCER_OT_scene_strip_add);
107
110
        WM_operatortype_append(SEQUENCER_OT_movieclip_strip_add);
 
111
        WM_operatortype_append(SEQUENCER_OT_mask_strip_add);
108
112
        WM_operatortype_append(SEQUENCER_OT_movie_strip_add);
109
113
        WM_operatortype_append(SEQUENCER_OT_sound_strip_add);
110
114
        WM_operatortype_append(SEQUENCER_OT_image_strip_add);
111
115
        WM_operatortype_append(SEQUENCER_OT_effect_strip_add);
 
116
 
 
117
        /* sequencer_buttons.c */
112
118
        WM_operatortype_append(SEQUENCER_OT_properties);
113
119
 
114
 
        WM_operatortype_append(SEQUENCER_OT_copy);
115
 
        WM_operatortype_append(SEQUENCER_OT_paste);
 
120
        /* sequencer_modifiers.c */
 
121
        WM_operatortype_append(SEQUENCER_OT_strip_modifier_add);
 
122
        WM_operatortype_append(SEQUENCER_OT_strip_modifier_remove);
 
123
        WM_operatortype_append(SEQUENCER_OT_strip_modifier_move);
 
124
 
 
125
        /* sequencer_view.h */
 
126
        WM_operatortype_append(SEQUENCER_OT_sample);
116
127
}
117
128
 
118
129
 
123
134
        
124
135
        /* Common items ------------------------------------------------------------------ */
125
136
        keymap = WM_keymap_find(keyconf, "SequencerCommon", SPACE_SEQ, 0);
126
 
        
 
137
 
 
138
        WM_keymap_add_item(keymap, "SEQUENCER_OT_properties", NKEY, KM_PRESS, 0, 0);
 
139
 
127
140
        kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", OKEY, KM_PRESS, KM_SHIFT, 0);
128
141
        RNA_string_set(kmi->ptr, "data_path", "scene.sequence_editor.show_overlay");
129
142
 
132
145
 
133
146
        /* Strips Region --------------------------------------------------------------- */
134
147
        keymap = WM_keymap_find(keyconf, "Sequencer", SPACE_SEQ, 0);
135
 
        
136
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_properties", NKEY, KM_PRESS, 0, 0);
137
 
        
 
148
 
138
149
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select_all", AKEY, KM_PRESS, 0, 0);
139
150
        RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
140
151
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
144
155
        RNA_enum_set(kmi->ptr, "type", SEQ_CUT_SOFT);
145
156
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_cut", KKEY, KM_PRESS, KM_SHIFT, 0);
146
157
        RNA_enum_set(kmi->ptr, "type", SEQ_CUT_HARD);
147
 
        
 
158
 
148
159
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_mute", HKEY, KM_PRESS, 0, 0);
149
160
        RNA_boolean_set(kmi->ptr, "unselected", FALSE);
150
161
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_mute", HKEY, KM_PRESS, KM_SHIFT, 0);
151
162
        RNA_boolean_set(kmi->ptr, "unselected", TRUE);
152
 
        
 
163
 
153
164
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_unmute", HKEY, KM_PRESS, KM_ALT, 0);
154
165
        RNA_boolean_set(kmi->ptr, "unselected", FALSE);
155
166
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_unmute", HKEY, KM_PRESS, KM_ALT | KM_SHIFT, 0);
166
177
 
167
178
        WM_keymap_add_item(keymap, "SEQUENCER_OT_offset_clear", OKEY, KM_PRESS, KM_ALT, 0);
168
179
 
169
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_duplicate", DKEY, KM_PRESS, KM_SHIFT, 0);
 
180
        WM_keymap_add_item(keymap, "SEQUENCER_OT_duplicate_move", DKEY, KM_PRESS, KM_SHIFT, 0);
170
181
 
171
182
        WM_keymap_add_item(keymap, "SEQUENCER_OT_delete", XKEY, KM_PRESS, 0, 0);
172
183
        WM_keymap_add_item(keymap, "SEQUENCER_OT_delete", DELKEY, KM_PRESS, 0, 0);
173
 
        
 
184
 
174
185
        WM_keymap_add_item(keymap, "SEQUENCER_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);
175
186
        WM_keymap_add_item(keymap, "SEQUENCER_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0);
176
187
 
184
195
        WM_keymap_add_item(keymap, "SEQUENCER_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
185
196
        WM_keymap_add_item(keymap, "SEQUENCER_OT_view_selected", PADPERIOD, KM_PRESS, 0, 0);
186
197
 
187
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_next_edit", PAGEUPKEY, KM_PRESS, 0, 0);
188
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_previous_edit", PAGEDOWNKEY, KM_PRESS, 0, 0);
 
198
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_strip_jump", PAGEUPKEY, KM_PRESS, 0, 0);
 
199
        RNA_boolean_set(kmi->ptr, "next", TRUE);
 
200
        RNA_boolean_set(kmi->ptr, "center", FALSE);
 
201
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_strip_jump", PAGEDOWNKEY, KM_PRESS, 0, 0);
 
202
        RNA_boolean_set(kmi->ptr, "next", FALSE);
 
203
        RNA_boolean_set(kmi->ptr, "center", FALSE);
 
204
 
 
205
        /* alt for center */
 
206
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_strip_jump", PAGEUPKEY, KM_PRESS, KM_ALT, 0);
 
207
        RNA_boolean_set(kmi->ptr, "next", TRUE);
 
208
        RNA_boolean_set(kmi->ptr, "center", TRUE);
 
209
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_strip_jump", PAGEDOWNKEY, KM_PRESS, KM_ALT, 0);
 
210
        RNA_boolean_set(kmi->ptr, "next", FALSE);
 
211
        RNA_boolean_set(kmi->ptr, "center", TRUE);
189
212
 
190
213
        RNA_enum_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_swap", LEFTARROWKEY, KM_PRESS, KM_ALT, 0)->ptr, "side", SEQ_SIDE_LEFT);
191
214
        RNA_enum_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_swap", RIGHTARROWKEY, KM_PRESS, KM_ALT, 0)->ptr, "side", SEQ_SIDE_RIGHT);
192
 
        
 
215
 
193
216
        WM_keymap_add_item(keymap, "SEQUENCER_OT_snap", SKEY, KM_PRESS, KM_SHIFT, 0);
194
217
        WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_inputs", SKEY, KM_PRESS, KM_ALT, 0);
195
218
 
224
247
        RNA_boolean_set(kmi->ptr, "linked_left", TRUE);
225
248
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0);
226
249
        RNA_boolean_set(kmi->ptr, "linked_right", TRUE);
227
 
        
 
250
 
228
251
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_CTRL | KM_ALT, 0);
229
252
        RNA_boolean_set(kmi->ptr, "linked_left", TRUE);
230
253
        RNA_boolean_set(kmi->ptr, "linked_right", TRUE);
272
295
 
273
296
        WM_keymap_add_item(keymap, "SEQUENCER_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
274
297
        WM_keymap_add_item(keymap, "SEQUENCER_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
275
 
        
 
298
 
276
299
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select_linked_pick", LKEY, KM_PRESS, 0, 0);
277
300
        RNA_boolean_set(kmi->ptr, "extend", FALSE);
278
301
        kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select_linked_pick", LKEY, KM_PRESS, KM_SHIFT, 0);
279
302
        RNA_boolean_set(kmi->ptr, "extend", TRUE);
280
 
        
 
303
 
281
304
        WM_keymap_add_item(keymap, "SEQUENCER_OT_select_linked", LKEY, KM_PRESS, KM_CTRL, 0);
282
 
        
 
305
 
283
306
        WM_keymap_add_item(keymap, "SEQUENCER_OT_select_border", BKEY, KM_PRESS, 0, 0);
284
307
 
285
308
        WM_keymap_add_item(keymap, "SEQUENCER_OT_select_grouped", GKEY, KM_PRESS, KM_SHIFT, 0);
287
310
        WM_keymap_add_menu(keymap, "SEQUENCER_MT_add", AKEY, KM_PRESS, KM_SHIFT, 0);
288
311
 
289
312
        WM_keymap_add_menu(keymap, "SEQUENCER_MT_change", CKEY, KM_PRESS, 0, 0);
290
 
        
 
313
 
291
314
        kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_int", OKEY, KM_PRESS, 0, 0);
292
315
        RNA_string_set(kmi->ptr, "data_path", "scene.sequence_editor.overlay_frame");
293
316
        RNA_int_set(kmi->ptr, "value", 0);
294
317
 
295
318
        transform_keymap_for_space(keyconf, keymap, SPACE_SEQ);
296
 
        
 
319
 
297
320
        /* special markers hotkeys for anim editors: see note in definition of this function */
298
321
        ED_marker_keymap_animedit_conflictfree(keymap);
299
 
        
300
 
        
 
322
 
 
323
 
301
324
        /* Preview Region ----------------------------------------------------------- */
302
325
        keymap = WM_keymap_find(keyconf, "SequencerPreview", SPACE_SEQ, 0);
303
326
        WM_keymap_add_item(keymap, "SEQUENCER_OT_view_all_preview", HOMEKEY, KM_PRESS, 0, 0);
304
 
        WM_keymap_add_item(keymap, "SEQUENCER_OT_properties", NKEY, KM_PRESS, 0, 0);
305
327
 
306
328
        WM_keymap_add_item(keymap, "SEQUENCER_OT_view_ghost_border", OKEY, KM_PRESS, 0, 0);
307
329
 
308
330
        /* would prefer to use numpad keys for job */
309
331
        RNA_float_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_view_zoom_ratio", PAD1, KM_PRESS, 0, 0)->ptr, "ratio", 1.0f);
310
 
        
 
332
 
311
333
        /* Setting zoom levels is not that useful, except for back to zoom level 1, removing keymap because of conflicts for now */
312
334
#if 0
313
335
        RNA_float_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_view_zoom_ratio", PAD8, KM_PRESS, KM_SHIFT, 0)->ptr, "ratio", 8.0f);
314
336
        RNA_float_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_view_zoom_ratio", PAD4, KM_PRESS, KM_SHIFT, 0)->ptr, "ratio", 4.0f);
315
337
        RNA_float_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_view_zoom_ratio", PAD2, KM_PRESS, KM_SHIFT, 0)->ptr, "ratio", 2.0f);
316
 
        
 
338
 
317
339
        RNA_float_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_view_zoom_ratio", PAD2, KM_PRESS, 0, 0)->ptr, "ratio", 0.5f);
318
340
        RNA_float_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_view_zoom_ratio", PAD4, KM_PRESS, 0, 0)->ptr, "ratio", 0.25f);
319
341
        RNA_float_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_view_zoom_ratio", PAD8, KM_PRESS, 0, 0)->ptr, "ratio", 0.125f);
320
342
#endif
321
 
}
322
 
 
 
343
 
 
344
        /* sample */
 
345
        WM_keymap_add_item(keymap, "SEQUENCER_OT_sample", ACTIONMOUSE, KM_PRESS, 0, 0);
 
346
}
 
347
 
 
348
void ED_operatormacros_sequencer(void)
 
349
{
 
350
        wmOperatorType *ot;
 
351
 
 
352
        ot = WM_operatortype_append_macro("SEQUENCER_OT_duplicate_move", "Duplicate Strips",
 
353
                                          "Duplicate selected strips and move them", OPTYPE_UNDO | OPTYPE_REGISTER);
 
354
 
 
355
        WM_operatortype_macro_define(ot, "SEQUENCER_OT_duplicate");
 
356
        WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 
357
}