fz0x1/Picocrypt
1
0
Fork 0
mirror of https://github.com/Picocrypt/Picocrypt.git synced 2025-05-12 05:48:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

handle more errors, hide main modal title bar

Browse source
This commit is contained in:
Evan Su 2025-04-18 14:52:36 -04:00
parent 693d0c4754
commit e72f687ae9
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Picocrypt.go
View file

@ -205,7 +205,7 @@ func (ezr *encryptedZipReader) Read(data []byte) (n int, err error) {
return n, err return n, err
} }
var onClickStartButton = func() { func onClickStartButton() {
// Start button should be disabled if these conditions are true; don't do anything if so // Start button should be disabled if these conditions are true; don't do anything if so
if (len(keyfiles) == 0 && password == "") || (mode == "encrypt" && password != cpassword) { if (len(keyfiles) == 0 && password == "") || (mode == "encrypt" && password != cpassword) {
return return
@ -214,12 +214,14 @@ var onClickStartButton = func() {
if keyfile && keyfiles == nil { if keyfile && keyfiles == nil {
mainStatus = "Please select your keyfiles" mainStatus = "Please select your keyfiles"
mainStatusColor = RED mainStatusColor = RED
giu.Update()
return return
} }
tmp, err := strconv.Atoi(splitSize) tmp, err := strconv.Atoi(splitSize)
if split && (splitSize == "" || tmp <= 0 || err != nil) { if split && (splitSize == "" || err != nil || tmp <= 0) {
mainStatus = "Invalid chunk size" mainStatus = "Invalid chunk size"
mainStatusColor = RED mainStatusColor = RED
giu.Update()
return return
} }
@ -228,7 +230,10 @@ var onClickStartButton = func() {
// Check if any split chunks already exist // Check if any split chunks already exist
if split { if split {
names, _ := filepath.Glob(outputFile + ".*") names, err2 := filepath.Glob(outputFile + ".*")
if err2 != nil {
panic(err2)
}
if len(names) > 0 { if len(names) > 0 {
err = nil err = nil
} else { } else {
@ -320,7 +325,7 @@ func draw() {
giu.PopupModal("Generate password:##"+strconv.Itoa(modalId)).Flags(6).Layout( giu.PopupModal("Generate password:##"+strconv.Itoa(modalId)).Flags(6).Layout(
giu.Row( giu.Row(
giu.Label("Length:"), giu.Label("Length:"),
giu.SliderInt(&passgenLength, 4, 64).Size(giu.Auto), giu.SliderInt(&passgenLength, 12, 64).Size(giu.Auto),
), ),
giu.Checkbox("Uppercase", &passgenUpper), giu.Checkbox("Uppercase", &passgenUpper),
giu.Checkbox("Lowercase", &passgenLower), giu.Checkbox("Lowercase", &passgenLower),
@ -421,7 +426,8 @@ func draw() {
} }
if showProgress { if showProgress {
giu.PopupModal(" ##"+strconv.Itoa(modalId)).Flags(6).Layout( giu.PopupModal("Progress:##"+strconv.Itoa(modalId)).Flags(6|1<<0).Layout(
giu.Dummy(0, 0),
giu.Row( giu.Row(
giu.ProgressBar(progress).Size(210, 0).Overlay(progressInfo), giu.ProgressBar(progress).Size(210, 0).Overlay(progressInfo),
giu.Style().SetDisabled(!canCancel).To( giu.Style().SetDisabled(!canCancel).To(
@ -438,7 +444,7 @@ func draw() {
), ),
giu.Label(popupStatus), giu.Label(popupStatus),
).Build() ).Build()
giu.OpenPopup(" ##" + strconv.Itoa(modalId)) giu.OpenPopup("Progress:##" + strconv.Itoa(modalId))
giu.Update() giu.Update()
} }
}), }),