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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-12-28 12:32:12 +01:00
parent c8d0f6faaf 85fc0dd24c
commit 770e405c50
112 changed files with 2783 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/widget/menue.cpp
View File

@@ -35,6 +35,7 @@
#include <driver/fontrenderer.h>
#include <driver/screen_max.h>
#include <gui/pluginlist.h>
#include <gui/widget/stringinput.h>
#include <neutrino_menue.h>
@@ -965,11 +966,9 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
return retval;
}
void CMenuWidget::integratePlugins(void *pluginsExec, CPlugins::i_type_t integration, const unsigned int shortcut)
void CMenuWidget::integratePlugins(CPlugins::i_type_t integration, const unsigned int shortcut)
{
CPluginsExec *_pluginsExec = static_cast<CPluginsExec*>(pluginsExec);
bool separatorline = false;
char id_plugin[5];
unsigned int number_of_plugins = (unsigned int) g_PluginList->getNumberOfPlugins();
unsigned int sc = shortcut;
for (unsigned int count = 0; count < number_of_plugins; count++)
@@ -982,9 +981,8 @@ void CMenuWidget::integratePlugins(void *pluginsExec, CPlugins::i_type_t integra
separatorline = true;
}
printf("[neutrino] integratePlugins: add %s\n", g_PluginList->getName(count));
sprintf(id_plugin, "%d", count);
neutrino_msg_t dk = (shortcut != CRCInput::RC_nokey) ? CRCInput::convertDigitToKey(sc++) : CRCInput::RC_nokey;
CMenuForwarder *fw_plugin = new CMenuForwarder(g_PluginList->getName(count), true, NULL, _pluginsExec, id_plugin, dk);
CMenuForwarder *fw_plugin = new CMenuForwarder(g_PluginList->getName(count), true, NULL, CPluginsExec::getInstance(), to_string(count).c_str(), dk);
fw_plugin->setHint(g_PluginList->getHintIcon(count), g_PluginList->getDescription(count));
addItem(fw_plugin);
}
@@ -1327,7 +1325,7 @@ void CMenuWidget::paintHint(int pos)
}
if (item->hint == NONEXISTANT_LOCALE && item->hintText.empty())
return;
item->hintText = " ";
int iheight = item->getHeight();
int rad = RADIUS_LARGE;
@@ -2289,7 +2287,7 @@ void CMenuProgressbar::init(const neutrino_locale_t Loc, const std::string &Text
name = Loc;
nameString = Text;
scale.setDimensionsAll(0, 0, 100, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight()/2);
scale.setValue(100);
scale.setValues(100, 100);
}
int CMenuProgressbar::paint(bool selected)