forked from Leak_Technologies/VideoTools
Return from queue to last module when opened in-context
This commit is contained in:
parent
26c4af25af
commit
cd3a9dcb68
11
main.go
11
main.go
|
|
@ -156,6 +156,7 @@ func (c convertConfig) CoverLabel() string {
|
||||||
type appState struct {
|
type appState struct {
|
||||||
window fyne.Window
|
window fyne.Window
|
||||||
active string
|
active string
|
||||||
|
lastModule string
|
||||||
source *videoSource
|
source *videoSource
|
||||||
loadedVideos []*videoSource // Multiple loaded videos for navigation
|
loadedVideos []*videoSource // Multiple loaded videos for navigation
|
||||||
currentIndex int // Current video index in loadedVideos
|
currentIndex int // Current video index in loadedVideos
|
||||||
|
|
@ -440,6 +441,7 @@ func (s *appState) showMainMenu() {
|
||||||
func (s *appState) showQueue() {
|
func (s *appState) showQueue() {
|
||||||
s.stopPreview()
|
s.stopPreview()
|
||||||
s.stopPlayer()
|
s.stopPlayer()
|
||||||
|
s.lastModule = s.active
|
||||||
s.active = "queue"
|
s.active = "queue"
|
||||||
s.refreshQueueView()
|
s.refreshQueueView()
|
||||||
}
|
}
|
||||||
|
|
@ -466,7 +468,13 @@ func (s *appState) refreshQueueView() {
|
||||||
|
|
||||||
view, scroll := ui.BuildQueueView(
|
view, scroll := ui.BuildQueueView(
|
||||||
jobs,
|
jobs,
|
||||||
s.showMainMenu, // onBack
|
func() { // onBack
|
||||||
|
if s.lastModule != "" && s.lastModule != "queue" && s.lastModule != "menu" {
|
||||||
|
s.showModule(s.lastModule)
|
||||||
|
} else {
|
||||||
|
s.showMainMenu()
|
||||||
|
}
|
||||||
|
},
|
||||||
func(id string) { // onPause
|
func(id string) { // onPause
|
||||||
if err := s.jobQueue.Pause(id); err != nil {
|
if err := s.jobQueue.Pause(id); err != nil {
|
||||||
logging.Debug(logging.CatSystem, "failed to pause job: %v", err)
|
logging.Debug(logging.CatSystem, "failed to pause job: %v", err)
|
||||||
|
|
@ -810,6 +818,7 @@ func (s *appState) batchAddToQueue(paths []string) {
|
||||||
|
|
||||||
func (s *appState) showConvertView(file *videoSource) {
|
func (s *appState) showConvertView(file *videoSource) {
|
||||||
s.stopPreview()
|
s.stopPreview()
|
||||||
|
s.lastModule = s.active
|
||||||
s.active = "convert"
|
s.active = "convert"
|
||||||
if file != nil {
|
if file != nil {
|
||||||
s.source = file
|
s.source = file
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user