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
2025-08-30 17:01:15 +02:00 · 2011-01-08 14:33:23 +00:00
parent 2bb7b1f62f
commit f5bbb8d0f2
5 changed files with 111 additions and 98 deletions
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -96,16 +96,18 @@ int CHDDMenuHandler::doMenu ()
 	}
 #endif

-	CMenuWidget* hddmenu = new CMenuWidget(LOCALE_HDD_SETTINGS, NEUTRINO_ICON_SETTINGS, 58);
-	hddmenu->addIntroItems();
+	CMenuWidget* hddmenu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, 58);
+	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->addItem( GenericMenuSeparatorLine );
+		tempMenu->addIntroItems();
 		//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]);
 	}
--- a/src/system/locals.h
+++ b/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,
--- a/src/system/locals_intern.h
+++ b/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",