Skip to content

Commit

Permalink
This commit marks the release point of version 1.2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
mhogomchungu committed Jul 7, 2017
1 parent edd5c6d commit ec4b8d2
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 25 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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} )

Expand Down
3 changes: 0 additions & 3 deletions OSX_BUILD_INSTRUCTIONS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions src/3rdParty/lxqt_wallet/frontend/changepassworddialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ){

Expand Down
3 changes: 1 addition & 2 deletions src/3rdParty/lxqt_wallet/frontend/password_dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ){

Expand Down
6 changes: 0 additions & 6 deletions src/mountinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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() ;

Expand Down
13 changes: 6 additions & 7 deletions src/sirikali.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 ) ; } )
{
}

Expand All @@ -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 )
Expand All @@ -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 )
Expand Down Expand Up @@ -1662,7 +1661,7 @@ void sirikali::pbUmount()

void sirikali::unMountAll()
{
m_mountInfo->announceEvents( false ) ;
m_mountInfo.announceEvents( false ) ;

this->disableAll() ;

Expand Down Expand Up @@ -1699,7 +1698,7 @@ void sirikali::unMountAll()

this->enableAll() ;

m_mountInfo->announceEvents( true ) ;
m_mountInfo.announceEvents( true ) ;
}

void sirikali::unMountAllAndQuit()
Expand Down
4 changes: 2 additions & 2 deletions src/sirikali.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "utility.h"
#include "utility2.h"
#include "secrets.h"

#include "mountinfo.h"
#include "lxqt_wallet.h"

class QCloseEvent ;
Expand Down Expand Up @@ -163,7 +163,7 @@ private slots:

QSystemTrayIcon m_trayIcon ;

std::unique_ptr< mountinfo > m_mountInfo ;
mountinfo m_mountInfo ;
};

#endif // MAINWINDOW_H
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.8
1.2.9

0 comments on commit ec4b8d2

Please sign in to comment.