New upstream version 18.0.1+dfsg1

This commit is contained in:
Sebastian Ramacher 2017-04-19 21:54:15 +02:00
parent 6efda2859e
commit f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions

View file

@ -608,6 +608,9 @@
<height>0</height>
</size>
</property>
<property name="accessibleName">
<string>Transition</string>
</property>
</widget>
</item>
<item>
@ -754,10 +757,16 @@
<property name="text">
<string>Basic.TransitionDuration</string>
</property>
<property name="buddy">
<cstring>transitionDuration</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="transitionDuration">
<property name="accessibleName">
<string>Basic.TransitionDuration</string>
</property>
<property name="suffix">
<string>ms</string>
</property>
@ -850,6 +859,8 @@
<string>Basic.MainMenu.Edit.Transform</string>
</property>
<addaction name="actionEditTransform"/>
<addaction name="actionCopyTransform"/>
<addaction name="actionPasteTransform"/>
<addaction name="actionResetTransform"/>
<addaction name="separator"/>
<addaction name="actionRotate90CW"/>
@ -873,8 +884,17 @@
<addaction name="actionMoveToTop"/>
<addaction name="actionMoveToBottom"/>
</widget>
<widget class="QMenu" name="scalingMenu">
<property name="title">
<string>Basic.MainMenu.Edit.Scale</string>
</property>
<addaction name="actionScaleWindow"/>
<addaction name="actionScaleCanvas"/>
<addaction name="actionScaleOutput"/>
</widget>
<addaction name="transformMenu"/>
<addaction name="orderMenu"/>
<addaction name="scalingMenu"/>
<addaction name="actionLockPreview"/>
<addaction name="separator"/>
<addaction name="actionAdvAudioProperties"/>
@ -887,6 +907,8 @@
<addaction name="actionDupProfile"/>
<addaction name="actionRenameProfile"/>
<addaction name="actionRemoveProfile"/>
<addaction name="actionImportProfile"/>
<addaction name="actionExportProfile"/>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="sceneCollectionMenu">
@ -897,6 +919,8 @@
<addaction name="actionDupSceneCollection"/>
<addaction name="actionRenameSceneCollection"/>
<addaction name="actionRemoveSceneCollection"/>
<addaction name="actionImportSceneCollection"/>
<addaction name="actionExportSceneCollection"/>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="viewMenu">
@ -1120,6 +1144,19 @@
<string>Basic.MainMenu.Edit.Transform.EditTransform</string>
</property>
</action>
<action name="actionCopyTransform">
<property name="text">
<string>Basic.MainMenu.Edit.Transform.CopyTransform</string>
</property>
</action>
<action name="actionPasteTransform">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Basic.MainMenu.Edit.Transform.PasteTransform</string>
</property>
</action>
<action name="actionRotate90CW">
<property name="text">
<string>Basic.MainMenu.Edit.Transform.Rotate90CW</string>
@ -1249,6 +1286,16 @@
<string>Remove</string>
</property>
</action>
<action name="actionImportSceneCollection">
<property name="text">
<string>Import</string>
</property>
</action>
<action name="actionExportSceneCollection">
<property name="text">
<string>Export</string>
</property>
</action>
<action name="actionNewProfile">
<property name="text">
<string>New</string>
@ -1269,6 +1316,16 @@
<string>Remove</string>
</property>
</action>
<action name="actionImportProfile">
<property name="text">
<string>Import</string>
</property>
</action>
<action name="actionExportProfile">
<property name="text">
<string>Export</string>
</property>
</action>
<action name="actionShowSettingsFolder">
<property name="text">
<string>Basic.MainMenu.File.ShowSettingsFolder</string>
@ -1328,6 +1385,30 @@
<string>Basic.MainMenu.Edit.LockPreview</string>
</property>
</action>
<action name="actionScaleWindow">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Basic.MainMenu.Edit.Scale.Window</string>
</property>
</action>
<action name="actionScaleCanvas">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Basic.MainMenu.Edit.Scale.Canvas</string>
</property>
</action>
<action name="actionScaleOutput">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Basic.MainMenu.Edit.Scale.Output</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

File diff suppressed because it is too large Load diff

View file

@ -493,6 +493,25 @@
</item>
<item row="9" column="1">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QSpinBox" name="cropLeft">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
</size>
</property>
<property name="maximum">
<number>100000</number>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QSpinBox" name="cropRight">
<property name="sizePolicy">
@ -602,25 +621,6 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="cropLeft">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
</size>
</property>
<property name="maximum">
<number>100000</number>
</property>
</widget>
</item>
<item row="0" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
@ -648,5 +648,12 @@
</layout>
</widget>
<resources/>
<connections/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>OBSBasicTransform</receiver>
<slot>reject()</slot>
</connection>
</connections>
</ui>

103
UI/forms/OBSUpdate.ui Normal file
View file

@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>OBSUpdate</class>
<widget class="QDialog" name="OBSUpdate">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>611</width>
<height>526</height>
</rect>
</property>
<property name="windowTitle">
<string>Updater.Title</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Updater.Text</string>
</property>
</widget>
</item>
<item>
<widget class="QTextEdit" name="text">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="yes">
<property name="text">
<string>Updater.UpdateNow</string>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="no">
<property name="text">
<string>Updater.RemindMeLater</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="skip">
<property name="text">
<string>Updater.Skip</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

BIN
UI/forms/images/obs.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

BIN
UI/forms/images/tray_active.png Normal file → Executable file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After