Commit c5b79ee8 authored by Julius Künzel's avatar Julius Künzel 💬
Browse files

Fix merge messup

parent 8b6baeb8
Pipeline #240149 passed with stage
in 16 minutes and 2 seconds
......@@ -2,10 +2,35 @@
<ui version="4.0">
<class>ConfigProject_UI</class>
<widget class="QWidget" name="ConfigProject_UI">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>507</width>
<height>383</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="leftMargin">
<number>0</number>
</property>
<item row="1" column="0" colspan="2">
<widget class="KMessageWidget" name="kmessagewidget">
<property name="text">
<string>These are the the default settings for new projects. To edit the parameters of the current project, use the project settings.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="closeButtonVisible">
<bool>false</bool>
</property>
<property name="icon">
<iconset theme="help-hint">
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_project_folder">
<property name="text">
......@@ -30,6 +55,38 @@
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QRadioButton" name="kcfg_customprojectfolder">
<property name="text">
<string>Custom project folder:</string>
</property>
</widget>
</item>
<item>
<widget class="KUrlRequester" name="projecturl">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QGroupBox" name="profile_box">
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_video_tracks">
<property name="text">
......@@ -76,64 +133,6 @@
</item>
</widget>
</item>
<item row="21" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QRadioButton" name="kcfg_customprojectfolder">
<property name="text">
<string>Custom project folder:</string>
</property>
</widget>
</item>
<item>
<widget class="KUrlRequester" name="projecturl">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="6" column="0" colspan="2">
<widget class="QGroupBox" name="profile_box">
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="minimumSize">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_preview_profile">
<property name="sizePolicy">
......@@ -150,23 +149,7 @@
<item row="11" column="1">
<layout class="QHBoxLayout" name="preview_profile_box"/>
</item>
<item row="1" column="0" colspan="2">
<widget class="KMessageWidget" name="kmessagewidget">
<property name="text">
<string>These are the the default settings for new projects. To edit the parameters of the current project, use the project settings.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="closeButtonVisible">
<bool>false</bool>
</property>
<property name="icon">
<iconset theme="help-hint"/>
</property>
</widget>
</item>
<item row="7" column="0">
<item row="12" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -179,10 +162,10 @@
</property>
</spacer>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Audio tracks</string>
<item row="7" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
......
......@@ -80,6 +80,22 @@
<item row="5" column="0" colspan="2">
<widget class="KSeparator" name="kseparator_3"/>
</item>
<item row="6" column="0" colspan="2">
<widget class="QGroupBox" name="profile_box">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="KSeparator" name="kseparator"/>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_video_tracks">
<property name="text">
......@@ -162,86 +178,12 @@
</sizepolicy>
</property>
<property name="text">
<string>Preview profile:</string>
<string>Timeline Preview:</string>
</property>
</widget>
</item>
<item row="21" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="KComboBox" name="preview_profile">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="preview_showprofileinfo">
<property name="text">
<string>...</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="preview_manageprofile">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="22" column="1">
<widget class="QPlainTextEdit" name="previewparams">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="KSeparator" name="kseparator"/>
</item>
<item row="6" column="0" colspan="2">
<widget class="QGroupBox" name="profile_box">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0" colspan="4">
<layout class="QHBoxLayout" name="preview_profile_box">
<item>
<widget class="QLabel" name="label_26">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Timeline Preview</string>
</property>
</widget>
</item>
</layout>
<layout class="QHBoxLayout" name="preview_profile_box"/>
</item>
</layout>
</widget>
......@@ -792,19 +734,6 @@
</customwidgets>
<tabstops>
<tabstop>project_folder</tabstop>
<<<<<<< HEAD
<tabstop>preview_profile</tabstop>
<tabstop>preview_showprofileinfo</tabstop>
<tabstop>preview_manageprofile</tabstop>
=======
<tabstop>same_folder</tabstop>
<tabstop>video_tracks</tabstop>
<tabstop>audio_tracks</tabstop>
<tabstop>audio_channels</tabstop>
<tabstop>video_thumbs</tabstop>
<tabstop>audio_thumbs</tabstop>
<tabstop>enable_proxy</tabstop>
>>>>>>> refs/remotes/upstream/master
<tabstop>generate_proxy</tabstop>
<tabstop>metadata_list</tabstop>
<tabstop>add_metadata</tabstop>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment