Index: mythtv/libs/libmythui/myththemedmenu.cpp =================================================================== --- mythtv/libs/libmythui/myththemedmenu.cpp (revision 18112) +++ mythtv/libs/libmythui/myththemedmenu.cpp (working copy) @@ -11,8 +11,6 @@ #include "myththemedmenu.h" #include "mythmainwindow.h" -#include "mythfontproperties.h" -#include "mythimage.h" #include "mythdialogbox.h" #include "mythgesture.h" @@ -28,1280 +26,253 @@ #include "mythdirs.h" #include "lcddevice.h" -struct TextAttributes +MythThemedMenuState::MythThemedMenuState(MythScreenStack *parent, + const QString &name) + : MythScreenType(parent, name) { - QRect textRect; - MythFontProperties font; - int textflags; -}; + m_loaded = false; -struct ButtonIcon -{ - QString name; - MythImage *icon; - MythImage *activeicon; - MythImage *watermark; - QPoint offset; -}; + m_titleState = m_watermarkState = NULL; + m_buttonList = NULL; -class ThemedButton : public MythUIType -{ - public: - ThemedButton(MythUIType *parent, const QString &name) - : MythUIType(parent, name), - background(NULL), icon(NULL), text(NULL), - row(0), col(0) - { - } + m_callback = NULL; + m_callbackdata = NULL; - void SetActive(bool active) - { - MythUIStateType::StateType state = MythUIStateType::None; - if (active) - state = MythUIStateType::Full; - - if (background) - background->DisplayState(state); - if (icon) - icon->DisplayState(state); - if (text) - text->DisplayState(state); - } - - MythUIStateType *background; - MythUIStateType *icon; - MythUIStateType *text; - - QStringList action; - QString message; - QString type; - - int row; - int col; -}; - -struct MenuRow -{ - int numitems; - bool visible; - vector buttons; -}; - -class MythThemedMenuPrivate; - -/** \class MyththemedMenuState - * \brief Private class that controls the settings of buttons, logos, - * backgrounds, texts, and more, for the MythThemedMenu class. - */ -class MythThemedMenuState: public XMLParseBase -{ - public: - MythThemedMenuState(); - ~MythThemedMenuState(); - - bool parseSettings(const QString &dir, const QString &menuname); - - void parseBackground(const QString &dir, QDomElement &element); - void parseLogo(const QString &dir, QDomElement &element); - void parseArrow(const QString &dir, QDomElement &element, bool up); - void parseTitle(const QString &dir, QDomElement &element); - void parseButtonDefinition(const QString &dir, QDomElement &element); - void parseButton(const QString &dir, QDomElement &element); - - void parseText(TextAttributes &attributes, QDomElement &element); - void parseOutline(TextAttributes &attributes, QDomElement &element); - void parseShadow(TextAttributes &attributes, QDomElement &element); - - void Reset(void); - void setDefaults(void); - - ButtonIcon *getButtonIcon(const QString &type); - - QRect buttonArea; - - QRect logoRect; - MythImage *logo; - - MythImage *buttonnormal; - MythImage *buttonactive; - - QMap allButtonIcons; - - TextAttributes normalAttributes; - TextAttributes activeAttributes; - - void (*callback)(void *, QString &); - void *callbackdata; - - bool killable; - - bool balancerows; - bool spreadbuttons; - bool buttoncenter; - - QMap titleIcons; - QMap m_loadedImages; - QString titleText; - QPoint titlePos; - - MythImage *buttonBackground; - - MythImage *uparrow; - QRect uparrowRect; - MythImage *downarrow; - QRect downarrowRect; - - QPoint watermarkPos; - QRect watermarkRect; - - bool allowreorder; - int maxColumns; - - int visiblerowlimit; - - bool loaded; - - QString themeDir; - - /* FIXME, remove */ - static bool parseFonts; -}; - -bool MythThemedMenuState::parseFonts = true; - -class MythThemedMenuPrivate: public XMLParseBase -{ - public: - MythThemedMenuPrivate(MythThemedMenu *lparent, const QString &cdir, - MythThemedMenuState *lstate); - ~MythThemedMenuPrivate(); - - bool keyPressHandler(QKeyEvent *e); - bool keyHandler(QStringList &actions, bool fullexit); - - bool ReloadTheme(void); - - bool parseMenu(const QString &menuname); - - void parseThemeButton(QDomElement &element); - - void addButton(const QString &type, const QString &text, - const QString &alttext, const QStringList &action); - bool layoutButtons(void); - void positionButtons(bool resetpos); - bool makeRowVisible(int newrow, int oldrow); - - bool handleAction(const QString &action); - bool findDepends(const QString &fileList); - QString findMenuFile(const QString &menuname); - - void checkScrollArrows(void); - - bool checkPinCode(const QString ×tamp_setting, - const QString &password_setting, - const QString &text); - - void SetupBackground(); - void SetupUITypes(); - - bool gestureEvent(MythUIType *origtype, MythGestureEvent *ge); - - void updateLCD(void); - - MythThemedMenu *parent; - - MythThemedMenuState *m_state; - bool allocedstate; - - vector buttonList; - ThemedButton *activebutton; - int currentrow; - int currentcolumn; - - vector buttonRows; - - QString selection; - bool foundtheme; - - int exitModifier; - - bool ignorekeys; - - int maxrows; - int visiblerows; - int columns; - - bool wantpop; - - QString titleText; - QString menumode; - - MythUIStateType *watermark; - MythUIImage *uparrow; - MythUIImage *downarrow; -}; - -///////////////////////////////////////////////////////////////////////////// - -MythThemedMenuState::MythThemedMenuState() : - logo(NULL), buttonnormal(NULL), - buttonactive(NULL), callback(NULL), - callbackdata(NULL), killable(false), - balancerows(true), spreadbuttons(false), - buttoncenter(false), buttonBackground(NULL), - uparrow(NULL), downarrow(NULL), - allowreorder(true), maxColumns(20), - visiblerowlimit(6), loaded(false) -{ + m_killable = false; } MythThemedMenuState::~MythThemedMenuState() { - Reset(); -} - -void MythThemedMenuState::Reset(void) -{ - if (logo) - logo->DownRef(); - if (buttonnormal) - buttonnormal->DownRef(); - if (buttonactive) - buttonactive->DownRef(); - if (uparrow) - uparrow->DownRef(); - if (downarrow) - downarrow->DownRef(); - if (buttonBackground) - buttonBackground->DownRef(); - - logo = NULL; - buttonnormal = NULL; - buttonactive = NULL; - uparrow = NULL; - downarrow = NULL; - buttonBackground = NULL; - QMap::Iterator it; - for (it = allButtonIcons.begin(); it != allButtonIcons.end(); ++it) + for (it = m_allButtonIcons.begin(); it != m_allButtonIcons.end(); ++it) { if (it.value().icon) it.value().icon->DownRef(); if (it.value().activeicon) it.value().activeicon->DownRef(); - if (it.value().watermark) - it.value().watermark->DownRef(); } - allButtonIcons.clear(); + m_allButtonIcons.clear(); QMap::Iterator jt; - for (jt = titleIcons.begin(); jt != titleIcons.end(); ++jt) + for (jt = m_titleIcons.begin(); jt != m_titleIcons.end(); ++jt) { jt.value()->DownRef(); } - titleIcons.clear(); - m_loadedImages.clear(); - - normalAttributes = activeAttributes = TextAttributes(); - setDefaults(); - - loaded = false; + m_titleIcons.clear(); } -ButtonIcon *MythThemedMenuState::getButtonIcon(const QString &type) +bool MythThemedMenuState::Create(void) { - if (allButtonIcons.find(type) != allButtonIcons.end()) - return &(allButtonIcons[type]); - return NULL; -} + bool foundtheme = false; -/** \brief Parse through the element's tags and set the button's - * area, spread, center, rows, columns and visible lower limit. - * \param dir the directory path of background - * \param element QDomElement with information about the background - */ -void MythThemedMenuState::parseBackground( - const QString &dir, QDomElement &element) -{ - QString path; + foundtheme = LoadWindowFromXML("menu-ui.xml", "mainmenu", this); - bool hasarea = false; + if (!foundtheme) + return false; - buttoncenter = true; - spreadbuttons = true; - maxColumns = 20; // Arbitrary number - visiblerowlimit = 6; // the old default + m_titleState = dynamic_cast (GetChild("titles")); + m_watermarkState = dynamic_cast (GetChild("watermarks")); + m_buttonList = dynamic_cast (GetChild("menu")); - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) + if (!m_buttonList) { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "buttonarea") - { - buttonArea = parseRect(info); - hasarea = true; - - if (info.hasAttribute("background")) - { - QString bPath = dir + info.attribute("background"); - QImage *image = GetMythUI()->LoadScaleImage(bPath); - buttonBackground = MythImage::FromQImage(&image); - } - } - else if (info.tagName() == "buttonspread") - { - QString val = getFirstText(info); - if (val == "no") - spreadbuttons = false; - } - else if (info.tagName() == "buttoncenter") - { - QString val = getFirstText(info); - if (val == "no") - buttoncenter = false; - } - else if (info.tagName() == "balancerows") - { - QString val = getFirstText(info); - if (val == "no") - balancerows = false; - } - else if (info.tagName() == "columns") - { - QString val = getFirstText(info); - maxColumns = val.toInt(); - } - else if (info.tagName() == "visiblerowlimit") - { - visiblerowlimit = getFirstText(info).toInt(); - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown tag %1 in " - "background").arg(info.tagName())); - } - } + VERBOSE(VB_IMPORTANT, "Missing 'menu' buttonlist."); + return false; } - if (!hasarea) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing button area in background"); - return; - } -} + m_buttonList->SetActive(true); -/** \brief Parse through the element's tags and set the shadow's color, - * offset, and alpha. - * \param attributes text attributes whose font shadow will be set - * \param element DOM dealing with shadow - */ -void MythThemedMenuState::parseShadow(TextAttributes &attributes, - QDomElement &element) -{ - QPoint offset; - QColor color; - int alpha = 255; + m_loaded = true; - bool hascolor = false; - bool hasoffset = false; - bool hasalpha = false; - - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) - { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "color") - { - // workaround alpha bug with named colors - QColor temp(getFirstText(info)); - color = QColor(temp.name()); - hascolor = true; - } - else if (info.tagName() == "offset") - { - offset = parsePoint(info); - hasoffset = true; - } - else if (info.tagName() == "alpha") - { - alpha = getFirstText(info).toInt(); - hasalpha = true; - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown tag %1 in " - "text/shadow").arg(info.tagName())); - } - } - } - - if (!hascolor) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing color tag in shadow"); - return; - } - - if (!hasalpha) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing alpha tag in shadow"); - return; - } - - if (!hasoffset) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing offset tag in shadow"); - return; - } - - attributes.font.SetShadow(true, offset, color, alpha); + return foundtheme; } -/** \brief Parse through the element's tags and set the outline's - * color and size. - * - * \param attributes text attributes whose font outline will be set - * \param element DOM element dealing with outline - */ -void MythThemedMenuState::parseOutline(TextAttributes &attributes, - QDomElement &element) +void MythThemedMenu::setButtonActive(MythUIButtonListItem* item) { - QColor color; - int size = 0, alpha = 255; - - bool hascolor = false; - bool hassize = false; - - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) + ThemedButton *button = item->GetData().value(); + if (m_watermarkState && button) { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "color") - { - // workaround alpha bug with named colors - QColor temp(getFirstText(info)); - color = QColor(temp.name()); - hascolor = true; - } - else if (info.tagName() == "size") - { - int lsize = getFirstText(info).toInt(); - size = GetMythMainWindow()->NormY(lsize); - hassize = true; - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown tag %1 in " - "text/shadow").arg(info.tagName())); - } - } + if (m_watermarkState->DisplayState(button->type)) + return; } - - if (!hassize) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing size in outline"); - return; - } - - if (!hascolor) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing color in outline"); - return; - } - - attributes.font.SetOutline(true, color, size, alpha); + m_watermarkState->DisplayState("DEFAULT"); } -/** \brief Parse through the element's tags and set the text's area, - * fontsize, fontname, positioning, and decorations. - * - * \param attributes text attributes whose font face will be set - * \param element DOM element dealing with text - */ -void MythThemedMenuState::parseText(TextAttributes &attributes, - QDomElement &element) +ButtonIcon *MythThemedMenuState::getButtonIcon(const QString &type) { - bool hasarea = false; - - int weight = QFont::Normal; - int fontsize = 14; - QString fontname = "Arial"; - bool italic = false; - - attributes.textflags = Qt::TextWordWrap; - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) - { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "area") - { - hasarea = true; - attributes.textRect = parseRect(info); - attributes.textRect = QRect(attributes.textRect.x(), - attributes.textRect.y(), - buttonnormal->width() - - attributes.textRect.width() - - attributes.textRect.x(), - buttonnormal->height() - - attributes.textRect.height() - - attributes.textRect.y()); - } - else if (info.tagName() == "fontsize") - { - fontsize = getFirstText(info).toInt(); - } - else if (info.tagName() == "fontname") - { - fontname = getFirstText(info); - } - else if (info.tagName() == "bold") - { - if (getFirstText(info) == "yes") - weight = QFont::Bold; - } - else if (info.tagName() == "italics") - { - if (getFirstText(info) == "yes") - italic = true; - } - else if (info.tagName() == "color") - { - // workaround alpha bug with named colors - QColor temp(getFirstText(info)); - attributes.font.SetColor(QColor(temp.name())); - } - else if (info.tagName() == "centered") - { - if (getFirstText(info) == "yes") - { - if (GetMythUI()->GetLanguage() == "ja") - { - attributes.textflags = Qt::AlignVCenter | - Qt::AlignHCenter | - Qt::TextWordWrap; - } - else - { - attributes.textflags = Qt::AlignTop | - Qt::AlignHCenter | - Qt::TextWordWrap; - } - } - } - // halign has three possible values: center, left, and right. // - else if (info.tagName() == "halign") - { - if (getFirstText(info) == "center") - { - // Apparently Japanese is drawn along a _center_ line // - if (GetMythUI()->GetLanguage() == "ja") - { - attributes.textflags = - (attributes.textflags & ~Qt::AlignHorizontal_Mask) | - Qt::AlignCenter; - } - else - { - attributes.textflags = - (attributes.textflags & ~Qt::AlignHorizontal_Mask) | - Qt::AlignHCenter; - } - } - else if (getFirstText(info) == "left") - { - attributes.textflags = - (attributes.textflags & ~Qt::AlignHorizontal_Mask) | - Qt::AlignLeft | Qt::TextWordWrap; - } - else if (getFirstText(info) == "right") - { - attributes.textflags = - (attributes.textflags & ~Qt::AlignHorizontal_Mask) | - Qt::AlignRight | Qt::TextWordWrap; - } - else - { - VERBOSE(VB_GENERAL, - QString("MythThemedMenuPrivate: Unknown value %1 " - "for halign").arg(getFirstText(info))); - } - } - // valign has three possible values: center, top, and bottom. // - else if (info.tagName() == "valign") - { - if (getFirstText(info) == "center") - { - attributes.textflags = - (attributes.textflags & ~Qt::AlignVertical_Mask) | - Qt::AlignVCenter; - } - else if (getFirstText(info) == "top") - { - attributes.textflags = - (attributes.textflags & ~Qt::AlignVertical_Mask) | - Qt::AlignTop; - } - else if (getFirstText(info) == "bottom") - { - attributes.textflags = - (attributes.textflags & ~Qt::AlignVertical_Mask) | - Qt::AlignBottom; - } - else - { - VERBOSE(VB_GENERAL, - QString("MythThemedMenuPrivate: Unknown value %1 " - "for valign").arg(getFirstText(info))); - } - } - else if (info.tagName() == "outline") - { - parseOutline(attributes, info); - } - else if (info.tagName() == "shadow") - { - parseShadow(attributes, info); - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown " - "tag %1 in text").arg(info.tagName())); - return; - } - } - } - - QFont font = GetMythMainWindow()->CreateQFont( - fontname, fontsize, weight, italic); - - attributes.font.SetFace(font); - - if (!hasarea) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing 'area' " - "tag in 'text' element of 'genericbutton'"); - return; - } + if (m_allButtonIcons.find(type) != m_allButtonIcons.end()) + return &(m_allButtonIcons[type]); + return NULL; } -void MythThemedMenuState::parseButtonDefinition(const QString &dir, - QDomElement &element) +void MythThemedMenuState::CopyFrom(MythUIType *base) { - bool hasnormal = false; - bool hasactive = false; - bool hasactivetext = false; - - QString setting; - - QImage *tmp; - - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) + MythThemedMenuState *st = dynamic_cast(base); + if (!st) { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "normal") - { - setting = dir + getFirstText(info); - tmp = GetMythUI()->LoadScaleImage(setting); - if (tmp) - { - buttonnormal = MythImage::FromQImage(&tmp); - hasnormal = true; - } - } - else if (info.tagName() == "active") - { - setting = dir + getFirstText(info); - tmp = GetMythUI()->LoadScaleImage(setting); - if (tmp) - { - buttonactive = MythImage::FromQImage(&tmp); - hasactive = true; - } - } - else if (info.tagName() == "text") - { - if (!hasnormal) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: The 'normal' " - "tag needs to come before the 'text' tag"); - return; - } - parseText(normalAttributes, info); - } - else if (info.tagName() == "activetext") - { - if (!hasactive) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: The 'active' " - "tag needs to come before the 'activetext' tag"); - return; - } - parseText(activeAttributes, info); - hasactivetext = true; - } - else if (info.tagName() == "watermarkposition") - { - watermarkPos = parsePoint(info); - } - else - { - VERBOSE(VB_GENERAL, - QString("MythThemedMenuPrivate: Unknown tag %1 in " - "genericbutton").arg(info.tagName())); - } - } - } - - if (!hasnormal) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: No normal button image defined"); + VERBOSE(VB_IMPORTANT, "ERROR, bad parsing"); return; } - if (!hasactive) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: No active button image defined"); - return; - } + m_loaded = st->m_loaded; - if (!hasactivetext) - { - activeAttributes = normalAttributes; - } + MythScreenType::CopyFrom(base); - watermarkRect = QRect(watermarkPos, QSize(0, 0)); + m_titleState = dynamic_cast (GetChild("titles")); + m_watermarkState = dynamic_cast (GetChild("watermarks")); + m_buttonList = dynamic_cast (GetChild("menu")); } -/** \brief Parse through the element's tags and set the logo's - * image and position. +//////////////////////////////////////////////////////////////////////////// + +/** \brief Creates a themed menu. * - * \param dir directory where logo images may be found - * \param element DOM element whose nodes describe the logo + * \param menufile file name of menu definition file + * \param parent the screen stack that owns this UI type + * \param name the name of this UI type + * \param state theme state associated with this menu */ -void MythThemedMenuState::parseLogo(const QString &dir, QDomElement &element) +MythThemedMenu::MythThemedMenu(const QString &cdir, const QString &menufile, + MythScreenStack *parent, const QString &name, + bool allowreorder, MythThemedMenuState *state) + : MythThemedMenuState(parent, name) { - bool hasimage = false; - bool hasposition = false; + m_state = state; + m_allocedstate = m_foundtheme = m_ignorekeys = m_wantpop = false; + m_exitModifier = -1; + m_menumode = ""; - QPoint logopos; - - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) + if (!m_state) { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "image") - { - QString logopath = dir + getFirstText(info); - QImage *tmp = GetMythUI()->LoadScaleImage(logopath); - if (tmp) - { - logo = MythImage::FromQImage(&tmp); - hasimage = true; - } - } - else if (info.tagName() == "position") - { - logopos = parsePoint(info); - hasposition = true; - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown tag %1 " - "in logo").arg(info.tagName())); - } - } + m_state = new MythThemedMenuState(parent, "themedmenustate"); + m_allocedstate = true; } - if (!hasimage) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing image tag in logo"); - return; - } - - if (!hasposition) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing position tag in logo"); - return; - } - - logoRect = QRect(logopos.x(), logopos.y(), logo->width(), - logo->height()); + Init(menufile); } -/** \brief Parse through the element's tags and set the title's image - * (and subsequent mode) and position. +/** \brief Loads the main UI theme, and a menu theme. * - * \param dir directory where title images may be found - * \param element DOM element dealing with the title - */ -void MythThemedMenuState::parseTitle(const QString &dir, QDomElement &element) -{ - bool hasimage = false; - bool hasposition = false; - - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) - { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "image") - { - - QString titlepath = dir + getFirstText(info); - - QString name = info.attribute("mode", ""); - if (name != "") - { - MythImage *icon; - QImage *tmppix; - - if (m_loadedImages[titlepath]) - { - icon = m_loadedImages[titlepath]; - icon->UpRef(); - } - else - { - tmppix = GetMythUI()->LoadScaleImage(titlepath); - - if (!tmppix) - continue; - - icon = MythImage::FromQImage(&tmppix); - m_loadedImages.insert(titlepath, icon); - } - - titleIcons[name] = icon; - } - else - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: " - "Missing mode in titles/image"); - return; - } - - hasimage = true; - } - else if (info.tagName() == "position") - { - titlePos = parsePoint(info); - hasposition = true; - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown tag %1 " - "in logo").arg(info.tagName())); - } - } - } - - if (!hasimage) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing image tag in titles"); - return; - } - - if (!hasposition) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing position tag in titles"); - return; - } -} - -/** \brief Parse through the element's tags to set the arrows - * image and position. + * See also foundtheme(void), it will return true when called after + * this method if this method was successful. * - * \param dir directory where arrow images may be found - * \param element DOM element dealing with arrow image and position + * See also ReloadTheme(void) which you can use to load a generic theme, + * if foundtheme(void) returns false after calling this. + * + * \param menufile name of menu item xml file */ -void MythThemedMenuState::parseArrow(const QString &dir, QDomElement &element, - bool up) +void MythThemedMenu::Init(const QString &menufile) { - QRect arrowrect; - QPoint arrowpos; - QImage *pix = NULL; + ReloadExitKey(); - bool hasimage = false; - bool hasposition = false; - - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) + if (!m_state->m_loaded) { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "image") - { - QString arrowpath = dir + getFirstText(info); - pix = GetMythUI()->LoadScaleImage(arrowpath); - if (pix) - hasimage = true; - } - else if (info.tagName() == "position") - { - arrowpos = parsePoint(info); - hasposition = true; - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown tag %1 " - "in arrow").arg(info.tagName())); - } - } + if (m_state->Create()) + m_foundtheme = true; } + else + m_foundtheme = true; - if (!hasimage) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing image tag in arrow"); + if (!m_foundtheme) return; - } - if (!hasposition) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing position tag in arrow"); - return; - } + CopyFrom(m_state); - arrowrect = QRect(arrowpos.x(), arrowpos.y(), pix->width(), - pix->height()); + parseMenu(menufile); - if (up) - { - uparrow = MythImage::FromQImage(&pix); - uparrowRect = arrowrect; - } - else - { - downarrow = MythImage::FromQImage(&pix); - downarrowRect = arrowrect; - } + connect(m_buttonList, SIGNAL(itemSelected(MythUIButtonListItem*)), + SLOT(setButtonActive(MythUIButtonListItem*))); + connect(m_buttonList, SIGNAL(itemClicked(MythUIButtonListItem*)), + SLOT(buttonAction(MythUIButtonListItem*))); + + m_buttonList->SetActive(true); } -/** \brief Parse through the element's tags and set the button's - * definition as normal, active, text, or activetext. - * - * \param dir directory where the button images may be found - * \param element DOM element whose nodes define Buttons - */ -void MythThemedMenuState::parseButton(const QString &dir, QDomElement &element) +MythThemedMenu::~MythThemedMenu(void) { - bool hasname = false; - bool hasoffset = false; - bool hasicon = false; + if (m_allocedstate) + delete m_state; +} - QString name = ""; - QImage *tmpimg = NULL; - MythImage *image = NULL; - MythImage *activeimage = NULL; - MythImage *watermark = NULL; - QPoint offset; +/// \brief Returns true iff a theme has been found by a previous call to +/// Init(const char*,const char*) or ReloadTheme(). +bool MythThemedMenu::foundTheme(void) +{ + return m_foundtheme; +} - name = element.attribute("name", ""); - if (name != "") - hasname = true; +/// \brief Set the themed menus callback function and data for that function +void MythThemedMenu::setCallback(void (*lcallback)(void *, QString &), void *data) +{ + m_state->m_callback = lcallback; + m_state->m_callbackdata = data; +} - for (QDomNode child = element.firstChild(); !child.isNull(); - child = child.nextSibling()) - { - QDomElement info = child.toElement(); - if (!info.isNull()) - { - if (info.tagName() == "image") - { - QString imagepath = dir + getFirstText(info); +void MythThemedMenu::setKillable(void) +{ + m_state->m_killable = true; +} - if (m_loadedImages[imagepath]) - { - image = m_loadedImages[imagepath]; - image->UpRef(); - } - else - { - tmpimg = GetMythUI()->LoadScaleImage(imagepath); - image = MythImage::FromQImage(&tmpimg); - m_loadedImages.insert(imagepath, image); - } - - if (image) - hasicon = true; - } - else if (info.tagName() == "activeimage") - { - QString imagepath = dir + getFirstText(info); - - if (m_loadedImages[imagepath]) - { - activeimage = m_loadedImages[imagepath]; - activeimage->UpRef(); - } - else - { - tmpimg = GetMythUI()->LoadScaleImage(imagepath); - activeimage = MythImage::FromQImage(&tmpimg); - m_loadedImages.insert(imagepath, activeimage); - } - } - else if (info.tagName() == "offset") - { - offset = parsePoint(info); - hasoffset = true; - } - else if (info.tagName() == "watermarkimage") - { - QString imagepath = dir + getFirstText(info); - - if (m_loadedImages[imagepath]) - { - watermark = m_loadedImages[imagepath]; - watermark->UpRef(); - } - else - { - tmpimg = GetMythUI()->LoadScaleImage(imagepath); - watermark = MythImage::FromQImage(&tmpimg); - m_loadedImages.insert(imagepath, watermark); - } - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown tag %1 " - "in buttondef").arg(info.tagName())); - } - } - } - - if (!hasname) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing name in button"); - return; - } - - if (!hasoffset) - { - VERBOSE(VB_IMPORTANT, QString("MythThemedMenuPrivate: Missing offset " - "in buttondef %1").arg(name)); - return; - } - - if (!hasicon) - { - VERBOSE(VB_IMPORTANT, QString("MythThemedMenuPrivate: Missing image " - "in buttondef %1").arg(name)); - return; - } - - ButtonIcon newbutton; - - newbutton.name = name; - newbutton.icon = image; - newbutton.offset = offset; - newbutton.activeicon = activeimage; - - if (watermark) - { - if (watermark->width() > watermarkRect.width()) - watermarkRect.setWidth(watermark->width()); - - if (watermark->height() > watermarkRect.height()) - watermarkRect.setHeight(watermark->height()); - } - - newbutton.watermark = watermark; - - allButtonIcons[name] = newbutton; - - if (tmpimg) - delete tmpimg; +QString MythThemedMenu::getSelection(void) +{ + return m_selection; } -/** \brief Set buttons, logo, title icons and text, arrows and - * watermarks back to the defaults. +/** \brief Looks at "AllowQuitShutdown" setting in DB, in order to + * determine what to show to user on exit from the frontend. */ -void MythThemedMenuState::setDefaults(void) +void MythThemedMenu::ReloadExitKey(void) { - logo = NULL; - buttonnormal = buttonactive = NULL; - balancerows = true; + int allowsd = GetMythDB()->GetNumSetting("AllowQuitShutdown"); - normalAttributes.textflags = Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap; - activeAttributes.textflags = Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap; - - titleIcons.clear(); - titleText = ""; - uparrow = NULL; - downarrow = NULL; - watermarkPos = QPoint(0, 0); - watermarkRect = QRect(0, 0, 0, 0); + if (allowsd == 1) + m_exitModifier = Qt::ControlModifier; + else if (allowsd == 2) + m_exitModifier = Qt::MetaModifier; + else if (allowsd == 3) + m_exitModifier = Qt::AltModifier; + else if (allowsd == 4) + m_exitModifier = 0; + else + m_exitModifier = -1; } -/** \brief Parse the menu from the given dir for background, button, - * logo, arrow, and font settings. - * \param dir directory where setting may be found - * \param menuname file name of menu file from which settings are parsed - * \return true iff file exists, opens, and parses correctly +/** \brief keyboard/LIRC event handler. + * + * This translates key presses through the "menu" context into MythTV + * actions and then handles them as appropriate. */ -bool MythThemedMenuState::parseSettings( - const QString &dir, const QString &menuname) +bool MythThemedMenu::keyPressEvent(QKeyEvent *e) { - QString filename = dir + menuname; - - QDomDocument doc; - QFile f(filename); - - if (!f.open(QIODevice::ReadOnly)) - { - VERBOSE(VB_IMPORTANT, QString("MythThemedMenuPrivate::parseSettings(): " - "Can't open: %1").arg(filename)); + if (m_ignorekeys) return false; - } - QString errorMsg; - int errorLine = 0; - int errorColumn = 0; + m_ignorekeys = true; - if (!doc.setContent(&f, false, &errorMsg, &errorLine, &errorColumn)) - { - VERBOSE(VB_IMPORTANT, QString("MythThemedMenuPrivate: Error, parsing %1\n" - "at line: %2 column: %3 msg: %4"). - arg(filename).arg(errorLine).arg(errorColumn).arg(errorMsg)); - f.close(); - return false; - } + bool ret = true; + if (!keyPressHandler(e)) + ret = MythScreenType::keyPressEvent(e); - f.close(); + m_ignorekeys = false; - bool setbackground = false; - bool setbuttondef = false; + if (m_wantpop) + m_ScreenStack->PopScreen(); - setDefaults(); - - QDomElement docElem = doc.documentElement(); - QDomNode n = docElem.firstChild(); - while (!n.isNull()) - { - QDomElement e = n.toElement(); - if (!e.isNull()) - { - if (e.tagName() == "background") - { - parseBackground(dir, e); - setbackground = true; - } - else if (e.tagName() == "genericbutton") - { - parseButtonDefinition(dir, e); - setbuttondef = true; - } - else if (e.tagName() == "logo") - { - parseLogo(dir, e); - } - else if (e.tagName() == "buttondef") - { - parseButton(dir, e); - } - else if (e.tagName() == "titles") - { - parseTitle(dir, e); - } - else if (e.tagName() == "uparrow") - { - parseArrow(dir, e, true); - } - else if (e.tagName() == "downarrow") - { - parseArrow(dir, e, false); - } - else if (e.tagName() == "font") - { - if (parseFonts) - { - MythFontProperties *font; - font = MythFontProperties::ParseFromXml(e, NULL, true); - delete font; - } - } - else - { - VERBOSE(VB_GENERAL, QString("MythThemedMenuPrivate: Unknown " - "element %1").arg(e.tagName())); - } - } - n = n.nextSibling(); - } - - if (!setbackground) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing background element"); - return false; - } - - if (!setbuttondef) - { - VERBOSE(VB_IMPORTANT, - "MythThemedMenuPrivate: Missing genericbutton definition"); - return false; - } - - parseFonts = false; - loaded = true; - return true; + return ret; } -///////////////////////////////////////////////////////////////////////////// - -/** \brief Constructor, Init() must be called before class can be used. - * - * \param lparent menu that owns this instance - * \param cdir directory where theme is stored - * \param lstate corresponding settings of the theme - */ -MythThemedMenuPrivate::MythThemedMenuPrivate(MythThemedMenu *lparent, - const QString &cdir, - MythThemedMenuState *lstate) : - parent(lparent), m_state(lstate), - allocedstate(false), activebutton(NULL), - currentrow(0), currentcolumn(0), - foundtheme(false), exitModifier(-1), - ignorekeys(false), maxrows(0), - visiblerows(0), columns(0), - wantpop(false), watermark(NULL), - uparrow(NULL), downarrow(NULL) +void MythThemedMenu::aboutToShow() { - if (!m_state) - { - m_state = new MythThemedMenuState(); - allocedstate = true; - } - - m_state->themeDir = cdir; + MythScreenType::aboutToShow(); +// updateLCD(); } -MythThemedMenuPrivate::~MythThemedMenuPrivate() -{ - if (allocedstate) - delete m_state; -} - /** \brief Parses the element's tags and set the ThemeButton's type, * text, depends, and action, then adds the button. * * \param element DOM element describing features of the themeButton */ -void MythThemedMenuPrivate::parseThemeButton(QDomElement &element) +void MythThemedMenu::parseThemeButton(QDomElement &element) { QString type = ""; QString text = ""; @@ -1322,17 +293,18 @@ } else if (info.tagName() == "text") { - if ((text.isNull() || text.isEmpty()) && - info.attribute("lang","") == "") + if ((text.isNull() || text.isEmpty()) && + info.attribute("lang","").isEmpty()) { - text = getFirstText(info); + text = qApp->translate("ThemeUI", + qPrintable(getFirstText(info))); } - else if (info.attribute("lang","").toLower() == + else if (info.attribute("lang","").toLower() == GetMythUI()->GetLanguageAndVariant()) { text = getFirstText(info); } - else if (info.attribute("lang","").toLower() == + else if (info.attribute("lang","").toLower() == GetMythUI()->GetLanguage()) { text = getFirstText(info); @@ -1341,11 +313,12 @@ else if (info.tagName() == "alttext") { if ((alttext.isNull() || alttext.isEmpty()) && - info.attribute("lang","") == "") + info.attribute("lang","").isEmpty()) { - alttext = getFirstText(info); + alttext = qApp->translate("ThemeUI", + qPrintable(getFirstText(info))); } - else if (info.attribute("lang","").toLower() == + else if (info.attribute("lang","").toLower() == GetMythUI()->GetLanguageAndVariant()) { alttext = getFirstText(info); @@ -1380,12 +353,12 @@ } } - if (text == "") + if (text.isEmpty()) { VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing 'text' in button"); return; } - + if (action.empty()) { VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Missing 'action' in button"); @@ -1409,7 +382,7 @@ * non-essential portion of MythTV which the theme does not support. * */ -bool MythThemedMenuPrivate::parseMenu(const QString &menuname) +bool MythThemedMenu::parseMenu(const QString &menuname) { QString filename = findMenuFile(menuname); @@ -1426,16 +399,10 @@ } else { - parent->GetScreenStack()->PopScreen(); -#if 0 - MythPopupBox::showOkPopup(gContext->GetMainWindow(), QObject::tr("No Menu File"), - QObject::tr(QString("Myth could not locate the menu file %1.\n\n" - "We will now return to the main menu.").arg(menuname))); -#endif + GetScreenStack()->PopScreen(); return false; } - - + } QString errorMsg; @@ -1454,28 +421,15 @@ return false; } - parent->GetScreenStack()->PopScreen(); -#if 0 - MythPopupBox::showOkPopup(gContext->GetMainWindow(), - QObject::tr("Bad Menu File"), - QObject::tr(QString("The menu file %1 is " - "incomplete.\n\nWe will now " - "return to the main menu.") - .arg(menuname))); -#endif + GetScreenStack()->PopScreen(); return false; } f.close(); - buttonList.clear(); - buttonRows.clear(); - - SetupBackground(); - QDomElement docElem = doc.documentElement(); - menumode = docElem.attribute("name", ""); + m_menumode = docElem.attribute("name", "MAIN"); QDomNode n = docElem.firstChild(); while (!n.isNull()) @@ -1497,99 +451,28 @@ n = n.nextSibling(); } - if (buttonList.size() == 0) + if (m_buttonList->GetCount() == 0) { VERBOSE(VB_IMPORTANT, QString("MythThemedMenuPrivate: No buttons " "for menu %1").arg(menuname)); return false; } - if (!layoutButtons()) - return false; - activebutton = NULL; - positionButtons(true); - - SetupUITypes(); - if (LCD::Get()) { - titleText = "MYTH-"; - titleText += menumode; + m_titleText = "MYTH-"; + m_titleText += m_menumode; } - selection = ""; + if (m_titleState) + m_titleState->DisplayState(m_menumode); + + m_selection = ""; return true; } -/// \brief Sets up menu background, must be done before the buttons are parsed -void MythThemedMenuPrivate::SetupBackground(void) +void MythThemedMenu::updateLCD(void) { - - if (m_state->buttonBackground) - { - MythUIImage *buttonBackground; - buttonBackground = new MythUIImage(parent, "menu button background"); - buttonBackground->SetImage(m_state->buttonBackground); - buttonBackground->SetPosition(m_state->buttonArea.topLeft()); - } - -} - -/// \brief Sets up UI according to the corresponding mythThemedMenuState. -void MythThemedMenuPrivate::SetupUITypes(void) -{ - if (m_state->titleIcons.contains(menumode)) - { - MythUIImage *curTitle; - curTitle = new MythUIImage(parent, "menu title image"); - curTitle->SetImage(m_state->titleIcons[menumode]); - curTitle->SetPosition(m_state->titlePos); - } - - if (m_state->logo) - { - MythUIImage *logo; - logo = new MythUIImage(parent, "menu logo"); - logo->SetImage(m_state->logo); - logo->SetPosition(m_state->logoRect.topLeft()); - } - - watermark = new MythUIStateType(parent, "menu watermarks"); - watermark->SetArea(m_state->watermarkRect); - watermark->SetShowEmpty(true); - QMap::Iterator it = m_state->allButtonIcons.begin(); - for (; it != m_state->allButtonIcons.end(); ++it) - { - ButtonIcon *icon = &(it.value()); - if (icon->watermark) - watermark->AddImage(icon->name, icon->watermark); - } - - watermark->DisplayState(activebutton->type); - - uparrow = new MythUIImage(parent, "menu up arrow"); - if (m_state->uparrow) - { - uparrow->SetArea(m_state->uparrowRect); - uparrow->SetImage(m_state->uparrow); - } - uparrow->SetVisible(false); - uparrow->SetCanTakeFocus(true); - - downarrow = new MythUIImage(parent, "menu down arrow"); - if (m_state->downarrow) - { - downarrow->SetArea(m_state->downarrowRect); - downarrow->SetImage(m_state->downarrow); - } - downarrow->SetVisible(false); - downarrow->SetCanTakeFocus(true); - - checkScrollArrows(); -} - -void MythThemedMenuPrivate::updateLCD(void) -{ LCD *lcddev = LCD::Get(); if (lcddev == NULL) return; @@ -1598,20 +481,20 @@ QList menuItems; bool selected; - for (int r = 0; r < (int)buttonRows.size(); r++) - { - if (r == currentrow) - selected = true; - else - selected = false; - - if (currentcolumn < buttonRows[r].numitems) - menuItems.append(LCDMenuItem(selected, NOTCHECKABLE, - buttonRows[r].buttons[currentcolumn]->message)); - } - - if (!menuItems.isEmpty()) - lcddev->switchToMenu(menuItems, titleText); +// for (int r = 0; r < (int)buttonRows.size(); r++) +// { +// if (r == currentrow) +// selected = true; +// else +// selected = false; +// +// if (currentcolumn < buttonRows[r].numitems) +// menuItems.append(LCDMenuItem(selected, NOTCHECKABLE, +// buttonRows[r].buttons[currentcolumn]->message)); +// } +// +// if (!menuItems.isEmpty()) +// lcddev->switchToMenu(menuItems, m_titleText); } /** \brief Create a new MythThemedButton based on the MythThemedMenuState @@ -1623,360 +506,62 @@ * \param alttext alternate text to appear when required * \param action actions to be associated with button */ -void MythThemedMenuPrivate::addButton(const QString &type, const QString &text, - const QString &alttext, +void MythThemedMenu::addButton(const QString &type, const QString &text, + const QString &alttext, const QStringList &action) { - ThemedButton *newbutton = new ThemedButton(parent, type); + MythUIButtonListItem *listbuttonitem = + new MythUIButtonListItem(m_buttonList, text); + ThemedButton *newbutton = new ThemedButton; newbutton->type = type; newbutton->action = action; - newbutton->message = text; + newbutton->text = text; + newbutton->active = false; - newbutton->SetCanTakeFocus(true); - newbutton->background = new MythUIStateType(newbutton, "button background"); - if (m_state->buttonnormal) - newbutton->background->AddImage(MythUIStateType::None, - m_state->buttonnormal); - if (m_state->buttonactive) - newbutton->background->AddImage(MythUIStateType::Full, - m_state->buttonactive); - newbutton->background->DisplayState(MythUIStateType::None); - - newbutton->SetArea(QRect(0, 0, m_state->buttonnormal->width(), - m_state->buttonnormal->height())); - - newbutton->icon = NULL; - ButtonIcon *buttonicon = m_state->getButtonIcon(type); - if (buttonicon) - { - newbutton->icon = new MythUIStateType(newbutton, "button icon"); - newbutton->icon->SetPosition(buttonicon->offset); - if (buttonicon->icon) - newbutton->icon->AddImage(MythUIStateType::None, - buttonicon->icon); - if (buttonicon->activeicon) - newbutton->icon->AddImage(MythUIStateType::Full, - buttonicon->activeicon); - newbutton->icon->DisplayState(MythUIStateType::None); - } - - newbutton->text = new MythUIStateType(newbutton, "button text state"); - { - QString msg = text; - QRect buttonTextRect = m_state->normalAttributes.textRect; - QRect testBoundRect = buttonTextRect; - testBoundRect.setWidth(testBoundRect.width() + 40); - - QFontMetrics tmp(m_state->normalAttributes.font.face()); - QRect testBound = tmp.boundingRect(testBoundRect.x(), testBoundRect.y(), - testBoundRect.width(), - testBoundRect.height(), - m_state->normalAttributes.textflags, - text); - if (testBound.height() > buttonTextRect.height() && alttext != "") - msg = alttext; - - MythUIText *txt = new MythUIText(msg, m_state->normalAttributes.font, - buttonTextRect, buttonTextRect, - newbutton->text, "button normal text"); - txt->SetJustification(m_state->normalAttributes.textflags); - newbutton->text->AddObject(MythUIStateType::None, txt); - } - { - QString msg = text; - QRect buttonTextRect = m_state->activeAttributes.textRect; - QRect testBoundRect = buttonTextRect; - testBoundRect.setWidth(testBoundRect.width() + 40); - - QFontMetrics tmp(m_state->activeAttributes.font.face()); - QRect testBound = tmp.boundingRect(testBoundRect.x(), testBoundRect.y(), - testBoundRect.width(), - testBoundRect.height(), - m_state->activeAttributes.textflags, - text); - if (testBound.height() > buttonTextRect.height() && alttext != "") - msg = alttext; - - MythUIText *txt = new MythUIText(msg, m_state->activeAttributes.font, - buttonTextRect, buttonTextRect, - newbutton->text, "button normal text"); - txt->SetJustification(m_state->activeAttributes.textflags); - newbutton->text->AddObject(MythUIStateType::Full, txt); - } - newbutton->text->DisplayState(MythUIStateType::None); - - newbutton->SetVisible(false); - - buttonList.push_back(newbutton); + listbuttonitem->SetData(qVariantFromValue(newbutton)); } -/** \brief Properly lay out all of the buttons that were added with addButton - * \return true iff there are more than 0 rows or columns - */ -bool MythThemedMenuPrivate::layoutButtons(void) -{ - int numbuttons = buttonList.size(); - - columns = m_state->buttonArea.width() / m_state->buttonnormal->width(); - columns = columns > m_state->maxColumns ? m_state->maxColumns : columns; - - maxrows = m_state->buttonArea.height() / m_state->buttonnormal->height(); - - if (maxrows < 1) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Must have " - "room for at least 1 row of buttons"); - return false; - } - - if (columns < 1) - { - VERBOSE(VB_IMPORTANT, "MythThemedMenuPrivate: Must have " - "room for at least 1 column of buttons"); - return false; - } - - if (m_state->balancerows) - { - // keep the rows balanced - if (numbuttons <= 4) - { - if (columns > 2) - columns = 2; - } - else - { - if (columns > 3) - columns = 3; - } - } - - // limit it to 6 items displayed at one time - if (columns * maxrows > m_state->visiblerowlimit) - { - maxrows = m_state->visiblerowlimit / columns; - } - - vector::iterator iter = buttonList.begin(); - - int rows = numbuttons / columns; - rows++; - - visiblerows = 0; - - for (int i = 0; i < rows; i++) - { - MenuRow newrow; - newrow.numitems = 0; - - for (int j = 0; j < columns && iter != buttonList.end(); - j++, iter++) - { - if (columns == 3 && j == 1 && m_state->allowreorder) - newrow.buttons.insert(newrow.buttons.begin(), *iter); - else - newrow.buttons.push_back(*iter); - newrow.numitems++; - } - - if (i < maxrows && newrow.numitems > 0) - { - newrow.visible = true; - visiblerows++; - } - else - newrow.visible = false; - - if (newrow.numitems > 0) - buttonRows.push_back(newrow); - } - - return true; -} - -/** \brief Place buttons in position and set them visible and active. - * - * \param resetpos whether or not to reset the active button to the - * first one on the buttonlist. - */ -void MythThemedMenuPrivate::positionButtons(bool resetpos) -{ - QRect buttonArea = m_state->buttonArea; - int buttonHeight = m_state->buttonnormal->height(); - int buttonWidth = m_state->buttonnormal->width(); - - int rows = visiblerows; - int yspacing = (buttonArea.height() - buttonHeight * rows) / - (rows + 1); - int ystart = 0; - - if (!m_state->spreadbuttons) - { - yspacing = 0; - if (m_state->buttoncenter) - ystart = (buttonArea.height() - buttonHeight * rows) / 2; - } - - int row = 1; - - vector::iterator menuiter = buttonRows.begin(); - for (; menuiter != buttonRows.end(); menuiter++) - { - if (!(*menuiter).visible) - { - vector::iterator biter; - biter = (*menuiter).buttons.begin(); - for (; biter != (*menuiter).buttons.end(); biter++) - { - ThemedButton *tbutton = (*biter); - tbutton->SetVisible(false); - tbutton->SetActive(false); - } - continue; - } - - int ypos = yspacing * row + (buttonHeight * (row - 1)); - ypos += buttonArea.y() + ystart; - - int xspacing = (buttonArea.width() - buttonWidth * - (*menuiter).numitems) / ((*menuiter).numitems + 1); - int col = 1; - vector::iterator biter = (*menuiter).buttons.begin(); - for (; biter != (*menuiter).buttons.end(); biter++) - { - int xpos = xspacing * col + (buttonWidth * (col - 1)); - xpos = (m_state->maxColumns == 1) ? 0 : xpos; - xpos += buttonArea.x(); - - ThemedButton *tbutton = (*biter); - - tbutton->SetVisible(true); - tbutton->SetActive(false); - tbutton->row = row; - tbutton->col = col; - tbutton->SetPosition(xpos, ypos); - - col++; - } - - row++; - } - - if (resetpos) - { - ThemedButton *old = activebutton; - activebutton = (*(buttonList.begin())); - - if (activebutton != old && old) - old->SetActive(false); - - activebutton->SetActive(true); - - currentrow = activebutton->row - 1; - currentcolumn = activebutton->col - 1; - } -} - -bool MythThemedMenuPrivate::makeRowVisible(int newrow, int oldrow) -{ - if (buttonRows[newrow].visible) - return true; - - if (newrow > oldrow) - { - int row; - for (row = newrow; row >= 0; row--) - { - if (row > newrow - visiblerows) - buttonRows[row].visible = true; - else - buttonRows[row].visible = false; - } - } - else - { - int row; - for (row = newrow; row < (int)buttonRows.size(); row++) - { - if (row < newrow + visiblerows) - buttonRows[row].visible = true; - else - buttonRows[row].visible = false; - } - } - - positionButtons(false); - - checkScrollArrows(); - - return true; -} - -/// \brief Add or remove scroll arrows as needed. -void MythThemedMenuPrivate::checkScrollArrows(void) -{ - bool needup = false; - bool needdown = false; - - if (!buttonRows.front().visible) - needup = true; - if (!buttonRows.back().visible) - needdown = true; - - uparrow->SetVisible(needup); - downarrow->SetVisible(needdown); -} - /** \brief Reset and reparse everything. * * Note: this does not use the theme or menu file chosen in Init(), but * instead uses defaults which should work if MythTV was properly installed. */ -bool MythThemedMenuPrivate::ReloadTheme(void) +void MythThemedMenu::ReloadTheme(void) { + m_foundtheme = false; + GetGlobalFontMap()->Clear(); - m_state->parseFonts = true; - buttonList.clear(); - buttonRows.clear(); + m_buttonList->Reset(); - parent->ReloadExitKey(); - - m_state->Reset(); + ReloadExitKey(); - parent->DeleteAllChildren(); - - QString themedir = GetMythUI()->GetThemeDir(); - bool ok = m_state->parseSettings(themedir, "theme.xml"); - if (!ok) - return ok; + DeleteAllChildren(); - return parseMenu("mainmenu.xml"); + if (parseMenu("mainmenu.xml")) + m_foundtheme = true; } /** \brief Delegate key event to appropriate action for keyHandler() * * \return true iff key event was properly handled */ -bool MythThemedMenuPrivate::keyPressHandler(QKeyEvent *e) +bool MythThemedMenu::keyPressHandler(QKeyEvent *e) { QStringList actions; GetMythMainWindow()->TranslateKeyPress("menu", e, actions); - return keyHandler(actions, e->modifiers() == exitModifier); + return keyHandler(actions, e->modifiers() == m_exitModifier); } /** \brief Interpret key presses on the menu into the appropriate actions * * \param actions list of MythTV actions to be handled. */ -bool MythThemedMenuPrivate::keyHandler(QStringList &actions, +bool MythThemedMenu::keyHandler(QStringList &actions, bool fullexit) { - ThemedButton *lastbutton = activebutton; - int oldrow = currentrow; - int oldcolumn = currentcolumn; bool handled = false; for (int i = 0; i < actions.size() && !handled; i++) @@ -1984,111 +569,36 @@ QString action = actions[i]; handled = true; - if (columns == 1) +// if (columns == 1) +// { +// if (action == "LEFT") +// action = "ESCAPE"; +// else if (action == "RIGHT") +// action = "SELECT"; +// } + if (action == "ESCAPE") { - if (action == "LEFT") - action = "ESCAPE"; - else if (action == "RIGHT") - action = "SELECT"; - } - - if (action == "UP") - { - if (currentrow > 0) - currentrow--; - else if (columns == 1) - currentrow = buttonRows.size() - 1; - - if (currentcolumn >= buttonRows[currentrow].numitems) - currentcolumn = buttonRows[currentrow].numitems - 1; - - if (currentrow == oldrow && currentcolumn == oldcolumn) - { - handled = false; - } - } - else if (action == "PAGEUP") - { - currentrow = max(currentrow - m_state->visiblerowlimit, 0); - - if (currentcolumn >= buttonRows[currentrow].numitems) - currentcolumn = buttonRows[currentrow].numitems - 1; - } - else if (action == "LEFT") - { - if (currentcolumn > 0) - currentcolumn--; - else - currentcolumn = buttonRows[currentrow].numitems - 1; - } - else if (action == "DOWN") - { - if (currentrow < (int)buttonRows.size() - 1) - currentrow++; - else if (columns == 1) - currentrow = 0; - - if (currentcolumn >= buttonRows[currentrow].numitems) - currentcolumn = buttonRows[currentrow].numitems - 1; - - if (currentrow == oldrow && currentcolumn == oldcolumn) - { - handled = false; - } - } - else if (action == "PAGEDOWN") - { - currentrow = min(currentrow + m_state->visiblerowlimit, - (int)buttonRows.size() - 1); - - if (currentcolumn >= buttonRows[currentrow].numitems) - currentcolumn = buttonRows[currentrow].numitems - 1; - } - else if (action == "RIGHT") - { - if (currentcolumn < buttonRows[currentrow].numitems - 1) - currentcolumn++; - else - currentcolumn = 0; - } - else if (action == "SELECT") - { - lastbutton = activebutton; - activebutton = NULL; - - QStringList::Iterator it = lastbutton->action.begin(); - for (; it != lastbutton->action.end(); it++) - { - if (handleAction(*it)) - break; - } - - lastbutton = NULL; - } - else if (action == "ESCAPE") - { QString action = "UPMENU"; - if (!allocedstate) + if (!m_allocedstate) handleAction(action); - else if (m_state->killable) + else if (m_state->m_killable) { - wantpop = true; - if (m_state->callback != NULL) + m_wantpop = true; + if (m_state->m_callback) { QString sel = "EXITING_MENU"; - m_state->callback(m_state->callbackdata, sel); + m_state->m_callback(m_state->m_callbackdata, sel); } if (GetMythMainWindow()->GetMainStack()->TotalScreens() == 1) QApplication::exit(); } - else if (exitModifier >= 0 && fullexit && + else if (m_exitModifier >= 0 && fullexit && GetMythMainWindow()->GetMainStack()->TotalScreens() == 1) { QApplication::exit(); - wantpop = true; + m_wantpop = true; } - lastbutton = NULL; } else handled = false; @@ -2097,86 +607,25 @@ if (!handled) return false; - if (!buttonRows[currentrow].visible) - { - makeRowVisible(currentrow, oldrow); - } - - activebutton = buttonRows[currentrow].buttons[currentcolumn]; - watermark->DisplayState(activebutton->type); - - if (lastbutton != activebutton && lastbutton && activebutton) - { - lastbutton->SetActive(false); - activebutton->SetActive(true); - } - // only update the LCD if we are still on the top of the stack - if (parent->GetScreenStack()->GetTopScreen() == (MythScreenType*) parent) - updateLCD(); +// if (GetScreenStack()->GetTopScreen() == this) +// updateLCD(); return true; -} +} -/** \brief Interprets mouse gestures as MythTV action events - * - * \param origtype originating element type for the gesture - * \param ge mouse gesture event - * \return true iff a gesture was handled here. - */ -bool MythThemedMenuPrivate::gestureEvent(MythUIType *origtype, - MythGestureEvent *ge) +void MythThemedMenu::buttonAction(MythUIButtonListItem *item) { - if (ge->gesture() == MythGestureEvent::Click) - { - if (origtype == uparrow) - { - QStringList action("PAGEUP"); - keyHandler(action, false); - } - else if (origtype == downarrow) - { - QStringList action("PAGEDOWN"); - keyHandler(action, false); - } - else - { - if (ThemedButton *button = reinterpret_cast(origtype)) - { - ThemedButton *lastbutton = activebutton; - activebutton = button; + ThemedButton *button = item->GetData().value(); - if (LCD *lcddev = LCD::Get()) - lcddev->switchToTime(); - - QStringList::Iterator it = button->action.begin(); - for (; it != button->action.end(); it++) - { - if (handleAction(*it)) - break; - } - - watermark->DisplayState(activebutton->type); - - if (lastbutton != activebutton && lastbutton && activebutton) - { - lastbutton->SetActive(false); - activebutton->SetActive(true); - } - } - } - - return true; - } - - if (ge->gesture() == MythGestureEvent::Left) + QStringList::Iterator it = button->action.begin(); + for (; it != button->action.end(); it++) { - QStringList action("ESCAPE"); - keyHandler(action, true); - return true; + if (handleAction(*it)) + break; } - return false; + button = NULL; } /** \brief Locates the appropriate menu file from which to parse the menu @@ -2184,7 +633,7 @@ * \param menuname file name of the menu you want to find * \return the directory in which the menu file is found */ -QString MythThemedMenuPrivate::findMenuFile(const QString &menuname) +QString MythThemedMenu::findMenuFile(const QString &menuname) { QString testdir = GetConfDir() + "/" + menuname; QFile file(testdir); @@ -2196,22 +645,21 @@ if (file.exists()) return testdir; - testdir = GetMythUI()->GetThemeDir() + "/" + menuname; file.setFileName(testdir); if (file.exists()) return testdir; - + testdir = GetShareDir() + menuname; file.setFileName(testdir); if (file.exists()) return testdir; - + testdir = "../mythfrontend/" + menuname; file.setFileName(testdir); if (file.exists()) return testdir; - + return ""; } @@ -2220,7 +668,7 @@ * \param action single action to be handled * \return true if the action is not to EXEC another program */ -bool MythThemedMenuPrivate::handleAction(const QString &action) +bool MythThemedMenu::handleAction(const QString &action) { MythUIMenuCallbacks *cbs = GetMythUI()->GetMenuCBs(); @@ -2229,7 +677,7 @@ QString rest = action.right(action.length() - 5); if (cbs && cbs->exec_program) cbs->exec_program(rest); - + return false; } else if (action.left(7) == "EXECTV ") @@ -2240,26 +688,24 @@ } else if (action.left(5) == "MENU ") { - QString rest = action.right(action.length() - 5); + QString menu = action.right(action.length() - 5); - if (rest == "main_settings.xml" && + if (menu == "main_settings.xml" && GetMythDB()->GetNumSetting("SetupPinCodeRequired", 0) && !checkPinCode("SetupPinCodeTime", "SetupPinCode", "Setup Pin:")) { return true; } - MythScreenStack *stack = parent->GetScreenStack(); + MythScreenStack *stack = GetScreenStack(); - MythThemedMenu *newmenu = new MythThemedMenu(m_state->themeDir, - rest, stack, rest, - m_state->allowreorder, - m_state); + MythThemedMenu *newmenu = new MythThemedMenu("", menu, stack, menu, + false, m_state); stack->AddScreen(newmenu); } else if (action.left(6) == "UPMENU") { - wantpop = true; + m_wantpop = true; } else if (action.left(12) == "CONFIGPLUGIN") { @@ -2275,9 +721,9 @@ } else if (action.left(8) == "SHUTDOWN") { - if (allocedstate) + if (m_allocedstate) { - wantpop = true; + m_wantpop = true; } } else if (action.left(5) == "EJECT") @@ -2292,21 +738,20 @@ } else { - selection = action; - if (m_state->callback != NULL) - m_state->callback(m_state->callbackdata, selection); + m_selection = action; + if (m_state->m_callback) + m_state->m_callback(m_state->m_callbackdata, m_selection); } - return true; + return true; } - -bool MythThemedMenuPrivate::findDepends(const QString &fileList) +bool MythThemedMenu::findDepends(const QString &fileList) { QStringList files = fileList.split(" "); QString filename; - for (QStringList::Iterator it = files.begin(); it != files.end(); ++it ) + for (QStringList::Iterator it = files.begin(); it != files.end(); ++it ) { QString filename = findMenuFile(*it); if (filename != "" && filename.endsWith(".xml")) @@ -2330,7 +775,7 @@ * \param text the message text to be displayed * \return true if password checks out or is not needed. */ -bool MythThemedMenuPrivate::checkPinCode(const QString ×tamp_setting, +bool MythThemedMenu::checkPinCode(const QString ×tamp_setting, const QString &password_setting, const QString &text) { @@ -2349,7 +794,7 @@ } else { - QDateTime last_time = QDateTime::fromString(last_time_stamp, + QDateTime last_time = QDateTime::fromString(last_time_stamp, Qt::TextDate); if (last_time.secsTo(curr_time) < 120) { @@ -2383,167 +828,3 @@ return false; } - -//////////////////////////////////////////////////////////////////////////// - -/** \brief Creates a themed menu. - * - * \param cdir directory where theme is stored - * \param menufile file name of menu definition file - * \param parent the screen stack that owns this UI type - * \param name the name of this UI type - * \param allowreorder will buttons be inserted into new rows or pushed back - * \param state theme state associated with this menu - */ -MythThemedMenu::MythThemedMenu(const QString &cdir, const QString &menufile, - MythScreenStack *parent, const QString &name, - bool allowreorder, MythThemedMenuState *state) - : MythScreenType(parent, name) -{ - d = new MythThemedMenuPrivate(this, cdir, state); - d->m_state->allowreorder = allowreorder; - - Init(cdir, menufile); -} - -/** \brief Loads the main UI theme, and a menu theme. - * - * See also foundTheme(void), it will return true when called after - * this method if this method was successful. - * - * See also ReloadTheme(void) which you can use to load a generic theme, - * if foundTheme(void) returns false after calling this. - * - * \param cdir directory where theme.xml is stored - * \param menufile name of menu item xml file - */ -void MythThemedMenu::Init(const QString &cdir, const QString &menufile) -{ - QString dir = QString(cdir) + "/"; - QString filename = dir + "theme.xml"; - - d->foundtheme = true; - QFile filetest(filename); - if (!filetest.exists()) - { - d->foundtheme = false; - return; - } - - ReloadExitKey(); - - if (!d->m_state->loaded) - d->foundtheme = d->m_state->parseSettings(dir, "theme.xml"); - - if (d->foundtheme) - d->parseMenu(menufile); -} - -MythThemedMenu::~MythThemedMenu(void) -{ - if (d) - delete d; -} - -/// \brief Returns true iff a theme has been found by a previous call to -/// Init(const char*,const char*) or ReloadTheme(). -bool MythThemedMenu::foundTheme(void) -{ - return d->foundtheme; -} - -/// \brief Set the themed menus callback function and data for that function -void MythThemedMenu::setCallback(void (*lcallback)(void *, QString &), void *data) -{ - d->m_state->callback = lcallback; - d->m_state->callbackdata = data; -} - -void MythThemedMenu::setKillable(void) -{ - d->m_state->killable = true; -} - -QString MythThemedMenu::getSelection(void) -{ - return d->selection; -} - -/** \brief Looks at "AllowQuitShutdown" setting in DB, in order to - * determine what to show to user on exit from the frontend. - */ -void MythThemedMenu::ReloadExitKey(void) -{ - int allowsd = GetMythDB()->GetNumSetting("AllowQuitShutdown"); - - if (allowsd == 1) - d->exitModifier = Qt::ControlModifier; - else if (allowsd == 2) - d->exitModifier = Qt::MetaModifier; - else if (allowsd == 3) - d->exitModifier = Qt::AltModifier; - else if (allowsd == 4) - d->exitModifier = 0; - else - d->exitModifier = -1; -} - -/** \brief Reset and reparse everything, check foundTheme(void) for success. - * - * Note: this does not use the theme or menu file chosen in Init(), but - * instead uses defaults which should work if MythTV was properly installed. - */ -void MythThemedMenu::ReloadTheme(void) -{ - if (!d->ReloadTheme()) - d->foundtheme = false; -} - -/** \brief keyboard/LIRC event handler. - * - * This translates key presses through the "menu" context into MythTV - * actions and then handles them as appropriate. - */ -bool MythThemedMenu::keyPressEvent(QKeyEvent *e) -{ - if (d->ignorekeys) - return false; - - d->ignorekeys = true; - - bool ret = true; - if (!d->keyPressHandler(e)) - { - ret = MythScreenType::keyPressEvent(e); - } - - d->ignorekeys = false; - - - if (d->wantpop) - m_ScreenStack->PopScreen(); - - return ret; -} - -/** \brief Interprets mouse gestures as MythTV action events - * - * \param origtype originating element type from the screen - * \param ge mouse gesture event - */ -void MythThemedMenu::gestureEvent(MythUIType *origtype, MythGestureEvent *ge) -{ - if (d->gestureEvent(origtype, ge)) - { - if (d->wantpop) - m_ScreenStack->PopScreen(); - } - else - MythScreenType::gestureEvent(origtype, ge); -} - -void MythThemedMenu::aboutToShow() -{ - MythScreenType::aboutToShow(); - d->updateLCD(); -} Index: mythtv/libs/libmythui/myththemedmenu.h =================================================================== --- mythtv/libs/libmythui/myththemedmenu.h (revision 18111) +++ mythtv/libs/libmythui/myththemedmenu.h (working copy) @@ -2,21 +2,75 @@ #define MYTHTHEMEDMENU_H_ #include "mythscreentype.h" +#include "mythuistatetype.h" +#include "mythuibuttonlist.h" +#include "xmlparsebase.h" #include class MythMainWindow; -class MythThemedMenuPrivate; class MythThemedMenuState; +struct ThemedButton +{ + QString type; + QStringList action; + QString text; + MythImage *icon; + bool active; +}; + +Q_DECLARE_METATYPE(ThemedButton*); + +struct ButtonIcon +{ + QString name; + MythImage *icon; + MythImage *activeicon; + QPoint offset; +}; + + +/** \class MyththemedMenuState + * \brief Private class that controls the settings of buttons, logos, + * backgrounds, texts, and more, for the MythThemedMenu class. + */ +class MythThemedMenuState : public MythScreenType +{ + public: + MythThemedMenuState(MythScreenStack *parent, const QString &name); + ~MythThemedMenuState(); + + bool Create(void); + + ButtonIcon *getButtonIcon(const QString &type); + + QMap m_allButtonIcons; + QMap m_titleIcons; + QString m_titleText; + + void (*m_callback)(void *, QString &); + void *m_callbackdata; + + bool m_killable; + + bool m_loaded; + MythUIStateType *m_titleState; + MythUIStateType *m_watermarkState; + MythUIButtonList *m_buttonList; + + protected: + void CopyFrom(MythUIType*); +}; + /// \brief Themed menu class, used for main menus in %MythTV frontend -class MythThemedMenu : public MythScreenType +class MythThemedMenu : public MythThemedMenuState { Q_OBJECT public: MythThemedMenu(const QString &cdir, const QString &menufile, - MythScreenStack *parent, const QString &name, - bool allowreorder = true, MythThemedMenuState *state = NULL); + MythScreenStack *parent, const QString &name, + bool allowreorder = false, MythThemedMenuState *state = NULL); ~MythThemedMenu(); bool foundTheme(void); @@ -32,12 +86,51 @@ protected: virtual bool keyPressEvent(QKeyEvent *e); - virtual void gestureEvent(MythUIType *origtype, MythGestureEvent *ge); + private slots: + void setButtonActive(MythUIButtonListItem* item); + void buttonAction(MythUIButtonListItem* item); + private: - void Init(const QString &cdir, const QString &menufile); + void Init(const QString &menufile); - MythThemedMenuPrivate *d; + bool keyPressHandler(QKeyEvent *e); + bool keyHandler(QStringList &actions, bool fullexit); + + bool parseMenu(const QString &menuname); + void parseThemeButton(QDomElement &element); + + void addButton(const QString &type, const QString &text, + const QString &alttext, const QStringList &action); + + bool handleAction(const QString &action); + bool findDepends(const QString &fileList); + QString findMenuFile(const QString &menuname); + + bool checkPinCode(const QString ×tamp_setting, + const QString &password_setting, + const QString &text); + + void updateLCD(void); + + MythThemedMenu *m_parent; + + MythThemedMenuState *m_state; + bool m_allocedstate; + + ThemedButton *m_activebutton; + + QString m_selection; + bool m_foundtheme; + + int m_exitModifier; + + bool m_ignorekeys; + + bool m_wantpop; + + QString m_titleText; + QString m_menumode; }; #endif