Skip to content

Commit

Permalink
tui: Rename Manual to Advanced
Browse files Browse the repository at this point in the history
Signed-off-by: Mark D Horn <[email protected]>
  • Loading branch information
mdhorn committed Apr 19, 2019
1 parent e0693dd commit 7fe0567
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion storage/ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -1182,7 +1182,7 @@ type InstallTarget struct {
Removable bool // Is this removable/hotswap media?
EraseDisk bool // Are we wiping the disk? New partition table
DataLoss bool // Are we making changes which will lose data
Manual bool // Was this disk manually configured?
Advanced bool // Was this disk configured via advanced mode?
FreeStart uint64 // Starting position of free space
FreeEnd uint64 // Ending position of free space
}
Expand Down
4 changes: 2 additions & 2 deletions tui/disk_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type SelectedBlockDevice struct {
}

const (
diskConfigTitle = `Manual Partitioning`
diskConfigTitle = `Advanced Configuration`
)
const (
diskColumnDisk = iota
Expand Down Expand Up @@ -161,7 +161,7 @@ func (page *DiskConfigPage) SetDone(done bool) bool {
page.getModel().InstallSelected = storage.InstallTarget{
Name: installBlockDevice.Name, Friendly: installBlockDevice.Model,
WholeDisk: sel.wholeDisk, Removable: installBlockDevice.RemovableDevice,
DataLoss: sel.dataLoss, Manual: true, FreeStart: 0, FreeEnd: installBlockDevice.Size}
DataLoss: sel.dataLoss, Advanced: true, FreeStart: 0, FreeEnd: installBlockDevice.Size}
}

// TODO start using new API page.GotoPage() when finished merging
Expand Down
10 changes: 5 additions & 5 deletions tui/media_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,9 @@ func newMediaConfigPage(tui *Tui) (Page, error) {
page.GotoPage(TuiPageMediaConfig)
})

// Add a Manual Partition button
manualPartBtn := CreateSimpleButton(page.cFrame, AutoSize, AutoSize, "Manual Partition", Fixed)
manualPartBtn.OnClick(func(ev clui.Event) {
// Add an Advanced Configuration button
advancedCfgBtn := CreateSimpleButton(page.cFrame, AutoSize, AutoSize, "Advanced Configuration", Fixed)
advancedCfgBtn.OnClick(func(ev clui.Event) {
page.GotoPage(TuiPageDiskConfig)
})

Expand Down Expand Up @@ -437,8 +437,8 @@ func fmtInstallPortion(target storage.InstallTarget) string {
if target.EraseDisk {
portion = "[Erase Disk]"
}
if target.Manual {
portion = "[Manual]"
if target.Advanced {
portion = "[Advanced]"
}

return portion
Expand Down

0 comments on commit 7fe0567

Please sign in to comment.