From 1b0114e5230efa33fc45ca9aadaa331b3895e37e Mon Sep 17 00:00:00 2001 From: satbaby Date: Fri, 24 Feb 2012 20:59:51 +0000 Subject: [PATCH] settings_manager & locale rework , thx svenhoefer git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2121 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/locale/deutsch.locale | 8 ++++---- data/locale/english.locale | 8 ++++---- data/scripts/backup.sh | 5 +++-- src/gui/settings_manager.cpp | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 63018ccbe..f264ea447 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -341,7 +341,7 @@ extra.key_timeshift Timeshift extra.key_unlock Entsperrtaste extra.ladirection Breitengrad-Ausrichtung extra.latitude Breitengrad -extra.loadconfig Lade Einstellungen von +extra.loadconfig Neutrino-Einstellungen: Laden von extra.loadkeys Lade Tastenbelegung von extra.lodirection Längengrad-Ausrichtung extra.logo Logonummer @@ -353,7 +353,7 @@ extra.rotor_swap Rotor dreht Ost/West extra.rounded_corners Eckendarstellung extra.rounded_corners_off eckig extra.rounded_corners_on abgerundet -extra.saveconfig Speichere Einstellungen als +extra.saveconfig Neutrino-Einstellungen: Sichern als extra.savekeys Speichere Tastenbelegung als extra.scan_fast Schnell extra.scan_full Total @@ -1211,7 +1211,7 @@ servicemenu.restart_hint Neutrino wird neu gestartet... servicemenu.restart_refused_recording Aufnahme läuft. Neustart nicht möglich. servicemenu.scants Kanalsuche servicemenu.update Software-Aktualisierung -settings.backup Alle Settings sichern +settings.backup Image-Einstellungen: Sichern settings.backup_failed Sicherung fehlgeschlagen! settings.help Hilfe settings.menu_pos Menüposition @@ -1223,7 +1223,7 @@ settings.pos_default_center oben Mitte settings.pos_higher_center unten Mitte settings.pos_top_left oben links settings.pos_top_right oben rechts -settings.restore Wiederherstellen aller Settings +settings.restore Image-Einstellungen: Wiederherstellen settings.restore_warn Alle Settings werden ersetzt.\nDie Box wird neu gestartet.\nWeiter? shutdown.recoding_query Aufnahme läuft. Trotzdem beenden? shutdowntimer.announce Die Box wird in 1 Min. heruntergefahren.\nShutdown abbrechen? diff --git a/data/locale/english.locale b/data/locale/english.locale index 24ed26fab..f4c233967 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -341,7 +341,7 @@ extra.key_timeshift Timeshift extra.key_unlock Unlock key extra.ladirection LaDirection extra.latitude Latitude -extra.loadconfig Load settings from +extra.loadconfig Neutrino-Settings: Load from extra.loadkeys Load keys from extra.lodirection LoDirection extra.logo Logo number @@ -353,7 +353,7 @@ extra.rotor_swap Swap rotor east/west extra.rounded_corners Shape of corners extra.rounded_corners_off angular extra.rounded_corners_on rounded -extra.saveconfig Save settings as +extra.saveconfig Neutrino-Settings: Save as extra.savekeys Save keys as extra.scan_fast Fast extra.scan_full Full @@ -1211,7 +1211,7 @@ servicemenu.restart_hint Restarting, please wait servicemenu.restart_refused_recording Cant restart, recording in progress servicemenu.scants Servicescan servicemenu.update Software Update -settings.backup Backup all settings +settings.backup Image-Settings: Backup settings.backup_failed Backup failed! settings.help Help settings.menu_pos Menu position @@ -1223,7 +1223,7 @@ settings.pos_default_center top center settings.pos_higher_center higher center settings.pos_top_left top left settings.pos_top_right top right -settings.restore Restore all settings +settings.restore Image-Settings: Restore settings.restore_warn This will replace all settings and reboot\nContinue ? shutdown.recoding_query You really want to to stop record ? shutdowntimer.announce Box will shutdown in 1 min.\nCancel Shutdown ? diff --git a/data/scripts/backup.sh b/data/scripts/backup.sh index 5bc2ae37d..d9998007e 100755 --- a/data/scripts/backup.sh +++ b/data/scripts/backup.sh @@ -5,9 +5,10 @@ USRF="/var/tuxbox/config/tobackup.conf" if [ -e "${USRF}" ]; then # read user-files from $USRF + TOBACKUP="${USRF}" while read i - do [ "${i:0:1}" = "#" ] || TOBACKUP="$TOBACKUP ${i%%#*}" - done < $USRF + do [ "${i:0:1}" = "#" ] || TOBACKUP="$TOBACKUP ${i%%#*}" + done < $USRF else TOBACKUP="/var/tuxbox/config/" diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index eecfedcd5..1b7c4cf94 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -152,8 +152,8 @@ int CSettingsManager::showMenu() mset->addItem(new CMenuForwarder(LOCALE_RESET_SETTINGS, true, NULL, resetNotifier, "settings", CRCInput::RC_recall));// FIXME: RC-button RECALL is broken mset->addItem(GenericMenuSeparatorLine); - mset->addItem(new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); - mset->addItem(new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); + mset->addItem(new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); + mset->addItem(new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); mset->addItem(GenericMenuSeparatorLine); mset->addItem(new CMenuForwarder(LOCALE_SETTINGS_BACKUP, true, NULL, this, "backup", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); mset->addItem(new CMenuForwarder(LOCALE_SETTINGS_RESTORE, true, NULL, this, "restore", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));