admin/noo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- few fixes

Browse Source
This commit is contained in:
Dmytro Bogovych 2020-12-08 19:17:07 +02:00
parent 682062b5e3
commit 47f5dd837f
4 changed files with 215 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/CMakeLists.txt
View File

@ -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 project (outliner C CXX) # Your project name
if (NOT LIB_PLATFORM) if (NOT LIB_PLATFORM)
message("No LIB_PLATFORM is set, defaulting to works/sevana/libraries") message("No LIB_PLATFORM is set, defaulting to works/sevana/platform/libraries")
set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/../../../sevana/libraries) set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/../../../sevana/platform/libraries)
endif() endif()
include (${LIB_PLATFORM}/platform_libs.cmake) include (${LIB_PLATFORM}/platform_libs.cmake)
@ -163,6 +163,9 @@ if (TARGET_LINUX)
set (PLATFORM_LIBS pthread m z dl) set (PLATFORM_LIBS pthread m z dl)
set (SCRIPT_PROCESSOR "/bin/bash") set (SCRIPT_PROCESSOR "/bin/bash")
set (BUILD_NUMBER_SCRIPT build_number.sh) set (BUILD_NUMBER_SCRIPT build_number.sh)
# Override UUID library from 'platform/libraries' to avoid problem when linking
set(UUID_LIB uuid)
endif() endif()
if(TARGET_OSX) if(TARGET_OSX)
@ -184,14 +187,17 @@ if(TARGET_OSX)
) )
find_library(COREFOUNDATION_LIBRARY CoreFoundation) find_library(COREFOUNDATION_LIBRARY CoreFoundation)
find_library(COCOA Cocoa) find_library(COCOA Cocoa)
find_library(IOKIT_LIBRARY IOKit) find_library(IOKIT_LIBRARY IOKit)
find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox) find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
find_library(COREAUDIO_LIBRARY CoreAudio) find_library(COREAUDIO_LIBRARY CoreAudio)
find_library(CARBON_LIBRARY Carbon) 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() endif()
if (TARGET_WIN) if (TARGET_WIN)
@ -238,7 +244,6 @@ add_executable(${EXE_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/platforms/hidtracker.cpp ${CMAKE_CURRENT_SOURCE_DIR}/platforms/hidtracker.cpp
${CMAKE_CURRENT_SOURCE_DIR}/platforms/hidtrackerimpl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/platforms/hidtrackerimpl.cpp
${SOURCE_FILES} ${SOURCE_FILES}
${PLATFORM_LIBS}
${UI_RESOURCES} ${UI_RESOURCES}
${MACOS_ICON_PATH} ${MACOS_ICON_PATH}
${RESOURCE_FILES} ${RESOURCE_FILES}
@ -274,7 +279,6 @@ endif()
target_link_libraries(${EXE_NAME} target_link_libraries(${EXE_NAME}
SQLiteCpp SQLiteCpp
qtkeychain qtkeychain
Fervor
${UUID_LIB} ${UUID_LIB}
${OPENSSL_CRYPTO} ${OPENSSL_CRYPTO}
Qt5::Core Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL Qt5::Network # Qt Qt5::Core Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL Qt5::Network # Qt

2
client/build-number/build_number.h
View File

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

13
client/mainwindow.cpp
View File

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

374
client/mainwindow.ui
View File

@ -43,204 +43,206 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<widget class="QSplitter" name="mSplitter"> <widget class="QStackedWidget" name="mStackedViews">
<property name="sizePolicy"> <widget class="QSplitter" name="mSplitter">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <property name="sizePolicy">
<horstretch>0</horstretch> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<verstretch>0</verstretch> <horstretch>0</horstretch>
</sizepolicy> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="minimumSize">
<size>
<width>600</width>
<height>200</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="TaskTreeView" name="mTaskTree">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property> </property>
<property name="dragEnabled"> <property name="minimumSize">
<bool>true</bool> <size>
<width>600</width>
<height>200</height>
</size>
</property> </property>
<property name="dragDropMode"> <property name="orientation">
<enum>QAbstractItemView::InternalMove</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="defaultDropAction"> <widget class="TaskTreeView" name="mTaskTree">
<enum>Qt::MoveAction</enum> <property name="contextMenuPolicy">
</property> <enum>Qt::CustomContextMenu</enum>
</widget>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property> </property>
<property name="topMargin"> <property name="dragEnabled">
<number>0</number> <bool>true</bool>
</property> </property>
<property name="rightMargin"> <property name="dragDropMode">
<number>0</number> <enum>QAbstractItemView::InternalMove</enum>
</property> </property>
<property name="bottomMargin"> <property name="defaultDropAction">
<number>0</number> <enum>Qt::MoveAction</enum>
</property> </property>
<item row="0" column="0"> </widget>
<widget class="QSplitter" name="mTimeSplitter"> <widget class="QFrame" name="frame">
<property name="minimumSize"> <property name="frameShape">
<size> <enum>QFrame::NoFrame</enum>
<width>0</width> </property>
<height>0</height> <property name="frameShadow">
</size> <enum>QFrame::Raised</enum>
</property> </property>
<property name="lineWidth"> <layout class="QGridLayout" name="gridLayout">
<number>0</number> <property name="leftMargin">
</property> <number>0</number>
<property name="orientation"> </property>
<enum>Qt::Vertical</enum> <property name="topMargin">
</property> <number>0</number>
<widget class="QFrame" name="mEditFrame"> </property>
<property name="frameShape"> <property name="rightMargin">
<enum>QFrame::StyledPanel</enum> <number>0</number>
</property> </property>
<property name="frameShadow"> <property name="bottomMargin">
<enum>QFrame::Plain</enum> <number>0</number>
</property>
<item row="0" column="0">
<widget class="QSplitter" name="mTimeSplitter">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property> </property>
<property name="lineWidth"> <property name="lineWidth">
<number>0</number> <number>0</number>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <property name="orientation">
<property name="spacing"> <enum>Qt::Vertical</enum>
<number>0</number>
</property>
<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>
<widget class="QMarkdownTextEdit" name="mNoteEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="mFindFrame">
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">background-color:white;</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QHBoxLayout" name="mFindFrameLayout">
<property name="spacing">
<number>5</number>
</property>
<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>
<widget class="QLabel" name="label">
<property name="text">
<string>Find:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mFindEdit"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QFrame" name="mTimeFrame">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>70</height>
</size>
</property> </property>
<property name="frameShape"> <widget class="QFrame" name="mEditFrame">
<enum>QFrame::StyledPanel</enum> <property name="frameShape">
</property> <enum>QFrame::StyledPanel</enum>
<layout class="QFormLayout" name="formLayout"> </property>
<item row="0" column="0"> <property name="frameShadow">
<widget class="QLabel" name="mTodayTextLabel"> <enum>QFrame::Plain</enum>
<property name="text"> </property>
<string>Today:</string> <property name="lineWidth">
</property> <number>0</number>
</widget> </property>
</item> <layout class="QVBoxLayout" name="verticalLayout">
<item row="0" column="1"> <property name="spacing">
<widget class="QLabel" name="mTodaySpentTimeLabel"> <number>0</number>
<property name="text"> </property>
<string>0 hours 0 minutes</string> <property name="leftMargin">
</property> <number>0</number>
</widget> </property>
</item> <property name="topMargin">
<item row="1" column="0"> <number>0</number>
<widget class="QLabel" name="mThisMonthTextLabel"> </property>
<property name="text"> <property name="rightMargin">
<string>This month:</string> <number>0</number>
</property> </property>
</widget> <property name="bottomMargin">
</item> <number>0</number>
<item row="1" column="1"> </property>
<widget class="QLabel" name="mThisMonthSpentTimeLabel"> <item>
<property name="text"> <widget class="QMarkdownTextEdit" name="mNoteEdit">
<string>0 hours 0 minutes</string> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
</widget> <horstretch>0</horstretch>
</item> <verstretch>0</verstretch>
</layout> </sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="mFindFrame">
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true">background-color:white;</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QHBoxLayout" name="mFindFrameLayout">
<property name="spacing">
<number>5</number>
</property>
<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>
<widget class="QLabel" name="label">
<property name="text">
<string>Find:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mFindEdit"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QFrame" name="mTimeFrame">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>70</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="mTodayTextLabel">
<property name="text">
<string>Today:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="mTodaySpentTimeLabel">
<property name="text">
<string>0 hours 0 minutes</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mThisMonthTextLabel">
<property name="text">
<string>This month:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="mThisMonthSpentTimeLabel">
<property name="text">
<string>0 hours 0 minutes</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</widget> </item>
</item> </layout>
</layout> </widget>
</widget> </widget>
</widget> </widget>
</item> </item>
@ -252,7 +254,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>647</width> <width>647</width>
<height>22</height> <height>29</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="mFileMenu"> <widget class="QMenu" name="mFileMenu">