Skip to content

Commit

Permalink
this commit marks the release point of version 1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mhogomchungu committed Jul 10, 2023
1 parent afc0e49 commit 9f25031
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 30 deletions.
29 changes: 8 additions & 21 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 4 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion rpm/sirikali.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

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+
Expand Down
4 changes: 2 additions & 2 deletions src/checkforupdates.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) )
Expand Down Expand Up @@ -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 ) ;
Expand Down
10 changes: 4 additions & 6 deletions src/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions src/sirikali.appdata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
</screenshots>
<releases>
<!-- Get timestamp with 'date +%s' -->
<release version="1.5.1" timestamp="1688972892"></release>
<release version="1.5.0" timestamp="1646145392"></release>
<release version="1.4.8" timestamp="1606827679"></release>
<release version="1.4.7" timestamp="1601526348"></release>
Expand Down

0 comments on commit 9f25031

Please sign in to comment.