diff --git a/gsmartcontrol/TODO b/gsmartcontrol/TODO index 5505cec..33f708e 100644 --- a/gsmartcontrol/TODO +++ b/gsmartcontrol/TODO @@ -61,20 +61,14 @@ Add support for launching with consolehelper (from usermode package). If the detection executes "smartctl -i", don't execute it again afterwards. -When adding device, have an option to specify "-d" type and other parameters. - This is needed to support multi-disk devices. - Maybe make "-d" a dropdown? - Not sure, "-l aaa /tmp" doesn't list all types. Also raid... -Add support for multiple drives behind devices. - Add support for specifying these drives on gsmartcontrol command-line, - each one with optional smartctl parameters. - Use :: as delimiter, as in device::-d_string::other_options. - Show in UI as device (-d_string). - Preferences will match it as device::-d_string +When adding device via GUI, have an option to specify "-d" type and other parameters. + Maybe make "-d" a dropdown? + Just list common types (sat,12; sat,16; scsi, ...?) + Rework drive properties UI: - add properties for each multi-drive. + add properties for each multi-drive (with type in a separate entry). smartctl options use 48-bit or not or auto. Enable/disable/dont_touch SMART on startup for this drive. diff --git a/gsmartcontrol/src/res/gsc_about_dialog.glade b/gsmartcontrol/src/res/gsc_about_dialog.glade index f48bb99..fda716b 100644 --- a/gsmartcontrol/src/res/gsc_about_dialog.glade +++ b/gsmartcontrol/src/res/gsc_about_dialog.glade @@ -1,10 +1,9 @@ - - - + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 + 6 About GSmartControl False GTK_WIN_POS_CENTER_ON_PARENT @@ -20,7 +19,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + 6 diff --git a/gsmartcontrol/src/res/gsc_executor_log_window.glade b/gsmartcontrol/src/res/gsc_executor_log_window.glade index ed64a5a..40f743b 100644 --- a/gsmartcontrol/src/res/gsc_executor_log_window.glade +++ b/gsmartcontrol/src/res/gsc_executor_log_window.glade @@ -1,7 +1,6 @@ - - - + + Execution Log - GSmartControl 620 @@ -10,8 +9,8 @@ True - 5 - 6 + 12 + 12 True @@ -20,7 +19,7 @@ True - 5 + 6 True @@ -34,7 +33,6 @@ True Commands executed Commands executed - True True @@ -83,15 +81,16 @@ True - 5 + 6 True + 6 True 0 - Command: + Command: False @@ -163,7 +162,7 @@ True - 5 + 6 True diff --git a/gsmartcontrol/src/res/gsc_help_window.glade b/gsmartcontrol/src/res/gsc_help_window.glade index 5abcc0e..3069869 100644 --- a/gsmartcontrol/src/res/gsc_help_window.glade +++ b/gsmartcontrol/src/res/gsc_help_window.glade @@ -1,7 +1,6 @@ - - - + + Help - GSmartControl 630 @@ -9,8 +8,8 @@ True - 5 - 5 + 12 + 12 True @@ -19,7 +18,7 @@ True - 5 + 6 True @@ -44,7 +43,6 @@ Topics Topics False - True diff --git a/gsmartcontrol/src/res/gsc_info_window.glade b/gsmartcontrol/src/res/gsc_info_window.glade index e769608..5692410 100644 --- a/gsmartcontrol/src/res/gsc_info_window.glade +++ b/gsmartcontrol/src/res/gsc_info_window.glade @@ -1,9 +1,7 @@ - - - + + - 5 Device Information - GSmartControl GTK_WIN_POS_CENTER_ON_PARENT 700 @@ -12,7 +10,8 @@ True - 5 + 12 + 12 True @@ -20,8 +19,8 @@ True - 5 - 5 + 6 + 6 True @@ -74,10 +73,9 @@ True 8 - 1 2 - 10 - 8 + 12 + 6 @@ -105,8 +103,8 @@ True - tab False + tab @@ -163,7 +161,6 @@ True True - True GTK_TREE_VIEW_GRID_LINES_BOTH @@ -188,9 +185,9 @@ True - tab 1 False + tab @@ -233,7 +230,6 @@ True True - True GTK_TREE_VIEW_GRID_LINES_BOTH @@ -259,9 +255,9 @@ True - tab 2 False + tab @@ -327,7 +323,6 @@ True True - True GTK_TREE_VIEW_GRID_LINES_BOTH @@ -385,9 +380,9 @@ True - tab 3 False + tab @@ -453,7 +448,6 @@ True True - True GTK_TREE_VIEW_GRID_LINES_BOTH @@ -530,16 +524,16 @@ Selective self-test log is also presented here. True - tab 4 False + tab True 11 - 5 + 6 True @@ -561,96 +555,74 @@ Selective self-test log is also presented here. True 4 2 - 8 - 10 + 6 + 6 - - True + + 6 - + True - - - True - 0 - <b>Test type: </b> - True - - - False - - - - - True - Choose a test type - Choose a test type - These are dummy entries -Immediate Offline -Short -Extended -Conveyance - - - False - 1 - - + gtk-dialog-info + 5 False - + True - - - True - Estimated test duration on idle drive - Estimated test duration on idle drive - <b>Estimated duration: </b> - True - - - False - - - - - True - Minimum test duration on idle drive - Minimum test duration on idle drive - N/A - - - False - 1 - - + 0 + Test result text + True + 70 - 10 1 + + 2 + 3 + 4 + 20 + - + + True + Test progress + Test progress + True + Test completion: 90%; ETA: 12 minutes + PANGO_ELLIPSIZE_END + + + 2 + 3 + 10 + + + + True True True - Perform selected test - Perform selected test - gtk-execute + Abort the test + Abort the test + gtk-stop True 0 1 2 + 2 + 3 GTK_FILL + 10 @@ -682,72 +654,97 @@ Conveyance - + True True True - Abort the test - Abort the test - gtk-stop + Perform selected test + Perform selected test + gtk-execute True 0 1 2 - 2 - 3 GTK_FILL - 10 - + True - Test progress - Test progress - True - Test completion: 90%; ETA: 12 minutes - PANGO_ELLIPSIZE_END - - - 2 - 3 - 10 - - - - - 5 + 6 - + True - gtk-dialog-info - 5 + 6 + + + True + 0 + <b>Test type:</b> + True + + + False + + + + + True + Choose a test type + Choose a test type + These are dummy entries +Immediate Offline +Short +Extended +Conveyance + + + False + 1 + + False - + True - 0 - Test result text - True - 70 + 6 + + + True + Estimated test duration on idle drive + Estimated test duration on idle drive + <b>Estimated duration:</b> + True + + + False + + + + + True + Minimum test duration on idle drive + Minimum test duration on idle drive + N/A + + + False + 1 + + + 10 1 - - 2 - 3 - 4 - 20 - @@ -757,7 +754,7 @@ Conveyance False - 5 + 6 @@ -776,9 +773,9 @@ Conveyance True - tab 5 False + tab @@ -803,8 +800,8 @@ Conveyance gtk-refresh True 0 - - + + @@ -832,7 +829,7 @@ Conveyance gtk-save-as True 0 - + 2 diff --git a/gsmartcontrol/src/res/gsc_main_window.glade b/gsmartcontrol/src/res/gsc_main_window.glade index 6d2ac1a..275dbef 100644 --- a/gsmartcontrol/src/res/gsc_main_window.glade +++ b/gsmartcontrol/src/res/gsc_main_window.glade @@ -1,7 +1,6 @@ - - - + + GSmartControl 460 @@ -28,17 +27,18 @@ True - 5 + 6 True Device, capacity, model (if available) Device, capacity, model (if available) + 6 True 0 - <b>Drive information:</b> + <b>Drive information:</b> True @@ -65,11 +65,12 @@ View drive details for more information. Basic health check status as reported by the drive. View drive details for more information. + 6 True 0 - <b>Basic health check:</b> + <b>Basic health check:</b> True @@ -98,19 +99,21 @@ View drive details for more information. True True True + 6 True - 14 + 12 True - 3 + 6 True Model family (if available in smartctl database) Model family (if available in smartctl database) + 6 True @@ -119,7 +122,7 @@ View drive details for more information. True 0 - <b>Model family:</b> + <b>Model family:</b> True True @@ -225,8 +228,7 @@ View drive details for more information. - - + False 3 diff --git a/gsmartcontrol/src/res/gsc_preferences_window.glade b/gsmartcontrol/src/res/gsc_preferences_window.glade index 45161e1..e34f579 100644 --- a/gsmartcontrol/src/res/gsc_preferences_window.glade +++ b/gsmartcontrol/src/res/gsc_preferences_window.glade @@ -1,13 +1,12 @@ - - - + + True - 5 - 5 + 12 + 12 True @@ -20,7 +19,7 @@ True 5 - 5 + 6 True @@ -36,7 +35,7 @@ True - 7 + 6 True @@ -121,27 +120,16 @@ True 2 - 3 - 7 - - - True - True - A path to smartctl binary. If the path is not absolute, the binary will be looked for in user's PATH. - A path to smartctl binary. If the path is not absolute, the binary will be looked for in user's PATH. - - - 1 - 2 - - + 2 + 12 + 6 True A path to smartctl binary. If the path is not absolute, the binary will be looked for in user's $PATH. A path to smartctl binary. If the path is not absolute, the binary will be looked for in user's $PATH. 1 - S_martctl binary: + S_martctl binary: True @@ -153,7 +141,7 @@ True Global parameters for smartctl. These parameters will be used every time the progam invokes smartctl. Global parameters for smartctl. These parameters will be used every time the progam invokes smartctl. - Smartctl _parameters: + Smartctl parameters: True @@ -177,21 +165,17 @@ - + True - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - True - 5 + 6 + + + True + True + A path to smartctl binary. If the path is not absolute, the binary will be looked for in user's PATH. + A path to smartctl binary. If the path is not absolute, the binary will be looked for in user's PATH. + + True @@ -201,12 +185,14 @@ True 0 + + 1 + - 2 - 3 - GTK_FILL + 1 + 2 @@ -249,15 +235,15 @@ True - tab False + tab True 5 - 5 + 6 True @@ -271,11 +257,22 @@ True - + True - 1 - 2 - 7 + 6 + + + True + Semicolon-separated blacklist PCRE patterns for device search. For example, to blacklist all "/dev/sd*" devices, use "sd.{1}$". Simply listing them as "sda;sdb" will also work. + Semicolon-separated blacklist PCRE patterns for device search. For example, to blacklist all "/dev/sd*" devices, use "sd.{1}$". Simply listing them as "sda;sdb" will also work. + 0 + Device blacklist patterns: + True + + + False + + True @@ -284,26 +281,12 @@ Semicolon-separated blacklist PCRE patterns for device search. For example, to blacklist all "/dev/sd*" devices, use "sd.$". Simply listing them as "sda;sdb" or "sd[ab]" will also work. - 1 - 2 - - - - - True - Semicolon-separated blacklist PCRE patterns for device search. For example, to blacklist all "/dev/sd*" devices, use "sd.{1}$". Simply listing them as "sda;sdb" will also work. - Semicolon-separated blacklist PCRE patterns for device search. For example, to blacklist all "/dev/sd*" devices, use "sd.{1}$". Simply listing them as "sda;sdb" will also work. - 1 - Device _blacklist patterns: - True - - - GTK_FILL + 1 - 10 + 12 @@ -323,7 +306,7 @@ False - 5 + 6 @@ -341,11 +324,11 @@ True - 8 + 12 True - 5 + 6 True @@ -367,7 +350,7 @@ True - 5 + 6 True @@ -409,9 +392,10 @@ True - 3 + 4 2 - 10 + 12 + 6 True @@ -429,7 +413,7 @@ Device name (for example, "/dev/sda") Device name (for example, "/dev/sda") 1 - De_vice: + De_vice: True @@ -438,12 +422,12 @@ - + True Smartctl parameters for this device. For example, to use older smartctl versions with libata devices, use "-d ata". Smartctl parameters for this device. For example, to use older smartctl versions with libata devices, use "-d ata". 1 - _Parameters: + _Type: True @@ -464,7 +448,7 @@ - + True True Smartctl parameters for this device. For example, to use older smartctl versions with libata devices, use "-d ata". Must be shell-escaped. @@ -477,6 +461,34 @@ 3 + + + True + Smartctl parameters for this device. For example, to use older smartctl versions with libata devices, use "-d ata". + Smartctl parameters for this device. For example, to use older smartctl versions with libata devices, use "-d ata". + 1 + _Parameters: + True + + + 3 + 4 + + + + + True + True + Smartctl parameters for this device. For example, to use older smartctl versions with libata devices, use "-d ata". Must be shell-escaped. + Smartctl parameters for this device. For example, to use older smartctl versions with libata devices, use "-d ata". Must be shell-escaped. + + + 1 + 2 + 3 + 4 + + False @@ -509,7 +521,7 @@ False - 5 + 6 1 @@ -525,9 +537,9 @@ True - tab 1 False + tab @@ -545,7 +557,7 @@ True True Reset all program settings to their defaults - Rese_t all + Reset a_ll True 0 diff --git a/gsmartcontrol/src/res/gsc_text_window.glade b/gsmartcontrol/src/res/gsc_text_window.glade index 0ba1a58..7de901e 100644 --- a/gsmartcontrol/src/res/gsc_text_window.glade +++ b/gsmartcontrol/src/res/gsc_text_window.glade @@ -1,7 +1,6 @@ - - - + + GSmartControl 600 @@ -10,8 +9,8 @@ True - 5 - 5 + 12 + 12 True @@ -44,16 +43,8 @@ 6 True - + True - True - True - Saved displayed text as... - Saved displayed text as... - gtk-save-as - True - 0 - @@ -65,8 +56,16 @@ - + True + True + True + Saved displayed text as... + Saved displayed text as... + gtk-save-as + True + 0 + 2