diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 7903eff..d5a63af 100644
--- a/client/CMakeLists.txt
+++ b/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)
@@ -184,14 +187,17 @@ if(TARGET_OSX)
)
- find_library(COREFOUNDATION_LIBRARY CoreFoundation)
- find_library(COCOA Cocoa)
- find_library(IOKIT_LIBRARY IOKit)
- 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})
+ find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+ find_library(COCOA Cocoa)
+ find_library(IOKIT_LIBRARY IOKit)
+ 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} 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
diff --git a/client/build-number/build_number.h b/client/build-number/build_number.h
index 27d82e9..768eed2 100644
--- a/client/build-number/build_number.h
+++ b/client/build-number/build_number.h
@@ -1,2 +1,2 @@
// Auto generated file ! Please do not edit !
-#define APP_BUILD_NUMBER 88
\ No newline at end of file
+#define APP_BUILD_NUMBER 103
\ No newline at end of file
diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index 11e7932..458ea17 100644
--- a/client/mainwindow.cpp
+++ b/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()
diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index b9b1721..ea90a47 100644
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -43,204 +43,206 @@
2
-
-
-
-
- 0
- 0
-
-
-
-
- 600
- 200
-
-
-
- Qt::Horizontal
-
-
-
- Qt::CustomContextMenu
+
+
+
+
+ 0
+ 0
+
-
- true
+
+
+ 600
+ 200
+
-
- QAbstractItemView::InternalMove
+
+ Qt::Horizontal
-
- Qt::MoveAction
-
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
- 0
+
+
+ Qt::CustomContextMenu
-
- 0
+
+ true
-
- 0
+
+ QAbstractItemView::InternalMove
-
- 0
+
+ Qt::MoveAction
-
-
-
-
-
- 0
- 0
-
-
-
- 0
-
-
- Qt::Vertical
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Plain
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Plain
-
-
-
- -
-
-
- false
-
-
- background-color:white;
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
- 0
-
-
-
- 5
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Find:
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
- 16777215
- 70
-
+
+ Qt::Vertical
-
- QFrame::StyledPanel
-
-
- -
-
-
- Today:
-
-
-
- -
-
-
- 0 hours 0 minutes
-
-
-
- -
-
-
- This month:
-
-
-
- -
-
-
- 0 hours 0 minutes
-
-
-
-
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Plain
+
+
+ 0
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Plain
+
+
+
+ -
+
+
+ false
+
+
+ background-color:white;
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+ 0
+
+
+
+ 5
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Find:
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+ 16777215
+ 70
+
+
+
+ QFrame::StyledPanel
+
+
+ -
+
+
+ Today:
+
+
+
+ -
+
+
+ 0 hours 0 minutes
+
+
+
+ -
+
+
+ This month:
+
+
+
+ -
+
+
+ 0 hours 0 minutes
+
+
+
+
+
-
-
-
+
+
+
@@ -252,7 +254,7 @@
0
0
647
- 22
+ 29