apply latest upstream

This commit is contained in:
Kevin Kim
2021-04-14 16:09:07 +09:00
parent a5ab810541
commit d65a8e0143
49 changed files with 1596 additions and 1478 deletions

View File

@@ -1,6 +1,5 @@
/*
* Copyright(C) 2020, Kevin Kim <root@hamonikr.org>
* 2014-2016, Krisztián Kende <nemh@freemail.hu>
* Copyright(C) 2014-2016, Franco Conidi <edmondweblog@gmail.com>
*
* This file is part of the Systemback.
*
@@ -179,7 +178,7 @@ uchar systemback::clistart()
if(! sb::pnames[14].isEmpty()) printw(bstr(" F ─ " % sb::left(sb::pnames[14], COLS - 7) % '\n'));
printw(bstr("\n G ─ " % tr("Create new") % "\n Q ─ " % tr("Quit") % '\n')),
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
if(! sb::eout.isEmpty()) sb::eout.clear();
if(! pname.isEmpty()) pname.clear();
@@ -246,7 +245,7 @@ uchar systemback::clistart()
attron(COLOR_PAIR(3)),
printw(bstr("\n\n 1 ─ " % tr("Delete") % "\n 2 ─ " % tr("System restore") % "\n B ─ ◂ " % tr("Back"))),
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
forever
@@ -381,7 +380,7 @@ uchar systemback::restore()
attron(COLOR_PAIR(3)),
printw(bstr("\n\n 3 ─ " % tr("Complete configuration files restore") % "\n 4 ─ " % tr("Keep newly installed configuration files") % "\n\n C ─ " % tr("Cancel"))),
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
do {
@@ -428,7 +427,7 @@ uchar systemback::restore()
{
printw(bstr("\n\n " % tr("You want to keep the current fstab file?") % ' ' % tr("(Y/N)"))),
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
do {
@@ -456,7 +455,7 @@ uchar systemback::restore()
{
printw(bstr("\n\n " % tr("Reinstall the GRUB 2 bootloader?") % ' ' % tr("(Y/N)"))),
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
do {
@@ -484,7 +483,7 @@ uchar systemback::restore()
{
printw(bstr("\n\n " % tr("Reinstall the GRUB 2 bootloader?") % ' ' % tr("(Y/N)"))),
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
do {
@@ -513,7 +512,7 @@ uchar systemback::restore()
attron(COLOR_PAIR(3)),
printw(bstr("\n\n " % tr("Start the restore?") % ' ' % tr("(Y/N)"))),
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
bool rstart(false);
@@ -553,7 +552,7 @@ uchar systemback::restore()
attron(COLOR_PAIR(3)),
printw(bstr("\n\n " % twrp(mthd < 3 ? tr("Press 'ENTER' key to reboot the computer, or 'Q' to quit.") : tr("Press 'ENTER' key to quit.")))),
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
forever
@@ -649,7 +648,7 @@ void systemback::progress(uchar status)
}()));
attron(COLOR_PAIR(2)),
mvprintw(LINES - 1, COLS - 13, "HamoniKR Team"),
mvprintw(LINES - 1, COLS - 13, "edmond, GPLv3"),
refresh();
if(a < 3) sb::delay(500);
}