diff --git a/panels/grapheditor.cpp b/panels/grapheditor.cpp index cb4bda3c2..370576465 100644 --- a/panels/grapheditor.cpp +++ b/panels/grapheditor.cpp @@ -24,46 +24,42 @@ GraphEditor::GraphEditor(QWidget* parent) : QDockWidget(parent), row(nullptr) { resize(720, 480); QWidget* main_widget = new QWidget(this); - setWidget(main_widget); QVBoxLayout* layout = new QVBoxLayout(main_widget); + setWidget(main_widget); - QWidget* tool_widget = new QWidget(this); + QWidget* tool_widget = new QWidget(); tool_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); - QHBoxLayout* tools = new QHBoxLayout(this); - tool_widget->setLayout(tools); + QHBoxLayout* tools = new QHBoxLayout(tool_widget); - QWidget* left_tool_widget = new QWidget(this); - QHBoxLayout* left_tool_layout = new QHBoxLayout(this); + QWidget* left_tool_widget = new QWidget(); + QHBoxLayout* left_tool_layout = new QHBoxLayout(left_tool_widget); left_tool_layout->setSpacing(0); left_tool_layout->setMargin(0); - left_tool_widget->setLayout(left_tool_layout); tools->addWidget(left_tool_widget); - QWidget* center_tool_widget = new QWidget(this); - QHBoxLayout* center_tool_layout = new QHBoxLayout(this); + QWidget* center_tool_widget = new QWidget(); + QHBoxLayout* center_tool_layout = new QHBoxLayout(center_tool_widget); center_tool_layout->setSpacing(0); center_tool_layout->setMargin(0); - center_tool_widget->setLayout(center_tool_layout); tools->addWidget(center_tool_widget); - QWidget* right_tool_widget = new QWidget(this); - QHBoxLayout* right_tool_layout = new QHBoxLayout(this); + QWidget* right_tool_widget = new QWidget(); + QHBoxLayout* right_tool_layout = new QHBoxLayout(right_tool_widget); right_tool_layout->setSpacing(0); right_tool_layout->setMargin(0); - right_tool_widget->setLayout(right_tool_layout); tools->addWidget(right_tool_widget); - keyframe_nav = new KeyframeNavigator(this, false); + keyframe_nav = new KeyframeNavigator(nullptr, false); keyframe_nav->enable_keyframes(true); keyframe_nav->enable_keyframe_toggle(false); left_tool_layout->addWidget(keyframe_nav); left_tool_layout->addStretch(); - linear_button = new QPushButton(tr("Linear"), this); + linear_button = new QPushButton(tr("Linear")); linear_button->setProperty("type", EFFECT_KEYFRAME_LINEAR); linear_button->setCheckable(true); - bezier_button = new QPushButton(tr("Bezier"), this); + bezier_button = new QPushButton(tr("Bezier")); bezier_button->setProperty("type", EFFECT_KEYFRAME_BEZIER); bezier_button->setCheckable(true); - hold_button = new QPushButton(tr("Hold"), this); + hold_button = new QPushButton(tr("Hold")); hold_button->setProperty("type", EFFECT_KEYFRAME_HOLD); hold_button->setCheckable(true); @@ -74,36 +70,33 @@ GraphEditor::GraphEditor(QWidget* parent) : QDockWidget(parent), row(nullptr) { layout->addWidget(tool_widget); - QWidget* central_widget = new QWidget(this); - QVBoxLayout* central_layout = new QVBoxLayout(this); - central_widget->setLayout(central_layout); + QWidget* central_widget = new QWidget(); + QVBoxLayout* central_layout = new QVBoxLayout(central_widget); central_layout->setSpacing(0); central_layout->setMargin(0); - header = new TimelineHeader(this); + header = new TimelineHeader(); header->viewer = panel_sequence_viewer; central_layout->addWidget(header); - view = new GraphView(this); + view = new GraphView(); central_layout->addWidget(view); layout->addWidget(central_widget); - QWidget* value_widget = new QWidget(this); + QWidget* value_widget = new QWidget(); value_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); - QHBoxLayout* values = new QHBoxLayout(this); - value_widget->setLayout(values); + QHBoxLayout* values = new QHBoxLayout(value_widget); values->addStretch(); - QWidget* central_value_widget = new QWidget(this); - value_layout = new QHBoxLayout(this); + QWidget* central_value_widget = new QWidget(); + value_layout = new QHBoxLayout(central_value_widget); value_layout->setMargin(0); - value_layout->addWidget(new QLabel("", this)); // a spacer so the layout doesn't jump - central_value_widget->setLayout(value_layout); + value_layout->addWidget(new QLabel("")); // a spacer so the layout doesn't jump values->addWidget(central_value_widget); values->addStretch(); layout->addWidget(value_widget); - current_row_desc = new QLabel(this); + current_row_desc = new QLabel(); current_row_desc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); current_row_desc->setAlignment(Qt::AlignCenter); layout->addWidget(current_row_desc); @@ -157,7 +150,7 @@ void GraphEditor::set_row(EffectRow *r) { for (int i=0;ifieldCount();i++) { EffectField* field = r->field(i); if (field->type == EFFECT_FIELD_DOUBLE) { - QPushButton* slider_button = new QPushButton(this); + QPushButton* slider_button = new QPushButton(); slider_button->setCheckable(true); slider_button->setChecked(field->is_enabled()); slider_button->setIcon(QIcon(":/icons/record.png")); @@ -167,7 +160,7 @@ void GraphEditor::set_row(EffectRow *r) { slider_proxy_buttons.append(slider_button); value_layout->addWidget(slider_button); - LabelSlider* slider = new LabelSlider(this); + LabelSlider* slider = new LabelSlider(); slider->set_color(get_curve_color(i, r->fieldCount()).name()); connect(slider, SIGNAL(valueChanged()), this, SLOT(passthrough_slider_value())); slider_proxies.append(slider); @@ -190,7 +183,7 @@ void GraphEditor::set_row(EffectRow *r) { connect(keyframe_nav, SIGNAL(goto_next_key()), row, SLOT(goto_next_key())); } else { row = nullptr; - current_row_desc->setText(0); + current_row_desc->setText(nullptr); } view->set_row(row); update_panel(); diff --git a/panels/project.cpp b/panels/project.cpp index 71a57c9e0..4ec6ae81a 100644 --- a/panels/project.cpp +++ b/panels/project.cpp @@ -64,8 +64,9 @@ Project::Project(QWidget *parent) : setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); QWidget* dockWidgetContents = new QWidget(this); + QVBoxLayout* verticalLayout = new QVBoxLayout(dockWidgetContents); - verticalLayout->setContentsMargins(0, 0, 0, 0); + verticalLayout->setMargin(0); verticalLayout->setSpacing(0); setWidget(dockWidgetContents); @@ -76,15 +77,15 @@ Project::Project(QWidget *parent) : sorter->setSourceModel(&project_model); // optional toolbar - toolbar_widget = new QWidget(this); + toolbar_widget = new QWidget(); toolbar_widget->setVisible(config.show_project_toolbar); toolbar_widget->setObjectName("project_toolbar"); + QHBoxLayout* toolbar = new QHBoxLayout(toolbar_widget); toolbar->setMargin(0); toolbar->setSpacing(0); - toolbar_widget->setLayout(toolbar); - QPushButton* toolbar_new = new QPushButton(toolbar_widget); + QPushButton* toolbar_new = new QPushButton(); QIcon icon1; icon1.addFile(QStringLiteral(":/icons/add-button.png"), QSize(), QIcon::Normal, QIcon::On); icon1.addFile(QStringLiteral(":/icons/add-button-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -93,7 +94,7 @@ Project::Project(QWidget *parent) : connect(toolbar_new, SIGNAL(clicked(bool)), this, SLOT(make_new_menu())); toolbar->addWidget(toolbar_new); - QPushButton* toolbar_open = new QPushButton(toolbar_widget); + QPushButton* toolbar_open = new QPushButton(); QIcon icon2; icon2.addFile(QStringLiteral(":/icons/open.png"), QSize(), QIcon::Normal, QIcon::On); icon2.addFile(QStringLiteral(":/icons/open-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -102,7 +103,7 @@ Project::Project(QWidget *parent) : connect(toolbar_open, SIGNAL(clicked(bool)), mainWindow, SLOT(open_project())); toolbar->addWidget(toolbar_open); - QPushButton* toolbar_save = new QPushButton(toolbar_widget); + QPushButton* toolbar_save = new QPushButton(); QIcon icon3; icon3.addFile(QStringLiteral(":/icons/save.png"), QSize(), QIcon::Normal, QIcon::On); icon3.addFile(QStringLiteral(":/icons/save-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -111,7 +112,7 @@ Project::Project(QWidget *parent) : connect(toolbar_save, SIGNAL(clicked(bool)), mainWindow, SLOT(save_project())); toolbar->addWidget(toolbar_save); - QPushButton* toolbar_undo = new QPushButton(toolbar_widget); + QPushButton* toolbar_undo = new QPushButton(); QIcon icon4; icon4.addFile(QStringLiteral(":/icons/undo.png"), QSize(), QIcon::Normal, QIcon::On); icon4.addFile(QStringLiteral(":/icons/undo-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -120,7 +121,7 @@ Project::Project(QWidget *parent) : connect(toolbar_undo, SIGNAL(clicked(bool)), mainWindow, SLOT(undo())); toolbar->addWidget(toolbar_undo); - QPushButton* toolbar_redo = new QPushButton(toolbar_widget); + QPushButton* toolbar_redo = new QPushButton(); QIcon icon5; icon5.addFile(QStringLiteral(":/icons/redo.png"), QSize(), QIcon::Normal, QIcon::On); icon5.addFile(QStringLiteral(":/icons/redo-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -130,7 +131,7 @@ Project::Project(QWidget *parent) : toolbar->addWidget(toolbar_redo); toolbar->addStretch(); - QPushButton* toolbar_tree_view = new QPushButton(toolbar_widget); + QPushButton* toolbar_tree_view = new QPushButton(); QIcon icon6; icon6.addFile(QStringLiteral(":/icons/treeview.png"), QSize(), QIcon::Normal, QIcon::On); icon6.addFile(QStringLiteral(":/icons/treeview-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -139,7 +140,7 @@ Project::Project(QWidget *parent) : connect(toolbar_tree_view, SIGNAL(clicked(bool)), this, SLOT(set_tree_view())); toolbar->addWidget(toolbar_tree_view); - QPushButton* toolbar_icon_view = new QPushButton(toolbar_widget); + QPushButton* toolbar_icon_view = new QPushButton(); QIcon icon7; icon7.addFile(QStringLiteral(":/icons/iconview.png"), QSize(), QIcon::Normal, QIcon::On); icon7.addFile(QStringLiteral(":/icons/iconview-disabled.png"), QSize(), QIcon::Disabled, QIcon::On); @@ -151,20 +152,19 @@ Project::Project(QWidget *parent) : verticalLayout->addWidget(toolbar_widget); // tree view - tree_view = new SourceTable(dockWidgetContents); + tree_view = new SourceTable(); tree_view->project_parent = this; tree_view->setModel(sorter); verticalLayout->addWidget(tree_view); // icon view - icon_view_container = new QWidget(dockWidgetContents); + icon_view_container = new QWidget(); QVBoxLayout* icon_view_container_layout = new QVBoxLayout(icon_view_container); icon_view_container_layout->setMargin(0); icon_view_container_layout->setSpacing(0); - icon_view_container->setLayout(icon_view_container_layout); - QHBoxLayout* icon_view_controls = new QHBoxLayout(icon_view_container); + QHBoxLayout* icon_view_controls = new QHBoxLayout(); icon_view_controls->setMargin(0); icon_view_controls->setSpacing(0); @@ -172,14 +172,14 @@ Project::Project(QWidget *parent) : directory_up_button.addFile(":/icons/dirup.png", QSize(), QIcon::Normal); directory_up_button.addFile(":/icons/dirup-disabled.png", QSize(), QIcon::Disabled); - directory_up = new QPushButton(icon_view_container); + directory_up = new QPushButton(); directory_up->setIcon(directory_up_button); directory_up->setEnabled(false); icon_view_controls->addWidget(directory_up); icon_view_controls->addStretch(); - QSlider* icon_size_slider = new QSlider(Qt::Horizontal, icon_view_container); + QSlider* icon_size_slider = new QSlider(Qt::Horizontal); icon_size_slider->setMinimum(16); icon_size_slider->setMaximum(120); icon_view_controls->addWidget(icon_size_slider); @@ -187,7 +187,7 @@ Project::Project(QWidget *parent) : icon_view_container_layout->addLayout(icon_view_controls); - icon_view = new SourceIconView(dockWidgetContents); + icon_view = new SourceIconView(); icon_view->project_parent = this; icon_view->setModel(sorter); icon_view->setIconSize(QSize(100, 100)); diff --git a/ui/viewercontainer.cpp b/ui/viewercontainer.cpp index dc02bd520..d6e3f0dcd 100644 --- a/ui/viewercontainer.cpp +++ b/ui/viewercontainer.cpp @@ -131,11 +131,11 @@ void ViewerContainer::adjust() { void ViewerContainer::resizeEvent(QResizeEvent *event) { horizontal_scrollbar->move(0, height()-horizontal_scrollbar->height()); - horizontal_scrollbar->setFixedWidth(width()-vertical_scrollbar->width()); + horizontal_scrollbar->setFixedWidth(qMax(0, width()-vertical_scrollbar->width())); horizontal_scrollbar->setPageStep(width()); vertical_scrollbar->move(width() - vertical_scrollbar->width(), 0); - vertical_scrollbar->setFixedHeight(height()-horizontal_scrollbar->height()); + vertical_scrollbar->setFixedHeight(qMax(0, height()-horizontal_scrollbar->height())); vertical_scrollbar->setPageStep(height()); event->accept();