several improvements
This commit is contained in:
@@ -59,11 +59,7 @@ bool EffectControls::keyframe_focus() {
|
||||
}
|
||||
|
||||
void EffectControls::set_zoom(bool in) {
|
||||
if (in) {
|
||||
zoom *= 2;
|
||||
} else {
|
||||
zoom *= 0.5;
|
||||
}
|
||||
zoom *= (in) ? 2 : 0.5;
|
||||
update_keyframes();
|
||||
}
|
||||
|
||||
@@ -94,7 +90,7 @@ void EffectControls::menu_select(QAction* q) {
|
||||
}
|
||||
|
||||
void EffectControls::update_keyframes() {
|
||||
if (ui->headers->isVisible()) ui->headers->update_zoom(zoom);
|
||||
ui->headers->update_zoom(zoom);
|
||||
ui->keyframeView->update();
|
||||
}
|
||||
|
||||
|
||||
@@ -3,4 +3,5 @@
|
||||
Project* panel_project = 0;
|
||||
EffectControls* panel_effect_controls = 0;
|
||||
Viewer* panel_sequence_viewer = 0;
|
||||
Viewer* panel_footage_viewer = 0;
|
||||
Timeline* panel_timeline = 0;
|
||||
|
||||
@@ -9,6 +9,7 @@ class Timeline;
|
||||
extern Project* panel_project;
|
||||
extern EffectControls* panel_effect_controls;
|
||||
extern Viewer* panel_sequence_viewer;
|
||||
extern Viewer* panel_footage_viewer;
|
||||
extern Timeline* panel_timeline;
|
||||
|
||||
#endif // PANELS_H
|
||||
|
||||
+8
-2
@@ -165,9 +165,13 @@ void Project::open_properties() {
|
||||
default:
|
||||
{
|
||||
// fall back to renaming
|
||||
QString new_name = QInputDialog::getText(this, "Rename '" + item->text(0) + "'", "Enter new name:");
|
||||
QString new_name = QInputDialog::getText(this, "Rename '" + item->text(0) + "'", "Enter new name:", QLineEdit::Normal, item->text(0));
|
||||
if (!new_name.isEmpty()) {
|
||||
item->setText(0, new_name);
|
||||
MediaRename* mr = new MediaRename();
|
||||
mr->from = item->text(0);
|
||||
mr->item = item;
|
||||
mr->to = new_name;
|
||||
undo_stack.push(mr);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -220,6 +224,7 @@ QTreeWidgetItem* Project::new_folder(QString name) {
|
||||
QTreeWidgetItem* item = new_item();
|
||||
item->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
|
||||
item->setText(0, (name.isEmpty()) ? "New Folder" : name);
|
||||
item->setIcon(0, QIcon(":/icons/folder.png"));
|
||||
set_item_to_folder(item);
|
||||
return item;
|
||||
}
|
||||
@@ -576,6 +581,7 @@ void set_sequence_of_tree(QTreeWidgetItem* item, Sequence* s) {
|
||||
+ "\nFrame Rate: " + QString::number(s->frame_rate)
|
||||
+ "\nAudio Frequency: " + QString::number(s->audio_frequency)
|
||||
+ "\nAudio Layout: " + get_channel_layout_name(av_get_channel_layout_nb_channels(s->audio_layout), s->audio_layout));
|
||||
item->setIcon(0, QIcon(":/icons/sequence.png"));
|
||||
}
|
||||
|
||||
int get_type_from_tree(QTreeWidgetItem* item) {
|
||||
|
||||
+10
-1
@@ -307,7 +307,9 @@ void Timeline::repaint_timeline(bool changed) {
|
||||
panel_effect_controls->update_keyframes();
|
||||
|
||||
if (sequence != NULL) {
|
||||
panel_timeline->ui->horizontalScrollBar->setMaximum(qMax(0, getScreenPointFromFrame(panel_timeline->zoom, sequence->getEndFrame()) + 100 - ui->editAreas->width()));
|
||||
long sequenceEndFrame = sequence->getEndFrame();
|
||||
|
||||
panel_timeline->ui->horizontalScrollBar->setMaximum(qMax(0, getScreenPointFromFrame(panel_timeline->zoom, sequenceEndFrame) + 100 - ui->editAreas->width()));
|
||||
|
||||
if (last_frame != sequence->playhead) {
|
||||
panel_sequence_viewer->viewer_widget->update();
|
||||
@@ -324,6 +326,13 @@ void Timeline::repaint_timeline(bool changed) {
|
||||
}
|
||||
|
||||
panel_sequence_viewer->update_playhead_timecode(sequence->playhead);
|
||||
|
||||
|
||||
if (sequenceEndFrame > 0) {
|
||||
panel_sequence_viewer->ui->headers->update_zoom((double) panel_sequence_viewer->ui->headers->width() / (double) sequenceEndFrame);
|
||||
} else {
|
||||
panel_sequence_viewer->ui->headers->update_zoom(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-5
@@ -22,6 +22,7 @@ Viewer::Viewer(QWidget *parent) :
|
||||
ui(new Ui::Viewer)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->headers->show_text(false);
|
||||
ui->glViewerPane->child = ui->openGLWidget;
|
||||
viewer_widget = ui->openGLWidget;
|
||||
update_media(MEDIA_TYPE_SEQUENCE, NULL);
|
||||
@@ -111,11 +112,7 @@ void Viewer::update_playhead_timecode(long p) {
|
||||
}
|
||||
|
||||
void Viewer::update_end_timecode() {
|
||||
if (sequence == NULL) {
|
||||
ui->endTimecode->setText(frame_to_timecode(0, config.timecode_view, 30));
|
||||
} else {
|
||||
ui->endTimecode->setText(frame_to_timecode(sequence->getEndFrame(), config.timecode_view, sequence->frame_rate));
|
||||
}
|
||||
ui->endTimecode->setText((sequence == NULL) ? frame_to_timecode(0, config.timecode_view, 30) : frame_to_timecode(sequence->getEndFrame(), config.timecode_view, sequence->frame_rate));
|
||||
}
|
||||
|
||||
void Viewer::update_media(int type, void* media) {
|
||||
|
||||
@@ -38,6 +38,9 @@
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="ViewerContainer" name="glViewerPane" native="true">
|
||||
<property name="sizePolicy">
|
||||
@@ -58,6 +61,9 @@
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="TimelineHeader" name="headers" native="true"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QWidget" name="playbackControls" native="true">
|
||||
<property name="sizePolicy">
|
||||
@@ -233,6 +239,12 @@
|
||||
<extends>QLabel</extends>
|
||||
<header>ui/labelslider.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>TimelineHeader</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>ui/timelineheader.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="../icons/icons.qrc"/>
|
||||
|
||||
Reference in New Issue
Block a user