From e0ac1d2d8e221dbde8d02e6549aec6cfff179596 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 3 Sep 2012 12:12:59 +0200 Subject: [PATCH] CChannelList: adapt for new functionality in CComponents Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d0af8fb7bff6803dd473ff54d2ca3b678e857ce1 Author: Thilo Graf Date: 2012-09-03 (Mon, 03 Sep 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 9effe9e8b..e85277be6 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1994,16 +1994,15 @@ void CChannelList::paintHead() if (clHead == NULL) { clHead = new CComponentsTitleBar(); clHead->setDimensionsAll(x, y, width, theight); - - clHead->addElement(CC_ALIGN_LEFT, CC_ITEMBOX_TEXT, name); - - clHead->addElement(CC_ALIGN_RIGHT, CC_ITEMBOX_ICON, NEUTRINO_ICON_BUTTON_INFO); - clHead->addElement(CC_ALIGN_RIGHT, CC_ITEMBOX_ICON, NEUTRINO_ICON_BUTTON_MENU); + + clHead->addText(name); + + clHead->addIcon(NEUTRINO_ICON_BUTTON_INFO, CC_ALIGN_RIGHT); + clHead->addIcon(NEUTRINO_ICON_BUTTON_MENU, CC_ALIGN_RIGHT); if (g_settings.channellist_new_zap_mode) - clHead->addElement(CC_ALIGN_RIGHT, CC_ITEMBOX_ICON, this->new_mode_active ? - NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE : NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE); - clHead->addElement(CC_ALIGN_RIGHT, CC_ITEMBOX_CLOCK); - clHead->addElement(CC_ALIGN_RIGHT, CC_ITEMBOX_PICTURE, "", &indexLogo); + clHead->addIcon(this->new_mode_active ? NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE : NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE, CC_ALIGN_RIGHT); + clHead->addClock(); + clHead->addPicture("", CC_ALIGN_RIGHT, &indexLogo); } clHead->paint(); }