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

neutrino.cpp: enable check for package updates with new setting

Browse Source 
Origin commit data
------------------
Commit: 981f5d6f1f
Author: Thilo Graf <dbt@novatux.de>
Date: 2021-04-10 (Sat, 10 Apr 2021)
This commit is contained in:
Thilo Graf
2021-04-10 22:14:39 +02:00
committed by vanhofen
parent e4de8c8f97
commit 012cc10695
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/update_check_packages.cpp
View File

@@ -51,7 +51,7 @@ CUpdateCheck* CUpdateCheck::getInstance()
void CUpdateCheck::check4PackageUpdates() void CUpdateCheck::check4PackageUpdates()
{ {
if (!g_settings.softupdate_autocheck) if (!g_settings.softupdate_autocheck_packages)
return; return;
COPKGManager man; COPKGManager man;

7
src/gui/update_settings.cpp
View File

@@ -39,6 +39,7 @@
#include <neutrino_menue.h> #include <neutrino_menue.h>
#include <gui/filebrowser.h> #include <gui/filebrowser.h>
#include <gui/update_check.h> #include <gui/update_check.h>
#include <gui/opkg_manager.h>
#include <gui/update_ext.h> #include <gui/update_ext.h>
#include <gui/update_settings.h> #include <gui/update_settings.h>
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
@@ -144,7 +145,8 @@ int CUpdateSettings::initMenu()
OnOffNotifier->addItem(apply_kernel); OnOffNotifier->addItem(apply_kernel);
#endif #endif
CMenuOptionChooser *autocheck = new CMenuOptionChooser(LOCALE_FLASHUPDATE_AUTOCHECK, &g_settings.softupdate_autocheck, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); CMenuOptionChooser *autocheck = new CMenuOptionChooser(LOCALE_FLASHUPDATE_AUTOCHECK, &g_settings.softupdate_autocheck, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, OnOffNotifier);
CMenuOptionChooser *package_autocheck = new CMenuOptionChooser("Package update check", &g_settings.softupdate_autocheck_packages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, OnOffNotifier);
// apply_settings->setHint("", LOCALE_MENU_HINT_XXX); // apply_settings->setHint("", LOCALE_MENU_HINT_XXX);
w_upsettings.addItem(fw_update_dir); w_upsettings.addItem(fw_update_dir);
@@ -158,7 +160,8 @@ int CUpdateSettings::initMenu()
#endif #endif
#endif #endif
w_upsettings.addItem(autocheck); w_upsettings.addItem(autocheck);
if (COPKGManager::hasOpkgSupport())
w_upsettings.addItem(package_autocheck);
#if 0 #if 0
w_upsettings.addItem(apply_kernel); w_upsettings.addItem(apply_kernel);
#endif #endif

7
src/neutrino.cpp
View File

@@ -98,9 +98,10 @@
#include "gui/update_ext.h" #include "gui/update_ext.h"
#include "gui/update.h" #include "gui/update.h"
#include "gui/update_check.h" #include "gui/update_check.h"
#include "gui/update_check_packages.h"
#include "gui/videosettings.h" #include "gui/videosettings.h"
#include "gui/audio_select.h" #include "gui/audio_select.h"
#include <gui/weather.h> #include "gui/weather.h"
#include "gui/webchannels_setup.h" #include "gui/webchannels_setup.h"
#include "gui/widget/hintbox.h" #include "gui/widget/hintbox.h"
@@ -404,6 +405,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.show_ecm_pos = configfile.getInt32("show_ecm_pos" , 0); g_settings.show_ecm_pos = configfile.getInt32("show_ecm_pos" , 0);
g_settings.softupdate_autocheck = configfile.getBool("softupdate_autocheck" , false); g_settings.softupdate_autocheck = configfile.getBool("softupdate_autocheck" , false);
g_settings.softupdate_autocheck_packages = configfile.getInt32("softupdate_autocheck_packages" , false);
// video // video
int vid_Mode_default = VIDEO_STD_720P50; int vid_Mode_default = VIDEO_STD_720P50;
@@ -1942,6 +1944,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32 ("softupdate_name_mode_apply", g_settings.softupdate_name_mode_apply); configfile.setInt32 ("softupdate_name_mode_apply", g_settings.softupdate_name_mode_apply);
configfile.setInt32 ("softupdate_name_mode_backup", g_settings.softupdate_name_mode_backup); configfile.setInt32 ("softupdate_name_mode_backup", g_settings.softupdate_name_mode_backup);
configfile.setBool("softupdate_autocheck", g_settings.softupdate_autocheck); configfile.setBool("softupdate_autocheck", g_settings.softupdate_autocheck);
configfile.setInt32("softupdate_autocheck_packages", g_settings.softupdate_autocheck_packages);
configfile.setInt32("flashupdate_createimage_add_var", g_settings.flashupdate_createimage_add_var); configfile.setInt32("flashupdate_createimage_add_var", g_settings.flashupdate_createimage_add_var);
configfile.setInt32("flashupdate_createimage_add_root1", g_settings.flashupdate_createimage_add_root1); configfile.setInt32("flashupdate_createimage_add_root1", g_settings.flashupdate_createimage_add_root1);
@@ -3129,6 +3132,7 @@ TIMER_START();
TIMER_STOP("################################## after all ##################################"); TIMER_STOP("################################## after all ##################################");
if (g_settings.softupdate_autocheck) { if (g_settings.softupdate_autocheck) {
#if 0 #if 0
hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET)); hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_CHECKUPDATE_INTERNET));
hintBox->paint(); hintBox->paint();
CFlashUpdate flash; CFlashUpdate flash;
@@ -3142,6 +3146,7 @@ TIMER_STOP("################################## after all #######################
#endif #endif
CFlashUpdateCheck::getInstance()->startThread(); CFlashUpdateCheck::getInstance()->startThread();
} }
//CUpdateCheck::getInstance()->startThread();
for (std::list<std::string>::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); it++) for (std::list<std::string>::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); it++)
g_Sectionsd->readSIfromXMLTV((*it).c_str()); g_Sectionsd->readSIfromXMLTV((*it).c_str());

1
src/system/settings.h
View File

@@ -833,6 +833,7 @@ struct SNeutrinoSettings
std::string softupdate_proxyusername; std::string softupdate_proxyusername;
std::string softupdate_proxypassword; std::string softupdate_proxypassword;
int softupdate_autocheck; int softupdate_autocheck;
int softupdate_autocheck_packages;
int softupdate_name_mode_apply; int softupdate_name_mode_apply;
int softupdate_name_mode_backup; int softupdate_name_mode_backup;
int apply_settings; int apply_settings;