Commit Graph

172 Commits

Author SHA1 Message Date
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
fb473475c3 remove cruft 2014-09-06 00:42:10 +02:00
976f006cc0 display key name when debugging keyboard/accel stuff 2014-07-02 12:54:49 -04:00
471570705d move contrasting_text_color() into ArdourCanvas 2014-06-30 10:38:45 -04:00
09479ad19a prepare formatting track-number for mixer (and other places) 2014-06-26 19:19:29 +02:00
a3c378cf62 move utility functions into a dedicated namespace 2014-06-25 21:47:54 +02:00
ba484f1e1f Fix finding icon sets by using correct utility function 2014-06-25 12:40:10 -04:00
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
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
c1ff79e2e6 GLib functions for listing directory contents don't include "." or ".." entries 2014-06-25 12:40:09 -04:00
2ebaf2e45a explanatory comment 2014-06-19 13:47:58 -04:00
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
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
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
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
912f07b919 mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64) 2014-03-04 15:25:58 +01:00
5568026387 'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead 2013-10-14 17:00:28 +01:00
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
cff174b541 move rate_as_string() from EngineControl to utils.cc 2013-09-23 21:35:17 -04:00
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
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
5e0e41e068 Merge branch 'master' into cairocanvas 2013-09-16 22:11:50 -04:00
fb45fdc052 fix conflicts and merge with master 2013-09-16 22:11:06 -04:00
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
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
4861eca974 Merge branch 'master' into windows 2013-09-13 11:55:56 -04:00
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
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
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
7b18260175 get meter color from gtkrc style file 2013-08-08 15:25:40 -04:00
616f2a0370 fix conflicts after merge with master 2013-08-05 14:22:32 -04:00
6a436fd826 fix merge conflict from master 2013-07-31 20:11:15 -04:00
fbfa0acebe remove compile errors (still will not link and JACKPortEngine is not close to done) 2013-07-30 23:26:46 -04:00
cd28d62b26 fix compiler warnings. 2013-07-28 20:32:52 +02:00
e469ce0961 get meter color from gtkrc style file 2013-07-24 22:05:24 +02:00
9db936ac26 Don't call pango_ft2* functions on windows 2013-07-13 08:30:27 -04:00
f47499f157 Use g_random_int instead of ::random for portability 2013-07-11 11:38:46 -04:00
645878db97 remove dead code (we have git) plus add a comment 2013-06-27 15:57:48 -04:00
6618c9e406 use HSV to pick random colors and avoid over-saturation or over-brightness 2013-06-27 15:51:57 -04:00
1b73ab2065 fixed const cast warning 2013-06-21 17:15:12 -04:00
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
5b7b56236b move emulate_key_event() to utils 2013-06-10 01:54:55 +02:00
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
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
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
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
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
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