13
0
Commit Graph

6903 Commits

Author SHA1 Message Date
01df705f70 change the way font specifications are used in UI config files
If no font family is specified, enforce use of Sans to match GTK behaviour (which we inadvertently relied on, it appears)
2014-06-19 11:18:44 -04:00
280fc81e05 modifications to region drag implementation
(1) if we're dragging over the drop zone, then x-axis motion is irrelevant for threshold-of-move
(2) store original time axis view of a dragged region so that if we create a new track with the region drag, it can be the same height
2014-06-19 11:18:44 -04:00
276e8b48ce various fixes for places that used get_font_for_style() ... converted to use UIConfiguration::get_canvasvar_*Font() 2014-06-19 11:18:44 -04:00
0d160a865b add bold monospace font specs to canvas_vars/ardour3_ui_default.conf 2014-06-19 11:18:43 -04:00
66a5d09f36 use new canvas cursor API to manage cursors while embedding audio 2014-06-19 09:26:00 -04:00
f552c1cc5c fix potential crash in Editor::set_canvas_cursor() if inadvertently passed a null cursor (semantics are different on OS X vs. X Window) 2014-06-19 09:26:00 -04:00
9f4f9c205d change verbose cursor font selection to use canvas variable mechanism, plus a few developing comment edits 2014-06-18 22:48:24 -04:00
e7895e1f80 more work on cursor tracking state 2014-06-18 21:03:25 -04:00
76a3a94536 explanatory comment 2014-06-18 21:03:11 -04:00
8419248a94 fix naming of selection rect-related items 2014-06-18 21:02:51 -04:00
nick_m
6b2c581c22 Summary changes :
* Use correct image format for background image
	* Construct thr ImageSurface as per cairo docs
	* Place start/end markers in background image
Tempo bars :
      * adjust beats display threshold to (hopefully) coincide with BBT ruler better.
