Commit graph

110 commits

Author SHA1 Message Date
Paul Davis
0bb8e80f87 more tweaking of color management.
User's own modification to NAME.colors are stored in $CONFIG/my-NAME.colors now.
2014-12-08 22:02:38 -05:00
Paul Davis
9ac551abab another metric ton of color work 2014-12-08 22:02:38 -05:00
Paul Davis
624a86c39d lots more color work, closer and closer to being ready for ... being taken apart again 2014-12-08 22:02:38 -05:00
Paul Davis
74becec17f change GTK rc file system to use just a single file, which is color-neutral.
* packaging scripts need modification
* light theme file left in place to help with possible generation of alternate theme
2014-12-08 22:02:38 -05:00
Paul Davis
aff8a806a2 more color work, including removing rgba{_p_}_from_style() 2014-12-08 22:02:38 -05:00
Paul Davis
acd54f1c58 Revert "new code-level defaults for audio peak meter colors"
This reverts commit 564d2860f85340ea091cfa4d92cb5f84d2a40fb1.
2014-12-07 16:11:24 -05:00
Paul Davis
a5e5c14c77 new code-level defaults for audio peak meter colors 2014-12-07 16:11:24 -05:00
Paul Davis
66f3de615f remove stacktrace 2014-12-07 14:23:24 -05:00
Paul Davis
d425a43b26 fix up various issues with UIConfiguration, saving state, RC file loading etc. 2014-12-07 14:20:17 -05:00
Paul Davis
d7ca81cced remove debug output 2014-12-07 13:44:00 -05:00
Paul Davis
700edbdf39 big strides in color management 2014-12-07 13:12:48 -05:00
Paul Davis
d586289be5 first mostly-working build supporting GTK rethemeing via the Theme Manager 2014-12-07 13:12:48 -05:00
Paul Davis
4bc4cd0e20 save and restore color aliases 2014-12-05 11:17:56 -05:00
Paul Davis
0045891362 part two of remove CANVAS_STRING_VARIABLE (it was replaced by CANVAS_FONT_VARIABLE 2014-12-05 09:26:12 -05:00
Paul Davis
dd49a249ad remove CANVAS_STRING_VARIABLE (it was replaced by CANVAS_FONT_VARIABLE 2014-12-05 09:25:34 -05:00
Paul Davis
2449fc9681 several steps closer to more sane color system 2014-12-05 09:01:55 -05:00
Paul Davis
46ed23116e make new color aliases actually work 2014-12-05 09:01:55 -05:00
Paul Davis
8e54baa65f working compilation for new color code 2014-12-05 09:01:55 -05:00
Paul Davis
140540ef59 variable name change for slightly increased clarity 2014-11-26 18:22:22 +02:00
Paul Davis
137425faf1 continue tweaks on the color road 2014-11-26 18:22:22 +02:00
Paul Davis
ed65c801c5 save base colors (configurable colors) in normal way (code had been removed) 2014-11-26 18:22:22 +02:00
Paul Davis
318a9edab9 massive reworking of color selection implementation 2014-11-26 18:22:22 +02:00
Robin Gareus
5dab88c3fa prepare support for [color] style name postfix 2014-09-07 20:23:49 +02:00
Paul Davis
4880019218 correct the variable used to name the file when loading the default UI config file 2014-09-07 11:53:52 -04:00
Paul Davis
dcf4d7b38a change all GUI config files (GTK RC and our own XML config files) to use product-neutral names
Conflicts:

	gtk2_ardour/ui_config.cc
	gtk2_ardour/ui_default.conf.in
	gtk2_ardour/wscript
2014-09-07 10:25:46 -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
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
3fa2302173 correct CANVAS_STRING_VARIABLE macro in UIConfiguration constructor 2014-06-13 12:22:39 -04:00
Paul Davis
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
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
f47499f157 Use g_random_int instead of ::random for portability 2013-07-11 11:38:46 -04:00
Paul Davis
11becd4a6b properly restore newer (cairo-canvas related) UI config parameters 2013-06-21 17:15:56 -04:00
Tim Mayberry
3959e5bf02 Use std::string and Glib::build_filename in UIConfiguration::save_state
git-svn-id: svn://localhost/ardour2/branches/3.0@12904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:48 +00:00
Tim Mayberry
e234dd5e33 Remove unnecessary code to create user_config_directory
git-svn-id: svn://localhost/ardour2/branches/3.0@12890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:17 +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
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
11fdd6cd18 solo buttons are now ArdourButtons
git-svn-id: svn://localhost/ardour2/branches/3.0@10401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-02 18:48:32 +00:00
Paul Davis
592bfa3616 mute and send-alert buttons are now ArdourButtons
git-svn-id: svn://localhost/ardour2/branches/3.0@10397 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-02 16:46:49 +00:00
Paul Davis
24765e8459 remove silly left-over debugging lines
git-svn-id: svn://localhost/ardour2/branches/3.0@10313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-26 21:47:47 +00:00
Paul Davis
51ab5ccabf new ArdourButton class, to start to provide more control over how our buttons work and appear; use ArdourButtons for monitor, solo isolate and solo safe buttons, and in the processor box; don't save UI config file (canvas colors) to the user's home dir unless one or more parameters were modified by the user
git-svn-id: svn://localhost/ardour2/branches/3.0@10311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-26 21:01:14 +00:00
Paul Davis
1060243302 major, substantive reworking of how we store GUI information (visibility, height) for automation data. old design stored (insufficient) identifying information plus actual data in a GUI-only XML node; new scheme adds GUI data via extra_xml node to each AutomationControl object. reworked public/private methods for showing/hiding TimeAxisView objects; changed labelling of automation tracks to just show the name of the controlled parameter - more info can be viewed in the tooltip for the track headers. NOTE: Session file format ALTERED. No data loss but track visibility may be different than previous ardour3 versions
git-svn-id: svn://localhost/ardour2/branches/3.0@9703 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 15:35:34 +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
Paul Davis
1526735d79 some (unfinished) work on incorporating Ben's rev 6919 changes regarding track selection; make newly selected tracks show the current range selection; fix crashes related to meter display; remove "all" group from main group tab display and just put it down in its own button (totally incomplete); minor cleanups
git-svn-id: svn://localhost/ardour2/branches/3.0@7696 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-26 23:25:44 +00:00
Paul Davis
f5c4c8a293 forward port 2.X changes up to and including rev 6767
git-svn-id: svn://localhost/ardour2/branches/3.0@7636 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-17 00:28:20 +00:00
Carl Hetherington
a811f69104 Handle return from find_file_in_search_path in the correct sense.
git-svn-id: svn://localhost/ardour2/branches/3.0@7401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-09 02:44:17 +00:00
David Robillard
20eb826764 Use info stream for infoey things.
git-svn-id: svn://localhost/ardour2/branches/3.0@5867 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-22 20:36:38 +00:00
David Robillard
bc56eb8bd7 Fix unused parameter warnings since GCC apparently doesn't feel like listening to -Wno-unused-parameter
git-svn-id: svn://localhost/ardour2/branches/3.0@5835 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-21 00:15:42 +00:00
Paul Davis
8713667ec1 rework Stateful::set_state() patch to avoid default version argument
git-svn-id: svn://localhost/ardour2/branches/3.0@5787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-15 18:56:11 +00:00
Carl Hetherington
79f91c7a20 Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty.
LOADING 2.X SESSIONS WITH THIS COMMIT IN PLACE WILL (PROBABLY) CORRUPT THE .ardour FILE,
MAKING THE SESSION UNLOADABLE ON 2.X AND LOSING INFORMATION.

So don't do that unless you make a backup of the session file first.



git-svn-id: svn://localhost/ardour2/branches/3.0@5786 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-15 00:57:55 +00:00