diff -u -r --exclude-from diff.exclude release.11597.1020c/mythtv/libs/libmythtv/osdlistbtntype.h release.11597.1020d/mythtv/libs/libmythtv/osdlistbtntype.h
old
|
new
|
|
51 | 51 | const QString &action = "", int check = -1, |
52 | 52 | OSDTypeImage *image = NULL, QString group = "") : |
53 | 53 | GenericTree(name), m_image(image), m_action(action), |
54 | | m_group(group), m_checkable(check), m_parentButton(NULL) |
| 54 | m_group(group), m_checkable(check), m_parentButton(NULL), |
| 55 | m_parent(parent) |
55 | 56 | { |
56 | 57 | m_group = (m_group.isEmpty()) ? action : m_group; |
57 | 58 | setSelectable(!action.isEmpty()); |
… |
… |
|
62 | 63 | QString getAction(void) const { return m_action; } |
63 | 64 | QString getGroup(void) const { return m_group; } |
64 | 65 | int getCheckable(void) const { return m_checkable; } |
| 66 | void setChecked(int checked) { m_checkable = checked; }; |
| 67 | OSDGenericTree *getParent(void) { return m_parent; } |
65 | 68 | |
66 | 69 | OSDTypeImage *getImage(void) { return m_image; } |
67 | 70 | OSDListBtnTypeItem *getParentButton(void) { return m_parentButton; } |
… |
… |
|
75 | 78 | QString m_group; |
76 | 79 | int m_checkable; |
77 | 80 | OSDListBtnTypeItem *m_parentButton; |
| 81 | OSDGenericTree *m_parent; |
78 | 82 | }; |
79 | 83 | |
80 | 84 | // Will _not_ delete the GenericTree that it's given. |
diff -u -r --exclude-from diff.exclude release.11597.1020c/mythtv/libs/libmythtv/tv_play.cpp release.11597.1020d/mythtv/libs/libmythtv/tv_play.cpp
old
|
new
|
|
6045 | 6045 | } |
6046 | 6046 | else if (action.left(12) == "TOGGLEASPECT") |
6047 | 6047 | { |
| 6048 | OSDGenericTree *parent = item->getParent(); |
| 6049 | QPtrList<GenericTree> *itemlist = parent->getAllChildren(); |
| 6050 | QPtrListIterator<GenericTree> it(*itemlist); |
| 6051 | |
| 6052 | OSDGenericTree *child = (OSDGenericTree*) it.current(); |
| 6053 | for (;(child = (OSDGenericTree*) it.current()); ++it) |
| 6054 | { |
| 6055 | child->setChecked(0); |
| 6056 | } |
| 6057 | |
| 6058 | item->setChecked(1); |
6048 | 6059 | ToggleLetterbox(action.right(1).toInt()); |
6049 | 6060 | hidetree = false; |
6050 | 6061 | } |