Commit cd7f737d authored by Simon Eugster's avatar Simon Eugster
Browse files

331 fixed: Naming of tracks now Audio 1, Video 1, etc....

331 fixed: Naming of tracks now Audio 1, Video 1, etc. http://www.kdenlive.org/mantis/view.php?id=331
Titler widget: vertical lines added to keep different elements separated
Comments inserted
Warning message adjusted

svn path=/trunk/kdenlive/; revision=4479
parent 5456223c
This diff is collapsed.
......@@ -139,6 +139,7 @@ private:
QString searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const;
void moveProjectData(KUrl url);
bool checkDocumentClips(QDomNodeList infoproducers);
/** Creates a new project */
QDomDocument createEmptyDocument(int videotracks, int audiotracks);
QDomDocument createEmptyDocument(QList <TrackInfo> tracks);
......
This diff is collapsed.
......@@ -100,7 +100,7 @@ public:
/** @brief Returns clip out position. */
int outPoint() const;
/** @brief Loads title templates. */
/** @brief Retrieves a list of all available title templates. */
static void refreshTitleTemplates();
protected:
......@@ -216,7 +216,7 @@ public slots:
void slotNewRect(QGraphicsRectItem *rect);
void slotChangeBackground();
/** @brief Sets up the tools according to the selected item. */
/** @brief Sets up the tools (toolbars etc.) according to the selected item. */
void selectionChanged();
void rectChanged();
void setupViewports();
......@@ -282,6 +282,7 @@ private slots:
void slotAdjustZoom();
void slotZoomOneToOne();
/** Called whenever text properties change (font e.g.) */
void slotUpdateText();
void slotInsertUnicode();
void slotInsertUnicodeString(QString);
......@@ -332,6 +333,7 @@ private slots:
void slotZIndexDown();
void slotZIndexTop();
void slotZIndexBottom();
/** Called when the user wants to apply a different template to the title */
void templateIndexChanged(int);
};
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>986</width>
<height>621</height>
<width>1100</width>
<height>679</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -20,7 +20,7 @@
<string>Title Clip</string>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0" colspan="5">
<item row="0" column="0" colspan="7">
<widget class="QFrame" name="frame_toolbar">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
......@@ -36,7 +36,7 @@
</property>
</widget>
</item>
<item row="0" column="5" colspan="6">
<item row="0" column="7" colspan="7">
<widget class="QFrame" name="frame_properties">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
......@@ -195,7 +195,7 @@
</layout>
</widget>
</item>
<item row="2" column="0" colspan="10">
<item row="2" column="0" colspan="13">
<widget class="QSplitter" name="splitter">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
......@@ -695,7 +695,7 @@
</property>
</widget>
</item>
<item row="3" column="2">
<item row="3" column="3">
<widget class="QSlider" name="zoom_slider">
<property name="minimumSize">
<size>
......@@ -723,21 +723,21 @@
</property>
</widget>
</item>
<item row="3" column="3">
<item row="3" column="4">
<widget class="QLabel" name="zoom_label">
<property name="text">
<string>x1</string>
</property>
</widget>
</item>
<item row="3" column="4" colspan="2">
<item row="3" column="6" colspan="2">
<widget class="QCheckBox" name="displayBg">
<property name="text">
<string>Show background</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="11">
<item row="1" column="0" colspan="14">
<widget class="QStackedWidget" name="toolbar_stack">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
......@@ -1085,7 +1085,7 @@
</widget>
</widget>
</item>
<item row="3" column="8">
<item row="3" column="11">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -1095,16 +1095,37 @@
</property>
</widget>
</item>
<item row="3" column="7">
<item row="3" column="10">
<widget class="QComboBox" name="templateBox"/>
</item>
<item row="3" column="6">
<item row="3" column="9">
<widget class="QLabel" name="label_22">
<property name="text">
<string>Template:</string>
</property>
</widget>
</item>
<item row="3" column="8">
<widget class="Line" name="line_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="3" column="5">
<widget class="Line" name="line_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="Line" name="line_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
......
Markdown is supported
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