Commit Graph

248 Commits

Author SHA1 Message Date
Paul Davis ec65e351ac ensure that all callers of ARDOUR_UI_UTILS::relay_key_press() provide a window 2016-02-22 15:31:24 -05:00
Paul Davis 98b14ad0e6 get normal GTK accelerators working again 2016-02-22 15:31:21 -05:00
Paul Davis 9010262bed first compilable version of tabbable design.
I would have loved to split this apart, but there are just so many interrelated changes,
it makes little sense and would be a huge effort that would break future git bisect
use because so many intermediate commits would not compile
2016-02-22 15:31:21 -05:00
André Nusser 4898614f90 Remove explicit positioning of overwrite_file_dialog.
ArdourDialog takes care of this.
2015-11-04 17:52:00 -05:00
André Nusser 6ccffbaf09 Improve behavior of overwrite_file_dialog.
- Make overwrite file dialogs transient.
- Cancelling the overwrite dialog doesn't close initial dialog.
2015-11-04 17:52:00 -05:00
André Nusser 5d50abed75 Confirmation on overwrite for track and session templates. -fixes #6587 2015-10-21 23:28:44 -04:00
Robin Gareus dc36b063bf remove unused fstream includes 2015-10-05 22:15:18 +02:00
Robin Gareus 22b07e0233 NOOP, remove trailing tabs/whitespace. 2015-10-05 16:17:49 +02:00
Paul Davis 4dc63966f0 globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
Robin Gareus 202b9cc82a fix a tautologically undefined comparison 2015-09-17 00:21:38 +02:00
Tim Mayberry 6b019a4953 Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
2015-09-16 16:55:17 -04:00
Tim Mayberry 0fd1aa3808 Remove unused header include 2015-09-16 16:55:17 -04:00
Tim Mayberry 2d47183dc9 Move util functions into UIConfiguration as they depend on it anyway 2015-09-16 16:55:17 -04:00
Robin Gareus 1bd7199f4f consolidate code 2015-06-27 01:00:03 +02:00
Paul Davis d79980d571 use Gtkmm2ext::possibly_translate_mod_to_make_legal_accelerator() in all cases where we use gtk_accel_groups_activate()
Because that function needs it, whereas the old gtk_window_activate_key() did not.
2015-01-30 11:08:56 -05:00
Paul Davis 17b8d9836d don't wipe out SHIFT from event state when processing keyboard events, as done in a recent commit 2015-01-29 12:16:18 -05:00
Paul Davis dab3346623 use gtk_accel_groups_active() in preference to gtk_window_activate_key() since the latter behaves incorrectly
The window version will not activate bindings like <Mod4><Super>-space, whereas the former one works correctly. We already used
the former one just above, when handling "fakekeys".

