drive-setup: hdd settings menu adapted, it looks now a little bit more

like the original, but it's still not what I imagine e.g. :
device settings should not be available for removable devices but should only
be visible, if the user has selected a hdd device
and also should  be able to manage network shares on network drives
...a lot todo

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1016 e54a6e83-5905-42d5-8d5c-058d10e6a962

data/locale/deutsch.locale

@@ -557,24 +557,26 @@ hdd_20min 20 min.
 hdd_30min 30 min.
 hdd_5min 5 min.
 hdd_60min 60 min.
-hdd_activate Einstellungen aktivieren
+hdd_activate Übernehmen
 hdd_check Dateisystemprüfung
 hdd_check_failed Festplattenprüfung fehlgeschlagen
 hdd_ext3 Ext3fs
+hdd_extended_settings Erweiterte Festplatteneinstellungen
 hdd_fast Schnell
 hdd_format Formatiere Festplatte
 hdd_format_failed Formatierung fehlgeschlagen
 hdd_format_warn Formatierung wird gestartet
 hdd_fs Dateisystem
-hdd_manage Festplattenverwaltung
+hdd_manage Laufwerke verwalten
 hdd_middle Mittel
-hdd_noise Akustik-Einstellung
+hdd_noise Akustikkontrolle (AAM)
 hdd_not_found Keine Festplatte
 hdd_reiser ReiserFS
-hdd_settings Festplatteneinstellungen
+hdd_removable_device Wechseldatenträger
-hdd_sleep Motorstopp nach
+hdd_settings Laufwerke
+hdd_sleep Ausschalten nach...
 hdd_slow Langsam
-hdd_umount_warn unmout des Laufwerks
+hdd_umount_warn Laufwerk aushängen
 imageinfo.creator Ersteller:
 imageinfo.date Datum:
 imageinfo.dokumentation Dokus:

data/locale/english.locale

@@ -188,7 +188,7 @@ audioplayer.show_playlist Show Playlist
 audioplayer.shuffle shuffle
 audioplayer.stop Stop
 audioplayer.title_artist Title, Artist
-audioplayerpicsettings.general audioplayer / picviewer
+audioplayerpicsettings.general Audioplayer / Picviewer
 bookmarkmanager.delete delete
 bookmarkmanager.name bookmarks
 bookmarkmanager.rename rename
@@ -403,6 +403,32 @@ fontsize.menu_info Menu Info
 fontsize.menu_title Menu Title
 gtxalpha.alpha1 Alpha 1
 gtxalpha.alpha2 Alpha 2
+hdd_10min 10 min.
+hdd_1min 1 min.
+hdd_20min 20 min.
+hdd_30min 30 min.
+hdd_5min 5 min.
+hdd_60min 60 min.
+hdd_activate Apply settings
+hdd_check Check filesystem
+hdd_check_failed HDD-check failed!
+hdd_ext3 Ext3fs
+hdd_extended_settings Extended HDD-Settings
+hdd_fast Fast
+hdd_format Formating drive...
+hdd_format_failed Formating failed!
+hdd_format_warn Start format...
+hdd_fs Filesystem
+hdd_manage Manage drives
+hdd_middle Mid
+hdd_noise Acoustic-control (AAM)
+hdd_not_found No HDD found
+hdd_reiser ReiserFS
+hdd_removable_device Removable device
+hdd_settings Hard Disk Drive/USB
+hdd_sleep Switch off after...
+hdd_slow Slow
+hdd_umount_warn unmount device
 infoviewer.epgnotload EPG not loaded....
 infoviewer.epgwait waiting for EPG...
 infoviewer.eventlist Event-List
@@ -454,7 +480,7 @@ keychooser.text2 wait a few seconds for abort
 keychoosermenu.currentkey current key
 keychoosermenu.setnew setup new key
 keychoosermenu.setnone no key
-languagesetup.head International settings
+languagesetup.head Language / Timezone
 languagesetup.osd OSD Language
 languagesetup.select OSD Language
 lcdcontroler.brightness normal Brightness
@@ -503,13 +529,13 @@ mainsettings.audio Audio
 mainsettings.osd OSD
 mainsettings.head Settings
 mainsettings.keybinding Key Setup
