mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)
This commit is contained in:
@@ -140,8 +140,8 @@ int CNetworkServiceSetup::showNetworkServiceSetup()
|
||||
{
|
||||
int shortcut = 1;
|
||||
|
||||
CMenuWidget* setup = new CMenuWidget(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width);
|
||||
setup->setSelected(selected);
|
||||
CMenuWidget* setup = new CMenuWidget(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_SERVICES);
|
||||
|
||||
setup->addIntroItems(LOCALE_NETWORKMENU_SERVICES);
|
||||
|
||||
CNetworkService * items[SERVICE_COUNT];
|
||||
@@ -194,7 +194,7 @@ int CNetworkServiceSetup::showNetworkServiceSetup()
|
||||
}
|
||||
|
||||
int res = setup->exec (NULL, "");
|
||||
selected = setup->getSelected();
|
||||
|
||||
delete setup;
|
||||
|
||||
for(unsigned i = 0; i < SERVICE_COUNT; i++)
|
||||
|
Reference in New Issue
Block a user