commit 1558d7a5c2960e448502c203dfa6c7bbc6c22e2d
parent dde8d837b3270ca8ef74f82cb951bb2a7b84930f
Author: rbckman <rob@tarina.org>
Date: Tue, 15 Oct 2024 16:00:49 +0100
move dsk up
Diffstat:
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gonzopi.py b/gonzopi.py
@@ -105,8 +105,8 @@ def main():
gonzopifolder = os.getcwd()
#MENUS
- standardmenu = 'FILM:', 'SCENE:', 'SHOT:', 'TAKE:', '', 'SHUTTER:', 'ISO:', 'RED:', 'BLUE:', 'FPS:', 'Q:', 'BRIGHT:', 'CONT:', 'SAT:', 'SFX:', 'FLIP:', 'BEEP:', 'LENGTH:', 'HW:', 'CH:', 'MIC:', 'PHONES:', 'COMP:', 'TIMELAPSE', 'MODE:', 'DSK:', 'SHUTDOWN', 'SRV:', 'SEARCH:', 'WIFI:', 'UPDATE', 'UPLOAD', 'BACKUP', 'LOAD', 'NEW', 'TITLE', 'LIVE:'
- gonzopictrlmenu = 'FILM:', 'SCENE:', 'SHOT:', 'TAKE:', '', 'SHUTTER:', 'ISO:', 'RED:', 'BLUE:', 'FPS:', 'Q:', 'BRIGHT:', 'CONT:', 'SAT:', 'SFX:', 'FLIP:', 'BEEP:', 'LENGTH:', 'HW:', 'CH:', 'MIC:', 'PHONES:', 'COMP:', 'TIMELAPSE', 'MODE:', 'DSK:', 'SHUTDOWN', 'SRV:', 'SEARCH:', 'WIFI:', 'CAMERA:', 'Add CAMERA', 'New FILM', 'New SCENE', 'Sync SCENE'
+ standardmenu = 'DSK:', 'FILM:', 'SCENE:', 'SHOT:', 'TAKE:', '', 'SHUTTER:', 'ISO:', 'RED:', 'BLUE:', 'FPS:', 'Q:', 'BRIGHT:', 'CONT:', 'SAT:', 'SFX:', 'FLIP:', 'BEEP:', 'LENGTH:', 'HW:', 'CH:', 'MIC:', 'PHONES:', 'COMP:', 'TIMELAPSE', 'MODE:', 'SHUTDOWN', 'SRV:', 'SEARCH:', 'WIFI:', 'UPDATE', 'UPLOAD', 'BACKUP', 'LOAD', 'NEW', 'TITLE', 'LIVE:'
+ gonzopictrlmenu = 'DSK:', 'FILM:', 'SCENE:', 'SHOT:', 'TAKE:', '', 'SHUTTER:', 'ISO:', 'RED:', 'BLUE:', 'FPS:', 'Q:', 'BRIGHT:', 'CONT:', 'SAT:', 'SFX:', 'FLIP:', 'BEEP:', 'LENGTH:', 'HW:', 'CH:', 'MIC:', 'PHONES:', 'COMP:', 'TIMELAPSE', 'MODE:','SHUTDOWN', 'SRV:', 'SEARCH:', 'WIFI:', 'CAMERA:', 'Add CAMERA', 'New FILM', 'New SCENE', 'Sync SCENE'
#gonzopictrlmenu = "BACK","CAMERA:", "Add CAMERA","New FILM","","New SCENE","Sync SCENE","Snapshot"
emptymenu='','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','','',''
menu = standardmenu
@@ -1615,8 +1615,8 @@ def main():
selected = selected - 1
else:
selected = len(menu) - 1
- if selected == 4:
- selected = 3
+ if selected == 5:
+ selected = 4
#DOWN
elif pressed == 'down':
if menu[selected] == 'FILM:':
@@ -1801,8 +1801,8 @@ def main():
selected = selected + 1
else:
selected = 0
- if selected == 4: #jump over recording time
- selected = 5
+ if selected == 5: #jump over recording time
+ selected = 6
#Start Recording Time
if recording == True:
t = time.time() - starttime
@@ -1950,12 +1950,12 @@ def main():
lastmenu = menu[selected]
if showgonzopictrl == False:
menu = standardmenu
- settings = filmname, str(scene) + '/' + str(scenes), str(shot) + '/' + str(shots), str(take) + '/' + str(takes), rectime, camerashutter, cameraiso, camerared, camerablue, str(round(camera.framerate)), str(quality), str(camera.brightness), str(camera.contrast), str(camera.saturation), effects[effectselected], str(flip), str(beeps), str(round(reclenght,2)), str(plughw), str(channels), str(miclevel), str(headphoneslevel), str(comp), '', cammode, storagedrives[dsk][0]+diskleft, '', serverstate, searchforcameras, wifistate, '', '', '', '', '', '', live
+ settings = storagedrives[dsk][0]+diskleft, filmname, str(scene) + '/' + str(scenes), str(shot) + '/' + str(shots), str(take) + '/' + str(takes), rectime, camerashutter, cameraiso, camerared, camerablue, str(round(camera.framerate)), str(quality), str(camera.brightness), str(camera.contrast), str(camera.saturation), effects[effectselected], str(flip), str(beeps), str(round(reclenght,2)), str(plughw), str(channels), str(miclevel), str(headphoneslevel), str(comp), '', cammode, '', serverstate, searchforcameras, wifistate, '', '', '', '', '', '', live
else:
#gonzopictrlmenu = 'FILM:', 'SCENE:', 'SHOT:', 'TAKE:', '', 'SHUTTER:', 'ISO:', 'RED:', 'BLUE:', 'FPS:', 'Q:', 'BRIGHT:', 'CONT:', 'SAT:', 'FLIP:', 'BEEP:', 'LENGTH:', 'HW:', 'CH:', 'MIC:', 'PHONES:', 'COMP:', 'TIMELAPSE', 'MODE:', 'DSK:', 'SHUTDOWN', 'SRV:', 'SEARCH:', 'WIFI:', 'CAMERA:', 'Add CAMERA', 'New FILM', 'Sync FILM', 'Sync SCENE'
menu = gonzopictrlmenu
#settings = '',str(camselected),'','',rectime,'','','','','','','','','',''
- settings = filmname, str(scene) + '/' + str(scenes), str(shot) + '/' + str(shots), str(take) + '/' + str(takes), rectime, camerashutter, cameraiso, camerared, camerablue, str(round(camera.framerate)), str(quality), str(camera.brightness), str(camera.contrast), str(camera.saturation), effects[effectselected], str(flip), str(beeps), str(reclenght), str(plughw), str(channels), str(miclevel), str(headphoneslevel), str(comp), '', cammode, storagedrives[dsk][0]+diskleft, '', serverstate, searchforcameras, wifistate, str(camselected), '', '', '', '', '', ''
+ settings = storagedrives[dsk][0]+diskleft, filmname, str(scene) + '/' + str(scenes), str(shot) + '/' + str(shots), str(take) + '/' + str(takes), rectime, camerashutter, cameraiso, camerared, camerablue, str(round(camera.framerate)), str(quality), str(camera.brightness), str(camera.contrast), str(camera.saturation), effects[effectselected], str(flip), str(beeps), str(reclenght), str(plughw), str(channels), str(miclevel), str(headphoneslevel), str(comp), '', cammode, '', serverstate, searchforcameras, wifistate, str(camselected), '', '', '', '', '', ''
#Rerender menu if picamera settings change
#if settings != oldsettings or selected != oldselected:
writemenu(menu,settings,selected,'',showmenu)
diff --git a/gui/gonzopi_menu.py b/gui/gonzopi_menu.py
@@ -188,33 +188,33 @@ while True:
render_menu(i, text_size, row1, y_offset3, WHITE, bakg)
row1 += read * space + morespace
if header == 0 and selected < 420:
- if linenr == 6+menuadd and i != '': ##show recording time if there is any
+ if linenr == 7+menuadd and i != '': ##show recording time if there is any
#render_subtitle(img, line, text_size, text_size_selected, rectime, y_offset2, 3);
color = RED
render_menu(i, text_size, rectime, y_offset2, color, bakg)
- if linenr >= 2+menuadd and linenr <= 5+menuadd:
+ if linenr >= 2+menuadd and linenr <= 6+menuadd:
render_menu(i, text_size, row1, y_offset2, color, bakg)
#render_subtitle(img, line, text_size, text_size_selected, row1, y_offset2, color);
row1 += read * space + morespace
#print(str(row1))
- if linenr >= 7+menuadd and linenr <= 12+menuadd:
+ if linenr >= 8+menuadd and linenr <= 13+menuadd:
if hidemenu == False:
render_menu(i, text_size, row2, y_offset3, color, bakg)
#render_subtitle(img, line, text_size, text_size_selected, row2, y_offset3, color);
row2 += read * space + morespace
#print(str(row2))
- if linenr >= 13+menuadd and linenr <= 19+menuadd:
+ if linenr >= 14+menuadd and linenr <= 20+menuadd:
if hidemenu == False:
render_menu(i, text_size, row3, y_offset4, color, bakg)
#render_subtitle(img, line, text_size, text_size_selected, row3, y_offset4, color);
row3 += read * space + morespace
#print(str(row3))
- if linenr >= 20+menuadd and linenr <= 28+menuadd:
+ if linenr >= 21+menuadd and linenr <= 29+menuadd:
if hidemenu == False:
render_menu(i, text_size, row4, y_offset5, color, bakg)
#render_subtitle(img, line, text_size, text_size_selected, row4, y_offset5, color);
row4 += read * space + morespace
- if linenr >= 29+menuadd and linenr <= 40+menuadd:
+ if linenr >= 30+menuadd and linenr <= 41+menuadd:
if hidemenu == False:
render_menu(i, text_size, row5, y_offset6, color, bakg)
#render_subtitle(img, line, text_size, text_size_selected, row5, y_offset6, color);
