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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: c7b4538921
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-19 (Sun, 19 Nov 2017)
This commit is contained in:
vanhofen
2017-11-19 21:59:10 +01:00
parent 7cd303d952 11a699c689
commit dff79725de
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/components/cc_frm.cpp
View File

@@ -482,10 +482,8 @@ void CComponentsForm::paintCCItems()
//reduce corner radius, if we have a frame around parent item, ensure matching corners inside of embedded item, this avoids ugly unpainted spaces between frame and item border //reduce corner radius, if we have a frame around parent item, ensure matching corners inside of embedded item, this avoids ugly unpainted spaces between frame and item border
//TODO: other constellations not considered at the moment //TODO: other constellations not considered at the moment
if (w_parent_frame){ if (w_parent_frame)
if(xpos <= fr_thickness || ypos <= fr_thickness) cc_item->setCorner(max(0, cc_item->getCornerRadius()- w_parent_frame), cc_item->getCornerType());
cc_item->setCorner(max(0, cc_item->getCornerRadius()-w_parent_frame), cc_item->getCornerType());
}
//These steps check whether the element can be painted into the container. //These steps check whether the element can be painted into the container.
//Is it too wide or too high, it will be shortened and displayed in the log. //Is it too wide or too high, it will be shortened and displayed in the log.

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

@@ -226,7 +226,7 @@ void CComponentsWindow::initFooter()
ccw_footer->setPos(cc_xr + fr_thickness, cc_yr + height - ccw_footer->getHeight()- fr_thickness); ccw_footer->setPos(cc_xr + fr_thickness, cc_yr + height - ccw_footer->getHeight()- fr_thickness);
ccw_footer->setWidth(width/*-2*fr_thickness*/); ccw_footer->setWidth(width/*-2*fr_thickness*/);
ccw_footer->enableShadow(false/*shadow*/); ccw_footer->enableShadow(false/*shadow*/);
ccw_footer->setCorner(corner_rad-fr_thickness, CORNER_BOTTOM); ccw_footer->setCorner(corner_rad, CORNER_BOTTOM);
ccw_footer->setButtonFont(ccw_button_font); ccw_footer->setButtonFont(ccw_button_font);
ccw_footer->setColorBody(ccw_col_footer); ccw_footer->setColorBody(ccw_col_footer);
ccw_footer->doPaintBg(true); ccw_footer->doPaintBg(true);

9
src/gui/imageinfo.cpp
View File

@@ -281,7 +281,14 @@ void CImageInfo::InitInfoData()
#ifdef IMAGE_VERSION #ifdef IMAGE_VERSION
version_string = IMAGE_VERSION; version_string = IMAGE_VERSION;
#else #else
if (isdigit(version_string[0])){ bool is_version_code = true;
for (size_t i=0; i<version_string.size(); i++){
if (!isdigit(version_string[i])){
is_version_code = false;
break;
}
}
if (is_version_code && version_string.size() == 16){
static CFlashVersionInfo versionInfo(version_string.c_str()); static CFlashVersionInfo versionInfo(version_string.c_str());
version_string = versionInfo.getReleaseCycle(); version_string = versionInfo.getReleaseCycle();
version_string += " "; version_string += " ";

3
src/gui/test_menu.cpp
View File

@@ -1117,6 +1117,9 @@ int CTestMenu::showTestMenu()
w_test.addItem(new CMenuForwarder(w_msg->getName(), true, NULL, w_msg)); w_test.addItem(new CMenuForwarder(w_msg->getName(), true, NULL, w_msg));
showMsgTests(w_msg); showMsgTests(w_msg);
//restart gui
w_test.addItem(new CMenuForwarder(LOCALE_SERVICEMENU_RESTART , true, NULL, CNeutrinoApp::getInstance(), "restart", CRCInput::RC_standby));
//footer buttons //footer buttons
static const struct button_label footerButtons[2] = { static const struct button_label footerButtons[2] = {
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_COLORCHOOSER_RED }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_COLORCHOOSER_RED },