-mainsettings.language International settings
+mainsettings.language Language / Timezone
 mainsettings.lcd VFD-Display
 mainsettings.misc Misc settings
 mainsettings.manage Manage settings
 mainsettings.network Network
 mainsettings.recording Recording
-mainsettings.savesettingsnow save settings now
+mainsettings.savesettingsnow Save settings now
 mainsettings.savesettingsnow_hint Saving settings,\nplease wait...
 mainsettings.streaming Movieplayer
 mainsettings.video Video
@@ -614,8 +640,8 @@ networkmenu.hostname Hostname
 networkmenu.inactive_network Network inactiv!
 networkmenu.ipaddress IP address
 networkmenu.mount Edit network shares
-networkmenu.nameserver name server
+networkmenu.nameserver Name server
-networkmenu.netmask netmask
+networkmenu.netmask Netmask
 networkmenu.ntpenable Syncronisation via
 networkmenu.ntprefresh NTP/DVB-Refresh
 networkmenu.ntprefresh_hint1 NTP/DVB-Time-Sync in minutes
@@ -625,12 +651,12 @@ networkmenu.ntpserver_hint1 NTP-Server example: ntp1.ptb.de
 networkmenu.ntpserver_hint2 need reboot or epg-reset
 networkmenu.ntptitle Time-Syncronisation
 networkmenu.reset_settings_now Do you want restore the previous settings?
-networkmenu.setupnow setup network now
+networkmenu.setupnow Apply network settings now
-networkmenu.setuponstartup setup network on startup
+networkmenu.setuponstartup Setup network on startup
-networkmenu.show show active network settings
+networkmenu.show Show active Network settings
-networkmenu.test test network now
+networkmenu.test Test network now
 nfs.alreadymounted directory already mounted
-nfs.automount mount on startup
+nfs.automount Mount on startup
 nfs.dir directory/share
 nfs.ip Server IP
 nfs.localdir local dir
@@ -1001,30 +1027,6 @@ extra.hw_sect Hardware Sections
 extra.logo Logo number
 extra.scan_full Full
 extra.scan_fast Fast
-hdd_slow Slow
-hdd_middle Middle
-hdd_fast Fast
-hdd_ext3 Ext3fs
-hdd_reiser Reiserfs
-hdd_1min 1 min.
-hdd_5min 5 min.
-hdd_10min 10 min.
-hdd_20min 20 min.
-hdd_30min 30 min.
-hdd_60min 60 min.
-hdd_sleep Sleep time
-hdd_noise Noise
-hdd_activate Activate settings
-hdd_fs Filesystem
-hdd_format Format HDD
-hdd_check Check filesystem
-hdd_settings HDD Settings
-hdd_format_warn Are you sure to format ? You will lost all data !
-hdd_umount_warn HDD unmount failed !
-hdd_check_failed HDD check failed !
-hdd_format_failed HDD format failed !
-hdd_manage Manage
-hdd_not_found No HDD found
 extra.clear_log Clear Log
 extra.zap_cycle Zap cycle
 extra.sms_channel sms-mode channel

src/gui/hdd_menu.cpp

@@ -96,16 +96,18 @@ int CHDDMenuHandler::doMenu ()
 	}
 #endif
 
-	CMenuWidget* hddmenu = new CMenuWidget(LOCALE_HDD_SETTINGS, NEUTRINO_ICON_SETTINGS, 58);
+	CMenuWidget* hddmenu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, 58);
-	hddmenu->addIntroItems();
+	hddmenu->addIntroItems(LOCALE_HDD_SETTINGS);
+	
+	hddmenu->addItem(new CMenuForwarder(LOCALE_HDD_ACTIVATE, true, "", new CHDDDestExec(), NULL, CRCInput::RC_red,NEUTRINO_ICON_BUTTON_RED));
 
+	hddmenu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_HDD_EXTENDED_SETTINGS));
+	
 	hddmenu->addItem( new CMenuOptionChooser(LOCALE_HDD_SLEEP, &g_settings.hdd_sleep, HDD_SLEEP_OPTIONS, HDD_SLEEP_OPTION_COUNT, true));
 	hddmenu->addItem( new CMenuOptionChooser(LOCALE_HDD_NOISE, &g_settings.hdd_noise, HDD_NOISE_OPTIONS, HDD_NOISE_OPTION_COUNT, true));
 
