Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
888177ad
Commit
888177ad
authored
Mar 16, 2021
by
Julius Künzel
Browse files
Cleanup and improvements for titlewidget code
Related to
#412
parent
4b767561
Pipeline
#54597
passed with stage
in 10 minutes and 33 seconds
Changes
2
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
src/titler/titlewidget.cpp
View file @
888177ad
...
...
@@ -289,19 +289,7 @@ TitleWidget::TitleWidget(const QUrl &url, const Timecode &tc, QString projectTit
buttonAlignCenter
->
setIconSize
(
iconSize
);
buttonAlignLeft
->
setIconSize
(
iconSize
);
buttonAlignRight
->
setIconSize
(
iconSize
);
buttonFitZoom
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"zoom-fit-best"
)));
buttonRealSize
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"zoom-original"
)));
buttonItalic
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"format-text-italic"
)));
buttonUnder
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"format-text-underline"
)));
buttonAlignCenter
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"format-justify-center"
)));
buttonAlignLeft
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"format-justify-left"
)));
buttonAlignRight
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"format-justify-right"
)));
edit_gradient
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"document-edit"
)));
edit_rect_gradient
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"document-edit"
)));
buttonAlignRight
->
setToolTip
(
i18n
(
"Align right"
));
buttonAlignLeft
->
setToolTip
(
i18n
(
"Align left"
));
buttonAlignCenter
->
setToolTip
(
i18n
(
"Align center"
));
if
(
qApp
->
isLeftToRight
())
{
buttonAlignRight
->
setChecked
(
true
);
}
else
{
...
...
@@ -370,16 +358,6 @@ TitleWidget::TitleWidget(const QUrl &url, const Timecode &tc, QString projectTit
buttonUnselectAll
->
setDefaultAction
(
m_unselectAll
);
buttonUnselectAll
->
setEnabled
(
false
);
zDown
->
setIconSize
(
iconSize
);
zTop
->
setIconSize
(
iconSize
);
zBottom
->
setIconSize
(
iconSize
);
zDown
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-zindex-down"
)));
zTop
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-zindex-top"
)));
zBottom
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-zindex-bottom"
)));
connect
(
zDown
,
&
QAbstractButton
::
clicked
,
this
,
&
TitleWidget
::
slotZIndexDown
);
connect
(
zTop
,
&
QAbstractButton
::
clicked
,
this
,
&
TitleWidget
::
slotZIndexTop
);
connect
(
zBottom
,
&
QAbstractButton
::
clicked
,
this
,
&
TitleWidget
::
slotZIndexBottom
);
origin_x_left
->
setToolTip
(
i18n
(
"Invert x axis and change 0 point"
));
origin_y_top
->
setToolTip
(
i18n
(
"Invert y axis and change 0 point"
));
rectBColor
->
setToolTip
(
i18n
(
"Select fill color"
));
...
...
@@ -402,19 +380,6 @@ TitleWidget::TitleWidget(const QUrl &url, const Timecode &tc, QString projectTit
itemright
->
setIconSize
(
iconSize
);
itemleft
->
setIconSize
(
iconSize
);
itemhcenter
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-align-hor"
)));
itemhcenter
->
setToolTip
(
i18n
(
"Align item horizontally"
));
itemvcenter
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-align-vert"
)));
itemvcenter
->
setToolTip
(
i18n
(
"Align item vertically"
));
itemtop
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-align-top"
)));
itemtop
->
setToolTip
(
i18n
(
"Align item to top"
));
itembottom
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-align-bottom"
)));
itembottom
->
setToolTip
(
i18n
(
"Align item to bottom"
));
itemright
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-align-right"
)));
itemright
->
setToolTip
(
i18n
(
"Align item to right"
));
itemleft
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-align-left"
)));
itemleft
->
setToolTip
(
i18n
(
"Align item to left"
));
auto
*
layout
=
new
QHBoxLayout
;
frame_toolbar
->
setLayout
(
layout
);
layout
->
setContentsMargins
(
0
,
0
,
0
,
0
);
...
...
@@ -629,17 +594,6 @@ TitleWidget::TitleWidget(const QUrl &url, const Timecode &tc, QString projectTit
btn_remove
->
setEnabled
(
cur
!=
prev
&&
cur
.
isValid
());
});
btn_add
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"list-add"
)));
btn_remove
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"list-remove"
)));
btn_removeAll
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-delete"
)));
btn_add
->
setToolTip
(
i18n
(
"Add pattern"
));
btn_remove
->
setToolTip
(
i18n
(
"Delete pattern"
));
btn_removeAll
->
setToolTip
(
i18n
(
"Delete all patterns"
));
btn_add
->
setEnabled
(
false
);
btn_remove
->
setEnabled
(
false
);
readPatterns
();
// templateBox->setIconSize(QSize(60,60));
...
...
src/ui/titlewidget_ui.ui
View file @
888177ad
This diff is collapsed.
Click to expand it.
Julius Künzel
@jlskuz
mentioned in commit
777e0389
·
Mar 16, 2021
mentioned in commit
777e0389
mentioned in commit 777e038932c1c9897e4e955e7a14e4427f74b2f1
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment