mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 01:41:12 +02:00
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 29b6f4a827
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-16 (Tue, 16 Aug 2016)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -77,8 +77,6 @@ CUpnpBrowserGui::CUpnpBrowserGui()
|
||||
|
||||
Init();
|
||||
|
||||
font_item = SNeutrinoSettings::FONT_TYPE_MENU;
|
||||
|
||||
dline = NULL;
|
||||
image = NULL;
|
||||
|
||||
@@ -91,6 +89,8 @@ CUpnpBrowserGui::CUpnpBrowserGui()
|
||||
|
||||
void CUpnpBrowserGui::Init()
|
||||
{
|
||||
font_item = SNeutrinoSettings::FONT_TYPE_MENU;
|
||||
|
||||
topbox.enableFrame(true, 2);
|
||||
topbox.setCorner(RADIUS_LARGE);
|
||||
topbox.setColorAll(COL_MENUCONTENT_PLUS_6, COL_MENUHEAD_PLUS_0, COL_MENUCONTENTDARK_PLUS_0, COL_MENUHEAD_TEXT);
|
||||
|
Reference in New Issue
Block a user