Commit Graph

145 Commits

Author SHA1 Message Date
WarmUpTill
4988683e22 Resize conditions and actions areas on expand / collapse all 2022-02-04 11:38:42 -08:00
WarmUpTill
6033426a6e Enable word wrap for macro priority warning 2022-01-21 09:51:00 -08:00
WarmUpTill
82503286ea Use the same widget for main settings window and status dock 2022-01-14 09:11:36 -08:00
WarmUpTill
16ee789c82 Add option to perform macro actions only on condition change 2022-01-06 08:41:18 -08:00
WarmUpTill
8d83df9034 Add warning if macro functionality is not running with highest priority 2021-12-06 10:27:20 -08:00
WarmUpTill
845506f7e4 Allow running macros in parallel to other macros 2021-12-04 04:09:30 -08:00
WarmUpTill
9dd47b811b Add button to manually run macro actions 2021-12-04 04:09:30 -08:00
WarmUpTill
f824ac8f4e Add option to display plugin running state in system tray 2021-10-30 11:40:10 -07:00
WarmUpTill
5a7d76061c Clean up general tab
- Remove unnecessary spacer next to priority list
- Remove horizontal line in General behviour section
2021-10-19 13:01:01 -07:00
WarmUpTill
8c0aad4c96 Add note to network tab
The requirement of the scene names having to match extactly was not made
clear and caused some confusion.
2021-07-24 23:31:35 -07:00
WarmUpTill
0fdbce25a1 Clean up minor UI inconsistencies 2021-07-13 13:14:43 -07:00
WarmUpTill
bf03edd391 Adjust size constraints of macro condition / action layouts
The reason for this change is that the macro condition "source" was
introduced which can change its required size drastically depending on
which condition type is selected.
2021-05-28 10:23:24 -07:00
WarmUpTill
9301713c49 Add option to not scene change msg via network tab 2021-05-25 10:18:36 -07:00
WarmUpTill
66285a0d3d Add option to synchronize preview scene via network tab 2021-05-25 10:18:36 -07:00
WarmUpTill
4b84850f00 Use splitter to separate actions and conditions 2021-05-19 11:47:22 -07:00
WarmUpTill
675021c284
Add Macro tab (#170)
* add action switch scene

* add window condition

* Add macro action wait

* Add macro condition region

* Add audio macro condition

* Add file based macro condition

* Add macro condition media

* Add video macro condition

* Add macro action audio

* Add macro action streaming

* Add macro action recording

* Add replay buffer macro action

* Add stream macro condition

* Add macro condition recording

* Add macro condition plugin state

* Add macro action to run an arbitrary command
2021-05-14 16:37:01 +02:00
WarmUpTill
e714df7ad0 Use Duration class and DurationSelection widget 2021-05-04 11:32:45 -07:00
WarmUpTill
e4bf5fa749
Add option to use transition overrides for transition changes (#164)
* Adjust switchScene() signature to support adjustActiveTransitionType and verbose parameters and only change the transition type if adjustActiveTransitionType, otherwise rely on transition overrides

* Add new adjustActiveTransitionType checkbox

* save and load adjustActiveTransitionType

* Add check to either enable transition type change or use of transition
overrides

* Add locale

* Adjust layout and locale
2021-04-10 19:58:17 +02:00
WarmUpTill
beb482bd5a
Disable Network tab functionality on macOS (#155)
The asio library ran into issues when the obs-websocket plugin was also running leading to a crash in the obs-websocket's listen() calls.

As the use obs-websocket plugin is more widespread than the use of the advanced scene switcher the network tab functionality will be disabled for macOS for the time being.
2021-04-03 18:52:16 +02:00
WarmUpTill
73ce88e2f0
Add option to save window size and position (#154) 2021-04-03 11:55:42 +02:00
WarmUpTill
dfccc4b16d
Add network tab (#149)
The network tab allows you to open a web-socket or connect to web-socket to synchronize the active scene between two or more instances of OBS.
The functionality is mostly based on https://github.com/Palakis/obs-websocket.

An OBS instance running a server will send its currently active scene to all connected clients on scene change.
By default all scene switches will trigger a message to be sent to all clients, but you also have the option to limit sending these messages only when an automated scene change is triggered by the advanced scene switcher.
2021-03-24 20:51:22 +01:00
WarmUpTill
1273446ce5
Add option to configure default transition delay. (#140) 2021-03-17 18:21:42 +01:00
WarmUpTill
e4bb034303
Add video tab (#131)
This tab will allow switching scenes based on the video output of sources.
2021-03-05 14:08:17 +01:00
WarmUpTill
7947ad2608
Add option to extend scene sequences (#121)
Extending a scene sequence allows for more complex switching setups, but should also simplify some setups.
Sequences like "A -> B -> A -> C", which previously were only possible by creating a copy of A, can now be specified in a single entry.
To extend a sequence either select the sequence you want to modify and click the extend sequence button or simply double click the entry.
2021-02-24 18:19:23 +01:00
WarmUpTill
a5f0eb8da8
Add option to automatically start scene switcher on recording / streaming start (#112) 2021-02-03 20:02:07 +01:00
WarmUpTill
35151ea134
Add scene trigger tab (#110) 2021-02-03 19:50:37 +01:00
WarmUpTill
27ae5107cd
Add help messages if tab is empty (#107) 2021-01-24 16:04:40 +01:00
WarmUpTill
69d452f978
allow selection of previous scene for exe,file,region,window and scene group for idle switches (#106) 2021-01-23 23:21:59 +01:00
WarmUpTill
d989c2b570
Add scene groups and rework save and load (#103) 2021-01-23 17:39:35 +01:00
WarmUpTill
0950d93828
allow selection of target for auto stop of recoding or streaming 2021-01-18 01:20:56 +01:00
WarmUpTill
17c4fefb37
add fallback option if multiple audio matches are active (#95) 2021-01-07 18:59:06 +01:00
WarmUpTill
2b90493ae9
add switch cooldown option (#97)
* add switch cooldown functionality

* slightly adjust sequence check for cooldown

* add UI implementation for cooldown feature
2021-01-07 18:58:35 +01:00
WarmUpTill
caa2833272
allow pause individual switching methods (#90)
* allow pausing individual switching methods

* clean up pause tab

* allow import of old pauseScenes and pauseWindows
2020-12-31 14:24:09 +01:00
shugen002
8ba78b12c1
I18n Support (#72)
* adapt UI for i18n

* add placeWidgets() helper function to ease translation

* add hint about Transition Matrix plugin on Transition tab

* translate

* rework UI of file tab

* write status of plugin to scene info file
2020-12-21 11:24:04 +01:00
WarmUpTill
faca5f8863
add option to only match if file content changed (#80) 2020-12-12 16:31:07 +01:00
WarmUpTill
9711390aac
add no match delay option (#78) 2020-12-06 14:10:17 +01:00
shugen002
16c4a2d5a9
Adjust UI And Improve (#63) 2020-11-20 19:10:06 +01:00
WarmUpTill
214821b69f
UI rework (#44)
* rework general tab UI

* rework audio tab UI

* rework media tab UI

* rework time tab UI

* rework random tab UI

* rework window tab UI

* rework sreen region tab UI

* rework sequence tab UI

* rework transition tab UI

* adjust log messages to new format

* fix include path and warning

* highlight widgets to guide users (can be disabled)

* add helper frame for screen region tab

* rename main SceneSwitcher widget to AdvSceneSwitcher to resolve naming conflicts with the frontend tools on certain platforms (e.g. Debian 10)

* add media state 'any'

* adjust media switch handling to support vlc source
2020-10-31 16:25:44 +01:00
WarmUpTill
dd63ff846c
Refactor, fixes and maximized option for title tab (#40)
* move definitions of switcher structs to separate files

* remove useless comment

* cleanup and silence warnings

* add generic switch

* removed delay on main thread startup as it served no purpose

* clean up ultility.hpp

* do not save switchStr to file as it could cause issues when scenes are renamed

* rename sceneRoundTrip to sceneSequence

* add option to switch if window is maximized to title tab
2020-09-25 21:42:58 +02:00
WarmUpTill
8d023ee385
Add audio tab (#36)
* add volumemeter widget

* add audio tab UI

* add checkAudioSwitch functionality

* use constexpr instead of preprocessing
2020-09-21 00:52:42 +02:00
WarmUpTill
3fd3801e56
load libcurl at runtime (#33)
* load libcurl at runtime

* add warning to file tab if curl cant be loaded
2020-09-13 09:13:09 +02:00
WarmUpTill
21a788b48b
Improve time tab (#34)
* add support for weekdays and allow reordering on time tab

* add option to use time relative to streaming/recording start on time tab
2020-09-13 00:03:38 +02:00
WarmUpTill
95261ce9bb add first draft of auto start of recording / streaming 2020-08-16 19:48:54 +02:00
WarmUpTill
3c1e240722 add option to set startup behavior 2020-08-02 18:45:44 +02:00
WarmUpTill
f8ad8c31be scene sequence adjustments
use double internally instead of two ints
rework save / load to file to reuse existing functionality
add option to select between seconds / minutes / hours
2020-08-01 10:12:32 +02:00
WarmUpTill
1516263d2a save and load tab order 2020-07-31 21:58:17 +02:00
WarmUpTill
79f5ec340d allow reordering of tabs and silence a few UI warnings 2020-07-29 20:23:03 +02:00
WarmUpTill
340cb559ee add option to override transitionOverrides 2020-06-17 22:16:47 +02:00
WarmUpTill
eeefd8279f allow reordering of file/media/sequence/region 2020-06-16 20:25:25 +02:00
WarmUpTill
d3ab9e01c5 add support for remote file using libcurl 2020-06-15 21:19:34 +02:00
WarmUpTill
2a92df4f3c add draft of remote file support 2020-06-14 20:35:02 +02:00
WarmUpTill
560044bbbf implement export/import of settings 2020-06-14 15:22:34 +02:00
WarmUpTill
c17cbb66d9 write to OBS log if verbose logging is enabled 2020-06-14 14:14:00 +02:00
WarmUpTill
8d23dd46b0 add export/import button and verbose log checkbox 2020-06-14 13:57:11 +02:00
WarmUpTill
bbe6a30506 clarify idle detection inputs 2020-06-12 18:48:30 +02:00
Myned
7458e9f2d5
Change and fix a multitude of UI elements
Fix spelling
Add minimum size
Simplify tab names and reorder by type and use
Change layout of start, interval, and no-condition selection
2020-06-07 21:09:48 -04:00
Myned
da2e11e35e
Resize UI to fit added elements
This size is what Qt Designer defaults to when saving
2020-06-07 14:19:23 -04:00
Myned
cba39633aa
Add ability to reorder Window and Executable switches with arrows 2020-06-06 23:23:02 -04:00
Myned
c6a26d862f
Enable sorting for Ignored windows
There is no use in reordering them
2020-06-06 23:21:06 -04:00
Myned
9386109168
Remove tooltip from UI
Wasn't able to isolate it to the link, so it gets in the way
2020-06-06 23:20:14 -04:00
Myned
8fd263f44a
Merge remote-tracking branch 'WarmUpTill/master' 2020-06-06 18:40:17 -04:00
WarmUpTill
f03fca85aa add thread priority option (using QThread) 2020-06-06 17:05:49 +02:00
Myned
fabb7406bd
Merge remote-tracking branch 'WarmUpTill/master' 2020-06-02 00:48:01 -04:00
Myned
cfb0a44b1f
Change UI to specify greater than
Scene locking can occur when interval is equal to transition time due to inconsistencies in timers
2020-06-02 00:40:22 -04:00
WarmUpTill
2e475b8059 add first draft of thread priority 2020-06-01 14:54:08 +02:00
WarmUpTill
99b5c16406 add Time scene switching 2020-05-31 12:43:34 +02:00
Myned
2a0e9e9d9a
Change wording 2020-05-22 23:58:18 -04:00
Myned
be83232caa
Update UI for focus addition, add/change warnings, and move exe tab 2020-05-21 00:37:03 -04:00
Myned
e33e93fd18
Change UI warning to allow direct matches and disable list sorting 2020-05-17 13:47:48 -04:00
Myned
f0aa76517a
Change executable switcher warning to regex requirement
Also change wording to align with Window Title, and fix an inconsequential error
2020-05-17 00:27:01 -04:00
Myned
5f87a61177
Remove direct match from window switcher and reorganize
Direct matching before regex has the potential to interfere with some usecases. For example, if a user wants to enter regex syntax such as `shell[1]`, a direct match would return a window matching `shell[1]` exactly instead of `shell1`. Granted, the odds of the two conflicting each other are slim, but the core logic shouldn't prevent a user from utilizing regex to its full potential. One can always escape reserved characters if they want to match it directly. I have also added a warning and link to https://regexr.com in the UI should this be accepted.

The rest of what has changed is simply to align with the executable switcher's matching, namely the use of `QRegularExpression` to drop the need for a try/catch block and moving the check for fullscreen to the if statement in order to remove the possibility of a race condition.
2020-05-17 00:18:28 -04:00
Myned
451bb6518c
Revert "Move forms/advanced-scene-switcher.ui to src/headers/"
This reverts commit 318502d8d0.
2020-05-16 23:42:26 -04:00
Myned
318502d8d0
Move forms/advanced-scene-switcher.ui to src/headers/
Out-of-tree building (at least) fails without this file in this location, and builds successfully without it under forms
2020-05-14 19:11:04 -04:00
Myned
e9b1ef58ba
Change executable list to disable sorting
This allows the UI to show the order in which the executables will be checked
2020-05-14 18:56:39 -04:00
Myned
26c24d4d53
Change executable entry box to be editable 2020-05-14 18:56:39 -04:00
Exeldro
38bd59c1fd add media 2020-04-25 13:55:53 +02:00
WarmUpTill
6338aaa891
add regex, date check to file switch 2018-05-22 21:04:06 +02:00
WarmUpTill
104f74bf39
add option to switch based on file contents 2018-05-21 23:20:02 +02:00
WarmUpTill
c934b5c7ff
option to switch to random scene if no no match
added random tab:
scenes listed here can be switched to at random for a set duration if no switch condition is met (and this setting is selected on the general tab)
2018-02-19 19:32:09 +01:00
WarmUpTill
1ed924a39c
Increased Scene Sequence timer limit 2017-11-14 20:04:30 +01:00
WarmUpTill
bb4035824b
Increased Scene Sequence timer limit 2017-11-14 19:58:43 +01:00
WarmUpTill
d807127bca
Added warning to transitions tab 2017-10-29 00:28:08 +02:00
WarmUpTill
9b44f26e1c Updated UI to fit new functions/be less confusing
Rename of Scene Round Trip to Scene Sequence
Moved all window title based stuff to its own tab
Redesigned general tab to fit new priority option and removed window title switch
Grouped other tabs where possible... don't remember all of it
Added some Warnings where applicable
2017-10-25 20:11:18 +02:00
WarmUpTill
5ff5512799 Made hints on transition tab more clear 2017-01-26 22:27:00 +01:00
WarmUpTill
35ebd7101d added option to set default transition per scene 2017-01-26 00:23:24 +01:00
WarmUpTill
d596f65df1 Improved Idle Detection and Scene Round Trip tab 2016-12-04 17:38:53 +01:00
WarmUpTill
ff73f272df Added Idle Detection tab 2016-11-24 15:40:55 +01:00
WarmUpTill
d21ae05fda Added Executable Tab (dasOven) 2016-11-23 22:25:05 +01:00
WarmUpTill
1d6bb4b0a0 added auto stop scene 2016-11-06 17:57:17 +01:00
WarmUpTill
2fb3c6d674 added Transitions tab 2016-10-14 03:27:52 +02:00
WarmUpTill
eec4ca6cb6 added transitions 2016-10-13 23:29:02 +02:00
WarmUpTill
2075b7c039 pause window label text change 2016-10-09 16:06:18 +02:00
WarmUpTill
0d6a207f62 Added Pause Windows 2016-10-08 21:19:41 +02:00
WarmUpTill
2025f75fde added from file 2016-10-04 22:58:04 +02:00
WarmUpTill
9860c6e255 forms folder added 2016-10-04 22:56:16 +02:00