-	hddmenu->addItem(new CMenuForwarder(LOCALE_HDD_ACTIVATE, true, "", new CHDDDestExec()));
-
 	//if(n > 0)
-	hddmenu->addItem( GenericMenuSeparatorLine );
+	hddmenu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_HDD_MANAGE));
 
 	ret = stat("/", &s);
 	if (ret != -1)
@@ -114,6 +116,7 @@ int CHDDMenuHandler::doMenu ()
 
 	for(int i = 0; i < n;i++) {
 		char str[256];
+		char sstr[256];
 		char vendor[128], model[128];
 		int64_t bytes;
 		int64_t megabytes;
@@ -168,15 +171,17 @@ int CHDDMenuHandler::doMenu ()
 		fscanf(f, "%d", &removable);
 		fclose(f);
 
-		snprintf(str, sizeof(str), "%s %s (%s-%s %lld %s)", g_Locale->getText(LOCALE_HDD_MANAGE), namelist[i]->d_name, vendor, model, megabytes < 10000 ? megabytes : megabytes/1000, megabytes < 10000 ? "MB" : "GB");
+ 		snprintf(str, sizeof(str), "%s %s %lld %s", vendor, model, megabytes < 10000 ? megabytes : megabytes/1000, megabytes < 10000 ? "MB" : "GB");
 		printf("HDD: %s\n", str);
 		CMenuWidget * tempMenu = new CMenuWidget(str, NEUTRINO_ICON_SETTINGS);
-		tempMenu->addItem( GenericMenuBack );
+		tempMenu->addIntroItems();
-		tempMenu->addItem( GenericMenuSeparatorLine );
 		//tempMenu->addItem( new CMenuOptionChooser(LOCALE_HDD_FS, &g_settings.hdd_fs, HDD_FILESYS_OPTIONS, HDD_FILESYS_OPTION_COUNT, true));
 		tempMenu->addItem(new CMenuForwarder(LOCALE_HDD_FORMAT, true, "", new CHDDFmtExec, namelist[i]->d_name));
 		tempMenu->addItem(new CMenuForwarder(LOCALE_HDD_CHECK, true, "", new CHDDChkExec, namelist[i]->d_name));
-		hddmenu->addItem(new CMenuForwarderNonLocalized(str, (removable || isroot) ? false : true, NULL, tempMenu));
+		
+		snprintf(sstr, sizeof(sstr), "%s (%s)", g_Locale->getText(LOCALE_HDD_REMOVABLE_DEVICE),  namelist[i]->d_name);	
+		hddmenu->addItem(new CMenuForwarderNonLocalized((removable ? sstr : namelist[i]->d_name), (removable || isroot) ? false : true, str, tempMenu));
+		
 		hdd_found = 1;
 		free(namelist[i]);
 	}

src/system/locals.h

