commit 55f92cb9139bce8b9882c5c9f9e5c6a42b2eb445
author Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Tue Oct 23 12:26:25 2018 -0400
committer Isa <isa.nanic@savoirfairelinux.com> Wed Oct 24 14:54:27 2018 -0400
tree 87113fb9289167ca2e6165e67847a2df202e07e2
parent 0a4e7aa3f7de317c390582d07f45183d5651dca8

ux: change application start

- make the wizard a widget in the mainwindow navstack
- remove findRingAccount, any account present should not invoke the
  wizard

Change-Id: I5341d9060e17b74ac253619d70aad6d2d9a93874
Reviewed-by: Isa Nanic <isa.nanic@savoirfairelinux.com>

ring-client-windows.vcxproj

diff --git a/ring-client-windows.vcxproj b/ring-client-windows.vcxproj
index cb7f54b..f82ccd2 100644
--- a/ring-client-windows.vcxproj
+++ b/ring-client-windows.vcxproj
@@ -169,8 +169,13 @@
     <ClCompile Include="videowidget.cpp" />

     <ClCompile Include="windowscontactbackend.cpp" />

     <ClCompile Include="wizarddialog.cpp" />

+    <ClCompile Include="wizardwidget.cpp" />

   </ItemGroup>

   <ItemGroup>

+    <QtMoc Include="wizardwidget.h">

+      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles\$(ConfigurationName)\.;.\GeneratedFiles;.;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\lrc\src;$(ProjectDir)..\client-windows\winsparkle\include;$(ProjectDir)..\client-windows\qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release</IncludePath>

+      <Define Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WINDOWS;UNICODE;_UNICODE;WIN32;WIN64;NIGHTLY_VERSION=20180706;ENABLE_AUTOUPDATE;QT_NO_DEBUG;NDEBUG</Define>

+    </QtMoc>

     <QtMoc Include="aboutdialog.h">

     </QtMoc>

     <QtMoc Include="accountdetails.h">

@@ -386,6 +391,7 @@
     </QtUic>

     <QtUic Include="invitebuttonswidget.ui" />

     <QtUic Include="mainwindow.ui">

+      <SubType>Designer</SubType>

     </QtUic>

     <QtUic Include="photoboothdialog.ui">

     </QtUic>

@@ -405,6 +411,9 @@
     </QtUic>

     <QtUic Include="wizarddialog.ui">

     </QtUic>

+    <QtUic Include="wizardwidget.ui">

+      <SubType>Designer</SubType>

+    </QtUic>

   </ItemGroup>

   <ItemGroup>

     <None Include="images\FontAwesome.otf" />