1660 Commits

Author SHA1 Message Date
Jim
5969d83575
Merge pull request #3398 from cg2121/scene-tree-fix
UI: Fix scene tree event handling
2020-09-07 18:15:08 -07:00
Jim
9e76f95811
Merge pull request #3409 from CodeYan01/patch-1
UI: Remove redundant word
2020-09-07 18:11:29 -07:00
Jim
dd94bffa45
Merge pull request #3432 from cg2121/rachni-fix
UI: Fix vcam button not changing colors when checked
2020-09-07 18:10:27 -07:00
Jim
96cb70049d
Merge pull request #3431 from cg2121/media-dup-code
UI: Remove duplicate media timer code
2020-09-07 18:10:14 -07:00
Clayton Groeneveld
6ebfbe2246 UI: Fix vcam button not changing colors when checked
This fixes a bug with the Rachni theme in which the virtual
camera button wouldn't change colors when active.
2020-09-07 18:33:54 -05:00
jp9000
50d3130b64 UI: Replace/simplify device toolbar
The old version of the device toolbar was a complex situation.  Because
of the fact that device properties can take significant time to query,
this put an unpleasant burden on the UI thread; so to fix this problem,
the device toolbar was made to be threaded.  However, threading is a
complex and dangerous thing, and there is a fear that this could cause
complications down the line whenever users are simply selecting devices.

So for the time being, as a safety precaution, simplify the device
toolbar down to just the "activate" button, and make it so that if users
really need to query and change the devices, that they need to
explicitly open the properties.  That way the devices aren't being
queried constantly every time a device source is selected.

