From d3c8e7379bdc0c24ff2a330d9cadc5f54bf8ab35 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 18 Dec 2018 02:03:40 +1100
Subject: [PATCH] fixed msvc issues and added zoom combobox

---
 dialogs/loaddialog.h     |  4 +-
 io/loadthread.cpp        |  3 +-
 io/loadthread.h          |  6 +--
 panels/viewer.ui         | 93 ++++++++++++++++++++++++++++++++++++++++
 project/projectmodel.cpp |  3 +-
 5 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/dialogs/loaddialog.h b/dialogs/loaddialog.h
index c9099c66d..b5f2cdf4f 100644
--- a/dialogs/loaddialog.h
+++ b/dialogs/loaddialog.h
@@ -4,9 +4,9 @@
 #include <QDialog>
 
 class QProgressBar;
-class Sequence;
+struct Sequence;
 class Media;
-class Footage;
+struct Footage;
 class QHBoxLayout;
 class LoadThread;
 
diff --git a/io/loadthread.cpp b/io/loadthread.cpp
index 90c10ac4f..8a65d1496 100644
--- a/io/loadthread.cpp
+++ b/io/loadthread.cpp
@@ -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);
 }
diff --git a/io/loadthread.h b/io/loadthread.h
index b41123775..522e2867d 100644
--- a/io/loadthread.h
+++ b/io/loadthread.h
@@ -8,9 +8,9 @@
 #include <QWaitCondition>
 
 class Media;
-class Footage;
-class Clip;
-class Sequence;
+struct Footage;
+struct Clip;
+struct Sequence;
 class LoadDialog;
 class EffectMeta;
 
diff --git a/panels/viewer.ui b/panels/viewer.ui
index 0a7613183..738c52458 100644
--- a/panels/viewer.ui
+++ b/panels/viewer.ui
@@ -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">
diff --git a/project/projectmodel.cpp b/project/projectmodel.cpp
index 74b284cb6..6452b623d 100644
--- a/project/projectmodel.cpp
+++ b/project/projectmodel.cpp
@@ -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() {