Also add a utility function to show modifier state.
2015-01-28 21:03:03 -05:00
David Robillard 4166b05bda Fix setting command key bindings on OSX. 2015-01-14 20:31:38 -05:00
Paul Davis 64fa63212f move all (G)UI related configuration parameters into UIConfiguration, not RCConfiguration 2014-12-22 13:39:46 -05:00
Paul Davis aff8a806a2 more color work, including removing rgba{_p_}_from_style() 2014-12-08 22:02:38 -05:00
Robin Gareus 9bac4df9ec also load hotspot file (if it exists) for default cursors 2014-11-19 00:21:31 +01:00
David Robillard 976a150e6b Remove obviously dead/redundant code. 2014-11-18 02:55:03 -05:00
Robin Gareus 6b3a8915f3 add abort() to non-reached code
This cleans up a lot of false-positives in static analysis
and also helps compilers to optimize code paths in general.
(tagging the fatal stingstream operator as ‘noreturn’ is
far less trivial)
2014-11-14 11:30:08 +01:00
Paul Davis e4e6f00103 slightly increased debugging output for -D accelerators 2014-11-02 08:57:58 -05:00
Robin Gareus 4f58638ac0 harfbuzzed - also reverts 666de70d 2014-10-01 16:24:37 +02:00
Robin Gareus 666de70ddc pango --with-included-modules=yes does not provide explicit pangoft header 2014-09-30 19:08:17 +02:00
Paul Davis 233d2e8530 add extra (default-ed) argument to ::get_icon_path() to allow it to be used to look for icon-related but non-image files 2014-09-10 19:39:15 -04:00
Robin Gareus fb473475c3 remove cruft 2014-09-06 00:42:10 +02:00
Paul Davis 976f006cc0 display key name when debugging keyboard/accel stuff 2014-07-02 12:54:49 -04:00
Paul Davis 471570705d move contrasting_text_color() into ArdourCanvas 2014-06-30 10:38:45 -04:00
Robin Gareus 09479ad19a prepare formatting track-number for mixer (and other places) 2014-06-26 19:19:29 +02:00
Robin Gareus a3c378cf62 move utility functions into a dedicated namespace 2014-06-25 21:47:54 +02:00
Tim Mayberry ba484f1e1f Fix finding icon sets by using correct utility function 2014-06-25 12:40:10 -04:00
Tim Mayberry cd12698b9c Rename PBD::find_file_in_search_path to just PBD::find_file
saves a bit of typing and not necessary if you look at how it is used.
2014-06-25 12:40:10 -04:00
Tim Mayberry 769ee5c1f2 Change PBD::get_files_in_directory to return full paths in result
get_files_in_directory uses get_directory_contents internally now
2014-06-25 12:40:09 -04:00
Tim Mayberry c1ff79e2e6 GLib functions for listing directory contents don't include "." or ".." entries 2014-06-25 12:40:09 -04:00
Paul Davis 2ebaf2e45a explanatory comment 2014-06-19 13:47:58 -04:00
Paul Davis 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
Paul Davis 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
Paul Davis 839a0063f2 add ::get_icon_sets() to utils 2014-06-10 14:39:28 -04:00
Paul Davis 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
Paul Davis 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
Robin Gareus 912f07b919 mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64) 2014-03-04 15:25:58 +01:00
John Emmas 5568026387 'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead 2013-10-14 17:00:28 +01:00
John Emmas 300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
Paul Davis cff174b541 move rate_as_string() from EngineControl to utils.cc 2013-09-23 21:35:17 -04:00
Paul Davis b362ff220c major rearrangement of startup/session loading code
first-time user code remains in ArdourStartup
session selection/setup moved to SessionDialog
many other cleanups, logic improvements, and so forth to the overall session loading process.
Not 100% finished yet.
2013-09-23 14:41:52 -04:00
John Emmas 19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
	gtk2_ardour/marker.cc
	gtk2_ardour/midi_region_view.h
	gtk2_ardour/region_gain_line.h
	gtk2_ardour/utils.cc
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/wscript
	libs/backends/jack/wscript
