Paul Davis
c5d29d59b5
rationalize and coordinate handle of region (time axis view item) opacity.
...
There are still some bugs with this because of the waveview image cache - fixes coming soon.
Conflicts:
gtk2_ardour/time_axis_view_item.cc
2014-08-17 15:23:31 -04:00
Paul Davis
3bde595378
rename UIConfigVariable as ColorVariable since that is really it should be used for; use ARDOUR::ConfigVariable for everything else in UI config
2014-08-17 15:22:56 -04:00
Robin Gareus
de6c43100e
Engine Dialog: Don't save duplicate states (and remove old dups)
2014-08-17 15:22:50 -04:00
Paul Davis
93b34819e5
add CANVAS_STRING_VARIABLE, the first step in being able to avoid using GTK rc files for font specifications
...
Still needs a way to generate the font specs at build time to account for platform differences
2014-08-17 15:22:36 -04:00
Robin Gareus
3dae0057d1
MIDI Device Button Style
...
Conflicts:
gtk2_ardour/ardour3_ui_default.conf
2014-08-17 15:22:23 -04:00
Robin Gareus
ef0fe0719c
add GUI for midi-device settings (and properly indent the code)
...
Conflicts:
gtk2_ardour/engine_dialog.cc
2014-08-17 15:20:39 -04:00
Colin Fletcher
4810e59335
Show Soundcloud credentials and upload options only when required
...
A slightly hacky patch to make the Soundcloud username & password and the
upload options only become visible when at least one export format is
chosen for upload to Soundcloud.
I think that changing ExportDialog::soundcloud_selector to a
boost::shared_ptr is the right thing to do, but I must confess to having
only a hazy understanding of what boost::scoped_ptr was doing in the first
place.
Also it feels a bit wrong to be passing a pointer to ExportDialog's
SoundcloudExportSelector around, but I can't (for the moment, at least)
think of any better way to affect its visibility from inside
ExportFileNotebook.
2014-08-17 15:14:25 -04:00
Colin Fletcher
c593d40e52
Add #include guards to soundcloud_export_selector.h
2014-08-17 15:14:14 -04:00
Colin Fletcher
67ea174c55
Actually pass Soundcloud downloadable flag to export handler
...
Conflicts:
gtk2_ardour/export_dialog.cc
2014-08-17 15:14:08 -04:00
Colin Fletcher
2b07c3060c
Remove unused function
...
Remove the unused ExportFileNotebook::get_nth_format_name()
2014-08-17 15:13:26 -04:00
Colin Fletcher
0b37220cf9
Export dialog: tidy code, & remove some superfluous debug output
...
Remove some debug output, tidy up a few whitespace inconsistencies, use
DEBUG::Soundcloud in one more place, and zap a couple of unused variables.
Conflicts:
libs/ardour/export_handler.cc
2014-08-17 15:13:20 -04:00
Colin Fletcher
ccd4f9ccdc
Post-export hook tweaks
...
Remove the Soundcloud username & password from the parameter substitutions
passed to the post-export hook: having thought about this now, I can't
actually think of a case where these are of any use at all.
In compensation, add %s and %n parameters that expand to the session
directory and name - maybe people will think of uses for these.
Conflicts:
libs/ardour/export_handler.cc
2014-08-17 15:12:38 -04:00
Paul Davis
cea43b4f6a
use the alpha/opacity value for the region base whether track colors are in use or not
2014-08-17 15:09:35 -04:00
Paul Davis
27b2651b28
restored track height adjustment using alt-scroll on track headers
2014-08-17 15:09:28 -04:00
Paul Davis
9620f61933
fixed rulers stealing all canvas scroll events and corrected computation of correct track for track-height adjustment using alt-scroll
2014-08-17 15:09:21 -04:00
Paul Davis
01b84f0ad0
remove no-longer-used code
2014-08-17 15:09:15 -04:00
Paul Davis
835e2fe109
add back click behaviour for canvas rulers, and also cursor enforcement
2014-08-17 15:09:10 -04:00
Paul Davis
f28348ea91
add canvas rulers event dispatch and reinstate scrolling behaviour
2014-08-17 15:09:05 -04:00
Paul Davis
eb69fd17fd
drag handles no longer exist as distinct item types (failed experiment)
2014-08-17 15:08:50 -04:00
Paul Davis
dbd35440aa
use new ArdourCanvas::Ruler constructor
2014-08-17 15:08:39 -04:00
Paul Davis
a401962539
add new canvas vars for rulers
2014-08-17 15:08:28 -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
5617432962
add new default colors for canvas rulers
2014-08-17 15:08:13 -04:00
Paul Davis
0ac4dfaa35
removed unused rule GTK widget style definition
2014-08-17 15:08:08 -04:00
Paul Davis
6d08de0233
remove unused GTK style
2014-08-17 15:08:02 -04:00
Paul Davis
2b99520451
OS X specific cleanup after canvas ruler introduction
2014-08-17 15:07:56 -04:00
Paul Davis
1776e12f26
remove header file includes of now-removed gtk custom ruler
2014-08-17 15:07:49 -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
0bf68bf76c
final ruler file removal
2014-08-17 15:07:39 -04:00
Paul Davis
7979265724
remove gtk ruler widget implementation - no longer in use
2014-08-17 15:07:27 -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
cd29e0b7cc
clamp zoom level to show 3 days on a 4000 pixel wide screen; comment unused variable for now
2014-08-17 15:05:53 -04:00
Paul Davis
89b7b77fdc
Revert "do not allow canvas cursor changes while a drag is in progress". This
...
was a bad idea. There are lots of reasons to want to change cursors while
dragging, even if we don't do that yet.
This reverts commit 144033e55c
2014-08-17 15:04:33 -04:00
Paul Davis
ce95944e5b
do not allow canvas cursor changes while a drag is in progress
2014-08-17 15:04:29 -04:00
Paul Davis
a6f89ce443
first pass an alternate cursor set (updates expected soon)
2014-08-17 15:04:23 -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
8d27a1436a
add icon set selector to theme manager
2014-08-17 15:03:34 -04:00
Paul Davis
d1e36a2fcc
add ::get_icon_sets() to utils
2014-08-17 15:03:29 -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
d89dd8e73a
remove ambiguous use of Rect (on OS X)
2014-08-17 15:03:17 -04:00
Paul Davis
895f4ccb16
remove instances of RGBA_TO_UINT() macro from region_view.cc
2014-08-17 15:02:56 -04:00
Paul Davis
9199b9fc6e
remove instances of RGBA_TO_UINT() macro from audio_region_view.cc
2014-08-17 15:02:50 -04:00
Paul Davis
cbea95b43d
remove more unusued color members from TimeAxisViewItem
2014-08-17 15:02:45 -04:00
Paul Davis
72d9c38702
substantial changes in color management, involving a reduction in the use of Gdk::Color and more consistent logic for region coloring.
...
Group tabs now also get the text drawn in an appropriately contrast-y color
Conflicts:
gtk2_ardour/region_view.cc
gtk2_ardour/time_axis_view_item.cc
2014-08-17 15:02:28 -04:00
Paul Davis
9fd95f2b4e
use Canvas::LineSet for tempolines rather than N different Canvas::Line items plus a cache
2014-08-17 15:00:29 -04:00
Paul Davis
0ca808f222
allow a drag down over the drop zone to be "reversed" and the region moved back up into existing tracks
2014-08-17 15:00:17 -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
b77f55ca82
change height of canvas drop so last 20 pixels of bottom track is still visible when fully scrolled down
2014-08-17 14:58:24 -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
c5152cfdb3
fix up fit-selected-tracks so that we are filling the trackview area, not the entire canvas (which now includes rulers)
2014-08-17 14:58:15 -04:00
