0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Commit Graph

947 Commits

Author SHA1 Message Date
Jim
9480cc4fd2
Merge pull request #1675 from admshao/clear-linux-compiling-warnings
Clear linux compiling warnings
2019-04-14 04:21:21 -07:00
Jim
d14fa715e8
Merge pull request #1641 from WizardCM/move-settings
UI: Refactor Audio Settings UI and move Monitoring Device from Advanced
2019-04-14 04:10:15 -07:00
Jim
b2bc1e159b
Merge pull request #1589 from caffeinetv/minor-improvements
Minor improvements
2019-04-14 03:43:05 -07:00
Jim
975aed836c
Merge pull request #1755 from Xaymar/patch-generate-obs-rc
obs-studio: Create obs.rc out-of-tree using the build path
2019-04-13 04:14:05 -07:00
Jim
c68f847562
Merge pull request #1821 from cg2121/multiview-cursor
UI: Don't hide cursor over multiview
2019-04-13 03:46:27 -07:00
Jim
23ed5ea7b4
Merge pull request #1816 from SCG82/patch-1
UI: Fix size of output icon
2019-04-13 03:40:12 -07:00
Anthony Torres
7ddab80d80 UI: Fix remux dialog ignoring filename changes 2019-04-12 22:25:28 -07:00
Anthony Torres
0e2fe10595 UI: Separate delegate class into header file 2019-04-12 22:25:23 -07:00
Colin Edwards
ff72e9efc3 UI: Show a message in the empty source list 2019-04-12 04:17:39 -07:00
stump
bc99ec4d7c UI: Add null check for rename of default theme
Without this, we strcmp a null pointer if no theme is set in the
configuration file.
2019-04-10 22:09:37 -04:00
Clayton Groeneveld
4d908e31d3 UI: Don't hide cursor over multiview
I considered making this an option, but I decided against it because
I felt it wasn't necessary and would make the settings more complex.
Opinions are welcome.
2019-04-09 11:51:41 -05:00
Jim
820385cf6a
Merge pull request #1817 from Gol-D-Ace/remove-double-spaces
Remove double spaces from localization
2019-04-08 23:50:09 -07:00
Clayton Groeneveld
977dea4ff0 UI: Add ability to center items vertically/horizontally 2019-04-08 22:52:39 -07:00
Jim
ff63e0c050
Merge pull request #1787 from cg2121/about-dialog-version
UI: Show correct version in about dialog
2019-04-08 21:37:22 -07:00
Clayton Groeneveld
94b3f80305 UI: Rename Default theme to System
The system theme was named Default even though the default theme is Dark.
This addresses that by renaming Default.qss to System.qss. I've made it
backwards compatible so users already using this theme are not affected.

The theme list now shows up as:
-System
-Dark (Default)
-Acri
-Rachni

I have also made it so that you can specify the default theme in the
UI config file.
2019-04-08 19:56:56 -05:00
Jim
b5cc26a918
Merge pull request #1814 from torresam/rename-autoselect
UI: Autoselect text on scene/source rename
2019-04-08 13:14:22 -07:00
Gol-D-Ace
9fc1069e9b Remove double spaces from localization 2019-04-08 16:02:32 +02:00
SCG82
a848565a62
UI: Fix size of output icon 2019-04-08 05:46:43 -07:00
Jim
298901d710
Merge pull request #1797 from WizardCM/log-groupitems
UI: Log group items on startup
2019-04-08 02:29:14 -07:00
Anthony Torres
fdae1bbc0f UI: Add text autoselect for source rename 2019-04-08 02:14:06 -07:00
Anthony Torres
bd71839259 UI: Add text autoselect on scene rename 2019-04-08 02:14:06 -07:00
James Park
21f4dd63d4 libobs: UI: Use graphics debug markers
Add D3D/GL debug markers to make RenderDoc captures easier to tranverse.

Also add obs_source_get_name_no_null() to avoid boilerplate for safe
string formatting.

Closes obsproject/obs-studio#1799
2019-04-08 02:05:37 -07:00
Jim
a0ead6f974
Merge pull request #1800 from cg2121/add-pragma-once
UI, libobs, text-freetype2: Add missing pragma once in header files
2019-04-06 23:40:43 -07:00
Jim
34a06caf50
Merge pull request #1805 from sputnick1124/frontend-api-access-systray
obs-frontend-api: Access system tray icon from API
2019-04-06 23:35:46 -07:00
Jim
411b6f1064
Merge pull request #1809 from cg2121/do-not-update-stats-hidden
UI: Don't update stats dock if hidden
2019-04-06 17:19:10 -07:00
Jim
a345b50966
Merge pull request #1807 from SuslikV/patch-14
UI: Fix incorrect padding usage in Rachni theme
2019-04-06 16:44:11 -07:00
Clayton Groeneveld
51198058c8 UI: Don't update stats dock if hidden
When the stats dock is hidden, the QTimer is still updating it, causing
unnecessary CPU usage.
2019-04-06 16:40:02 -07:00
derrod
4a55dedadc UI: Fix bandwidth test flag being saved to stream key
Previously enabling and disabling bandwidth testing in a certain order
lead to the parameter being included in the stream key that is saved to
disk, making it impossible to disable the bandwidth test later on.