2013-09-21 09:17:25 +01:00
Paul Davis 5e0e41e068 Merge branch 'master' into cairocanvas 2013-09-16 22:11:50 -04:00
Paul Davis fb45fdc052 fix conflicts and merge with master 2013-09-16 22:11:06 -04:00
Paul Davis 61b98d3e9f check for an existing PublicEditor instance AFTER attempting to handle a key press in a window that has called relay_key_press(), so that normal key handling works there (e.g. audio/MIDI setup) 2013-09-16 22:03:27 -04:00
Paul Davis 7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
Paul Davis 4861eca974 Merge branch 'master' into windows 2013-09-13 11:55:56 -04:00
Paul Davis 9a884535c3 prevent key press in pre-main-window dialog(s) from crashing the program because there is no editor window to forward key presses to 2013-09-12 14:39:17 -04:00
Paul Davis bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
Tim Mayberry 8ddd12a60d Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
Robin Gareus 7b18260175 get meter color from gtkrc style file 2013-08-08 15:25:40 -04:00
Paul Davis 616f2a0370 fix conflicts after merge with master 2013-08-05 14:22:32 -04:00
Paul Davis 6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
Paul Davis fbfa0acebe remove compile errors (still will not link and JACKPortEngine is not close to done) 2013-07-30 23:26:46 -04:00
Robin Gareus cd28d62b26 fix compiler warnings. 2013-07-28 20:32:52 +02:00
Robin Gareus e469ce0961 get meter color from gtkrc style file 2013-07-24 22:05:24 +02:00
Paul Davis 9db936ac26 Don't call pango_ft2* functions on windows 2013-07-13 08:30:27 -04:00
Paul Davis f47499f157 Use g_random_int instead of ::random for portability 2013-07-11 11:38:46 -04:00
Paul Davis 645878db97 remove dead code (we have git) plus add a comment 2013-06-27 15:57:48 -04:00
Paul Davis 6618c9e406 use HSV to pick random colors and avoid over-saturation or over-brightness 2013-06-27 15:51:57 -04:00
Paul Davis 1b73ab2065 fixed const cast warning 2013-06-21 17:15:12 -04:00
Paul Davis f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
Robin Gareus 5b7b56236b move emulate_key_event() to utils 2013-06-10 01:54:55 +02:00
Paul Davis ec8d521e98 semi-fix xfade display, and reduce number of calls to Curve::get_vector() by a factor of two 2013-04-18 09:56:01 -04:00
Paul Davis aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Julien de Kozak 16f8fc0657 Fix some compilation warnings 2013-03-23 14:50:58 +01:00
Paul Davis 8d783c3d4b additional keycode for is-legal-as-numeric
git-svn-id: svn://localhost/ardour2/branches/3.0@13622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 20:21:54 +00:00
Paul Davis d082c2f208 accept decimal point as well
git-svn-id: svn://localhost/ardour2/branches/3.0@13621 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 19:46:40 +00:00
Paul Davis 7fdc582f19 locale debugging
git-svn-id: svn://localhost/ardour2/branches/3.0@13620 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-08 19:33:48 +00:00
Paul Davis 0c0b04ab5c determine whether or not to accept comma or period as a numeric character based on locale settings (once per instance of ardour), related to #5027
git-svn-id: svn://localhost/ardour2/branches/3.0@13481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 18:05:09 +00:00
Paul Davis 98834c0532 remove a bunch of cerr output and/or convert to use error<<
git-svn-id: svn://localhost/ardour2/branches/3.0@13477 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-13 15:11:07 +00:00
Paul Davis 760ccbabfb add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix const cast warnings generated by new flags
git-svn-id: svn://localhost/ardour2/branches/3.0@13124 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-10 15:57:09 +00:00
Paul Davis 05d80120bf slightly more debugging for kbd accels
git-svn-id: svn://localhost/ardour2/branches/3.0@13095 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-27 03:21:39 +00:00
Paul Davis a701365f38 comment code that stopped the keybd accel activation pathway if Keyboard::some_magic_widget_has_focus() is true. this was OS X only and (a) appears to be unnecessary (b) stops accels from working in windows that still handle some key events
git-svn-id: svn://localhost/ardour2/branches/3.0@13094 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-27 03:12:52 +00:00
Tim Mayberry 105caf23da Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:06:54 +00:00
Carl Hetherington d7551a8f08 Escape angled brackets in playlist names for tooltips.
git-svn-id: svn://localhost/ardour2/branches/3.0@12672 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-12 14:19:35 +00:00
David Robillard 6fa6514cfd Remove over 500 unnecessary includes (including 54 of session.h).
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff).  I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.

