From b3f30ba8db3e097a707970abca1723ad30796f7f Mon Sep 17 00:00:00 2001 From: Felix de las Pozas Alvarez Date: Thu, 21 Sep 2017 21:35:49 +0200 Subject: [PATCH] Release version. Installer files. Use windows registry instead of ini file. --- AboutDialog.ui | 4 ++-- CMakeLists.txt | 7 ++----- SimpleHasher.cpp | 4 ++-- installer/image.bmp | Bin 0 -> 52574 bytes installer/script.iss.in | 37 +++++++++++++++++++++++++++++++++++++ installer/smallimage.bmp | Bin 0 -> 4326 bytes readme.md | 10 ++++++---- 7 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 installer/image.bmp create mode 100644 installer/script.iss.in create mode 100644 installer/smallimage.bmp diff --git a/AboutDialog.ui b/AboutDialog.ui index ffcef74..5352231 100644 --- a/AboutDialog.ui +++ b/AboutDialog.ui @@ -100,7 +100,7 @@ - Copyright (c) 2016 Félix de las Pozas Álvarez + Copyright (c) 2017 Félix de las Pozas Álvarez Qt::AlignCenter @@ -218,7 +218,7 @@ Qt Framework - version 5.5 + version 5.9 Qt::AlignCenter diff --git a/CMakeLists.txt b/CMakeLists.txt index 238a47c..38bfded 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,6 @@ find_package(Qt5 COMPONENTS Widgets Multimedia) #add_definitions(${Qt5Multimedia_DEFINITIONS}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Multimedia_EXECUTABLE_COMPILE_FLAGS}") if (CMAKE_BUILD_TYPE MATCHES Debug) set(CORE_EXTERNAL_LIBS ${CORE_EXTERNAL_LIBS} ${QT_QTTEST_LIBRARY}) @@ -29,6 +28,7 @@ endif (CMAKE_BUILD_TYPE MATCHES Debug) if(DEFINED MINGW) configure_file("${PROJECT_SOURCE_DIR}/resources.rc.in" "${PROJECT_BINARY_DIR}/resources.rc") + configure_file("${PROJECT_SOURCE_DIR}/installer/script.iss.in" "${PROJECT_BINARY_DIR}/script.iss") set(CORE_SOURCES ${CORE_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/resources.rc) set(CMAKE_RC_COMPILE_OBJECT " -O coff -o -i ") enable_language(RC) @@ -42,7 +42,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} # For wrap/ui files ) -set(CMAKE_CXX_FLAGS " -Wall -Wno-deprecated -std=c++11 -mwindows") +set(CMAKE_CXX_FLAGS " -Wall -Wno-deprecated -std=c++11 -mwindows -m64") # Add Qt Resource files qt5_add_resources(RESOURCES @@ -79,9 +79,6 @@ set (CORE_SOURCES set(CORE_EXTERNAL_LIBS Qt5::Widgets - Qt5::Multimedia - ${LIBVORBIS_LIBRARIES} - ${LIBOGG_LIBRARY} ) add_executable(SimpleHasher ${CORE_SOURCES}) diff --git a/SimpleHasher.cpp b/SimpleHasher.cpp index 10008f4..8824514 100644 --- a/SimpleHasher.cpp +++ b/SimpleHasher.cpp @@ -517,7 +517,7 @@ void SimpleHasher::onComputationFinished() //---------------------------------------------------------------- void SimpleHasher::loadSettings() { - QSettings settings{"SimpleHasher.ini", QSettings::IniFormat}; + QSettings settings("Felix de las Pozas Alvarez", "SimpleHasher"); auto geometry = settings.value(GEOMETRY, QByteArray()).toByteArray(); if(geometry.length() != 0) @@ -551,7 +551,7 @@ void SimpleHasher::loadSettings() //---------------------------------------------------------------- void SimpleHasher::saveSettings() { - QSettings settings{"SimpleHasher.ini", QSettings::IniFormat}; + QSettings settings("Felix de las Pozas Alvarez", "SimpleHasher"); settings.setValue(GEOMETRY, saveGeometry()); if(m_mode == Mode::GENERATE) diff --git a/installer/image.bmp b/installer/image.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8578660c047ec06108cbfdf9965cd6ad41aa3b18 GIT binary patch literal 52574 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�+)joz2Jeq@aby>&T=rW$WYY!gXf~k0QhXWR*p*0qvxs|25)P+h zc?|0f6-L}U43mc_xWhwlUl#c=TMPS%B0)JO?qztr@MFC7-DruD;bKwWBu+m%Esu9J2=n4==S9}U2ce*&!rq!g!zQLLm74G3W= zWSmkTM;cweegW>XlEU0v`N6EpqMSmNy{fX}0@uo7?lSOf14n!LDSc zaf-Ucsu}B&(SwgR>SwgR>S gwgR>SwgR>SwgR>SwgR>SwgR>SwgR>S|KSS!8v6-V2DHs2pW(8;SxzODr!6sBjHe^f)XSIFb0Sa5KX`U zYEV>GVcqT0vb-s;50>Rs-lbJad6xHm{L{0`GQAuN<>&mXW~S%$`}LdYe%(D27T0dc zDK%1;<36UP0D1(`gXavDcHz`!t~#hus1O96=b@vc1BpZeU0q%1>FGgVUmper1~4=< zgprXEjE#+9VqyYQQ&X6knZexL92OQ9u(Y&!iPk4EGVaSjn@b>n`(4j-& zb>&cv))vyhUKg4wfYBQ-S@bLY-QT3Q;?)6Kva_?1laqrbOO_xvHy3$%d04h=8S?Y70C_o6o&Ye54Yu7I9-n|=p_Uysl zy?e25-#+Z$zaIw<9KgYY2XW}oA+)u%;qc+ZICA6&jvhUVW5C-rK<_ylBJ&SYa&f)y|^SE%~0xn*>h)b6);qv9nxN_wRu3o*0YuB#f`t|F$ zapMMV-n@zS_IBL5bqlv|-^QIgcX0RaUEI5O5BKli$AbqC@bKY7JbLs9j~_qAlP6E` z^yyPPd-e>^pFhWo7ccPgf&`vqOp`XT!{3ii>sz!YZ$4{J- zI&W!dRTIgjxcQHALP}g{srxvn`m<>$=V#1u*0I}FFGa`->doUf z49moRS*b%g2{#~JM&$GLdy7X%r7iVKQ%56Yl`hA7{Q8}N&Zt_VNbH>>E3G*$P~>X$ z&9b%<#cxKO?HaOvj#xqGt&rDZzLdN0W5wzQV+VR8jifHYaYgDn@xu=|4w&8P2Mn1(|p?GbXDw zeWl7LL-m2BqGNjIR&{)|DV+=pl}_7yn1H%v3@FAM&$w`0$7mF>i=;ozRJHox!hXx~P_LvTAj2s({M}8pErgVIWT+DN+o1wQP8u%E?yj<1N=P(o zoY$3`$<~Tx>lX5lg?P(3ZdQU~yeOuUEv_SE7JHx6g!{xJ6TXY&O^vu)((k%S&sbyFp zzTeksqvn<0K)K1ZEArVi4Hmhnn*QoL^KAmhr;;6^Y7@P>h}k!Ii7a}c<5xM##ZbjHZqu%bLLgzEZjp67mXg!4r+?7eq+EQv q@9#oueM^%Q2c<7^3fprWyEJ literal 0 HcmV?d00001 diff --git a/readme.md b/readme.md index 6cc74f6..d5ed803 100644 --- a/readme.md +++ b/readme.md @@ -32,7 +32,7 @@ The following libraries are required: * [Qt opensource framework](http://www.qt.io/). # Install -The only current option is build from source as binaries are not provided. +Download and execute the latest installer from the [releases](https://github.com/FelixdelasPozas/SimpleHasher/releases) page. # Screenshots Simple main dialog, showing the progress while computing the hashes of some files. @@ -52,11 +52,13 @@ Configuration dialog **Status**: finished +**License**: GNU General Public License 3 + **cloc statistics** | Language |files |blank |comment |code | |:-----------------------------|--------------:|------------:|-----------------:|-------:| -| C++ | 13 | 462 | 378 | 2040 | +| C++ | 13 | 463 | 378 | 2039 | | C/C++ Header | 12 | 199 | 493 | 383 | -| CMake | 1 | 16 | 10 | 63 | -| **Total** | **26** | **677** | **881** |**2486**| +| CMake | 1 | 16 | 10 | 60 | +| **Total** | **26** | **678** | **881** |**2482**|