@@ -430,6 +430,32 @@ typedef enum {
 	LOCALE_FONTSIZE_MENU_TITLE,
 	LOCALE_GTXALPHA_ALPHA1,
 	LOCALE_GTXALPHA_ALPHA2,
+	LOCALE_HDD_10MIN,
+	LOCALE_HDD_1MIN,
+	LOCALE_HDD_20MIN,
+	LOCALE_HDD_30MIN,
+	LOCALE_HDD_5MIN,
+	LOCALE_HDD_60MIN,
+	LOCALE_HDD_ACTIVATE,
+	LOCALE_HDD_CHECK,
+	LOCALE_HDD_CHECK_FAILED,
+	LOCALE_HDD_EXT3,
+	LOCALE_HDD_EXTENDED_SETTINGS,
+	LOCALE_HDD_FAST,
+	LOCALE_HDD_FORMAT,
+	LOCALE_HDD_FORMAT_FAILED,
+	LOCALE_HDD_FORMAT_WARN,
+	LOCALE_HDD_FS,
+	LOCALE_HDD_MANAGE,
+	LOCALE_HDD_MIDDLE,
+	LOCALE_HDD_NOISE,
+	LOCALE_HDD_NOT_FOUND,
+	LOCALE_HDD_REISER,
+	LOCALE_HDD_REMOVABLE_DEVICE,
+	LOCALE_HDD_SETTINGS,
+	LOCALE_HDD_SLEEP,
+	LOCALE_HDD_SLOW,
+	LOCALE_HDD_UMOUNT_WARN,
 	LOCALE_INFOVIEWER_EPGNOTLOAD,
 	LOCALE_INFOVIEWER_EPGWAIT,
 	LOCALE_INFOVIEWER_EVENTLIST,
@@ -1273,30 +1299,6 @@ typedef enum {
 	LOCALE_EXTRA_LOGO,
 	LOCALE_EXTRA_SCAN_FULL,
 	LOCALE_EXTRA_SCAN_FAST,
-	LOCALE_HDD_SLOW,
-	LOCALE_HDD_MIDDLE,
-	LOCALE_HDD_FAST,
-	LOCALE_HDD_EXT3,
-	LOCALE_HDD_REISER,
-	LOCALE_HDD_1MIN,
-	LOCALE_HDD_5MIN,
-	LOCALE_HDD_10MIN,
-	LOCALE_HDD_20MIN,
-	LOCALE_HDD_30MIN,
-	LOCALE_HDD_60MIN,
-	LOCALE_HDD_SLEEP,
-	LOCALE_HDD_NOISE,
-	LOCALE_HDD_ACTIVATE,
-	LOCALE_HDD_FS,
-	LOCALE_HDD_FORMAT,
-	LOCALE_HDD_FORMAT_WARN,
-	LOCALE_HDD_FORMAT_FAILED,
-	LOCALE_HDD_UMOUNT_WARN,
-	LOCALE_HDD_CHECK,
-	LOCALE_HDD_CHECK_FAILED,
-	LOCALE_HDD_SETTINGS,
-	LOCALE_HDD_MANAGE,
-	LOCALE_HDD_NOT_FOUND,
 	LOCALE_EXTRA_CLEAR_LOG,
 	LOCALE_EXTRA_ZAP_CYCLE,
 	LOCALE_EXTRA_SMS_CHANNEL,

src/system/locals_intern.h

@@ -430,6 +430,32 @@ const char *locale_real_names[] = {
 	"fontsize.menu_title",
 	"gtxalpha.alpha1",
 	"gtxalpha.alpha2",
+	"hdd_10min",
+	"hdd_1min",
+	"hdd_20min",
+	"hdd_30min",
+	"hdd_5min",
+	"hdd_60min",
+	"hdd_activate",
+	"hdd_check",
+	"hdd_check_failed",
+	"hdd_ext3",
+	"hdd_extended_settings",
+	"hdd_fast",
+	"hdd_format",
+	"hdd_format_failed",
+	"hdd_format_warn",
+	"hdd_fs",
+	"hdd_manage",
+	"hdd_middle",
+	"hdd_noise",
+	"hdd_not_found",
+	"hdd_reiser",
+	"hdd_removable_device",
+	"hdd_settings",
+	"hdd_sleep",
+	"hdd_slow",
+	"hdd_umount_warn",
 	"infoviewer.epgnotload",
 	"infoviewer.epgwait",
 	"infoviewer.eventlist",
@@ -1273,30 +1299,6 @@ const char *locale_real_names[] = {
 	"extra.logo",
 	"extra.scan_full",
 	"extra.scan_fast",
-	"hdd_slow",
-	"hdd_middle",
-	"hdd_fast",
-	"hdd_ext3",
-	"hdd_reiser",
-	"hdd_1min",
-	"hdd_5min",
-	"hdd_10min",
-	"hdd_20min",
-	"hdd_30min",
-	"hdd_60min",
-	"hdd_sleep",
-	"hdd_noise",
-	"hdd_activate",
-	"hdd_fs",
-	"hdd_format",
-	"hdd_format_warn",
-	"hdd_format_failed",
-	"hdd_umount_warn",
-	"hdd_check",
-	"hdd_check_failed",
-	"hdd_settings",
-	"hdd_manage",
-	"hdd_not_found",
 	"extra.clear_log",
 	"extra.zap_cycle",
 	"extra.sms_channel",