mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsWindow: remove refresh()

Browse Source 
initCCWItems() does the same, but is private


Origin commit data
------------------
Branch: ni/coolstream
Commit: de330ac39c
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2013-03-09 14:05:24 +01:00
parent 7bec5a6e4f
commit db094c3a10
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc.h
View File

@@ -33,7 +33,7 @@
#include <string> #include <string>
#include <driver/pictureviewer/pictureviewer.h> #include <driver/pictureviewer/pictureviewer.h>
//#define DEBUG_CC #define DEBUG_CC
class CComponents class CComponents
{ {
@@ -515,8 +515,8 @@ class CComponentsWindow : public CComponentsForm
~CComponentsWindow(); ~CComponentsWindow();
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES); void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
void refresh(){initCCWItems();};
void setWindowCaption(const std::string& text){ccw_caption = text;}; void setWindowCaption(const std::string& text){ccw_caption = text;};
void setWindowCaption(neutrino_locale_t locale_text);
void setWindowIcon(const char* iconname){ccw_icon_name = iconname;}; void setWindowIcon(const char* iconname){ccw_icon_name = iconname;};
}; };

15
src/gui/components/cc_frm_window.cpp
View File

@@ -67,10 +67,18 @@ CComponentsWindow::~CComponentsWindow()
delete ccw_head; delete ccw_head;
} }
void CComponentsWindow::setWindowCaption(neutrino_locale_t locale_text)
{
ccw_caption = g_Locale->getText(locale_text);
}
void CComponentsWindow::initHeader() void CComponentsWindow::initHeader()
{ {
if (ccw_head == NULL) if (ccw_head){
ccw_head = new CComponentsHeader(); delete ccw_head;
ccw_head = NULL;
}
ccw_head = new CComponentsHeader();
ccw_head->setXPos(0); ccw_head->setXPos(0);
ccw_head->setYPos(0); ccw_head->setYPos(0);
@@ -89,6 +97,9 @@ void CComponentsWindow::initCCWItems()
void CComponentsWindow::paint(bool do_save_bg) void CComponentsWindow::paint(bool do_save_bg)
{ {
//prepare items before paint
initCCWItems();
//paint body //paint body
paintInit(do_save_bg); paintInit(do_save_bg);

1
src/gui/test_menu.cpp
View File

@@ -512,7 +512,6 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
window->setWindowIcon(NEUTRINO_ICON_LOCK); window->setWindowIcon(NEUTRINO_ICON_LOCK);
window->setWindowCaption("Test"); window->setWindowCaption("Test");
} }
window->refresh();
if (!window->isPainted()) if (!window->isPainted())
window->paint(); window->paint();