2014-06-19 01:52:21 +10:00
becf857f48 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-06-18 10:24:59 -04:00
1f46e75ac9 highlight send-panner 2014-06-17 16:19:58 +02:00
472d0ad2c6 Merge branch 'pathscanner-refactor' of https://github.com/mojofunk/ardour into cairocanvas 2014-06-17 08:09:00 -04:00
e41bd05073 Merge branch 'summary_background' of https://github.com/nmains/ardour into cairocanvas 2014-06-17 08:08:44 -04:00
c30bda5173 a set of inter-related subtle changes to get vertical autoscrolling to work, or at least work better. 2014-06-17 08:08:14 -04:00
nick_m
46c158d8c6 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-06-17 21:44:36 +10:00
0e96d84079 Change PBD::PathScanner API to return results by value to avoid inadvertent memory leaks 2014-06-17 21:13:05 +10:00
33ea2d25f1 hide "turn down volume" label for midi-latency measurement 2014-06-16 23:36:29 +02:00
fbe359e8c7 debug alsa midi latency measurement 2014-06-16 19:44:23 +02:00
f383f2b856 fix pango font style (prev commit) 2014-06-16 17:56:52 +02:00
5baa6ca5b4 no more red latency messages 2014-06-16 17:30:22 +02:00
80c7971f50 reset latency dialog every time. 2014-06-15 13:24:41 +02:00
61ab4f0fb0 be smart, use boost::shared_ptr 2014-06-15 13:24:41 +02:00
21ed2d6767 clear engine device combo when no devices are available 2014-06-15 13:24:40 +02:00
b17ec0c43d tweak ArdourButton focus outline 2014-06-15 13:24:40 +02:00
2708a145af remove debug output 2014-06-15 13:24:40 +02:00
12cf9d5be8 fix pathscanner / stl_vector related memory leaks 2014-06-15 13:24:39 +02:00
51b475467a if we don't have control over the device/backend, allow to proceed. 2014-06-14 16:26:14 +02:00
7b64448dbb simply future debugging of exit at start. 2014-06-14 16:25:18 +02:00
9268de566c fix initialization of audio-engine dialog 2014-06-14 16:01:46 +02:00
ca1064e337 new anchored trim cursors (for now, just copies of the normal ones) 2014-06-13 18:45:12 -04:00
23b1c59630 fix erroneous start of autoscroll when mouse pointer is left or above the left/upper scrolling boundary but we're already scrolled to zero on the relevant axes 2014-06-13 18:43:53 -04:00
f7844f4893 do most of the work related to adding new anchored trim cursors (but debugging/analysis continues) 2014-06-13 18:43:53 -04:00
f312113163 enable ArdourButton focus in EngineDialog 2014-06-14 00:22:32 +02:00
bb2970e5e9 allow ardour button to handle focused keyboard events 2014-06-14 00:22:32 +02:00
e977b659af fix keyboard shorcuts in dialogs.
actually, for most dialogs, key-presses should never
be relayed. a get_modal() check might be the appropriate.
2014-06-14 00:22:32 +02:00
902e202f3e disambiguate another use of Rect on OS X 2014-06-13 15:48:30 -04:00
7a0b2e1c18 fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there) 2014-06-13 14:27:59 -04:00
7d678604fa add all the fonts, and use the right name for the rulers as a result 2014-06-13 12:51:46 -04:00
bcdac3d06e no need to specify sans for ruler font 2014-06-13 12:38:29 -04:00
fec46824bd use canvas ruler font specification rather than get_font_for_style() 2014-06-13 12:22:39 -04:00
77caa045ec define ruler font style (to be subst'ed) in ardour3_ui_default.conf.in 2014-06-13 12:22:39 -04:00
01b25b139b add first canvas string variable to canvas_vars.h - the ruler font 2014-06-13 12:22:39 -04:00
3fa2302173 correct CANVAS_STRING_VARIABLE macro in UIConfiguration constructor 2014-06-13 12:22:39 -04:00
16aa2fb61c build ardour3_ui_default.conf at build time, to allow font substitutions to be done (which are platform dependent) 2014-06-13 12:22:39 -04:00
9d4327efbf missing part of ColorVariable commit 2014-06-13 12:22:39 -04:00
50fea864db 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.
2014-06-13 12:22:39 -04:00
a50569e787 rename UIConfigVariable as ColorVariable since that is really it should be used for; use ARDOUR::ConfigVariable for everything else in UI config 2014-06-13 12:22:39 -04:00
f2404a522d Engine Dialog: Don't save duplicate states (and remove old dups) 2014-06-13 17:18:30 +02:00
d6c41f3935 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-06-13 07:30:27 -04:00
3573b4ee0a MIDI Device Button Style 2014-06-13 12:02:50 +02:00
2e88935bbf add GUI for midi-device settings (and properly indent the code) 2014-06-13 12:01:55 +02:00
be7da2e952 Fix opening of recent sessions with mismatched directory & file names
When populating the list of recent sessions, and there's only one session
file in the session folder, don't assume that the base name of the session
file is the same as the name of the session directory.

Allows loading sessions that were created with trailing spaces in their
names from the recent sessions list, and also helps in the case that the
session file (or directory) was renamed.

There are actually two implementations of the 'recent sessions' chooser:
this applies to both. I suppose a useful project one of these days
would be to unify the two...
2014-06-12 23:20:06 +01:00
83ce8dde6b Prevent creation of session directory with leading or trailing space. 2014-06-12 23:20:06 +01:00
60349bcee6 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-06-12 23:20:06 +01:00
d5cbb098da Add #include guards to soundcloud_export_selector.h 2014-06-12 23:20:06 +01:00
a82aba8581 Actually pass Soundcloud downloadable flag to export handler 2014-06-12 23:20:06 +01:00
cc2e6aeac3 Remove unused function
Remove the unused ExportFileNotebook::get_nth_format_name()
2014-06-12 23:20:05 +01:00
f0dbd6c085 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.
2014-06-12 23:20:05 +01:00
70308f5174 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.
2014-06-12 23:20:05 +01:00
a245250409 use the alpha/opacity value for the region base whether track colors are in use or not 2014-06-12 18:14:55 -04:00
684d45c0cc restored track height adjustment using alt-scroll on track headers 2014-06-12 17:21:41 -04:00
720a9b73a5 fixed rulers stealing all canvas scroll events and corrected computation of correct track for track-height adjustment using alt-scroll 2014-06-12 17:21:23 -04:00
6958409187 remove no-longer-used code 2014-06-12 16:18:38 -04:00
85e2c60673 add back click behaviour for canvas rulers, and also cursor enforcement 2014-06-12 16:06:31 -04:00
ea355bfe15 add canvas rulers event dispatch and reinstate scrolling behaviour 2014-06-12 15:58:05 -04:00
551014240a drag handles no longer exist as distinct item types (failed experiment) 2014-06-12 14:51:51 -04:00
887e75260d use new ArdourCanvas::Ruler constructor 2014-06-12 10:35:32 -04:00
0762708d83 add new canvas vars for rulers 2014-06-12 10:32:34 -04:00
79c30ab766 make rulers color-sensitive (e.g. theme manager editable, etc) 2014-06-12 01:07:58 -04:00
b2ee6b4344 add new default colors for canvas rulers 2014-06-12 01:07:58 -04:00
95fc5ab0a8 removed unused rule GTK widget style definition 2014-06-12 01:07:58 -04:00
3d81944b1d remove unused GTK style 2014-06-12 01:07:58 -04:00
0ab69cb8c7 OS X specific cleanup after canvas ruler introduction 2014-06-12 00:19:42 -04:00
9461fcb271 remove header file includes of now-removed gtk custom ruler 2014-06-12 00:18:58 -04:00
4b07d01532 remove header file includes of now-removed gtk custom ruler 2014-06-12 00:18:15 -04:00
6c9f4e9598 final ruler file removal 2014-06-12 00:01:30 -04:00
43e2baf54e remove gtk ruler widget implementation - no longer in use 2014-06-12 00:01:06 -04:00
b73352880e use canvas rulers now instead of gtk widgets
Some bugs that exist in master are still present.
2014-06-11 23:54:28 -04:00
18190eaa5e clamp zoom level to show 3 days on a 4000 pixel wide screen; comment unused variable for now 2014-06-11 23:54:28 -04:00
22f45b5a78 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-06-10 18:50:42 -04:00
144033e55c do not allow canvas cursor changes while a drag is in progress 2014-06-10 16:46:09 -04:00
b9f7aeb61e first pass an alternate cursor set (updates expected soon) 2014-06-10 14:40:10 -04:00
c56d309bd7 make the icon set selector actually do something 2014-06-10 14:39:28 -04:00
324ef3b085 add icon set selector to theme manager 2014-06-10 14:39:28 -04:00
839a0063f2 add ::get_icon_sets() to utils 2014-06-10 14:39:28 -04:00
d59d26b89a 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-06-10 14:39:28 -04:00
eca6c9f998 remove ambiguous use of Rect (on OS X) 2014-06-10 11:00:15 -04:00
3f38a602cc remove instances of RGBA_TO_UINT() macro from region_view.cc 2014-06-09 23:42:12 -04:00
96fbdd4bee remove instances of RGBA_TO_UINT() macro from audio_region_view.cc 2014-06-09 23:39:07 -04:00
65ef1a8b8a remove more unusued color members from TimeAxisViewItem 2014-06-09 23:33:14 -04:00
ce08ec0de0 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
2014-06-09 23:29:00 -04:00
c8ab1aaf7d use Canvas::LineSet for tempolines rather than N different Canvas::Line items plus a cache 2014-06-09 15:39:57 -04:00
9933a80dd4 allow a drag down over the drop zone to be "reversed" and the region moved back up into existing tracks 2014-06-09 10:55:37 -04:00
d36afa6b8b forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is) 2014-06-09 10:02:38 -04:00
95f2b4ba17 change height of canvas drop so last 20 pixels of bottom track is still visible when fully scrolled down 2014-06-09 09:12:42 -04:00
b530e8649e rename Editor::_canvas_bottom_rect as Editor::_canvas_drop_zone; increase its size; remove debug message 2014-06-09 09:09:21 -04:00
0c5dae881c fix up fit-selected-tracks so that we are filling the trackview area, not the entire canvas (which now includes rulers) 2014-06-09 09:08:51 -04:00
92bb0e0d7f 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-06-08 14:41:29 -04:00