mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +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 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c35e647878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-12-07 12:17:23 +01:00
parent 55faf0c143 7bc6dceca8
commit 4bd6a1dcb3
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/iso-codes/Makefile.am
View File

@@ -1,4 +1,4 @@
installdir = $(datadir)/iso-codes installdir = $(DATADIR)/iso-codes
install_DATA = \ install_DATA = \
iso-639.tab iso-639.tab

6
data/y-web/Y_Info_Help.yhtm
View File

@@ -7,10 +7,10 @@
{=var-set:help_url=Help-Info-Hilfe=}{=var-set:menu={=L:info.help=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div> {=var-set:help_url=Help-Info-Hilfe=}{=var-set:menu={=L:info.help=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body"> <div class="work_box_body">
<ul> <ul>
<li><a href="http://wiki.tuxbox.org/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki Help</a></li> <li><a href="http://wiki.tuxbox.org/wiki/Neutrino-HD" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino Help</a></li>
<li><a href="http://wiki.tuxbox.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb Help</a></li>
<li><a href="http://forum.tuxbox.org/forum" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li> <li><a href="http://forum.tuxbox.org/forum" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
<li><a href="http://www.cstworld.net" class="exlink" title="CST User Forum" target="_blank">CST User Forum</a></li> <li><a href="http://tuxbox-neutrino.org" class="exlink" title="Tuxbox-Neutrino developers" target="_blank">Sources</a></li>
<li><a href="https://dbox2world.net/board/329-development/" class="exlink" title="CST Dev Forum" target="_blank">CST Developer Forum</a></li>
</ul> </ul>
</div> </div>
</div> </div>

7
src/gui/widget/hintbox.cpp
View File

@@ -265,6 +265,9 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
/* set required font and line height */ /* set required font and line height */
Font* item_font = !font_text ? hb_font : font_text; Font* item_font = !font_text ? hb_font : font_text;
/* set picon */
string picon = Picon;
/* pre define required info height depends of lines and minimal needed height*/ /* pre define required info height depends of lines and minimal needed height*/
int line_breaks = CTextBox::getLines(Text); int line_breaks = CTextBox::getLines(Text);
int h_font = item_font->getHeight(); int h_font = item_font->getHeight();
@@ -276,7 +279,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
int txt_mode = text_mode; int txt_mode = text_mode;
/* remove CENTER mode if picon defined */ /* remove CENTER mode if picon defined */
if (!Picon.empty() && (txt_mode & CTextBox::CENTER)){ if (!picon.empty() && (txt_mode & CTextBox::CENTER)){
txt_mode &= ~CTextBox::CENTER; txt_mode &= ~CTextBox::CENTER;
} }
@@ -313,7 +316,7 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
color_text); color_text);
/* define picon and disable bg */ /* define picon and disable bg */
info_box->setPicture(Picon); info_box->setPicture(picon);
info_box->doPaintBg(false); info_box->doPaintBg(false);
/* recalculate new hintbox dimensions and position*/ /* recalculate new hintbox dimensions and position*/

4
src/system/localize.cpp
View File

@@ -48,8 +48,10 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#define ISO_639_TAB DATADIR "/iso-codes/iso-639.tab"
//static const char * iso639filename = "/usr/share/iso-codes/iso-639.tab"; //static const char * iso639filename = "/usr/share/iso-codes/iso-639.tab";
static const char * iso639filename = "/share/iso-codes/iso-639.tab"; //static const char * iso639filename = "/share/iso-codes/iso-639.tab";
static const char * iso639filename = ISO_639_TAB;
#define DEFAULT_LOCALE "english" #define DEFAULT_LOCALE "english"