Commit graph

869 commits

Author SHA1 Message Date
GZharun
882fdc793c [Summary] Changed tracks selection workflow according to PRD 2014-09-09 14:04:13 +03:00
GZharun
b57a35c934 [Summary] Removed possibility to drop selection when clicked under the list of tracks 2014-09-09 12:47:04 +03:00
Paul Davis
2867fa20f3 add icons (with pre-rendered text) for add marker + global tracks button, tweak arrangement of upper right of arrange view, make add marker button work 2014-09-07 09:37:37 -04:00
Paul Davis
f4fab90fc0 increase timebar (ruler) height to 32 pixels 2014-09-05 14:17:04 -04:00
Paul Davis
e29dc599a8 fix merge conflict resolution error - use controls layout button press event handler (fixes dbl-click to add track) 2014-09-04 10:50:44 -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
ec7b341382 STFU! part two 2014-09-03 15:50:46 -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
31d500e3a9 Merge branch 'master' into ardour-merge
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui2.cc
	gtk2_ardour/editor.cc
	gtk2_ardour/mixer_strip.cc
	gtk2_ardour/route_time_axis.cc
	gtk2_ardour/route_ui.h
	gtk2_ardour/ui/audio_time_axis.xml
	gtk2_ardour/ui/editor_mixer.xml
	gtk2_ardour/ui/meter_strip.xml
	gtk2_ardour/waves_button.cc
	gtk2_ardour/waves_button.h
	gtk2_ardour/waves_zoom_control.cc
	gtk2_ardour/waves_zoom_control.h
2014-08-27 12:38:27 -04:00
GZharun
b061a56c21 [Summary] Made master added to the beginning of older session which do not have this track 2014-08-27 18:56:34 +03:00
nikolay
47142ef74d [Summary] Change in MeterStips name
[Reviewed] GZharun
2014-08-27 11:38:35 +03:00
nikolay
8a6be6cb75 [Summary] Changed max name size in the meter strips
[Reviewed] GZharun
2014-08-20 14:09:03 +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
Paul Davis
d22126e088 more tweaks to try to get the layout of the canvas and associated objects right (not done) 2014-08-18 20:27:32 -04:00
VKamyshniy
b1c6795601 [Summary] Implementing the wave zoom control in the transport bar 2014-08-18 18:44:25 -04:00
nikolay
2e47e057ca [Summary] Cut track's name in MixerBridge and MeterBridge
[Review] GZharun
2014-08-18 18:43:21 -04:00
Paul Davis
c3782da59e remove dead code left over from ardour-cairocanvas merge 2014-08-18 17:51:21 -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
nikolay
3b4e11b4c6 [Summary] Cut track's name in MixerBridge and MeterBridge
[Review] GZharun
2014-08-18 16:15:26 -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
7731b4f676 up/down scroll buttons on left of summary should move by tracks 2014-08-18 12:23:42 -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
Ben Loftis
da2c89fc93 add mixbus profile which removes the tearoffs
Conflicts:
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui2.cc
	gtk2_ardour/editor.cc
2014-08-18 12:10:33 -04:00
Ben Loftis
be2a3d6efc remove EditAtSelectedMarker for Mixbus, to match mb2. (also fix an existing thinko in the edit point selection actions) (oops: also fix previous track selection fix so that it pays attention to the selection property of the group) 2014-08-18 11:46:10 -04:00
Paul Davis
6b7a118376 size various ArdourDropdowns according to the pixel width, not character length, of their various strings 2014-08-17 20:59:53 -04:00
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