By doing this properly and using string concatenation instead of
modifying (appending to) the key_ value this will no longer happen.
2019-04-06 15:35:16 +02:00
Michael Fabian 'Xaymar' Dirks
8b346ade64 cmake: Generate obs.rc out-of-tree
Fixes the `obs.rc` file appearing in the UI source tree and moves it
into the out-of-tree build directories provided by CMake. Projects
requiring this can use it by adding `${obs-studio_BINARY_DIR}/obs.rc`
to their source list.
2019-04-06 15:35:08 +02:00
Gol-D-Ace
e78ac5ebef Update translations from Crowdin 2019-04-04 16:19:51 +02:00
Nick Stockton
54da8eca85 obs-frontend-api: Access system tray icon from API
All UI elements are accessible through the obs frontend api via
obs_frontend_api_get_main_window, except for the tray icon and its
elements. This commit adds an obs_frontend_api_get_system_tray function
which returns the pointer to the QSystemTrayIcon cast to void (much like
the QMainWindow pointer for the main window).
2019-04-04 07:55:19 -04:00
SuslikV
2990a83c09
UI: Fix incorrect padding usage in Rachni theme 2019-04-04 09:59:03 +02:00
jp9000
739072fdcb UI: Do not show [x] (close) for primary dock widgets
This solves the issue of users who close the primary dock widgets and
can't figure out how to get them back, who for whatever reason choose
not to read the message box when closing dock widgets that tells them
how to get it back.  The users can still hide the primary dock widgets
via the View menu, but they can no longer close them via the [x] button
on the dock widget.  This change does not apply to secondary dock
widgets, such as a chat window, stats, etc.

Closes obsproject/obs-studio#1804
2019-04-03 09:55:27 -07:00
Clayton Groeneveld
736ebca259 UI: Show correct version in about dialog
This fixes an issue where the wrong version would
be shown in the about dialog when it is a rc release.
2019-04-02 23:16:50 -05:00
Matt Gajownik
2feb0f0c5d UI: Log group items on startup 2019-04-01 18:51:36 +11:00
Clayton Groeneveld
d1be93ae69 UI, libobs, text-freetype2: Add missing pragma once in header files 2019-04-01 02:48:28 -05:00
Jim
98c86307aa
Merge pull request #1792 from WizardCM/restream-smaller
UI: Allow smaller Restream docks
2019-03-31 21:55:51 -07:00
Jim
2d442452b7
Merge pull request #1796 from cg2121/fix-hotkeys-not-showing
UI: Fix issue where space/esc hotkeys would be blank
2019-03-31 20:44:04 -07:00
Jim
7e634ee389
Merge pull request #1798 from cg2121/mantis-1418
UI: Fix file browser showing up when dir selected
2019-03-31 20:32:00 -07:00
Jim
62e2c955de
Merge pull request #1794 from cg2121/fix-ctrl-c-crash-linux
UI: Fix crash when using ctrl-c in Linux terminal
2019-03-31 18:50:39 -07:00
Clayton Groeneveld
659b58c8f3 UI: Fix file browser showing up when dir selected
Fixes: https://obsproject.com/mantis/view.php?id=1418
2019-03-31 06:36:13 -05:00
Clayton Groeneveld
e321005b02 UI: Fix issue where space/esc hotkeys would be blank
This also modifies libobs.

This only happened on Linux.

Fixes https://obsproject.com/mantis/view.php?id=1018
2019-03-31 05:10:02 -05:00
Matt Gajownik
ef9af0ee08 UI: Hide border for Output Settings container 2019-03-31 17:37:44 +11:00
Matt Gajownik
21aa9d1020 UI: Hide border for General Settings container
This makes the screen consistent with Advanced and Audio
2019-03-31 17:37:43 +11:00
Matt Gajownik
31d3669154 UI: Refactor Audio Settings tab structure
- Now uses a QVBoxLayout with a QScrollArea for the container
- Uses QGroupBox for each section
- Moved Monitoring and ducking settings out of the Advanced tab
- Push-to hotkeys are no longer in a child scroll area
- Renamed device labels for consistency
2019-03-31 17:37:36 +11:00
Clayton Groeneveld
cc1f239420 UI: Fix crash when using ctrl-c in Linux terminal
This fixes a seg fault that would happen when launching OBS from the
terminal and then hitting ctrl-c.
2019-03-31 00:59:51 -05:00
Matt Gajownik
69bbbe342a UI: Allow smaller Restream docks 2019-03-30 20:28:22 +11:00
Shaolin
5d3c6428f7 UI: Fix Q_PROPERTY compiling warnings 2019-03-29 06:22:14 -03:00
jp9000
eb672d7725 UI: Fix act. feed version hide check to <= 23.0.2 2019-03-28 16:45:24 -07:00
jp9000
81354a9903 UI: Hide act. feed by default if prev ver below 23.1 2019-03-28 16:38:14 -07:00