Commit 614e503e authored by Ingemar Ceicer's avatar Ingemar Ceicer

Merge branch 'v2.5.0' of gitlab.com:posktomten/hashsum into v2.5.0

parents d378aade afe2a8ca
......@@ -7,4 +7,4 @@ TryExec=hashsum
Exec=hashsum %F
Icon=hashsum
Categories=Utility;
X-AppImage-Version=91f32b6
X-AppImage-Version=84c622a
......@@ -7,7 +7,7 @@ linuxdeployqt hashsum -bundle-non-qt-libs -appimage -verbose=2 -qmake=/opt/Qt5.1
statisk
linuxdeployqt hashsum -bundle-non-qt-libs -appimage -verbose=2 -qmake=/opt/Qt5.14.1_static/bin/qmake -no-translations -no-copy-copyright-files -executable=hashsum -extra-plugins=platformthemes
linuxdeployqt hashsum -bundle-non-qt-libs -appimage -verbose=2 -qmake=/opt/Qt5.14.2_static/bin/qmake -no-translations -no-copy-copyright-files -executable=hashsum -extra-plugins=platformthemes
dynamisk ubuntu 16.04 32- bit
......
......@@ -2429,8 +2429,11 @@ bool Hash::askForFileNameCheck(const QString &sokvag2, const std::string &algori
}
}
qSort(fileNamesOld);
qSort(fileNamesNew);
// obsolete
// qSort(fileNamesOld);
// qSort(fileNamesNew);
fileNamesOld.sort();
fileNamesNew.sort();
QString no, nn, so, sn;
int pos1;
QList<QString>::iterator itOld;
......
......@@ -21,6 +21,7 @@
#include <string>
#include <sstream>
#include <fstream>
#include <algorithm>
#include "checkforupdates.h"
#include "config.h"
#include "extqlineedit.h"
......
......@@ -40,17 +40,17 @@ TARGET = hashsum-2.5.1
# any feature of Qt which as been marked as deprecated (the exact warnings
# depend on your compiler). Please consult the documentation of the
# deprecated API in order to know how to port your code away from it.
#DEFINES += QT_DEPRECATED_WARNINGS
# DEFINES += QT_DEPRECATED_WARNINGS
DEFINES += QT_NO_DEPRECATED_WARNINGS
## 32-bit Lubuntu 16.04
# CONFIG += /usr/lib/i386-linux-gnu/qt5/bin/lrelease embed_translations
## 64-bit Lubuntu 16.04
# CONFIG += /opt/Qt5.14.1_static/bin/lrelease embed_translations
CONFIG += /opt/Qt5.14.2_static/bin/lrelease embed_translations
# CONFIG += /opt/Qt5.13.1/5.13.1/gcc_64/bin/lrelease embed_translations
## Windows
# CONFIG += C:\Qt\Qt5.13.2_static\5.13.2\bin\lrelease embed_translations
CONFIG += C:\Qt\Qt5.14.2\5.14.2\bin\lrelease embed_translations
# CONFIG += C:\Qt\Qt5.14.2\5.14.2\bin\lrelease embed_translations
## 64-bit Lubuntu 14.04
# CONFIG += /opt/Qt5.8.0/5.8/gcc_64/bin\lrelease embed_translations
## Ubuntu 18.04
......@@ -59,12 +59,22 @@ TARGET = hashsum-2.5.1
# Input
HEADERS += checkforupdates.h config.h createuser.h hash.h extqlineedit.h
HEADERS += checkforupdates.h \
config.h \
createuser.h \
hash.h \
extqlineedit.h
FORMS += hash.ui license.ui
SOURCES += checkforupdates.cpp config.cpp createuser.cpp hash.cpp main.cpp extqlineedit.cpp \
SOURCES += checkforupdates.cpp \
config.cpp \
createuser.cpp \
hash.cpp main.cpp \
extqlineedit.cpp \
duplicates.cpp \
isthereaduplicate.cpp \
system.cpp
RC_FILE = myapp.rc
#CODECFORSRC = UTF-8
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SelectFont</class>
<widget class="QDialog" name="SelectFont">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>671</width>
<height>140</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>2</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>Select font</string>
</property>
<widget class="QComboBox" name="comboFontSizes">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>111</width>
<height>31</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
<widget class="QFontComboBox" name="comboFontFamilies">
<property name="geometry">
<rect>
<x>140</x>
<y>10</y>
<width>521</width>
<height>31</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="insertPolicy">
<enum>QComboBox::InsertAfterCurrent</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>371</width>
<height>31</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="normal">
<property name="text">
<string>Normal</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="bold">
<property name="text">
<string>Bold</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="italic">
<property name="text">
<string>Italic</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="boldItalic">
<property name="text">
<string>Bold and italic</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QComboBox" name="comboFilter">
<property name="geometry">
<rect>
<x>390</x>
<y>50</y>
<width>271</width>
<height>31</height>
</rect>
</property>
</widget>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>90</y>
<width>511</width>
<height>33</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pbOk">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbDefault">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pbExit">
<property name="text">
<string>Exit</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<resources/>
<connections/>
</ui>
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment