diff --git a/Assets/Icon.ico b/Assets/Icon.ico index 0aaca39..a6f7a45 100644 Binary files a/Assets/Icon.ico and b/Assets/Icon.ico differ diff --git a/Assets/Icon.png b/Assets/Icon.png index 638e95b..2ce836f 100644 Binary files a/Assets/Icon.png and b/Assets/Icon.png differ diff --git a/Assets/Icon2.xcf b/Assets/Icon2.xcf new file mode 100644 index 0000000..a0e7c79 Binary files /dev/null and b/Assets/Icon2.xcf differ diff --git a/Freedomain Livestream Scheduler.ahk b/Freedomain Livestream Scheduler.ahk index 79e2962..69b5ef4 100644 --- a/Freedomain Livestream Scheduler.ahk +++ b/Freedomain Livestream Scheduler.ahk @@ -161,6 +161,7 @@ LivestreamThumbnail := ThumbnailJPEGFilepath ; ------------------------------------------------ IniRead, ConfirmBeforeSubmit, %SettingsIniFilepath%, %ScriptSettingsSection%, ConfirmBeforeSubmit, 1 IniRead, AutoUpdateCheck, %SettingsIniFilepath%, %ScriptSettingsSection%, AutoUpdateCheck, 1 + IniRead, ErrorLogToDiscord, %SettingsIniFilepath%, %ScriptSettingsSection%, ErrorLogToDiscord, 1 if(ErrorLogToDiscord){ ; Discord @@ -176,6 +177,9 @@ if(ErrorLogToDiscord){ ; GUI Variables ; ------------------------------------------------ +IniRead, XPosition, %SettingsIniFilepath%, %ScriptSettingsSection%, XPosition, 0 +IniRead, YPosition, %SettingsIniFilepath%, %ScriptSettingsSection%, YPosition, 0 + GuiFontSize = 15 MarginSize := 10 @@ -186,13 +190,13 @@ ThumbnailPreviewWidth := 150 -GuiHeight := 470 +GuiHeight := 500 VerticalLineHeight := GuiHeight - 100 ; Column One -ColumnOneWidth := 500 +ColumnOneWidth := 550 ColumnOneEditBoxWidth := ColumnOneWidth - (MarginSize * 2) ColumnOneEditBoxHalfWidth := (ColumnOneEditBoxWidth / 2) + 5 @@ -216,7 +220,7 @@ GUIWidth := ColumnThreeXPosition + ColumnThreeEditBoxWidth + MarginSize ; Results Screen ResultButtonWidth := 250 -ResultButtonEditWidth := 250 +ResultButtonEditWidth := 350 ResultButtonHeights := 30 ResultButtonAndEditWidth := ResultButtonWidth + ResultButtonEditWidth + MarginSize @@ -252,7 +256,7 @@ Gui, Add, Button, x+%MarginSize% gPasteClipboardToEditBox vPasteClipboardToFLSDe Gui, Font, s%GuiFontSize% Gui, Font, Normal -Gui, Add, Edit,x%MarginSize% w%ColumnOneEditBoxWidth% h170 vLivestreamDescription, %LivestreamDescription% +Gui, Add, Edit,x%MarginSize% w%ColumnOneEditBoxWidth% h200 vLivestreamDescription, %LivestreamDescription% Gui, Font, s%GuiFontSize% Gui, Font, Bold @@ -271,19 +275,21 @@ Gui, Add, Edit,x%MarginSize% w%ColumnOneEditBoxWidth% vLivestreamTags, %Livestre ; ------------------------------------------------ ; Start with Column one and go across -ScheduleButtonWidths := 234 +ScheduleButtonWidths := 250 ScheduleButtonHeight := 50 +ScheduleButtonHalfHeight := ScheduleButtonHeight / 2 -Gui, Font, s%GuiFontSize% -Gui, Font, Bold -Gui, add, text, x0 y+%marginsizeDoubled% w970 0x10 +Gui, add, Text, x0 y+%marginsizeDoubled% w%GUIWidth% 0x10 -Gui, Add, Button, x%MarginSize% yp+%marginsizeDoubled% w%ColumnTwoEditBoxWidth% h%ScheduleButtonHeight% gLoadPrevious , Load Previous +Gui, Font, s10 +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% yp+%marginsizeDoubled% w%ColumnTwoEditBoxWidth% h%ScheduleButtonHalfHeight% gLoadPrevious , Load Previous +Gui, Add, Button, y+0 w%ColumnTwoEditBoxWidth% h%ScheduleButtonHalfHeight% gShowResultsScreen , Show Results +Gui, Font, s%GuiFontSize% Gui, Font, Bold -; Gui, Font, S10 -Gui, Add, Button, x+%marginsize% w%ScheduleButtonWidths% h%ScheduleButtonHeight% gSaveAsTemplate, Save As Template +Gui, Add, Button, x+%marginsize% yp-%ScheduleButtonHalfHeight% w%ScheduleButtonWidths% h%ScheduleButtonHeight% gSaveAsTemplate, Save As Template Gui, Add, Button,x+%marginsize% gSchedulePost h%ScheduleButtonHeight% w%ScheduleButtonWidths% gLoadTemplate, Load Template Gui, Add, Button, x+%marginsize% gSchedulePost h%ScheduleButtonHeight% w%ScheduleButtonWidths% gSchedulePost, Schedule @@ -345,7 +351,7 @@ Gui, add, text, x%ColumnThreeVerticalLineXPosition% y%marginSize% h%VerticalLine ; ------------------------------------------------ Gui, Font, s%GuiFontSize% Gui, Font, Bold -Gui, Add, Text,y0 x%ColumnThreeXPosition%, Settings +Gui, Add, Text,y%MarginSize% x%ColumnThreeXPosition%, Settings Gui, Font, s12 @@ -357,22 +363,26 @@ Gui, Add, Checkbox, vConfirmBeforeSubmit checked%ConfirmBeforeSubmit%, Confirm B Gui, Font, s%GuiFontSize% Gui, Font, Bold -Gui, Add, Text, y+%MarginSizeDoubled% x%ColumnThreeXPosition%, Updates +Gui, Add, Text, y+%MarginSizeDoubled% x%ColumnThreeXPosition%, System Gui, Font, S10 -if(UpdateAvailable) - Gui, Add, Button, cRed w%ColumnTwoEditBoxWidth% center vUpdateAvailable gUpdateScript, FLS Update Available! +/*if(UpdateAvailable) + Gui, Add, Button, cRed w%ColumnTwoEditBoxWidth% center vUpdateAvailable gUpdateScript, %ScriptAbbreviatedName% Update Available! else, - Gui, Add, Button, w%ColumnThreeEditBoxWidth% center vUpdateAvailable gUpdateScript, FLS Up-to-Date +*/ +Gui, Add, Button, w%ColumnThreeEditBoxWidth% center vUpdateAvailable gUpdateScript, %ScriptAbbreviatedName% Up-to-Date -if(ChromeUpdateAvailable) +/*if(ChromeUpdateAvailable) Gui, Add, Button, cRed w%ColumnThreeEditBoxWidth% center vChromeUpdateAvailable gUpdateChrome,Chrome Update Available! else, - Gui, Add, Button, w%ColumnThreeEditBoxWidth% center vChromeUpdateAvailable gUpdateChrome, Chrome Up-to-Date +*/ +Gui, Add, Button, w%ColumnThreeEditBoxWidth% center vChromeUpdateAvailable gUpdateChrome, Chrome Up-to-Date + +Gui, Add, Button, x%ColumnThreeXPosition% y+%MarginSize% w%ColumnThreeEditBoxWidth% center gOpenGiteaPage, Report Bug -Gui, Show, h%GuiHeight% w%GUIWidth%, %FullScriptName% +Gui, Show, h%GuiHeight% w%GUIWidth% x%XPosition% y%YPosition%, %FullScriptName% @@ -479,12 +489,15 @@ Return SchedulePost: Gui, submit, NoHide +WinGetPos, XPosition, YPosition, , , A ; Save Settings.ini ; ------------------------------------------------ IniWrite, %ConfirmBeforeSubmit%, %SettingsIniFilepath%, %ScriptSettingsSection%, ConfirmBeforeSubmit IniWrite, %AutoUpdateCheck%, %SettingsIniFilepath%, %ScriptSettingsSection%, AutoUpdateCheck IniWrite, %ErrorLogToDiscord%, %SettingsIniFilepath%, %ScriptSettingsSection%, ErrorLogToDiscord +IniWrite, %XPosition%, %SettingsIniFilepath%, %ScriptSettingsSection%, XPosition +IniWrite, %YPosition%, %SettingsIniFilepath%, %ScriptSettingsSection%, YPosition ; Re-use an existing errorlog or create new directory @@ -531,6 +544,8 @@ if(InputRumbleCustomRTMP){ ; Gui, Add, + +ShowResultsScreen: ToolTip ; hide any existing tooltips Gui, Destroy @@ -563,11 +578,6 @@ IniRead, RumbleCustomRTMPs, %PostStatusesFilepath%, Livestream,RumbleCustomRTMPs Gui, Font, Bold Gui, Font, s%GuiFontSize% - -/*Gui, Add, Button, x%MarginSize% gResultsGUIAction h%ResultButtonHeights% w%ResultButtonEditWidth%,Copy Title -Gui, Add, Button, x+%marginsize% gResultsGUIAction h%ResultButtonHeights% w%ResultButtonEditWidth%,Copy Description - -*/ Gui, Add, Button,x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Copy Title Gui, Add, Button, x+5 yp+0 h%ResultButtonHeights% w%ResultButtonEditWidth% center gResultsGUIAction, Copy Description @@ -603,11 +613,10 @@ Gui, Add, Edit, x+5 yp+0 h%ResultButtonHeights% w%ResultButtonEditWidth% vRumbl Gui, add, text, x%MarginSize% y+%marginsizeDoubled% w%ResultButtonAndEditWidth% 0x10 ;Horizontal Line > Etched Gray Gui, Font, s%GuiFontSize% -Gui, Add, Button, x%MarginSize% y+%marginsize% gResultsGUIAction h%ResultButtonHeights% w%ResultButtonEditWidth%,Save Changes +Gui, Add, Button, x%MarginSize% y+%marginsize% gResultsGUIAction h%ResultButtonHeights% w%ResultButtonWidth%,Save Changes Gui, Add, Button, x+%marginsize% h%ResultButtonHeights% w%ResultButtonEditWidth% gRetryUpload ,Try Failed Again -Gui, Add, Button, x%MarginSize% h%ResultButtonHeights% w%ResultButtonEditWidth% gStartSMP, Start SMP -; Gui, Font, s10 +Gui, Add, Button, x%MarginSize% h%ResultButtonHeights% w%ResultButtonWidth% gStartSMP, Start SMP Gui, Add, Button, x+%marginsize% gUpdateRedirects h%ResultButtonHeights% w%ResultButtonEditWidth%, Update M.M. Redirects Gui, Font, s%GuiFontSize% @@ -622,7 +631,7 @@ Gui, Add, Edit, y+5 h400 w%ResultButtonEditWidth%, %ErrorLogVar% ; Gui, Add, Button, x%MarginSize% gRetryUpload h%ResultButtonHeights% w%ResultButtonEditWidth%,Try Failed Again -Gui, Show +Gui, Show, x%XPosition% y%YPosition% w%GUIWidth%, %FullScriptName% - Results Return @@ -630,6 +639,12 @@ Return ; GoSubs ; ------------------------------------------------ + +OpenGiteaPage: +run, https://freedomain.dev/yuriy/video-uploader/issues +Return + + StartSMP: ; IniWrite, %A_ScriptFullPath%, %SettingsIniFilepath%, Filepaths, SMPFilepath IniRead, SocialMediaPosterFilepath, %SettingsIniFilepath%, Filepaths, SocialMediaPosterFilepath, %A_Space% @@ -660,8 +675,6 @@ if(SocialMediaPosterFilepath = "" or !FileExist(SocialMediaPosterFilepath)){ UpdateRedirects: gosub, MediaManagerUpdate - - Return diff --git a/Lib/Freedomain-Posters-Shared-Functions b/Lib/Freedomain-Posters-Shared-Functions index 738e1af..cf56ae8 160000 --- a/Lib/Freedomain-Posters-Shared-Functions +++ b/Lib/Freedomain-Posters-Shared-Functions @@ -1 +1 @@ -Subproject commit 738e1af44353f55a3bd4684139381eaaf57bd8ef +Subproject commit cf56ae8136def874793895733d595349b20d9c19 diff --git a/Version.ini b/Version.ini index 0ad57a0..fe94a03 100644 Binary files a/Version.ini and b/Version.ini differ