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

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

Browse Source 
Conflicts:
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/settings.h
	version_pseudo.h


Origin commit data
------------------
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
This commit is contained in:
vanhofen
2016-12-29 00:59:00 +01:00
parent 465c6ce561 e973c28e0f
commit 65cf83258c
11 changed files with 84 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/volumebar.cpp
View File

@@ -194,7 +194,7 @@ void CVolumeBar::initVolumeBarScale()
vb_pb->setProgress(vb_pbx, vb_pby, vb_pbw, vb_pbh, *vb_vol, 100);
//NI
if (g_settings.progressbar_design == CProgressBar::PB_GRAPHIC)
if (g_settings.theme.progressbar_design == CProgressBar::PB_GRAPHIC)
vb_pb->setGraphic("volumebar");
//add progressbar to container