Skip to content

Commit

Permalink
UI: Reorganize Preview/Source context menu
Browse files Browse the repository at this point in the history
  • Loading branch information
Warchamp7 committed Nov 6, 2024
1 parent 24ea557 commit 64ff8e5
Show file tree
Hide file tree
Showing 5 changed files with 150 additions and 131 deletions.
30 changes: 15 additions & 15 deletions UI/data/locale/en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ Browse="Browse"
Mono="Mono"
Stereo="Stereo"
DroppedFrames="Dropped Frames %1 (%2%)"
StudioProgramProjector="Fullscreen Projector (Program)"
PreviewProjector="Fullscreen Projector (Preview)"
SceneProjector="Fullscreen Projector (Scene)"
SourceProjector="Fullscreen Projector (Source)"
StudioProgramWindow="Windowed Projector (Program)"
PreviewWindow="Windowed Projector (Preview)"
SceneWindow="Windowed Projector (Scene)"
SourceWindow="Windowed Projector (Source)"
MultiviewProjector="Multiview (Fullscreen)"
MultiviewWindowed="Multiview (Windowed)"
ResizeProjectorWindowToContent="Fit window to content"
Projector.Open.Program="Open Program Projector"
Projector.Open.Preview="Open Preview Projector"
Projector.Open.Scene="Open Scene Projector"
Projector.Open.Source="Open Source Projector"
Projector.Open.Multiview="Open Multiview"
Projector.Display="Display: %1"
Projector.Window="New window"
Projector.Title="Projector"
Projector.Title.Scene="Scene: %1"
Projector.Title.Source="Source: %1"
Projector.ResizeWindowToContent="Fit window to content"
Clear="Clear"
Revert="Revert"
Show="Show"
Expand Down Expand Up @@ -1130,10 +1130,10 @@ Basic.Settings.Output.SplitFile.Size="Split Size"
# Screenshot
Screenshot="Screenshot Output"
Screenshot.SourceHotkey="Screenshot Selected Source"
Screenshot.StudioProgram="Screenshot (Program)"
Screenshot.Preview="Screenshot (Preview)"
Screenshot.Scene="Screenshot (Scene)"
Screenshot.Source="Screenshot (Source)"
Screenshot.StudioProgram="Save Program Screenshot"
Screenshot.Preview="Save Preview Screenshot"
Screenshot.Scene="Save Scene Screenshot"
Screenshot.Source="Save Source Screenshot"

# basic mode 'output' settings - advanced section - recording subsection - completer
FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z\n%FPS\n%CRES\n%ORES\n%VF"
Expand Down
8 changes: 1 addition & 7 deletions UI/forms/OBSBasic.ui
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@
</widget>
<widget class="QMenu" name="multiviewProjectorMenu">
<property name="title">
<string>MultiviewProjector</string>
<string>Projector.Open.Multiview</string>
</property>
</widget>
<action name="resetUI">
Expand Down Expand Up @@ -815,7 +815,6 @@
<addaction name="stats"/>
<addaction name="separator"/>
<addaction name="multiviewProjectorMenu"/>
<addaction name="multiviewProjectorWindowed"/>
<addaction name="separator"/>
<addaction name="actionAlwaysOnTop"/>
</widget>
Expand Down Expand Up @@ -2047,11 +2046,6 @@
<string>Basic.Stats</string>
</property>
</action>
<action name="multiviewProjectorWindowed">
<property name="text">
<string>MultiviewWindowed</string>
</property>
</action>
<action name="resetDocks">
<property name="text">
<string>Basic.MainMenu.Docks.ResetDocks</string>
Expand Down
Loading

0 comments on commit 64ff8e5

Please sign in to comment.