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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-19 21:11:54 +01:00
parent b0a78885b0 705930e152
commit a413bfb40d
112 changed files with 2965 additions and 2923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/settings_manager_teams.cpp
View File

@@ -36,7 +36,7 @@
#include "gui/settings_manager_teams.h"
#include "gui/widget/hintbox.h"
#include "gui/widget/messagebox.h"
#include "gui/widget/msgbox.h"
#include "gui/widget/stringinput.h"
#include <driver/screen_max.h>
@@ -136,7 +136,7 @@ int CSettingsManagerTeams::showMenu()
void CSettingsManagerTeams::showHelp()
{
ShowMsg(LOCALE_SETTINGS_TEAMS_HELP, g_Locale->getText(LOCALE_SETTINGS_TEAMS_HELP_TEXT), CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8
ShowMsg(LOCALE_SETTINGS_TEAMS_HELP, g_Locale->getText(LOCALE_SETTINGS_TEAMS_HELP_TEXT), CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); // UTF-8
return;
}
@@ -175,7 +175,7 @@ void CSettingsManagerTeams::doBackup()
delete hintBox;
}
else
ShowMsg(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_SETTINGS_TEAMS_BACKUP_FAILED),CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_ERROR);
ShowMsg(LOCALE_MESSAGEBOX_ERROR, g_Locale->getText(LOCALE_SETTINGS_TEAMS_BACKUP_FAILED),CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_ERROR);
}
return;
}
@@ -188,8 +188,8 @@ void CSettingsManagerTeams::doRestore()
if(fileBrowser.exec("/media") == true)
{
std::string TFile = fileBrowser.getSelectedFile()->Name.c_str();
int result = ShowMsg(LOCALE_SETTINGS_TEAMS_RESTORE, g_Locale->getText(LOCALE_SETTINGS_TEAMS_RESTORE_WARN), CMessageBox::mbrNo, CMessageBox::mbYes | CMessageBox::mbNo);
if(result == CMessageBox::mbrYes)
int result = ShowMsg(LOCALE_SETTINGS_TEAMS_RESTORE, g_Locale->getText(LOCALE_SETTINGS_TEAMS_RESTORE_WARN), CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo);
if(result == CMsgBox::mbrYes)
{
char buf[256];
sprintf(buf, SYSCALLRESTORE " %s", TFile.c_str());