From ec4b8d2d2c4245e59612078d9d5271e8390f8a6c Mon Sep 17 00:00:00 2001 From: Francis Banyikwa Date: Fri, 7 Jul 2017 09:20:09 +0300 Subject: [PATCH] This commit marks the release point of version 1.2.9 --- CMakeLists.txt | 4 ++-- OSX_BUILD_INSTRUCTIONS | 3 --- .../lxqt_wallet/frontend/changepassworddialog.cpp | 3 +-- .../lxqt_wallet/frontend/password_dialog.cpp | 3 +-- src/mountinfo.h | 6 ------ src/sirikali.cpp | 13 ++++++------- src/sirikali.h | 4 ++-- version | 2 +- 8 files changed, 13 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 230f267a..7290ec4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,9 @@ set_property( GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS ON ) project( sirikali ) -set( PGR_VERSION "1.2.8" ) +set( PGR_VERSION "1.2.9" ) -add_definitions( -D_FILE_OFFSET_BITS=64 -Wextra -Wall -pedantic ) +add_definitions( -Wextra -Wall -pedantic ) include_directories( ${PROJECT_BINARY_DIR} ) diff --git a/OSX_BUILD_INSTRUCTIONS b/OSX_BUILD_INSTRUCTIONS index b129c948..1a8ec41e 100644 --- a/OSX_BUILD_INSTRUCTIONS +++ b/OSX_BUILD_INSTRUCTIONS @@ -39,9 +39,6 @@ This option tells the build process to install project's files in "$HOME/sirikal This option tells the build process to build the project in release mode.This mode is most suitable for non developers. --DQT5=true -This option tells the build process to build GUI components using Qt5.Set the option to "false" if you want to build using Qt4. - -DNOSECRETSUPPORT=false This option tells the build process to add gnome's libsecret secure storage of passwords.Set this option to "true" if you do not want libsecret's support. diff --git a/src/3rdParty/lxqt_wallet/frontend/changepassworddialog.cpp b/src/3rdParty/lxqt_wallet/frontend/changepassworddialog.cpp index e2b169cb..5850c485 100644 --- a/src/3rdParty/lxqt_wallet/frontend/changepassworddialog.cpp +++ b/src/3rdParty/lxqt_wallet/frontend/changepassworddialog.cpp @@ -43,8 +43,7 @@ LXQt::Wallet::changePassWordDialog::changePassWordDialog( QWidget * parent,const this->setFixedSize( this->size() ) ; - //this->setWindowFlags( this->windowFlags() | Qt::WindowStaysOnTopHint ) ; - this->setWindowFlags( this->windowFlags() ) ; + this->setWindowFlags( this->windowFlags() | Qt::WindowStaysOnTopHint ) ; if( parent ){ diff --git a/src/3rdParty/lxqt_wallet/frontend/password_dialog.cpp b/src/3rdParty/lxqt_wallet/frontend/password_dialog.cpp index 12238f5b..cfaff726 100644 --- a/src/3rdParty/lxqt_wallet/frontend/password_dialog.cpp +++ b/src/3rdParty/lxqt_wallet/frontend/password_dialog.cpp @@ -43,8 +43,7 @@ LXQt::Wallet::password_dialog::password_dialog( QWidget * parent, this->setFixedSize( this->size() ) ; - //this->setWindowFlags( this->windowFlags() | Qt::WindowStaysOnTopHint ) ; - this->setWindowFlags( this->windowFlags() ) ; + this->setWindowFlags( this->windowFlags() | Qt::WindowStaysOnTopHint ) ; if( parent ){ diff --git a/src/mountinfo.h b/src/mountinfo.h index f3f9e91d..b3ec0610 100644 --- a/src/mountinfo.h +++ b/src/mountinfo.h @@ -40,12 +40,6 @@ class mountinfo : private QObject public: QStringList mountedVolumes() ; - static std::unique_ptr< mountinfo > instance( QObject * parent, - bool b, - std::function< void() >&& f ) - { - return std::unique_ptr< mountinfo >( new mountinfo( parent,b,std::move( f ) ) ) ; - } mountinfo( QObject * parent,bool,std::function< void() >&& ) ; mountinfo() ; diff --git a/src/sirikali.cpp b/src/sirikali.cpp index e83aaf70..c9fab477 100644 --- a/src/sirikali.cpp +++ b/src/sirikali.cpp @@ -51,7 +51,6 @@ #include "dialogmsg.h" #include "tablewidget.h" #include "oneinstance.h" -#include "mountinfo.h" #include "utility.h" #include "siritask.h" #include "checkforupdates.h" @@ -63,7 +62,7 @@ sirikali::sirikali() : m_secrets( this ), - m_mountInfo( mountinfo::instance( this,true,[ & ](){ QCoreApplication::exit( m_exitStatus ) ; } ) ) + m_mountInfo( this,true,[ & ](){ QCoreApplication::exit( m_exitStatus ) ; } ) { } @@ -74,7 +73,7 @@ void sirikali::closeApplication() { utility::quitHelper() ; this->hide() ; - m_mountInfo->stop()() ; + m_mountInfo.stop()() ; } void sirikali::closeApplication( int s,const QString& e ) @@ -87,13 +86,13 @@ void sirikali::closeApplication( int s,const QString& e ) } this->hide() ; - m_mountInfo->stop()() ; + m_mountInfo.stop()() ; } void sirikali::closeApplication_1( int s ) { Q_UNUSED( s ) ; - m_mountInfo->stop()() ; + m_mountInfo.stop()() ; } void sirikali::setUpApp( bool start,const QString& volume ) @@ -1662,7 +1661,7 @@ void sirikali::pbUmount() void sirikali::unMountAll() { - m_mountInfo->announceEvents( false ) ; + m_mountInfo.announceEvents( false ) ; this->disableAll() ; @@ -1699,7 +1698,7 @@ void sirikali::unMountAll() this->enableAll() ; - m_mountInfo->announceEvents( true ) ; + m_mountInfo.announceEvents( true ) ; } void sirikali::unMountAllAndQuit() diff --git a/src/sirikali.h b/src/sirikali.h index 9660e1d2..0982ae67 100644 --- a/src/sirikali.h +++ b/src/sirikali.h @@ -33,7 +33,7 @@ #include "utility.h" #include "utility2.h" #include "secrets.h" - +#include "mountinfo.h" #include "lxqt_wallet.h" class QCloseEvent ; @@ -163,7 +163,7 @@ private slots: QSystemTrayIcon m_trayIcon ; - std::unique_ptr< mountinfo > m_mountInfo ; + mountinfo m_mountInfo ; }; #endif // MAINWINDOW_H diff --git a/version b/version index db6fb4a9..9d4f8239 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.8 +1.2.9