Commit graph

364 commits

Author SHA1 Message Date
Paul Davis
55c59504ca 3.0-SG catchup merge after git changeover and merge with master (more to do) 2013-04-01 14:59:17 -04:00
Paul Davis
2acc37e38d merged with 3.0, probably finished 2013-03-12 17:36:51 -04:00
Paul Davis
6130440836 update gtkmm2ext po files from 3.0 2013-03-12 17:29:36 -04:00
Paul Davis
537a5c2fcb merge -r 13599:13629 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13630 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-10 15:28:22 +00:00
Paul Davis
26741db3c4 merge -r 13414:13599 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0 ; plus a few tweaks that will be cleaned up soon
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13600 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-05 14:33:11 +00:00
Paul Davis
6c52612009 merge 12954:1363 svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13364 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-29 16:50:05 +00:00
Paul Davis
680ea1118c merge 13034:13103 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@13107 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-08-02 14:33:56 +00:00
Paul Davis
14aac7e210 merge 12717:12791 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 03:53:34 +00:00
Paul Davis
129dcd7f97 merge 12607:12717 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12718 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-14 01:09:40 +00:00
Paul Davis
f228d2c68e merge 12436:12607 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-08 14:03:30 +00:00
Paul Davis
8e1db53556 merge -r12436:12545 from 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12546 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-02 16:21:08 +00:00
Paul Davis
a2bb5c1feb merge 12389:12436 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12437 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 19:01:24 +00:00
Paul Davis
d6edbf5ca2 merge 12096:12268 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12269 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-14 18:35:19 +00:00
Paul Davis
9c8b57aab0 SG: merge 3.0 from 11783-12096
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12097 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-26 17:06:21 +00:00
Carl Hetherington
05fcf75eaf Use sigc::slot for ClickBox printing function rather
than a function pointer.


