[mythtv-firehose] mythtv branch devel/027candidates updated by jpoet. v0.27-302-gdc78888

[Git Repo Owner]

The branch, devel/027candidates has been updated on the
mythtv repository by gitolite user jpoet.
       via  dc78888261367b78eee9fb5afabfc93c638e2415 (commit)
       via  23af8668d267faa20fd27db50b5dce0907971b90 (commit)
      from  5877f14a9e1d88ea75d3b4e9c1609920bc8ac71a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc78888261367b78eee9fb5afabfc93c638e2415
Author:    John Poet <jpoet at mythtv.org> at Tue, 6 May 2014 13:50:57 -0600
Committer: John Poet <jpoet at mythtv.org> at Thu, 15 May 2014 10:36:20 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=dc78888261367b78eee9fb5afabfc93c638e2415

Honor the disabled state in buttonlist items.
(cherry picked from commit eb17a56d137c76cf8a84c43d192b72d93338ccf5)
(cherry picked from commit 73037c4ecd36eaf7ff35504f524344d1ab5a3f18)



commit 23af8668d267faa20fd27db50b5dce0907971b90
Author:    John Poet <jpoet at mythtv.org> at Fri, 25 Apr 2014 16:12:28 -0600
Committer: John Poet <jpoet at mythtv.org> at Thu, 15 May 2014 10:36:18 -0600
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=23af8668d267faa20fd27db50b5dce0907971b90

Create an 'active' filters buttonlist which can be used for informational purposes in the schedule editor.
Allow the filters buttonlist to be used on the main schedule editor view.

(cherry picked from commit 6a87bbda31a209398c44fa92761ec0d5d9784954)

Conflicts:
	mythtv/programs/mythfrontend/scheduleeditor.cpp



-----------------------------------------------------------------------

Summary of changes:
 mythtv/libs/libmythui/mythuibuttonlist.cpp      |   26 +++-
 mythtv/libs/libmythui/mythuibuttonlist.h        |    1 +
 mythtv/programs/mythfrontend/scheduleeditor.cpp |  225 +++++++++++++++++------
 mythtv/programs/mythfrontend/scheduleeditor.h   |   33 +++-
 4 files changed, 217 insertions(+), 68 deletions(-)

--