Commit graph

763 commits

Author SHA1 Message Date
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: If after session-load some
radio-item other than the first one is set active, it is
impossible to switch to the first.
e.g. set "Snap to Grid", Save Session, Load Session, trying to
switch to "Snap to None" fails until another mode is selected first.
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
nikolay
faf47b3b78 [Summary]
1. Changed Ardour's random color generator to Tracks's
MixerStrip::palette_random_color()
2) Apply selected color to all activated routes
MixerStrip::color_button_clicked (WavesButton *button)
3) Set black default color to new added tracks
[Review] GZharun
2014-08-08 13:13:04 +03:00
GZharun
dbfaa75584 [Summary] Fixed issue: made right click disabled on editor space under tracks. 2014-08-05 16:16:41 +03:00
GZharun
6acabf15ce [Summary] Implemented master bus use cases for inspector track view
[Details] 1. Made master bus shownable in inspector when no track selected in StereoOut, StereoOut mode has just been enabled, or there is no tracks at all in StereoOut.
2. Made master bus hidden in MultiOut mode in any case.
2014-08-04 14:35:13 +03:00
nikolay
8b154ba61e [Summary] Fix bug with initial value of the track's height
[Reviewed] GZharun
2014-08-04 13:50:47 +03:00
GZharun
6f215a3537 [Summary] Added new track creation by double click under the list of tracks. Removed New Track menu appearance on the right click on the same region 2014-08-01 10:45:28 +03:00
VKamyshniy
f9ed8e9ded [Summary] Excluding whatever is not bus from arrange view, compact meter bridge and mixer bridge view 2014-07-29 14:07:15 +03:00
VKamyshniy
0f3f0d0a4a [Summary] Implementing synchronously changed tracks/busses selection in the editor and embedded mixer bridge view. 2014-07-29 09:29:40 +03:00
VKamyshniy
f2251dd1c2 [Summary] Progressing UI 2014-07-28 11:06:02 +03:00
VKamyshniy
0ef3ed02c1 [Summary] Progressing UI 2014-07-27 09:36:49 +03:00
nikolay
ec5f68635f [Summary] Alt+Click on horizontal fader to set its value to default (on OS Windows)
[Review] Nobody
2014-07-22 17:46:52 +03:00
nikolay
281394cf91 [Summary] Alt+Click on horizontal fader to set its value to default
[Review] Nobody
2014-07-22 15:21:08 +03:00
VKamyshniy
dd51b638bc [Summary] Progressing embedded meterbridge 2014-07-20 18:02:36 +03:00
VKamyshniy
a5caa2778b [Summary] Progressing TRACKS Meter Bridge (invented name = compact meter bridge) 2014-07-19 18:32:45 +03:00
VKamyshniy
46240b0329 [Summary] Fixing the bug of having not , _master_bus_ui (0) in the Editor::Editor() 2014-07-16 14:56:08 +03:00
VKamyshniy
596e3b9140 [Summary] Progressing MASTER UI and occasional cleanup 2014-07-16 00:12:14 +03:00
VKamyshniy
44dcd48be4 [Summary] Progressing MASTER UI 2014-07-15 00:44:46 +03:00
VKamyshniy
3833e3b627 Merge branch 'master' of git.waves.com:waves/tracks 2014-07-04 18:04:39 +03:00
VKamyshniy
ebe7c829e4 [Summary] XML-izing MIXER STRIP UI 2014-07-04 18:00:45 +03:00
nikolay
f28dcaa77f [Summary] Implementation of the AUTO LOCK TIMER and minor improvement of session_lock_dialog
[Review] GZharun
2014-07-03 17:52:57 +03:00
Paul Davis
385629b8c3 add timer-based trigger for locking.
Also changed the lock dialog to be a normal Gtk::Dialog because ArdourDialog forwards events to the Editor.
Not sure if this is true for WavesDialog at present.
2014-06-25 08:37:10 -04:00
Paul Davis
c7e7940364 add Editor::lock() and Editor::unlock() and the to-be-replaced Lock dialog from Ardour 2014-06-25 08:00:11 -04:00
Valeriy Kamyshniy
706f89993a [Summary] Making namespace WavesUI a class.
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 466991]
2014-06-12 18:19:50 -04:00
Valeriy Kamyshniy
b25e95ef60 [Summary] Adding ZOOM TOOL actions.
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 464697]
2014-06-03 20:24:00 -04:00
Valeriy Kamyshniy
0089053814 [Summary] Rearranging transport toolbar and other tools in editor window
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461983]
2014-05-20 09:12:48 -05:00
Valeriy Kamyshniy
5f65b603ad [Summary] Rearranging transport toolbar and other tools in editor window
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461669]
2014-05-19 17:28:29 -05:00
Valeriy Kamyshniy
387653e437 [Summary] Reordering TRACKS top bars
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 461662]
2014-05-19 16:30:55 -05:00
Grygorii Zharun
ce2a519afa [Summary] Merging from GIT
[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
2014-04-18 04:21:54 -05:00
Valeriy Kamyshniy
72f54bbc1f [P4/git history rebuild] further changes related to this codebase missing Ardour canvas autoscroll commits. Hopefully to be undone later by commits from a merge by Paul and Grygorii 2014-05-27 21:18:58 -04:00
Robin Gareus
640bd36906 fix editor full-screen state when re-loading session 2014-03-21 15:21:09 +01:00