Alternatively in the future, device enumeration could be cached, but
seeing as that's a significant amount of work and needs to take in to
account whether a user adds/removes a device while the process is
active, that's not going to happen any time soon.
2020-09-07 16:21:29 -07:00
Clayton Groeneveld
adb4c40f73 UI: Remove duplicate media timer code
This removes duplicate code that is already in the
start/stop timer functions.
2020-09-07 16:14:32 -05:00
Jim
86147d9719
Merge pull request #3415 from jpark37/default-color-space
Unify color space settings as 709
2020-09-07 13:29:44 -07:00
CodeYan01
de875a454e UI: Remove redundant word
Remove redundant "desired" in
Basic.AutoConfig.VideoPage.SubTitle="Specify the desired video settings
you would like to use"
2020-09-08 00:18:06 +08:00
Clayton Groeneveld
41e38cc958 UI: Fix scene tree event handling
This fixes a bug where the same scene would show up in
the multiview more than once when reordering scenes.
2020-09-07 09:53:11 -05:00
Jim
358f453938
Merge pull request #3400 from cg2121/studio-mode-bug
UI: Fix studio mode load bug
2020-09-07 06:34:15 -07:00
Jim
8696e431af
Merge pull request #3425 from Darkhogg/tray-icons
UI: Ensure tray icon is themed in all cases
2020-09-07 06:25:26 -07:00
Jim
2d7801ce16
Merge pull request #3404 from cg2121/media-state-fix
UI: Set restart state when there is no media
2020-09-07 06:22:42 -07:00
Jim
74c2bfa49c
Merge pull request #3422 from cg2121/media-arrow-buttons
UI: Allow adjusting media slider with arrow buttons
2020-09-07 06:22:25 -07:00
Daniel Escoz
c899729c12
UI: Ensure tray icon is themed in all cases 2020-09-07 00:06:33 +02:00
jpark37
bfa0224399 UI: Change the default color setting in the UI from sRGB to 709
It seems like YouTube applies nonlinear-to-linear sRGB, and
linear-to nonlinear-709 transformations to uploaded videos now. This
makes sRGB too dark on their platform for video players that alias 709
as sRGB, which is almost everyone. Make 709 the default to keep peace.
2020-09-06 12:33:02 -07:00
Clayton Groeneveld
167a4dce37 UI: Refine context bar
This adds spacing between the timer and duration labels in the media
controls. The vertical alignment of the labels have been fixed as well.
And the width of the source label has also been widened.
2020-09-06 07:44:56 -07:00
Clayton Groeneveld
6ab2768546 UI: Allow adjusting media slider with arrow buttons
This allows the user to adjust the media slider with the left
and right keyboard arrows. It is currently set to adjust
by 5 second increments.
2020-09-05 23:53:54 -05:00
Richard Stanway
e1b0d1d984 UI: Use correct constant for CryptDecodeObjectEx 2020-09-04 22:10:06 +02:00
Clayton Groeneveld
ecb71e32d1 UI: Set restart state when there is no media
When there is no media, set the media to the restart state.
Currently, this only affects the VLC source, as the media
source doesn't use the OBS_MEDIA_STATE_NONE, at this time.
2020-09-03 17:09:31 -05:00
Jim
ace0faebd8
Merge pull request #3377 from WizardCM/toolbar-fixes
UI: Don't save invalid colors via Source Toolbar (Freetype 2 Source)
2020-09-03 13:42:17 -07:00
Jim
a1434fe443
Merge pull request #3397 from cg2121/fix-stats-bug
UI: Fix rec time left not showing in stats
2020-09-03 07:48:51 -07:00
Jim
44bdf60d06
Merge pull request #3394 from cg2121/fix-leak
UI: Fix memory leak when dropping files
2020-09-03 07:45:59 -07:00
Jim
a66a8da093
Merge pull request #3383 from Programatic/warning_fix
UI: Fix compiler warning about needing parenthesis
2020-09-03 07:44:24 -07:00
Jim
9af5edc6e2
Merge pull request #3393 from Programatic/crash_fix
UI: Fix source ref bug causing crash on exit
2020-09-03 07:43:46 -07:00
jp9000
7286ee427a UI: Make SetupOutputs virtual instead of ignoring vcam
In 218b936b1dae, the virtual camera was ignored when checking the active
state, which is kind of a lackluster solution.  Instead, this makes
SetupOutputs() a virtual function, and calls it before starting the
virtual camera to be more consistent with the rest of the outputs.
2020-09-03 06:56:03 -07:00
Matt Gajownik
cefc8cc767 UI: Save Freetype Text source color from Source Toolbar 2020-09-03 23:09:45 +10:00
jp9000
b99613b677 UI: Fix auto-remux not working w/ slash filesnames
When the feature was added to allow slashes in recording/replay
filenames to automatically create directories, auto-remux was not
accounted for, and all filenames were assumed to be complete.  It used
fi.completeBaseName() to construct the new name which would only add the
last part after the last slash as the filename, causing the remuxed file
to save in the base directory rather than the intended directory.  This
fixes that by simply using the input string as the output string,
removing the extension, appending the new extension.
2020-09-03 05:49:58 -07:00
jp9000
4869167f5c UI: Do not show tray icon if not active
Because the virtual camera stops immediately when you call
obs_output_stop() rather than with a delay like other outputs, it
exposed a bug where the tray icon would show OBS as active when stopping
the source, regardless of the fact that it was stopped.  The bug was
that the expression used to activate the tray icon did not check to make
sure that the output was actually active, so add that to the expression.
2020-09-03 05:49:58 -07:00
jp9000
28f56c0201 UI: Do not show media controls on network media source 2020-09-03 05:49:58 -07:00
jp9000
218b936b1d UI: Fix crash when starting vcam before other outputs
The BasicOutputHandler::Active() function was used for checking whether
outputs had started or not.  However, the virtual camera is not used in
the subclasses; instead it's a part of the base class.  Because of that
fact, when the virtual camera is started, the procedures used to start
up the other outputs are never called, causing outputs to crash because
they hadn't been initialized properly.  For example, starting the
virtual camera, then starting stream/recording would crash.

