oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup and disabled nonfunctional scrolling code

Browse Source
This commit is contained in:
itsmattkc
2019-02-16 03:23:09 -08:00
parent 6bccd0c660
commit 2f38a0b111
70 changed files with 383 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/aboutdialog.h
+1 -1
View File
@@ -28,7 +28,7 @@ class AboutDialog : public QDialog
Q_OBJECT
public:
explicit AboutDialog(QWidget *parent = 0);
explicit AboutDialog(QWidget *parent = 0);
};
#endif // ABOUTDIALOG_H
dialogs/actionsearch.h
+1 -3
View File
@@ -24,9 +24,7 @@
#include <QDialog>
#include <QLineEdit>
#include <QListWidget>
class QListWidget;
class QMenu;
#include <QMenu>
class ActionSearchList : public QListWidget {
Q_OBJECT
dialogs/advancedvideodialog.h
+1 -2
View File
@@ -22,11 +22,10 @@
#define ADVANCEDVIDEODIALOG_H
#include <QDialog>
#include <QComboBox>
#include "io/exportthread.h"
class QComboBox;
class AdvancedVideoDialog : public QDialog {
Q_OBJECT
public:
dialogs/debugdialog.h
+1 -1
View File
@@ -22,7 +22,7 @@
#define DEBUGDIALOG_H
#include <QDialog>
class QTextEdit;
#include <QTextEdit>
class DebugDialog : public QDialog {
Q_OBJECT
dialogs/exportdialog.cpp
+1 -8
View File
@@ -28,18 +28,12 @@
#include <QtMath>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QGroupBox>
#include <QComboBox>
#include <QSpinBox>
#include <QPushButton>
#include <QProgressBar>
#include "oliveglobal.h"
#include "dialogs/advancedvideodialog.h"
#include "panels/panels.h"
#include "ui/viewerwidget.h"
#include "project/sequence.h"
#include "io/exportthread.h"
#include "playback/playback.h"
#include "mainwindow.h"
@@ -343,6 +337,7 @@ void ExportDialog::render_thread_finished() {
panel_sequence_viewer->viewer_widget->makeCurrent();
panel_sequence_viewer->viewer_widget->initializeGL();
update_ui(false);
et->deleteLater();
if (progressBar->value() == 100) accept();
}
@@ -537,7 +532,6 @@ void ExportDialog::export_action() {
et = new ExportThread(params, vcodec_params, this);
connect(et, SIGNAL(finished()), et, SLOT(deleteLater()));
connect(et, SIGNAL(finished()), this, SLOT(render_thread_finished()));
connect(et, SIGNAL(progress_changed(int, qint64)), this, SLOT(update_progress_bar(int, qint64)));
@@ -549,7 +543,6 @@ void ExportDialog::export_action() {
prep_ui_for_render(true);
et->ed = this;
cancelled = false;
et->start();
dialogs/exportdialog.h
+7 -8
View File
@@ -22,15 +22,14 @@
#define EXPORTDIALOG_H
#include <QDialog>
#include <QComboBox>
#include <QSpinBox>
#include <QDoubleSpinBox>
#include <QLabel>
#include <QProgressBar>
#include <QGroupBox>
struct Sequence;
class ExportThread;
class QComboBox;
class QSpinBox;
class QDoubleSpinBox;
class QLabel;
class QProgressBar;
class QGroupBox;
#include "project/sequence.h"
#include "io/exportthread.h"
dialogs/loaddialog.cpp
+1 -4
View File
@@ -20,17 +20,14 @@
#include "loaddialog.h"
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QLabel>
#include <QProgressBar>
#include <QPushButton>
#include "oliveglobal.h"
#include "panels/panels.h"
#include "io/loadthread.h"
#include "playback/playback.h"
#include "ui/sourcetable.h"
#include "mainwindow.h"
@@ -59,7 +56,7 @@ LoadDialog::LoadDialog(QWidget *parent, bool autorecovery) : QDialog(parent) {
update();
lt = new LoadThread(this, autorecovery);
lt = new LoadThread(autorecovery);
QObject::connect(lt, SIGNAL(success()), this, SLOT(thread_done()));
QObject::connect(lt, SIGNAL(error()), this, SLOT(die()));
QObject::connect(lt, SIGNAL(report_progress(int)), bar, SLOT(setValue(int)));
dialogs/loaddialog.h
+4 -6
View File
@@ -22,13 +22,11 @@
#define LOADDIALOG_H
#include <QDialog>
#include <QProgressBar>
#include <QHBoxLayout>
class QProgressBar;
struct Sequence;
class Media;
struct Footage;
class QHBoxLayout;
class LoadThread;
#include "project/projectelements.h"
#include "io/loadthread.h"
class LoadDialog : public QDialog
{
dialogs/mediapropertiesdialog.h
+7 -7
View File
@@ -22,14 +22,14 @@
#define MEDIAPROPERTIESDIALOG_H
#include <QDialog>
#include <QComboBox>
#include <QLineEdit>
#include <QListWidget>
#include <QDoubleSpinBox>
#include <QCheckBox>
struct Footage;
class QComboBox;
class QLineEdit;
class Media;
class QListWidget;
class QDoubleSpinBox;
class QCheckBox;
#include "project/footage.h"
#include "project/media.h"
class MediaPropertiesDialog : public QDialog {
Q_OBJECT
dialogs/newsequencedialog.h
+6 -6
View File
@@ -22,13 +22,13 @@
#define NEWSEQUENCEDIALOG_H
#include <QDialog>
#include <QComboBox>
#include <QSpinBox>
#include <QLineEdit>
class Project;
class Media;
class QComboBox;
class QSpinBox;
class QLineEdit;
struct Sequence;
#include "panels/project.h"
#include "project/media.h"
#include "project/sequence.h"
class NewSequenceDialog : public QDialog
{
dialogs/preferencesdialog.cpp
+48 -48
View File
@@ -83,10 +83,10 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) :
setWindowTitle(tr("Preferences"));
setup_ui();
accurateSeekButton->setChecked(!config.fast_seeking);
fastSeekButton->setChecked(config.fast_seeking);
recordingComboBox->setCurrentIndex(config.recording_mode - 1);
imgSeqFormatEdit->setText(config.img_seq_formats);
accurateSeekButton->setChecked(!Olive::CurrentConfig.fast_seeking);
fastSeekButton->setChecked(Olive::CurrentConfig.fast_seeking);
recordingComboBox->setCurrentIndex(Olive::CurrentConfig.recording_mode - 1);
imgSeqFormatEdit->setText(Olive::CurrentConfig.img_seq_formats);
}
PreferencesDialog::~PreferencesDialog() {}
@@ -184,11 +184,11 @@ void PreferencesDialog::save() {
}
// Check if any settings will require a restart of Olive
if (config.effect_textbox_lines != effect_textbox_lines_field->value()
|| config.use_software_fallback != use_software_fallbacks_checkbox->isChecked()
|| config.language_file != language_combobox->currentData().toString()
|| config.thumbnail_resolution != thumbnail_res_spinbox->value()
|| config.waveform_resolution != waveform_res_spinbox->value()) {
if (Olive::CurrentConfig.effect_textbox_lines != effect_textbox_lines_field->value()
|| Olive::CurrentConfig.use_software_fallback != use_software_fallbacks_checkbox->isChecked()
|| Olive::CurrentConfig.language_file != language_combobox->currentData().toString()
|| Olive::CurrentConfig.thumbnail_resolution != thumbnail_res_spinbox->value()
|| Olive::CurrentConfig.waveform_resolution != waveform_res_spinbox->value()) {
// any changes to these settings will require a restart - ask the user if we should do one now or later
@@ -215,51 +215,51 @@ void PreferencesDialog::save() {
}
// Audio settings may require the audio device to be re-initiated.
if (config.preferred_audio_output != audio_output_devices->currentData().toString()
|| config.preferred_audio_input != audio_input_devices->currentData().toString()
|| config.audio_rate != audio_sample_rate->currentData().toInt()) {
if (Olive::CurrentConfig.preferred_audio_output != audio_output_devices->currentData().toString()
|| Olive::CurrentConfig.preferred_audio_input != audio_input_devices->currentData().toString()
|| Olive::CurrentConfig.audio_rate != audio_sample_rate->currentData().toInt()) {
reinit_audio = true;
}
// save settings from UI to backend
config.css_path = custom_css_fn->text();
Olive::MainWindow->load_css_from_file(config.css_path);
Olive::CurrentConfig.css_path = custom_css_fn->text();
Olive::MainWindow->load_css_from_file(Olive::CurrentConfig.css_path);
config.recording_mode = recordingComboBox->currentIndex() + 1;
config.img_seq_formats = imgSeqFormatEdit->text();
config.fast_seeking = fastSeekButton->isChecked();
config.upcoming_queue_size = upcoming_queue_spinbox->value();
config.upcoming_queue_type = upcoming_queue_type->currentIndex();
config.previous_queue_size = previous_queue_spinbox->value();
config.previous_queue_type = previous_queue_type->currentIndex();
config.add_default_effects_to_clips = add_default_effects_to_clips->isChecked();
Olive::CurrentConfig.recording_mode = recordingComboBox->currentIndex() + 1;
Olive::CurrentConfig.img_seq_formats = imgSeqFormatEdit->text();
Olive::CurrentConfig.fast_seeking = fastSeekButton->isChecked();
Olive::CurrentConfig.upcoming_queue_size = upcoming_queue_spinbox->value();
Olive::CurrentConfig.upcoming_queue_type = upcoming_queue_type->currentIndex();
Olive::CurrentConfig.previous_queue_size = previous_queue_spinbox->value();
Olive::CurrentConfig.previous_queue_type = previous_queue_type->currentIndex();
Olive::CurrentConfig.add_default_effects_to_clips = add_default_effects_to_clips->isChecked();
config.preferred_audio_output = audio_output_devices->currentData().toString();
config.preferred_audio_input = audio_input_devices->currentData().toString();
config.audio_rate = audio_sample_rate->currentData().toInt();
Olive::CurrentConfig.preferred_audio_output = audio_output_devices->currentData().toString();
Olive::CurrentConfig.preferred_audio_input = audio_input_devices->currentData().toString();
Olive::CurrentConfig.audio_rate = audio_sample_rate->currentData().toInt();
config.effect_textbox_lines = effect_textbox_lines_field->value();
config.use_software_fallback = use_software_fallbacks_checkbox->isChecked();
config.language_file = language_combobox->currentData().toString();
Olive::CurrentConfig.effect_textbox_lines = effect_textbox_lines_field->value();
Olive::CurrentConfig.use_software_fallback = use_software_fallbacks_checkbox->isChecked();
Olive::CurrentConfig.language_file = language_combobox->currentData().toString();
if (config.thumbnail_resolution != thumbnail_res_spinbox->value()
|| config.waveform_resolution != waveform_res_spinbox->value()) {
if (Olive::CurrentConfig.thumbnail_resolution != thumbnail_res_spinbox->value()
|| Olive::CurrentConfig.waveform_resolution != waveform_res_spinbox->value()) {
// we're changing the size of thumbnails and waveforms, so let's delete them and regenerate them next start
// delete nothing
char delete_match = 0;
if (config.thumbnail_resolution != thumbnail_res_spinbox->value()) {
if (Olive::CurrentConfig.thumbnail_resolution != thumbnail_res_spinbox->value()) {
// delete existing thumbnails
config.thumbnail_resolution = thumbnail_res_spinbox->value();
Olive::CurrentConfig.thumbnail_resolution = thumbnail_res_spinbox->value();
// delete only thumbnails
delete_match = 't';
}
if (config.waveform_resolution != waveform_res_spinbox->value()) {
if (Olive::CurrentConfig.waveform_resolution != waveform_res_spinbox->value()) {
// delete existing waveforms
config.waveform_resolution = waveform_res_spinbox->value();
Olive::CurrentConfig.waveform_resolution = waveform_res_spinbox->value();
// if we're already deleting thumbnails
if (delete_match == 't') {
@@ -468,7 +468,7 @@ void PreferencesDialog::setup_ui() {
QString locale_str = locale_file_basename.mid(locale_file_basename.lastIndexOf('_')+1);
language_combobox->addItem(QLocale(locale_str).nativeLanguageName(), locale_relative_path);
if (config.language_file == locale_relative_path) {
if (Olive::CurrentConfig.language_file == locale_relative_path) {
language_combobox->setCurrentIndex(language_combobox->count() - 1);
}
}
@@ -483,7 +483,7 @@ void PreferencesDialog::setup_ui() {
general_layout->addWidget(new QLabel(tr("Custom CSS:"), this), row, 0);
custom_css_fn = new QLineEdit(general_tab);
custom_css_fn->setText(config.css_path);
custom_css_fn->setText(Olive::CurrentConfig.css_path);
general_layout->addWidget(custom_css_fn, row, 1, 1, 3);
QPushButton* custom_css_browse = new QPushButton(tr("Browse"), general_tab);
@@ -516,7 +516,7 @@ void PreferencesDialog::setup_ui() {
effect_textbox_lines_field = new QSpinBox(general_tab);
effect_textbox_lines_field->setMinimum(1);
effect_textbox_lines_field->setValue(config.effect_textbox_lines);
effect_textbox_lines_field->setValue(Olive::CurrentConfig.effect_textbox_lines);
general_layout->addWidget(effect_textbox_lines_field, row, 1, 1, 4);
row++;
@@ -527,7 +527,7 @@ void PreferencesDialog::setup_ui() {
thumbnail_res_spinbox = new QSpinBox(this);
thumbnail_res_spinbox->setMinimum(0);
thumbnail_res_spinbox->setMaximum(INT_MAX);
thumbnail_res_spinbox->setValue(config.thumbnail_resolution);
thumbnail_res_spinbox->setValue(Olive::CurrentConfig.thumbnail_resolution);
general_layout->addWidget(thumbnail_res_spinbox, row, 1);
general_layout->addWidget(new QLabel(tr("Waveform Resolution:"), this), row, 2);
@@ -535,7 +535,7 @@ void PreferencesDialog::setup_ui() {
waveform_res_spinbox = new QSpinBox(this);
waveform_res_spinbox->setMinimum(0);
waveform_res_spinbox->setMaximum(INT_MAX);
waveform_res_spinbox->setValue(config.waveform_resolution);
waveform_res_spinbox->setValue(Olive::CurrentConfig.waveform_resolution);
general_layout->addWidget(waveform_res_spinbox, row, 3);
QPushButton* delete_preview_btn = new QPushButton(tr("Delete Previews"));
@@ -547,7 +547,7 @@ void PreferencesDialog::setup_ui() {
// General -> Use Software Fallbacks When Possible
use_software_fallbacks_checkbox = new QCheckBox(general_tab);
use_software_fallbacks_checkbox->setText(tr("Use Software Fallbacks When Possible"));
use_software_fallbacks_checkbox->setChecked(config.use_software_fallback);
use_software_fallbacks_checkbox->setChecked(Olive::CurrentConfig.use_software_fallback);
general_layout->addWidget(use_software_fallbacks_checkbox, row, 0, 1, 4);
tabWidget->addTab(general_tab, tr("General"));
@@ -559,7 +559,7 @@ void PreferencesDialog::setup_ui() {
QVBoxLayout* behavior_tab_layout = new QVBoxLayout(behavior_tab);
add_default_effects_to_clips = new QCheckBox("Add Default Effects to New Clips");
add_default_effects_to_clips->setChecked(config.add_default_effects_to_clips);
add_default_effects_to_clips->setChecked(Olive::CurrentConfig.add_default_effects_to_clips);
behavior_tab_layout->addWidget(add_default_effects_to_clips);
// Playback
@@ -584,21 +584,21 @@ void PreferencesDialog::setup_ui() {
QGridLayout* memory_usage_layout = new QGridLayout(memory_usage_group);
memory_usage_layout->addWidget(new QLabel(tr("Upcoming Frame Queue:"), playback_tab), 0, 0);
upcoming_queue_spinbox = new QDoubleSpinBox(playback_tab);
upcoming_queue_spinbox->setValue(config.upcoming_queue_size);
upcoming_queue_spinbox->setValue(Olive::CurrentConfig.upcoming_queue_size);
memory_usage_layout->addWidget(upcoming_queue_spinbox, 0, 1);
upcoming_queue_type = new QComboBox(playback_tab);
upcoming_queue_type->addItem(tr("frames"));
upcoming_queue_type->addItem(tr("seconds"));
upcoming_queue_type->setCurrentIndex(config.upcoming_queue_type);
upcoming_queue_type->setCurrentIndex(Olive::CurrentConfig.upcoming_queue_type);
memory_usage_layout->addWidget(upcoming_queue_type, 0, 2);
memory_usage_layout->addWidget(new QLabel(tr("Previous Frame Queue:"), playback_tab), 1, 0);
previous_queue_spinbox = new QDoubleSpinBox(playback_tab);
previous_queue_spinbox->setValue(config.previous_queue_size);
previous_queue_spinbox->setValue(Olive::CurrentConfig.previous_queue_size);
memory_usage_layout->addWidget(previous_queue_spinbox, 1, 1);
previous_queue_type = new QComboBox(playback_tab);
previous_queue_type->addItem(tr("frames"));
previous_queue_type->addItem(tr("seconds"));
previous_queue_type->setCurrentIndex(config.previous_queue_type);
previous_queue_type->setCurrentIndex(Olive::CurrentConfig.previous_queue_type);
memory_usage_layout->addWidget(previous_queue_type, 1, 2);
playback_tab_layout->addWidget(memory_usage_group);
@@ -620,7 +620,7 @@ void PreferencesDialog::setup_ui() {
for (int i=0;i<devs.size();i++) {
audio_output_devices->addItem(devs.at(i).deviceName(), devs.at(i).deviceName());
if (!found_preferred_device
&& devs.at(i).deviceName() == config.preferred_audio_output) {
&& devs.at(i).deviceName() == Olive::CurrentConfig.preferred_audio_output) {
audio_output_devices->setCurrentIndex(audio_output_devices->count()-1);
found_preferred_device = true;
}
@@ -639,7 +639,7 @@ void PreferencesDialog::setup_ui() {
for (int i=0;i<devs.size();i++) {
audio_input_devices->addItem(devs.at(i).deviceName(), devs.at(i).deviceName());
if (!found_preferred_device
&& devs.at(i).deviceName() == config.preferred_audio_input) {
&& devs.at(i).deviceName() == Olive::CurrentConfig.preferred_audio_input) {
audio_input_devices->setCurrentIndex(audio_input_devices->count()-1);
found_preferred_device = true;
}
@@ -652,7 +652,7 @@ void PreferencesDialog::setup_ui() {
audio_sample_rate = new QComboBox();
combobox_audio_sample_rates(audio_sample_rate);
for (int i=0;i<audio_sample_rate->count();i++) {
if (audio_sample_rate->itemData(i).toInt() == config.audio_rate) {
if (audio_sample_rate->itemData(i).toInt() == Olive::CurrentConfig.audio_rate) {
audio_sample_rate->setCurrentIndex(i);
break;
}
dialogs/preferencesdialog.h
+10 -10
View File
@@ -23,16 +23,16 @@
#include <QDialog>
#include <QKeySequenceEdit>
class QMenuBar;
class QLineEdit;
class QComboBox;
class QRadioButton;
class QTreeWidget;
class QTreeWidgetItem;
class QMenu;
class QCheckBox;
class QDoubleSpinBox;
class QSpinBox;
#include <QMenuBar>
#include <QLineEdit>
#include <QComboBox>
#include <QRadioButton>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QMenu>
#include <QCheckBox>
#include <QDoubleSpinBox>
#include <QSpinBox>
class KeySequenceEditor : public QKeySequenceEdit {
Q_OBJECT
dialogs/proxydialog.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include <QVector>
#include <QComboBox>
struct Footage;
#include "project/footage.h"
class ProxyDialog : public QDialog {
Q_OBJECT
dialogs/replaceclipmediadialog.cpp
-4
View File
@@ -20,20 +20,16 @@
#include "replaceclipmediadialog.h"
#include "ui/sourcetable.h"
#include "panels/panels.h"
#include "project/projectelements.h"
#include "playback/playback.h"
#include "playback/cacher.h"
#include "project/undo.h"
#include <QVBoxLayout>
#include <QTreeView>
#include <QLabel>
#include <QPushButton>
#include <QMessageBox>
#include <QCheckBox>
ReplaceClipMediaDialog::ReplaceClipMediaDialog(QWidget *parent, Media *old_media) :
QDialog(parent),
dialogs/replaceclipmediadialog.h
+4 -4
View File
@@ -22,11 +22,11 @@
#define REPLACECLIPMEDIADIALOG_H
#include <QDialog>
#include <QTreeView>
#include <QCheckBox>
class SourceTable;
class QTreeView;
class Media;
class QCheckBox;
#include "ui/sourcetable.h"
#include "project/projectelements.h"
class ReplaceClipMediaDialog : public QDialog {
Q_OBJECT
dialogs/speeddialog.cpp
-3
View File
@@ -23,12 +23,9 @@
#include <QHBoxLayout>
#include <QGridLayout>
#include <QLabel>
#include <QCheckBox>
#include <QPushButton>
#include <QDialogButtonBox>
#include "ui/labelslider.h"
#include "project/clip.h"
#include "project/sequence.h"
#include "project/footage.h"
#include "playback/playback.h"
dialogs/speeddialog.h
+3 -3
View File
@@ -22,10 +22,10 @@
#define SPEEDDIALOG_H
#include <QDialog>
#include <QCheckBox>
class Clip;
class LabelSlider;
class QCheckBox;
#include "project/clip.h"
#include "ui/labelslider.h"
class SpeedDialog : public QDialog
{
dialogs/stabilizerdialog.cpp
-124
View File
@@ -1,124 +0,0 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "stabilizerdialog.h"
#include <QVBoxLayout>
#include <QCheckBox>
#include <QDialogButtonBox>
#include <QGroupBox>
#include <QLabel>
#include "ui/labelslider.h"
// NOTE: this is never used in Olive, hasn't been maintained, and needs to be written
StabilizerDialog::StabilizerDialog(QWidget *parent) : QDialog(parent) {
setWindowTitle("Stabilizer");
layout = new QVBoxLayout(this);
enable_stab = new QCheckBox(this);
enable_stab->setText("Enable Stabilizer");
layout->addWidget(enable_stab);
analysis = new QGroupBox("Analysis", this);
layout->addWidget(analysis);
analysis_layout = new QGridLayout(analysis);
analysis->setLayout(analysis_layout);
analysis_layout->addWidget(new QLabel("Shakiness:", this), 0, 0);
shakiness_slider = new LabelSlider(this);
shakiness_slider->set_minimum_value(1);
shakiness_slider->set_default_value(5);
shakiness_slider->set_maximum_value(10);
analysis_layout->addWidget(shakiness_slider, 0, 1);
analysis_layout->addWidget(new QLabel("Accuracy:", this), 1, 0);
accuracy_slider = new LabelSlider(this);
accuracy_slider->set_minimum_value(1);
accuracy_slider->set_default_value(15);
accuracy_slider->set_maximum_value(15);
analysis_layout->addWidget(accuracy_slider, 1, 1);
analysis_layout->addWidget(new QLabel("Step Size:", this), 2, 0);
stepsize_slider = new LabelSlider(this);
stepsize_slider->set_minimum_value(1);
stepsize_slider->set_default_value(6);
analysis_layout->addWidget(stepsize_slider, 2, 1);
analysis_layout->addWidget(new QLabel("Minimum Contrast:", this), 3, 0);
mincontrast_slider = new LabelSlider(this);
mincontrast_slider->set_minimum_value(0);
mincontrast_slider->set_default_value(0.3);
mincontrast_slider->set_maximum_value(1);
analysis_layout->addWidget(mincontrast_slider, 3, 1);
/*analysis_layout->addWidget(new QLabel("Tripod Mode:"), 4, 0);
tripod_mode_box = new QCheckBox();
analysis_layout->addWidget(tripod_mode_box, 4, 1);*/
stabilization = new QGroupBox("Stabilization", this);
layout->addWidget(stabilization);
stabilization_layout = new QGridLayout(this);
stabilization->setLayout(stabilization_layout);
stabilization_layout->addWidget(new QLabel("Smoothing:", this), 0, 0);
smoothing_slider = new LabelSlider();
smoothing_slider->set_minimum_value(0);
smoothing_slider->set_default_value(10);
stabilization_layout->addWidget(smoothing_slider, 0, 1);
stabilization_layout->addWidget(new QLabel("Gaussian Motion:"), 1, 0);
gaussian_motion = new QCheckBox();
gaussian_motion->setChecked(true);
stabilization_layout->addWidget(gaussian_motion, 1, 1);
stabilization_layout->addWidget(new QLabel("Maximum Movement:"), 2, 0);
stabilization_layout->addWidget(new QLabel("Maximum Rotation:"), 3, 0);
stabilization_layout->addWidget(new QLabel("Crop:"), 4, 0);
stabilization_layout->addWidget(new QLabel("Zoom Behavior:"), 5, 0);
stabilization_layout->addWidget(new QLabel("Zoom Speed:"), 6, 0);
stabilization_layout->addWidget(new QLabel("Interpolation Quality:"), 7, 0);
buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
layout->addWidget(buttons);
connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
connect(enable_stab, SIGNAL(toggled(bool)), this, SLOT(set_all_enabled(bool)));
set_all_enabled(false);
}
void StabilizerDialog::set_all_enabled(bool e) {
analysis->setEnabled(e);
stabilization->setEnabled(e);
}
dialogs/stabilizerdialog.h
-57
View File
@@ -1,57 +0,0 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef STABILIZERDIALOG_H
#define STABILIZERDIALOG_H
class QVBoxLayout;
class QCheckBox;
class QDialogButtonBox;
class QGroupBox;
class QGridLayout;
class LabelSlider;
#include <QDialog>
class StabilizerDialog : public QDialog
{
Q_OBJECT
public:
StabilizerDialog(QWidget* parent = 0);
private slots:
void set_all_enabled(bool e);
private:
QVBoxLayout* layout;
QCheckBox* enable_stab;
QDialogButtonBox* buttons;
QGroupBox* analysis;
QGridLayout* analysis_layout;
LabelSlider* shakiness_slider;
LabelSlider* accuracy_slider;
LabelSlider* stepsize_slider;
LabelSlider* mincontrast_slider;
QCheckBox* tripod_mode_box;
QGroupBox* stabilization;
QGridLayout* stabilization_layout;
LabelSlider* smoothing_slider;
QCheckBox* gaussian_motion;
};
#endif // STABILIZERDIALOG_H
dialogs/texteditdialog.cpp
-1
View File
@@ -21,7 +21,6 @@
#include "texteditdialog.h"
#include <QVBoxLayout>
#include <QPlainTextEdit>
#include <QDialogButtonBox>
TextEditDialog::TextEditDialog(QWidget *parent, const QString &s) :
dialogs/texteditdialog.h
+2 -3
View File
@@ -22,13 +22,12 @@
#define TEXTEDITDIALOG_H
#include <QDialog>
class QPlainTextEdit;
#include <QPlainTextEdit>
class TextEditDialog : public QDialog {
Q_OBJECT
public:
TextEditDialog(QWidget* parent = 0, const QString& s = 0);
TextEditDialog(QWidget* parent = nullptr, const QString& s = nullptr);
const QString& get_string();
private slots:
void save();