This commit only targets includes of ardour/*.h.  There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.


git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00
Paul Davis 813c5f0af9 major rationalization of use of search paths. ardour now has just 4 functions used to define how external resources are located: ardour_config_search_path() (for system or user specific configuration data), ardour_data_search_path() (for machine, user and system independent data), ardour_dll_directory() (base directory where shared libraries are found) and user_config_directory(). These are now used throughout the code. the config, data and dll paths/directories can be overridden by environment variables. the user config dir is added as the first element of the first two search paths, and use selectively when searching for a few other things.
This commit re-enabes ./waf install, and it is believed that it works fully at this point (more testing likely required)

git-svn-id: svn://localhost/ardour2/branches/3.0@12326 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-18 17:24:06 +00:00
Paul Davis c52c2b7368 forward-port some fixes from a2
git-svn-id: svn://localhost/ardour2/branches/3.0@11630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-09 17:15:25 +00:00
Carl Hetherington fd1ff3d753 Remove unused color_from_style / gc_from_style.
git-svn-id: svn://localhost/ardour2/branches/3.0@11618 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-07 14:40:33 +00:00
Paul Davis bb737997ae move 2 other non-ardour-specific utility functions into gtkmm2ext
git-svn-id: svn://localhost/ardour2/branches/3.0@10932 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:08:00 +00:00
Paul Davis 604dd4fe64 show focus window in accels debugging
git-svn-id: svn://localhost/ardour2/branches/3.0@10711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-20 17:43:23 +00:00
Paul Davis 3b588d1cef remove code no longer needed for OSX accel handling
git-svn-id: svn://localhost/ardour2/branches/3.0@10562 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-13 13:22:37 +00:00
Carl Hetherington 7d32cf3813 Give route groups their own colour, settable from the route
group dialogue.  Americanise spelling of color in a few
places to avoid confusion.  Fixes #4224.  Addresses parts
of #2650 and #4064.


git-svn-id: svn://localhost/ardour2/branches/3.0@10030 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-30 09:48:53 +00:00
Paul Davis 6f4e224f71 fix various MIDI keybindings that were lost due to a subtle change in keyboard event forwarding
git-svn-id: svn://localhost/ardour2/branches/3.0@10010 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-19 14:47:41 +00:00
Paul Davis 45d51d3aee various fixes to MidiRegionView selection handling, key handling, drawing of ghost notes (contains a fix for #4263); shift-drag selections in MidiRegionViews now correctly add to the selection rather than replacing any existing one.
git-svn-id: svn://localhost/ardour2/branches/3.0@10000 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-08-17 12:46:42 +00:00
Paul Davis 83f385d263 audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 17:50:37 +00:00
David Robillard ed626628b5 Delete trailing whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
Carl Hetherington 7cf24873f8 Use PBD debugging code for keyboard debugging.
git-svn-id: svn://localhost/ardour2/branches/3.0@9019 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 23:26:27 +00:00
Paul Davis 6177135857 add DEBUG::Accelerators to mildly cut down on cruft in key_press_focus_accelerator_handler()
git-svn-id: svn://localhost/ardour2/branches/3.0@8954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-24 19:44:13 +00:00
Paul Davis 1a49bb9556 use volume controller widget for monitor section, drop some now-unused code
git-svn-id: svn://localhost/ardour2/branches/3.0@8828 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-11 18:04:09 +00:00
Paul Davis cc074c66fa cairo-ify expose handlers for PixFader and PixScroller (latter is not used); tweak UI RC file in response; move rgb macros to gtkmm2ext for easier use there as we go cairo over time
git-svn-id: svn://localhost/ardour2/branches/3.0@8775 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-08 19:19:55 +00:00
Paul Davis b85b4d9e54 make ardour3 build and link on OS X (tiger, at least)
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-13 05:14:48 +00:00
Paul Davis aad157337c correct version of: port cairo ARGB/BGRA -> pixbuf RGBA patch from recent 2.X commit (restores text on canvas), in which i move some functions around, rename stuff and add comments
git-svn-id: svn://localhost/ardour2/branches/3.0@7846 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-26 13:33:39 +00:00