mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stefan Seyfried
2016-01-01 14:10:48 +01:00
parent 3e37715c86 6801bf215e
commit 9113716171
36 changed files with 249 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/opkg_manager.cpp
View File

@@ -105,6 +105,14 @@ static const string pkg_types[OM_MAX] =
COPKGManager::COPKGManager(): opkg_conf('\t')
{
init();
}
void COPKGManager::init()
{
if (!hasOpkgSupport())
return;
OM_ERRORS();
width = 80;
@@ -492,8 +500,8 @@ int COPKGManager::showMenu()
//feed setup
CMenuWidget feeds_menu(LOCALE_OPKG_TITLE, NEUTRINO_ICON_UPDATE, w_max (100, 10));
showMenuConfigFeed(&feeds_menu);
fw = new CMenuForwarder(LOCALE_OPKG_FEED_ADRESSES, true, NULL, &feeds_menu, NULL, CRCInput::RC_www);
fw->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_OPKG_FEED_ADRESSES_EDIT);
fw = new CMenuForwarder(LOCALE_OPKG_FEED_ADDRESSES, true, NULL, &feeds_menu, NULL, CRCInput::RC_www);
fw->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_OPKG_FEED_ADDRESSES_EDIT);
menu->addItem(fw);
menu->addItem(GenericMenuSeparatorLine);
@@ -879,7 +887,7 @@ bool COPKGManager::isUpgradable(const string& pkg_name)
void COPKGManager::showMenuConfigFeed(CMenuWidget *feed_menu)
{
feed_menu->addIntroItems(LOCALE_OPKG_FEED_ADRESSES);
feed_menu->addIntroItems(LOCALE_OPKG_FEED_ADDRESSES);
for(size_t i=0; i<OPKG_MAX_FEEDS ;i++){
CKeyboardInput *feedinput = new CKeyboardInput("Feed " +to_string(i+1), &config_src[i], 0, NULL, NULL, LOCALE_OPKG_ENTER_FEED_ADDRESS, LOCALE_OPKG_ENTER_FEED_ADDRESS_EXAMPLE);