- few fixes

client/CMakeLists.txt

@@ -6,8 +6,8 @@ set (CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment v
 project (outliner C CXX) # Your project name
 
 if (NOT LIB_PLATFORM)
-    message("No LIB_PLATFORM is set, defaulting to works/sevana/libraries")
-    set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/../../../sevana/libraries)
+    message("No LIB_PLATFORM is set, defaulting to works/sevana/platform/libraries")
+    set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/../../../sevana/platform/libraries)
 endif()
 
 include (${LIB_PLATFORM}/platform_libs.cmake)
@@ -163,6 +163,9 @@ if (TARGET_LINUX)
     set (PLATFORM_LIBS pthread m z dl)
     set (SCRIPT_PROCESSOR "/bin/bash")
     set (BUILD_NUMBER_SCRIPT build_number.sh)
+
+    # Override UUID library from 'platform/libraries' to avoid problem when linking
+    set(UUID_LIB uuid)
 endif()
 
 if(TARGET_OSX)
@@ -190,8 +193,11 @@ if(TARGET_OSX)
      find_library(AUDIOTOOLBOX_LIBRARY      AudioToolbox)
      find_library(COREAUDIO_LIBRARY         CoreAudio)
      find_library(CARBON_LIBRARY            Carbon)
-     set (PLATFORM_LIBS ${COCOA} ${COREFOUNDATION_LIBRARY} ${IOKIT_LIBRARY} ${AUDIOTOOLBOX_LIBRARY} ${COREAUDIO_LIBRARY} ${CARBON_LIBRARY})
 
+     set (PLATFORM_LIBS
+         ${COCOA} ${COREFOUNDATION_LIBRARY} ${IOKIT_LIBRARY}
+         ${AUDIOTOOLBOX_LIBRARY} ${COREAUDIO_LIBRARY}
+         ${CARBON_LIBRARY} Fervor)
 endif()
 
 if (TARGET_WIN)
@@ -238,7 +244,6 @@ add_executable(${EXE_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/hidtracker.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/platforms/hidtrackerimpl.cpp
     ${SOURCE_FILES}
-    ${PLATFORM_LIBS}
     ${UI_RESOURCES}
     ${MACOS_ICON_PATH}
     ${RESOURCE_FILES}
@@ -274,7 +279,6 @@ endif()
 target_link_libraries(${EXE_NAME}
     SQLiteCpp
     qtkeychain
-    Fervor
     ${UUID_LIB}
     ${OPENSSL_CRYPTO}
     Qt5::Core Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL Qt5::Network   # Qt

client/build-number/build_number.h

@@ -1,2 +1,2 @@
 // Auto generated file ! Please do not edit !
-#define APP_BUILD_NUMBER 88
+#define APP_BUILD_NUMBER 103

client/mainwindow.cpp

@@ -65,6 +65,9 @@ MainWindow::MainWindow(QWidget *parent) :
     loadGeometry();
 
     this->setUpdatesEnabled(true);
+
+    // init event
+    QApplication::postEvent(this, new UiInitEvent());
 }
 
 MainWindow::~MainWindow()
@@ -177,6 +180,10 @@ void MainWindow::alertBox(const QString &title, const QString &text, AlertType a
 
 void MainWindow::initClient()
 {
+    // Avoid double initialization
+    if (!mStackedViews->children().empty())
+        return;
+
     mFindStartIndex = 0;
 
     // Open settings
@@ -259,6 +266,7 @@ void MainWindow::initClient()
     ui->mStartRecentTaskMenu->setEnabled(false);
 
     buildOpenOrCreateView();
+    buildPasswordView();
 }
 
 void MainWindow::save()
@@ -824,6 +832,7 @@ void MainWindow::setupMainUi()
     // Construct main UI
     ui = new Ui::MainWindow();
     ui->setupUi(this);
+    this->mStackedViews = ui->mStackedViews;
 
     // Hide Find line edit for now
     ui->mFindFrame->setVisible(false);
@@ -870,13 +879,13 @@ void MainWindow::buildOpenOrCreateView()
 void MainWindow::askDbPassword(const QString& message)
 {
     if (mStackedViews)
-        mStackedViews->setCurrentIndex(0);
+        mStackedViews->setCurrentIndex(ViewIndex_DbPassword);
 }
 
 void MainWindow::askNewDbPassword()
 {
     if (mStackedViews)
-        mStackedViews->setCurrentIndex(1);
+        mStackedViews->setCurrentIndex(ViewIndex_OpenOrCreateDb);
 }
 
 void MainWindow::startOrStopTracking()

client/mainwindow.ui

@@ -43,6 +43,7 @@
      <number>2</number>
     </property>
     <item>
+     <widget class="QStackedWidget" name="mStackedViews">
       <widget class="QSplitter" name="mSplitter">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -243,6 +244,7 @@
         </layout>
        </widget>
       </widget>
+     </widget>
     </item>
    </layout>
   </widget>
@@ -252,7 +254,7 @@
      <x>0</x>
      <y>0</y>
      <width>647</width>
-     <height>22</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="mFileMenu">