git-svn-id: svn://localhost/ardour2/branches/3.0@11743 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-21 16:38:59 +00:00
Paul Davis
f1638d365e use MOD2 for command key on OS X, just like in 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@11716 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-16 21:53:06 +00:00
Carl Hetherington
9a74312f9f Make route group dialog resizable; make ArdourPrompter entries
resize when the window is resized, rather than the label (#4756).


git-svn-id: svn://localhost/ardour2/branches/3.0@11599 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-05 22:34:49 +00:00
Paul Davis
b08d13706f remove additional "mid" color from ArdourButton; replace Active/Mid widget state with ExplicitActive/ImplicitActive; represent implicit-active state with colored border around ArdourButton; tune button colors; new rounded_foo() functions, some in use, some not in use right now
git-svn-id: svn://localhost/ardour2/branches/3.0@11466 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-07 17:43:55 +00:00
Paul Davis
6db9cb8d75 add some more variants of the cairo rounded rectangle code
git-svn-id: svn://localhost/ardour2/branches/3.0@11434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 03:55:58 +00:00
Paul Davis
f56bbe2799 fix inconsistent display on selection clocks when in join-object-range mode, and fix restore of that mode from session state via new ActionManager::set_toggle_action()
git-svn-id: svn://localhost/ardour2/branches/3.0@11366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 19:05:03 +00:00
Paul Davis
035074d1b7 provide ActionManager::do_action() as a way to trigger any action item as if the user has asked for it via some UI proxy
git-svn-id: svn://localhost/ardour2/branches/3.0@11332 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 16:19:38 +00:00
Paul Davis
21d4eb56d4 fix default response behaviour of Gtkmm2ext::Prompter (from colinf)
git-svn-id: svn://localhost/ardour2/branches/3.0@11112 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 01:41:21 +00:00
Paul Davis
81b5814098 add visible() method to Tearoff so we can check whether or not it is hidden
git-svn-id: svn://localhost/ardour2/branches/3.0@10935 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 15:48:00 +00:00
Paul Davis
20aeb5af0a move CairoWidget into gtkmm2ext, add CairoPacker, made the time info box use CairoPacker, make the info status "bar" use CairoPacker
git-svn-id: svn://localhost/ardour2/branches/3.0@10933 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:57:45 +00:00
Paul Davis
2f837b66f7 switch to benjamin otte's implemention of fit_to_pixels() but leave uncommented because this prototype is not used; move 2 other non-ardour-specific utility functions into gtkmm2ext
git-svn-id: svn://localhost/ardour2/branches/3.0@10931 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-07 13:07:43 +00:00
Paul Davis
d29fe416da if color property is not yet set, don't render
git-svn-id: svn://localhost/ardour2/branches/3.0@10915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-06 21:58:41 +00:00
Paul Davis
5e3a3b56de add a new simple cell renderer to be used to allow color display/editing in treeviews
git-svn-id: svn://localhost/ardour2/branches/3.0@10913 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-06 21:43:30 +00:00
Paul Davis
b0a2eb359d use the correct display for key accelerators
git-svn-id: svn://localhost/ardour2/branches/3.0@10893 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 22:01:59 +00:00
Carl Hetherington
e2d6d8e34d Remove unused variables.
git-svn-id: svn://localhost/ardour2/branches/3.0@10885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 16:59:19 +00:00
Paul Davis
5b913f9a2b add PAINT_VERTA_GR and PAINT_BOX_GR to rgba macros (from Mike Dawes)
git-svn-id: svn://localhost/ardour2/branches/3.0@10874 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 21:08:13 +00:00
Paul Davis
ad1ec2bacc get that fix for accels in tooltips correct this time
git-svn-id: svn://localhost/ardour2/branches/3.0@10856 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 03:40:56 +00:00
Paul Davis
6a61ddb3af fix message about markup elements by changing accel strings from <Mod> to Mod-
git-svn-id: svn://localhost/ardour2/branches/3.0@10854 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-02 01:58:32 +00:00
Paul Davis
b504c8cc90 fix a number of fundamental issues with Gtkmm2ext::Prompter, mostly centered on bad behaviour when Enter/Return is pressed
git-svn-id: svn://localhost/ardour2/branches/3.0@10848 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-01 19:32:56 +00:00
Paul Davis
6a5a5b0340 commit to the "new" tooltip API, use set_tooltip_markup() rather than set_tooltip_text() to allow for more creative tooltips
git-svn-id: svn://localhost/ardour2/branches/3.0@10844 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-30 21:07:11 +00:00
Paul Davis
a9a288b6a8 extra include required for S_()
git-svn-id: svn://localhost/ardour2/branches/3.0@10835 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 21:07:22 +00:00
Paul Davis
c05e30c043 add _S() macro to i18n.h for libs/ardour and libs/gtkmm2ext
git-svn-id: svn://localhost/ardour2/branches/3.0@10834 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 20:38:23 +00:00
Carl Hetherington
23964284a4 Hopefully fix some i18n bugs (#3565).
git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 19:46:30 +00:00
David Robillard
0a71d52448 Fix key bindings in tooltips for ArdourButton buttons.
Sinced gtkmm2ext needs to get at the actions of widgets, I moved the
action to Gtkmm2ext::Activatable.  Not sure if the wisest thing to
do here would be to use Gtkmm::Activatable, but figured there's
a reason Paul didn't do so (the name set_related_action is from there
so presumably it's known about), so this is the simplest change
that allows access to the action in Gtkmm2ext.  The vfunc calling
stuff should probably move there as well...


git-svn-id: svn://localhost/ardour2/branches/3.0@10818 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-24 05:36:31 +00:00
David Robillard
e70249ab65 Pack toolbar combo boxes with expand=false and remove size kludges.
Turns out gtk these days sizes combo boxes with precisely enough space if
packed to not expand, none of this mess is necessary any more.


git-svn-id: svn://localhost/ardour2/branches/3.0@10790 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-23 08:35:41 +00:00
Paul Davis
4821026841 more spreading of I18N_PACKAGE as the name for .mo files
git-svn-id: svn://localhost/ardour2/branches/3.0@10752 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 23:20:31 +00:00
Paul Davis
091b9ff7b9 tweak wscript files to set PACKAGE in one place
git-svn-id: svn://localhost/ardour2/branches/3.0@10747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 22:24:56 +00:00
Paul Davis
1377784b00 unintentional but valid updates to .po files
git-svn-id: svn://localhost/ardour2/branches/3.0@10744 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 21:28:26 +00:00
Paul Davis
6567c1ba0a new i18n targets (to be explained in TRANSLATORS)
git-svn-id: svn://localhost/ardour2/branches/3.0@10743 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-21 21:27:30 +00:00
Paul Davis
b25fbc8a95 all new implementation of audio clocks, with entirely new editing model. not entirely finished, but lookable, and usable
git-svn-id: svn://localhost/ardour2/branches/3.0@10662 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-17 22:49:13 +00:00
Carl Hetherington
41efdd54a4 Fix glitchness in DnDVBox placeholders.
git-svn-id: svn://localhost/ardour2/branches/3.0@10640 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-16 00:57:46 +00:00
Paul Davis
4770fea0a2 change package names for i18n files, in an attempt to fix #4085
git-svn-id: svn://localhost/ardour2/branches/3.0@10616 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 15:36:35 +00:00
Carl Hetherington
28f328e09c Fix placeholder creation when dragging from one DnDVBox to
another (should fix #4421).


git-svn-id: svn://localhost/ardour2/branches/3.0@10584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 14:42:29 +00:00
Carl Hetherington
eb2870eee6 Allow a dialogue containing an audioclock to be
activated by a enter button press on the clock.


git-svn-id: svn://localhost/ardour2/branches/3.0@10580 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 13:44:01 +00:00
Carl Hetherington
7ffe37faad Comment typo.
git-svn-id: svn://localhost/ardour2/branches/3.0@10575 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 11:31:11 +00:00
Paul Davis
9674867b9d switch use of Option/Alt and Control on OS X for bindings. Option/Alt is intended by Apple to be used primarily (if not entirely) for entering alternate characters. Shift would be more conventional as 2ndary modified on OS X but that might have a few more implications than we want to deal with right now
git-svn-id: svn://localhost/ardour2/branches/3.0@10481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-07 19:19:31 +00:00