Commit f8964827 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Make title widget slightly smaller

parent 24e6c434
......@@ -78,6 +78,8 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
setFont(KGlobalSettings::toolBarFont());
frame_properties->setEnabled(false);
frame_properties->setFixedHeight(frame_toolbar->height());
int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
QSize iconSize(size, size);
#if KDE_IS_VERSION(4,5,0)
rectBColor->setAlphaChannelEnabled(true);
......@@ -262,6 +264,15 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
font_weight_box->setCurrentIndex(1);
font_weight_box->blockSignals(false);
buttonFitZoom->setIconSize(iconSize);
buttonRealSize->setIconSize(iconSize);
buttonItalic->setIconSize(iconSize);
buttonUnder->setIconSize(iconSize);
buttonAlignCenter->setIconSize(iconSize);
buttonAlignLeft->setIconSize(iconSize);
buttonAlignRight->setIconSize(iconSize);
buttonAlignNone->setIconSize(iconSize);
buttonFitZoom->setIcon(KIcon("zoom-fit-best"));
buttonRealSize->setIcon(KIcon("zoom-original"));
buttonItalic->setIcon(KIcon("format-text-italic"));
......@@ -338,6 +349,10 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
buttonUnselectAll->setDefaultAction(m_unselectAll);
buttonUnselectAll->setEnabled(false);
zDown->setIconSize(iconSize);
zTop->setIconSize(iconSize);
zBottom->setIconSize(iconSize);
zDown->setIcon(KIcon("kdenlive-zindex-down"));
zTop->setIcon(KIcon("kdenlive-zindex-top"));
zBottom->setIcon(KIcon("kdenlive-zindex-bottom"));
......@@ -360,6 +375,13 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
buttonSelectImages->setToolTip(getTooltipWithShortcut(i18n("Select image items in current selection"), m_selectImages));
buttonUnselectAll->setToolTip(getTooltipWithShortcut(i18n("Unselect all"), m_unselectAll));
itemhcenter->setIconSize(iconSize);
itemvcenter->setIconSize(iconSize);
itemtop->setIconSize(iconSize);
itembottom->setIconSize(iconSize);
itemright->setIconSize(iconSize);
itemleft->setIconSize(iconSize);
itemhcenter->setIcon(KIcon("kdenlive-align-hor"));
itemhcenter->setToolTip(i18n("Align item horizontally"));
itemvcenter->setIcon(KIcon("kdenlive-align-vert"));
......@@ -378,8 +400,7 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
frame_toolbar->setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0);
QToolBar *m_toolbar = new QToolBar("titleToolBar", this);
int s = style()->pixelMetric(QStyle::PM_SmallIconSize);
m_toolbar->setIconSize(QSize(s, s));
m_toolbar->setIconSize(iconSize);
m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), QString());
m_buttonCursor->setCheckable(true);
......
......@@ -6,16 +6,10 @@
<rect>
<x>0</x>
<y>0</y>
<width>640</width>
<height>480</height>
<width>1057</width>
<height>589</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Title Clip</string>
</property>
......@@ -546,106 +540,192 @@
</widget>
</widget>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="buttonFitZoom">
<property name="text">
<string>V</string>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="buttonRealSize">
<property name="text">
<string>V</string>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="zoom_slider">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>150</number>
</property>
<property name="pageStep">
<number>30</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="zoom_label">
<property name="text">
<string>x1</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="displayBg">
<property name="text">
<string>Show background</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_22">
<property name="text">
<string>Template:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="templateBox"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<widget class="QSplitter" name="splitter">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="verticalLayoutWidget">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGraphicsView" name="graphicsView">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<layout class="QGridLayout" name="gridLayout_16">
<property name="horizontalSpacing">
<number>-1</number>
</property>
<item row="2" column="0">
<widget class="QToolButton" name="buttonSelectImages">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>I</string>
</property>
</widget>
</item>
<item>
<widget class="QStackedWidget" name="bottomToolbarStack">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="2" column="1">
<widget class="QToolButton" name="buttonSelectText">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>T</string>
</property>
<widget class="QWidget" name="page_5">
<layout class="QGridLayout" name="bottomToolbarGridLayout">
<item row="0" column="0">
<widget class="QToolButton" name="buttonSelectAll">
<property name="whatsThis">
<string>Selects all items on the canvas.</string>
</property>
<property name="text">
<string>A</string>
</property>
</widget>
</item>
<item row="0" column="5">
<spacer name="spacerBottomStack">
<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 row="0" column="2">
<widget class="QToolButton" name="buttonSelectText">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>T</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QToolButton" name="buttonSelectImages">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>I</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QToolButton" name="buttonSelectRects">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>R</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QToolButton" name="buttonUnselectAll">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>N</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="2" column="2">
<widget class="QToolButton" name="buttonUnselectAll">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>N</string>
</property>
</widget>
</item>
<item row="2" column="5">
<spacer name="spacerBottomStack">
<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 row="2" column="3">
<widget class="QToolButton" name="buttonSelectAll">
<property name="whatsThis">
<string>Selects all items on the canvas.</string>
</property>
<property name="text">
<string>A</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QToolButton" name="buttonSelectRects">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>R</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="6">
<widget class="QGraphicsView" name="graphicsView"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
......@@ -922,6 +1002,13 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="typewriter_start">
<property name="suffix">
<string> frames</string>
</property>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
......@@ -935,13 +1022,6 @@
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="typewriter_start">
<property name="suffix">
<string> frames</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
......@@ -949,10 +1029,19 @@
</layout>
</widget>
</item>
<item row="3" column="1">
<widget class="KoSliderCombo" name="itemrotatex"/>
</item>
<item row="4" column="1">
<widget class="KoSliderCombo" name="itemrotatey"/>
</item>
<item row="5" column="1">
<widget class="KoSliderCombo" name="itemrotatez"/>
</item>
<item row="8" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -1102,129 +1191,10 @@
</widget>
</widget>
</item>
<item row="3" column="1">
<widget class="KoSliderCombo" name="itemrotatex"/>
</item>
<item row="4" column="1">
<widget class="KoSliderCombo" name="itemrotatey"/>
</item>
<item row="5" column="1">
<widget class="KoSliderCombo" name="itemrotatez"/>
</item>
</layout>
</widget>
</widget>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="buttonFitZoom">
<property name="text">
<string>V</string>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="buttonRealSize">
<property name="text">
<string>V</string>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_8">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="zoom_slider">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>150</number>
</property>
<property name="pageStep">
<number>30</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="zoom_label">
<property name="text">
<string>x1</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="displayBg">
<property name="text">
<string>Show background</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_22">
<property name="text">
<string>Template:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="templateBox"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</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