fixed #637
This commit is contained in:
@@ -20,16 +20,6 @@
|
|||||||
|
|
||||||
#include "newsequencedialog.h"
|
#include "newsequencedialog.h"
|
||||||
|
|
||||||
#include "panels/panels.h"
|
|
||||||
#include "panels/project.h"
|
|
||||||
#include "timeline/sequence.h"
|
|
||||||
#include "undo/undostack.h"
|
|
||||||
#include "undo/undo.h"
|
|
||||||
#include "timeline/clip.h"
|
|
||||||
#include "panels/timeline.h"
|
|
||||||
#include "project/media.h"
|
|
||||||
#include "rendering/audio.h"
|
|
||||||
|
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
#include <QComboBox>
|
#include <QComboBox>
|
||||||
@@ -40,6 +30,16 @@
|
|||||||
#include <QLineEdit>
|
#include <QLineEdit>
|
||||||
#include <QDialogButtonBox>
|
#include <QDialogButtonBox>
|
||||||
|
|
||||||
|
#include "panels/panels.h"
|
||||||
|
#include "panels/project.h"
|
||||||
|
#include "timeline/sequence.h"
|
||||||
|
#include "undo/undostack.h"
|
||||||
|
#include "undo/undo.h"
|
||||||
|
#include "timeline/clip.h"
|
||||||
|
#include "panels/timeline.h"
|
||||||
|
#include "project/media.h"
|
||||||
|
#include "rendering/audio.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <libavcodec/avcodec.h>
|
#include <libavcodec/avcodec.h>
|
||||||
}
|
}
|
||||||
|
|||||||
+19
-17
@@ -213,24 +213,26 @@ void TextEditDialog::SetAlignmentFromProperty()
|
|||||||
|
|
||||||
void TextEditDialog::UpdateUIFromTextCursor()
|
void TextEditDialog::UpdateUIFromTextCursor()
|
||||||
{
|
{
|
||||||
italic_button->setChecked(textEdit->fontItalic());
|
if (rich_text_) {
|
||||||
underline_button->setChecked(textEdit->fontUnderline());
|
italic_button->setChecked(textEdit->fontItalic());
|
||||||
font_list->setCurrentText(textEdit->fontFamily());
|
underline_button->setChecked(textEdit->fontUnderline());
|
||||||
font_size->SetValue(textEdit->fontPointSize());
|
font_list->setCurrentText(textEdit->fontFamily());
|
||||||
font_color->set_color(textEdit->textColor());
|
font_size->SetValue(textEdit->fontPointSize());
|
||||||
|
font_color->set_color(textEdit->textColor());
|
||||||
|
|
||||||
for (int i=0;i<font_weight->count();i++) {
|
for (int i=0;i<font_weight->count();i++) {
|
||||||
if (font_weight->itemData(i).toInt() == textEdit->fontWeight()) {
|
if (font_weight->itemData(i).toInt() == textEdit->fontWeight()) {
|
||||||
font_weight->blockSignals(true);
|
font_weight->blockSignals(true);
|
||||||
font_weight->setCurrentIndex(i);
|
font_weight->setCurrentIndex(i);
|
||||||
font_weight->blockSignals(false);
|
font_weight->blockSignals(false);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Qt::Alignment align = textEdit->alignment();
|
Qt::Alignment align = textEdit->alignment();
|
||||||
left_align_button->setChecked(align == Qt::AlignLeft);
|
left_align_button->setChecked(align == Qt::AlignLeft);
|
||||||
center_align_button->setChecked(align == Qt::AlignCenter);
|
center_align_button->setChecked(align == Qt::AlignCenter);
|
||||||
right_align_button->setChecked(align == Qt::AlignRight);
|
right_align_button->setChecked(align == Qt::AlignRight);
|
||||||
justify_align_button->setChecked(align == Qt::AlignJustify);
|
justify_align_button->setChecked(align == Qt::AlignJustify);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user