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

opkgmanager: rename hintBox -> loadBox

Browse Source 
That should be a more plausible term.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a5779e5931
Author: Thilo Graf <dbt@novatux.de>
Date: 2023-04-28 (Fri, 28 Apr 2023)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2023-04-28 23:35:57 +02:00
committed by vanhofen
parent 966c29f508
commit ff2e395bda
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/gui/opkg_manager.cpp
View File

@@ -139,7 +139,7 @@ void COPKGManager::init(int wizard_mode)
local_dir = &g_settings.update_dir_opkg; local_dir = &g_settings.update_dir_opkg;
initPackagePatternLists(); initPackagePatternLists();
hintBox = new CLoaderHint(LOCALE_OPKG_UPDATE_CHECK); loadBox = new CLoaderHint(LOCALE_OPKG_UPDATE_CHECK);
silent = false; silent = false;
menu_used = false; menu_used = false;
num_updates = 0; num_updates = 0;
@@ -150,15 +150,18 @@ COPKGManager::~COPKGManager()
if (menu_used) if (menu_used)
{ {
// TODO: Show message only if the waiting time is too long // TODO: Show message only if the waiting time is too long
hintBox->setMsgText(LOCALE_OPKG_MESSAGEBOX_PLEASE_WAIT); loadBox->setMsgText(LOCALE_OPKG_MESSAGEBOX_PLEASE_WAIT);
hintBox->paint(); loadBox->paint();
if (menu) if (menu)
delete menu; delete menu;
} }
pkg_map.clear(); pkg_map.clear();
execCmd(pm_cmd[CMD_CLEAN], CShellWindow::QUIET); execCmd(pm_cmd[CMD_CLEAN], CShellWindow::QUIET);
hintBox->hide(); if (loadBox)
delete hintBox; {
loadBox->hide();
delete loadBox;
}
} }
int COPKGManager::exec(CMenuTarget* parent, const string &actionKey) int COPKGManager::exec(CMenuTarget* parent, const string &actionKey)
@@ -185,14 +188,14 @@ int COPKGManager::exec(CMenuTarget* parent, const string &actionKey)
expert_mode = !expert_mode; expert_mode = !expert_mode;
// Show message while reloading menu // Show message while reloading menu
hintBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS); loadBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS);
hintBox->paint(); loadBox->paint();
updateMenu(); updateMenu();
menu->setSelectedByName(pkg_name); menu->setSelectedByName(pkg_name);
// Close message // Close message
hintBox->hide(); loadBox->hide();
return res; return res;
} }
@@ -222,14 +225,14 @@ int COPKGManager::exec(CMenuTarget* parent, const string &actionKey)
*local_dir = fileBrowser.getCurrentDir(); *local_dir = fileBrowser.getCurrentDir();
// Show message while reloading package list // Show message while reloading package list
hintBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS); loadBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS);
hintBox->paint(); loadBox->paint();
pullPkgData(); pullPkgData();
updateMenu(); updateMenu();
// Close message // Close message
hintBox->hide(); loadBox->hide();
} }
return res; return res;
} }
@@ -254,15 +257,15 @@ int COPKGManager::exec(CMenuTarget* parent, const string &actionKey)
} }
// Show message while reloading package list // Show message while reloading package list
hintBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS); loadBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS);
hintBox->paint(); loadBox->paint();
// Reloading package lists // Reloading package lists
pullPkgData(); pullPkgData();
updateMenu(); updateMenu();
// Close message // Close message
hintBox->hide(); loadBox->hide();
return res; return res;
} }
@@ -379,34 +382,34 @@ int COPKGManager::exec(CMenuTarget* parent, const string &actionKey)
} }
// Show message while reloading package list // Show message while reloading package list
hintBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS); loadBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS);
hintBox->paint(); loadBox->paint();
pullPkgData(); pullPkgData();
updateMenu(); updateMenu();
menu->setSelectedByName(pkg_name); menu->setSelectedByName(pkg_name);
// Close message // Close message
hintBox->hide(); loadBox->hide();
return res; return res;
} }
if (actionKey == "rc_blue") if (actionKey == "rc_blue")
{ {
// Show message while update // Show message while update
hintBox->setMsgText(LOCALE_OPKG_UPDATE_CHECK); loadBox->setMsgText(LOCALE_OPKG_UPDATE_CHECK);
hintBox->paint(); loadBox->paint();
doUpdate(); doUpdate();
pullPkgData(); pullPkgData();
hintBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS); loadBox->setMsgText(LOCALE_OPKG_UPDATE_READING_LISTS);
updateMenu(); updateMenu();
menu->setSelected(selected); menu->setSelected(selected);
// Close message // Close message
hintBox->hide(); loadBox->hide();
return res; return res;
} }
@@ -820,7 +823,7 @@ int COPKGManager::initMenu()
{ {
installed = false; installed = false;
hintBox->paint(); loadBox->paint();
setUpdateCheckResult(false); // without message setUpdateCheckResult(false); // without message
if (menu == NULL) if (menu == NULL)
@@ -830,7 +833,7 @@ int COPKGManager::initMenu()
menu->setSelected(1); //back-item in wizard mode next-item menu->setSelected(1); //back-item in wizard mode next-item
} }
hintBox->hide(); loadBox->hide();
int res = menu->exec(NULL, ""); int res = menu->exec(NULL, "");

2
src/gui/opkg_manager.h
View File

@@ -116,7 +116,7 @@ class COPKGManager : public CMenuTarget, public COPKGManagerExtra
bool expert_mode; bool expert_mode;
std::string *local_dir; std::string *local_dir;
CLoaderHint *hintBox; CLoaderHint *loadBox;
bool has_err; bool has_err;
typedef struct OPKG_error_data_t typedef struct OPKG_error_data_t