Paul Davis
a128e64e6e
tracks has only 1 ruler, and the metric it uses depends on the primary clock mode
2014-09-05 15:24:41 -04:00
Paul Davis
b805a9f8eb
indent
2014-09-04 22:29:18 -04:00
Paul Davis
250fe06ec7
add Editor::_tool_cut_button to refer to button defined in ui/editor_window.xml and connect it to cut/split tool functionality
2014-09-03 21:14:13 -04:00
Paul Davis
0c326926ab
numerous small changes to get close to PRD spec for marker bar display
2014-09-03 14:45:53 -04:00
Paul Davis
9c24d10862
Merge branch 'master' into ardour-merge
...
Conflicts:
gtk2_ardour/editor.cc
gtk2_ardour/editor_mouse.cc
gtk2_ardour/public_editor.h
gtk2_ardour/time_axis_view_item.cc
gtk2_ardour/time_axis_view_item.h
2014-08-28 10:58:49 -04:00
nikolay
267a628b96
[Summary] Delete old INFO panel upon the TOP BAR
...
[Reviewed] GZharun
2014-08-28 16:45:54 +03:00
Paul Davis
0c123205d6
continue tweaks to get packing correct now that there is only 1 canvas
2014-08-19 14:31:05 -04:00
VKamyshniy
b1c6795601
[Summary] Implementing the wave zoom control in the transport bar
2014-08-18 18:44:25 -04:00
VKamyshniy
6b61267b88
[Summary] Implementing the wave zoom control in the transport bar
...
Conflicts:
gtk2_ardour/editor.cc
gtk2_ardour/editor.h
2014-08-18 16:18:59 -04:00
Ben Loftis
7d0bfeadd8
Add some new zoom-to-selection actions, so zoom tool is less needed.
...
Reverse order of items in the zoom menus to match Ardour.
Consolidate the extra zoom math into a function; this fixes a problem in zoom-to-session.
2014-08-18 12:42:16 -04:00
Paul Davis
9b240978a7
add Editor::trackviews_height() convenience function to determine height of trackview area of canvas; use to help fix set_visible_track_count(); don't consider hidden tracks in that function; add "Selected" to that selector menu
2014-08-18 12:30:22 -04:00
Paul Davis
90502b200d
scroll up/down by tracks uses top edge as "focal point"; fix some other nasty code details
2014-08-18 12:23:52 -04:00
Ben Loftis
0750cd2046
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
...
Conflicts:
gtk2_ardour/ardour_button.cc
gtk2_ardour/editor.cc
2014-08-18 12:22:59 -04:00
Paul Davis
10becc1411
add "fade range" operation, bound to alt-f at present by default
2014-08-17 21:00:59 -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
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
3b0ce4038e
initial implementation of "bring all media into session folder". Incomplete but basically functional for audio files
2014-08-17 20:43:49 -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
Paul Davis
d93526de76
add functionality for cut tool
2014-08-17 20:41:15 -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
a15ab33edf
lots of keybinding changes. added a new action to allow removing markers at the playhead location. numpad now allows you to access marks higher than 9. to locate to a marker, use the numpad decimal to start and end the operation - for example press .19. to locate to marker 19. also added alternate bindings for redo, delete, and several other alternates that will be needed in subsequent commits. tab is not working, using either Tab or nabla in the binding.in file
...
Conflicts:
gtk2_ardour/ardour_ui.cc
2014-08-17 20:35:46 -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
Robin Gareus
67c1322f0d
add RAII DisplaySuspender
2014-08-17 19:49:03 -04:00
Robin Gareus
8db5d93a35
use a hash-table to cache gui properties
2014-08-17 19:48:57 -04:00
Paul Davis
21c26c8688
replace old implementation of Editor::_ensure_time_axis_view_is_visible() with the guts of Editor::ensure_track_is_visible(), then remove the latter.
...
Also change all users of ensure_track_is_visible() to use _ensure_time_axis_view_is_visible()
2014-08-17 19:47:36 -04:00
Paul Davis
50c5ba16b8
add ability to save current action sensitivities and restore them, and to disable all action sensitivity.
...
This is needed to be able to lock the application fully on OS X, where the global menu bar would still allow interaction
even when a modal dialog is displayed.
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_ops.cc
gtk2_ardour/verbose_cursor.cc
2014-08-17 19:45:04 -04:00
Paul Davis
2f77f2bc69
removed no-longer-used Editor::track_canvas_motion()
...
Conflicts:
gtk2_ardour/editor.h
2014-08-17 19:27:11 -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
8473bd72e1
remove unused code
...
Conflicts:
gtk2_ardour/editor_ops.cc
2014-08-17 18:45:50 -04:00
Paul Davis
28fdc71d70
more canvas refactoring.
...
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
2014-08-17 17:44:17 -04:00
Paul Davis
3be5f658ea
use newly factored canvas in gtk2_ardour
2014-08-17 17:43:03 -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
ad67a36d7d
more work on cursor tracking state
2014-08-17 16:24:38 -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
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
01b84f0ad0
remove no-longer-used code
2014-08-17 15:09:15 -04:00
Paul Davis
f28348ea91
add canvas rulers event dispatch and reinstate scrolling behaviour
2014-08-17 15:09:05 -04:00
Paul Davis
e02dac67b5
remove header file includes of now-removed gtk custom ruler
2014-08-17 15:07:44 -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
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
e81e6841ff
rename Editor::_canvas_bottom_rect as Editor::_canvas_drop_zone; increase its size; remove debug message
2014-08-17 14:58:19 -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
983cbeba6f
reinstate a canvas group where we reparent regions while dragging, so that they are always on top.
...
I mistakenly removed this during the onecanvas changes.
2014-08-17 14:49:44 -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