So, as a simple fix to this, when checking the active status in the
derived classes, do not factor in the virtual camera.
2020-09-03 05:49:58 -07:00
jp9000
1cdf16bac5 UI: Fix maximum size on image source toolbar
The edit widget on the image source toolbar had a maximum width set,
which caused the layout for the toolbar to look ugly if it hit that
maximum width.
2020-09-03 05:49:58 -07:00
jp9000
55c21319e0 UI: Fix source toolbar color selection on color source
When selecting a color on the color source, if you pressed cancel, it
would cause it to set the color to black.  Instead, make sure to check
isValid() on the returned color value to see if the user pressed cancel
when selecting a color.
2020-09-03 05:49:58 -07:00
Clayton Groeneveld
8a3b3da5e4 UI: Fix studio mode load bug
This fixes a bug where studio mode where it would transition
to the preview scene when loaded instead of using previous
program scene.
2020-09-02 22:53:35 -05:00
Clayton Groeneveld
f3501976d7 UI: Fix rec time left not showing in stats
If a user would start recording, then open the stats dialog,
the recording time left would be blank.
2020-09-02 18:49:13 -05:00
Clayton Groeneveld
fd0872d630 UI: Fix memory leak when dropping files
This fixes a memory leak when dropping files when the name
is the same as other sources.
2020-09-02 15:08:32 -05:00
Programatic
642dff054d UI: Fix source ref bug causing crash on exit 2020-09-02 12:50:36 -05:00
Programatic
e1fd89a4e5 UI: Fix compiler warning about needing parenthesis
It was the only thing blocking me from a clean and satisfying compile.
2020-09-01 12:53:25 -05:00
Jim
f9d664302e
Merge pull request #3349 from WizardCM/fix-settings-tab-order
UI: Add missing tab stop fields in Settings
2020-08-27 06:31:25 -07:00
Jim
6999f6a4bd
Merge pull request #3344 from admshao/fix-compiling-warnings
Fix compiling warnings
2020-08-27 05:14:58 -07:00
Matt Gajownik
1f1e0ceb47 UI: Add missing tab stop fields in Settings 2020-08-27 21:17:35 +10:00
Shaolin
5ff82bb9fe UI: Fix compile warnings about deprecated QT usage 2020-08-26 23:20:23 -03:00
Jim
afb6e8acb6
Merge pull request #3343 from cg2121/output-source-delete
UI: Fix output channels not being deleted
2020-08-26 01:13:09 -07:00
Jim
7b43e2072a
Merge pull request #3342 from RytoEX/disable-rename-shortcuts-while-editing
UI: Disable scene rename shortcut key while renaming
2020-08-26 01:12:40 -07:00
Jim
466e5f6a6d
Merge pull request #3339 from Programatic/tray_fix
UI: Fix tray icon appearing when disabled in settings
2020-08-26 00:07:56 -07:00
Jim
d0db1a6eea
Merge pull request #3333 from WizardCM/aap-percent-left
UI: Align Advanced Audio Percent toggle to Volume text
2020-08-26 00:06:53 -07:00
Jim
e4e78db7a8
Merge pull request #3332 from WizardCM/log-focus
UI / Log Viewer: Bring to front rather than close, add minimize/maximize buttons
2020-08-26 00:06:29 -07:00
Clayton Groeneveld
08426c8710 UI: Fix output channels not being deleted
Output channel 6 was not being deleted, so use for loop
to delete all possible channels.
2020-08-25 23:19:10 -05:00
Ryan Foster
9cb36f803f UI: Disable scene rename shortcut key while renaming
While editing a scene name, the Qt shortcut key for the renameScene
action remained active. If the user pressed the shortcut key while
actively editing a scene name, the widget would retrigger the action,
causing the name edit to fail and discard the current changes to the
scene name. The scene name would be reset to its previous saved value
and reselected as if the user had pressed the shortcut key for the first
time.

This commit removes the QAction associated with the shortcut key from
the scenes dock widget when editing starts and adds the action back to
the widget once editing is done.

Fixes #3044.
2020-08-25 22:33:23 -04:00
Ford Smith
45c46fe24a UI: Fix tray icon appearing when disabled in settings 2020-08-25 18:12:23 -05:00