diff --git a/CMakeLists.txt b/CMakeLists.txt index f01befab..468b0e90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,28 +4,15 @@ set_property( GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS ON ) project( sirikali ) -set( PGR_VERSION "1.5.0" ) -set( COPYRIGHT_YEARS "2016-2022" ) - -if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0 ) - set( CMAKE_CXX_STANDARD 20 ) - MESSAGE( STATUS "Setting C++ version to C++20" ) -elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0) - set( CMAKE_CXX_STANDARD 17 ) - MESSAGE( STATUS "Setting C++ version to C++17" ) -else() - if( WIN32 ) - set( CMAKE_CXX_STANDARD 14 ) - MESSAGE( STATUS "Setting C++ version to C++14" ) - else() - set( CMAKE_CXX_STANDARD 14 ) - MESSAGE( STATUS "Setting C++ version to C++14" ) - if(${CMAKE_VERSION} VERSION_LESS "3.1.0") - message("Warning your cmake version is too old(<3.1.0) and code my not compile") - add_definitions(-std=c++14) - endif() - endif() +set( PGR_VERSION "1.5.1" ) +set( COPYRIGHT_YEARS "2016-2023" ) + +set( CMAKE_CXX_STANDARD 14 ) +MESSAGE( STATUS "Setting C++ version to C++14" ) +if(${CMAKE_VERSION} VERSION_LESS "3.1.0") + message("Warning your cmake version is too old(<3.1.0) and code my not compile") + add_definitions(-std=c++14) endif() if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") diff --git a/changelog b/changelog index 2d968b09..db7102da 100644 --- a/changelog +++ b/changelog @@ -273,3 +273,7 @@ version 1.4.2(December 18,2019) [ALL] -- Add dark theme. -- Add support for gocryptfs using cppcryptfs as a CLI backend. + + version 1.5.1(July 10, 2023) + [NON WINDOWS] +-- Folders specified in PATH variable will be checked when looking for executables. diff --git a/rpm/sirikali.spec b/rpm/sirikali.spec index 92201261..5c56a886 100644 --- a/rpm/sirikali.spec +++ b/rpm/sirikali.spec @@ -17,7 +17,7 @@ # along with this program. If not, see . Name: SiriKali -Version: 1.4.8 +Version: 1.5.1 Release: 0 Summary: SiriKali is a Qt/C++ GUI front end to fscrypt,encfs,cryfs,gocryptfs,ecryptfs and securefs. License: GPL-2.0+ diff --git a/src/checkforupdates.cpp b/src/checkforupdates.cpp index 7dfdfca8..9e65c027 100644 --- a/src/checkforupdates.cpp +++ b/src/checkforupdates.cpp @@ -28,7 +28,7 @@ checkUpdates::checkUpdates( QWidget * widget,checkforupdateswindow::functions ff ) : m_widget( widget ), - m_timeOut( settings::instance().networkTimeOut() ), + m_timeOut( settings::instance().networkTimeOut() * 1000 ), m_network( m_timeOut ), m_running( false ), m_functions( std::move( ff ) ) @@ -223,7 +223,7 @@ void checkUpdates::checkForUpdate( size_t position ) }else if( reply.timeOut() ){ - auto s = QString::number( m_timeOut ) ; + auto s = QString::number( m_timeOut / 1000 ) ; auto e = QObject::tr( "Network Request Failed To Respond Within %1 Seconds." ).arg( s ) ; DialogMsg( m_widget ).ShowUIOK( QObject::tr( "ERROR" ),e ) ; diff --git a/src/settings.cpp b/src/settings.cpp index c23c2197..fc1db885 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1214,14 +1214,12 @@ bool settings::showFavoritesInContextMenu() int settings::networkTimeOut() { - if( m_settings.contains( "NetworkTimeOut" ) ){ + if( !m_settings.contains( "NetworkTimeOutInSeconds" ) ){ - return m_settings.value( "NetworkTimeOut" ).toInt() ; - }else{ - int s = 5 ; - m_settings.setValue( "NetworkTimeOut",s ) ; - return s ; + m_settings.setValue( "NetworkTimeOutInSeconds",30 ) ; } + + return m_settings.value( "NetworkTimeOutInSeconds" ).toInt() ; } bool settings::showMountDialogWhenAutoMounting() diff --git a/src/sirikali.appdata.xml b/src/sirikali.appdata.xml index 043d621c..58ce6edd 100644 --- a/src/sirikali.appdata.xml +++ b/src/sirikali.appdata.xml @@ -34,6 +34,7 @@ +