Combine [writing][blanking] fields

When wiping a drive a status message is displayed
that show [writing] or [syncing] or [verifying] or
[blanking] etc. Previously there were two bracketed
fields, [syncing] occupied one field and all the others
occupied the other field.

To conserve screen space they all occupy the same
bracketed field.

The bracketed field is also now a fixed length of
9 characters padded with spaces as necessary to maintain
column alignment when wiping multiple drives simultaneously.
This commit is contained in:
PartialVolume
2020-03-30 14:22:19 +01:00
parent 3ed8dfd708
commit fa9eb6892b

View File

@@ -2404,41 +2404,34 @@ void* nwipe_gui_status( void* ptr )
{
switch( c[i]->pass_type )
{
/* Each text field in square brackets should be the same number of characters
* to retain output in columns */
case NWIPE_PASS_FINAL_BLANK:
if( !c[i]->sync_status )
{
wprintw( main_window, "[blanking] " );
}
else
{
wprintw( main_window, "[--------] " );
wprintw( main_window, "[ blanking] " );
}
break;
case NWIPE_PASS_FINAL_OPS2:
if( !c[i]->sync_status )
{
wprintw( main_window, "[OPS-II final] " );
}
else
{
wprintw( main_window, "[------------] " );
wprintw( main_window, "[OPS2final] " );
}
break;
case NWIPE_PASS_WRITE:
if( !c[i]->sync_status )
{
wprintw( main_window, "[writing] " );
}
else
{
wprintw( main_window, "[-------] " );
wprintw( main_window, "[ writing ] " );
}
break;
case NWIPE_PASS_VERIFY:
wprintw( main_window, "[verifying] " );
if( !c[i]->sync_status )
{
wprintw( main_window, "[verifying] " );
}
break;
case NWIPE_PASS_NONE:
@@ -2447,11 +2440,7 @@ void* nwipe_gui_status( void* ptr )
if( c[i]->sync_status )
{
wprintw( main_window, "[syncing] " );
}
else
{
wprintw( main_window, "[-------] " );
wprintw( main_window, "[ syncing ] " );
}
}