added naming for media and sequence viewer

This commit is contained in:
itsmattkc
2019-01-18 00:32:57 +11:00
parent 016a94f656
commit 5776387eb0
5 changed files with 31 additions and 988 deletions
+10 -7
View File
@@ -12,6 +12,7 @@
#include "debug.h"
#include <QScrollBar>
#include <QCoreApplication>
Project* panel_project = 0;
EffectControls* panel_effect_controls = 0;
@@ -125,9 +126,9 @@ QDockWidget *get_focused_panel() {
w = panel_footage_viewer;
} else if (panel_timeline->underMouse()) {
w = panel_timeline;
} else if (panel_graph_editor->view_is_under_mouse()) {
w = panel_graph_editor;
}
} else if (panel_graph_editor->view_is_under_mouse()) {
w = panel_graph_editor;
}
}
if (w == nullptr) {
if (panel_project->is_focused()) {
@@ -140,9 +141,9 @@ QDockWidget *get_focused_panel() {
w = panel_footage_viewer;
} else if (panel_timeline->focused()) {
w = panel_timeline;
} else if (panel_graph_editor->view_is_focused()) {
w = panel_graph_editor;
}
} else if (panel_graph_editor->view_is_focused()) {
w = panel_graph_editor;
}
}
return w;
}
@@ -151,12 +152,14 @@ void alloc_panels(QWidget* parent) {
// TODO maybe replace these with non-pointers later on?
panel_sequence_viewer = new Viewer(parent);
panel_sequence_viewer->setObjectName("seq_viewer");
panel_sequence_viewer->set_panel_name(QCoreApplication::translate("Viewer", "Sequence Viewer"));
panel_footage_viewer = new Viewer(parent);
panel_footage_viewer->setObjectName("footage_viewer");
panel_footage_viewer->set_panel_name(QCoreApplication::translate("Viewer", "Media Viewer"));
panel_project = new Project(parent);
panel_project->setObjectName("proj_root");
panel_effect_controls = new EffectControls(parent);
init_effects();
init_effects();
panel_effect_controls->setObjectName("fx_controls");
panel_timeline = new Timeline(parent);
panel_timeline->setObjectName("timeline");
+18 -7
View File
@@ -43,9 +43,8 @@ Viewer::Viewer(QWidget *parent) :
media(nullptr),
seq(nullptr),
created_sequence(false),
cue_recording_internal(false),
panel_name(tr("Viewer: ")),
minimum_zoom(1.0)
minimum_zoom(1.0),
cue_recording_internal(false)
{
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
@@ -488,6 +487,21 @@ void Viewer::set_zoom(bool in) {
}
}
void Viewer::set_panel_name(const QString &n) {
panel_name = n;
update_window_title();
}
void Viewer::update_window_title() {
QString name;
if (seq == nullptr) {
name = tr("(none)");
} else {
name = seq->name;
}
setWindowTitle(QString("%1: %2").arg(panel_name, name));
}
void Viewer::set_zoom_value(double d) {
headers->update_zoom(d);
if (viewer_widget->waveform) {
@@ -781,14 +795,11 @@ void Viewer::set_sequence(bool main, Sequence *s) {
update_end_timecode();
viewer_container->adjust();
setWindowTitle(panel_name + seq->name);
} else {
update_playhead_timecode(0);
update_end_timecode();
setWindowTitle(panel_name + tr("(none)"));
}
update_window_title();
update_header_zoom();
+2
View File
@@ -45,6 +45,7 @@ public:
void set_in_point();
void set_out_point();
void set_zoom(bool in);
void set_panel_name(const QString& n);
// playback functions
void seek(long p);
@@ -91,6 +92,7 @@ private slots:
void resize_move(double d);
private:
void update_window_title();
void clean_created_seq();
void set_sequence(bool main, Sequence* s);
bool main_sequence;