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

fixed msvc issues and added zoom combobox

Browse Source
This commit is contained in:
itsmattkc
2018-12-18 02:03:40 +11:00
parent 467d271d5c
commit d3c8e7379b
5 changed files with 101 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/loaddialog.h
+2 -2
View File
@@ -4,9 +4,9 @@
#include <QDialog>
class QProgressBar;
class Sequence;
struct Sequence;
class Media;
class Footage;
struct Footage;
class QHBoxLayout;
class LoadThread;
io/loadthread.cpp
+1 -2
View File
@@ -634,8 +634,6 @@ void LoadThread::run() {
}
if (cont) {
mainWindow->setWindowModified(autorecovery);
panel_project->add_recent_project(project_url);
emit success(); // run in main thread
@@ -658,6 +656,7 @@ void LoadThread::cancel() {
}
void LoadThread::success_func() {
mainWindow->setWindowModified(autorecovery);
if (open_seq != NULL) set_sequence(open_seq);
update_ui(false);
}
io/loadthread.h
+3 -3
View File
@@ -8,9 +8,9 @@
#include <QWaitCondition>
class Media;
class Footage;
class Clip;
class Sequence;
struct Footage;
struct Clip;
struct Sequence;
class LoadDialog;
class EffectMeta;
panels/viewer.ui
+93
View File
@@ -80,6 +80,99 @@
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="zoomControlBar" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>260</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QComboBox" name="comboBox">
<item>
<property name="text">
<string>Fit</string>
</property>
</item>
<item>
<property name="text">
<string>10%</string>
</property>
</item>
<item>
<property name="text">
<string>25%</string>
</property>
</item>
<item>
<property name="text">
<string>50%</string>
</property>
</item>
<item>
<property name="text">
<string>75%</string>
</property>
</item>
<item>
<property name="text">
<string>100%</string>
</property>
</item>
<item>
<property name="text">
<string>150%</string>
</property>
</item>
<item>
<property name="text">
<string>200%</string>
</property>
</item>
<item>
<property name="text">
<string>400%</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>259</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="playbackControls" native="true">
<property name="sizePolicy">
project/projectmodel.cpp
+2 -1
View File
@@ -7,7 +7,8 @@
#include "debug.h"
ProjectModel::ProjectModel(QObject *parent) : QAbstractItemModel(parent), root_item(NULL) {
clear();
root_item = new Media(0);
root_item->root = true;
}
ProjectModel::~ProjectModel() {