mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 15:41:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source 
# Conflicts:
#	src/gui/components/cc_frm_window.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: aaa34d8887
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-05-11 12:18:38 +02:00
parent f6e2507451 064b2cc588
commit a8f3d88872
11 changed files with 62 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/test_menu.cpp
View File

@@ -744,11 +744,11 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
else if (actionKey == "window"){
if (window == NULL){
window = new CComponentsWindow();
window->setWindowCaption("|........HEADER........|", CTextBox::CENTER);
window->setWindowCaption("|........HEADER........|", CCHeaderTypes::CC_TITLE_CENTER);
window->setDimensionsAll(50, 50, 500, 500);
window->setWindowIcon(NEUTRINO_ICON_INFO);
window->enableShadow();
window->getFooterObject()->setCaption("|........FOOTER........|", CTextBox::CENTER);
window->getFooterObject()->setCaption("|........FOOTER........|", CCHeaderTypes::CC_TITLE_CENTER);
CComponentsShapeCircle *c10 = new CComponentsShapeCircle(0, 0, 28);
CComponentsShapeCircle *c11 = new CComponentsShapeCircle(0, CC_APPEND, 28);