Paul Davis
94a2e799ae
Revert "adjust horizontal-offset for snap/grid dropdown." Wrong fix for the problem.
...
This reverts commit c90d35c4a1
2014-08-17 20:59:48 -04:00
Robin Gareus
a3c71e8f65
adjust horizontal-offset for snap/grid dropdown.
2014-08-17 20:59:38 -04:00
Paul Davis
381a3c0a99
add Editor::edit_mode_strings to allow for i18n; correctly size ArdourDropdowns using longest, translated strings
...
Conflicts:
gtk2_ardour/editor.cc
2014-08-17 20:51:45 -04:00
Robin Gareus
53d8318a26
shorten grid/snap label "Timecode" -> "TC"
2014-08-17 20:49:33 -04:00
Robin Gareus
d8909ab83f
automatically set ArdourDropdown box width.
...
..according to longest text in English.
Conflicts:
gtk2_ardour/editor.cc
2014-08-17 20:49:24 -04:00
Ben Loftis
31ffc2aa85
fix thinko with split selections. also ignore follow_edits when we are splitting, because the playlist freeze and the newly added regions cause the playhead to jump to unexpected locations
2014-08-17 20:44:22 -04:00
Paul Davis
f246c98529
fix build after copy-n-paste/code change collision
2014-08-17 20:42:54 -04:00
Paul Davis
fca6419abf
some code shuffling to make sure that cut mode always operates at the mouse location, with (maybe) the right regions
2014-08-17 20:42:47 -04:00
Ben Loftis
9aef2d74e3
remove all_group_active_button. if you want to operate on all tracks, choose select-all-tracks ( ctrl+t in the mnemonic bindings ). this is more explicit and allows safer use of the deselected-region-under-mouse operations
2014-08-17 20:42:33 -04:00
Paul Davis
b18b3b850b
add basics of Cut mouse mode, no functionality yet. Icon images are still required
...
Conflicts:
gtk2_ardour/editor.cc
gtk2_ardour/editor_actions.cc
2014-08-17 20:41:07 -04:00
Ben Loftis
2db9d6bc19
remove some cruft with previous commits. remove option link-region-and-track-selection since they are now exclusive, and rename select-all-regions to select-all-objects to match the implementation
2014-08-17 20:39:24 -04:00
Ben Loftis
2e3acae230
now that track and region selections are mutually exclusive, you need a separate action to select-all-tracks and select-all-regions. also, preserve region selection during a split, iff we are working on a region selection: only add the newly created regions, dont change anything else in the selection; leave that in control of the user
2014-08-17 20:38:04 -04:00
Ben Loftis
f0d7b35bc7
new approach to selections which will help rationalize Split and similar functions. Object and Track selections are now mutually exclusive. a split will happen at (a) selection->regions (b) the intersection of edit_point and selection->tracks or (c) the region under the mouse, IFF nothing else is selected.
2014-08-17 20:37:37 -04:00
Paul Davis
3705b6d099
revert part of 0f1c7b1d71 which broke lots of stuff based on region selection
2014-08-17 20:34:59 -04:00
Ben Loftis
4dca4a7f7e
start-range and finish-range should graphically show the range being created. also add bindings for comma and period in addition to existing bindings which require a numpad. the old ones are now alternates. all primary functionality should appear on the qwerrty, and the numpad should be considered an ergonomic redundant alternative if you have one
2014-08-17 20:34:30 -04:00
Paul Davis
fbad093b59
simplify zooming, remove Editor::clamp_samples_per_pixel(), fix getting "stuck" at max and min zoom levels
2014-08-17 20:34:07 -04:00
Paul Davis
0ba6999b86
remove unused "zoom range clock" from code as part of zoom simplifications
2014-08-17 20:34:02 -04:00
Ben Loftis
fa2f8876ea
splice mode is undefined, undocumented, and buggy. ripple does most of what we want. remove splice for now. leave code because it may be revived later
2014-08-17 20:33:04 -04:00
Paul Davis
d8a9f3f472
new UI config var to allow playhead to be optionally draggable (default is: yes, it can be dragged)
...
Conflicts:
gtk2_ardour/ui_config_vars.h
2014-08-17 20:03:31 -04:00
Paul Davis
4cbb6e1cdc
ensure that Editor::entered_track is reset during session deletion to avoid a crash when we explicitly unset it elsewhere
2014-08-17 20:01:59 -04:00
Robin Gareus
94632100a6
suspend route redisplay for (rec-en, solo, mute and monitor) batch changes
...
Conflicts:
gtk2_ardour/ardour_ui.cc
gtk2_ardour/route_ui.cc
2014-08-17 19:56:45 -04:00
Robin Gareus
67c1322f0d
add RAII DisplaySuspender
2014-08-17 19:49:03 -04:00
Robin Gareus
a17616f1da
move utility functions into a dedicated namespace
...
Conflicts:
gtk2_ardour/about.cc
gtk2_ardour/editor_ops.cc
2014-08-17 18:51:22 -04:00
Paul Davis
c1213d0040
use new ruler dialog class for context clicks on ruler labels area
...
Conflicts:
gtk2_ardour/editor.cc
2014-08-17 18:48:40 -04:00
Paul Davis
dc757ab7c1
fix conflicts caused by XML-ization of old 2-canvas design
2014-08-17 17:40:48 -04:00
Paul Davis
4d4851cffc
a whole slew of changes related to centralizing and rationalizing cursor management.
...
Debugging output left in place to help address the reports that will come in as people test this more
2014-08-17 16:23:52 -04:00
nick_m
ac39db608f
Render tracks and regions to a background image in the editor summary.
...
Connect to editor's SelectionChanged signal to display corresponding region colour change.
2014-08-17 15:32:55 -04:00
Paul Davis
41526eec44
do most of the work related to adding new anchored trim cursors (but debugging/analysis continues)
2014-08-17 15:25:36 -04:00
Paul Davis
d9cee7a6d6
fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there)
2014-08-17 15:24:46 -04:00
Paul Davis
f35de8c953
make rulers color-sensitive (e.g. theme manager editable, etc)
2014-08-17 15:08:24 -04:00
Paul Davis
59ccbc8774
use canvas rulers now instead of gtk widgets
...
Some bugs that exist in master are still present.
Conflicts:
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
2014-08-17 15:07:20 -04:00
Paul Davis
5fea87ead6
make the icon set selector actually do something
...
Conflicts:
gtk2_ardour/editor.cc
2014-08-17 15:04:16 -04:00
Paul Davis
7e317e7ad8
change ::get_icon_path() and ::get_icon() to accept an "icon set" name to provide ability to use different sets of icons; use when creating MouseCursors
2014-08-17 15:03:22 -04:00
Paul Davis
91702c2702
forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
...
Conflicts:
gtk2_ardour/editor.cc
2014-08-17 15:00:07 -04:00
Paul Davis
525f2893f9
fix problem with calls to Editor::trackview_by_y_position() when using motion events. The coordinate passed in was in canvas space and the method expected trackview space
...
To handle any further issues like this, I generalized and added an optional argument specifying that the canvas=>trackview transform is required, thus
centralizing where this done.
2014-08-17 14:56:50 -04:00
Paul Davis
678b836853
introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group.
...
More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
2014-08-17 14:56:20 -04:00
Paul Davis
e8e3460665
more profound changes to canvas scrolling, in particular find appropriate ScrollGroup for Canvas::{window,canvas}_to_{canvas,window}()
...
Conflicts:
gtk2_ardour/editor_mouse.cc
2014-08-17 13:43:52 -04:00
Paul Davis
893452b388
remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done
...
Conflicts:
gtk2_ardour/editor.cc
2014-08-17 13:38:30 -04:00
Robin Gareus
d411468f08
set Gtk::RadioAction state on instant.xml load.
...
This should really be done in ArdourDropdown somehow.
Fixes issues introduced at b9708d5
2014-08-16 17:56:23 -04:00
Robin Gareus
4e55433457
update x-fade context-menu
2014-08-16 17:56:09 -04:00
Robin Gareus
e528eb1e86
update fade icons
2014-08-16 17:22:33 -04:00
Robin Gareus
10b6bb833c
fix x-fade icons in context menu
2014-08-16 17:21:15 -04:00
Paul Davis
c752167ccc
change return type of Editor::axis_view_from_route()
2014-08-16 16:56:28 -04:00
Colin Fletcher
80f04cc298
Ripple mode: basic implementation
...
Add a value for Ripple to EditMode enum.
Add Ripple edit mode to edit mode dropdown, by adding it to the
Editor::build_edit_mode_menu() helper function, and remove the old code that
added items to the (now unused) Editor::edit_mode_strings.
Add the regions that should be affected by the drag to RegionDrag::_views so
that the drag carries them along automatically.
Use a copy of the RegionList in Playlist::core_ripple(), since bad things
happen when iterating over regions and they get moved around in the list.
Handle rippling in removal of regions from playlist.
When dragging in ripple mode, exclude all regions that lie before the
original start position of the selected regions being dragged from
rippling: this is what Mixbus does.
Make editor dragging respect snap-to settings, by using the existing
compute_x_delta() function, which did almost the right thing. Move setting
of _last_frame_position out of that function so all ripple-dragged regions
can move.
Ripple when dragging from region list: even though Mixbus doesn't do this, it
seems like a good idea.
Prevent multi-track selection being dragged across tracks, by making
RegionMotionDrag::y_movement_allowed() virtual, and overriding it in
RegionRippleDrag to forbid dragging of selections containing regions on more
than one track to dofferent tracks in ripple mode.
Remember which TimeAxisView a ripple-mode drag that's allowed cross-track
drags started from, so that the effect of rippling regions after any region
that's dragged off that track can be undone.
2014-08-16 16:36:03 -04:00
Paul Davis
38ec61e640
change location marker ruler text for get_trx() == true case
2014-08-16 16:16:13 -04:00
Paul Davis
16afdf26d6
fix missed detail of previous cherry pick, which changed visible_tracks_selector into ArdourDropdown
2014-08-15 22:15:38 -04:00
harrison
c7d4ce1399
cherry-pick b9708d5f6b, then manually resolve conflicts (thanks git rerere)
2014-08-15 22:06:18 -04:00
nikolay
6809921555
[Summary] Session auto save
...
[Reviewed] GZharun
2014-08-13 15:17:51 +03:00
nikolay
68b323a1a7
[Summary] Updated Auto Lock Timer according to PRD
...
[Reviewed] GZharun
2014-08-11 13:11:37 +03:00
VKamyshniy
65035584c9
[Summary] Adding the TRACKs specific meter bridge view.
2014-08-11 12:56:58 +03:00
