blumia/caesium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: build with Qt6

Browse Source
This commit is contained in:
Gary Wang
2021-10-04 15:24:39 +08:00
parent abf6bfd172
commit bed5ef71ea
11 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Caesium.pro
View File

@ -4,7 +4,7 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui network widgets QT += core gui network widgets concurrent
TARGET = Caesium TARGET = Caesium
TEMPLATE = app TEMPLATE = app

24
caesium.cpp
View File

@ -34,8 +34,8 @@
#include "loadpreview.h" #include "loadpreview.h"
#include "imageresize.h" #include "imageresize.h"
#include <QtWidgets/QStyleFactory> #include <QStyleFactory>
#include <QtWidgets/QScrollBar> #include <QScrollBar>
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
@ -48,6 +48,10 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QProgressDialog> #include <QProgressDialog>
#include <QImageReader>
#include <QDesktopServices>
#include <QActionGroup>
#include <QMovie>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -216,7 +220,9 @@ Caesium::Caesium(QWidget *parent) :
QDir::setCurrent(QFileInfo(QCoreApplication::arguments().at(0)).absolutePath()); QDir::setCurrent(QFileInfo(QCoreApplication::arguments().at(0)).absolutePath());
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings.setIniCodec("UTF-8"); settings.setIniCodec("UTF-8");
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QApplication::setStyle(QStyleFactory::create(settings.value("Preferences/style").value<QString>())); QApplication::setStyle(QStyleFactory::create(settings.value("Preferences/style").value<QString>()));
QApplication::setPalette(QApplication::style()->standardPalette()); QApplication::setPalette(QApplication::style()->standardPalette());
@ -708,7 +714,9 @@ void Caesium::on_setQualityButton_clicked()
void Caesium::on_actionPreview_triggered() void Caesium::on_actionPreview_triggered()
{ {
QtConcurrent::run(this, &Caesium::runPreview); [[maybe_unused]] QFuture<void> future = QtConcurrent::run([this](){
this->runPreview();
});
} }
void Caesium::on_previewButton_clicked() void Caesium::on_previewButton_clicked()
@ -1006,7 +1014,7 @@ void Caesium::on_cancelButton_clicked()
void Caesium::on_suffixLineEdit_textChanged(QString text) void Caesium::on_suffixLineEdit_textChanged(QString text)
{ {
QRegExp rx("[\\/|:*<>]"); QRegularExpression rx("[\\/|:*<>]");
if (text.contains(rx)) if (text.contains(rx))
{ {
ui->suffixErrorLabel->setVisible(true); ui->suffixErrorLabel->setVisible(true);
@ -1287,7 +1295,9 @@ void Caesium::on_actionSave_Profile_triggered()
if (fileName != "") if (fileName != "")
{ {
QSettings profile(fileName, QSettings::IniFormat); QSettings profile(fileName, QSettings::IniFormat);
profile.setIniCodec("UTF-8"); #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings.setIniCodec("UTF-8");
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
profile.setValue("Profile/quality", ui->qualitySlider->value()); profile.setValue("Profile/quality", ui->qualitySlider->value());
profile.setValue("Profile/same_quality", ui->sameLevelCheckBox->isChecked()); profile.setValue("Profile/same_quality", ui->sameLevelCheckBox->isChecked());
profile.setValue("Profile/format", ui->formatComboBox->currentIndex()); profile.setValue("Profile/format", ui->formatComboBox->currentIndex());
@ -1321,7 +1331,9 @@ void Caesium::profileLoadEngine(QString fileName)
if (fileName != "") if (fileName != "")
{ {
QSettings profile(fileName, QSettings::IniFormat); QSettings profile(fileName, QSettings::IniFormat);
profile.setIniCodec("UTF-8"); #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings.setIniCodec("UTF-8");
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
ui->qualitySlider->setValue(profile.value("Profile/quality").value<int>()); ui->qualitySlider->setValue(profile.value("Profile/quality").value<int>());
ui->sameLevelCheckBox->setChecked(profile.value("Profile/same_quality").value<bool>()); ui->sameLevelCheckBox->setChecked(profile.value("Profile/same_quality").value<bool>());
ui->formatComboBox->setCurrentIndex(profile.value("Profile/format").value<int>()); ui->formatComboBox->setCurrentIndex(profile.value("Profile/format").value<int>());

4
compressionthread.cpp
View File

@ -33,6 +33,8 @@
#include <QMessageBox> #include <QMessageBox>
#include <QDebug> #include <QDebug>
#include <QProgressDialog> #include <QProgressDialog>
#include <QFileInfo>
#include <QDir>
#include <windows.h> #include <windows.h>
#include <afxres.h> #include <afxres.h>
@ -100,7 +102,9 @@ CompressionThread::CompressionThread(QStringList list, QString orig_dir, QString
t_resize = resize; t_resize = resize;
t_structure = structure; t_structure = structure;
t_orig_dir = orig_dir; t_orig_dir = orig_dir;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings.setIniCodec("UTF-8"); settings.setIniCodec("UTF-8");
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
} }
QString t_getRatio(int origSize, int newSize) QString t_getRatio(int origSize, int newSize)

2
compressionthread.h
View File

@ -1,7 +1,7 @@
#ifndef COMPRESSIONTHREAD_H #ifndef COMPRESSIONTHREAD_H
#define COMPRESSIONTHREAD_H #define COMPRESSIONTHREAD_H
#include <QtGui> #include <QThread>
class CompressionThread : public QThread class CompressionThread : public QThread
{ {

4
global.cpp
View File

@ -24,10 +24,10 @@
#include <QString> #include <QString>
#include <QDir> #include <QDir>
#include <QDesktopServices> #include <QStandardPaths>
#include "global.h" #include "global.h"
QSettings settings(QStandardPaths::standardLocations(QStandardPaths::DataLocation).at(0) + "/Caesium/settings.ini", QSettings::IniFormat); QSettings settings(QStandardPaths::standardLocations(QStandardPaths::AppLocalDataLocation).at(0) + "/Caesium/settings.ini", QSettings::IniFormat);
QString out_folder = ""; QString out_folder = "";
bool same_folder_flag = false; bool same_folder_flag = false;
const int version_build = 170; const int version_build = 170;

9
main.cpp
View File

@ -24,13 +24,16 @@
# #
# ******************************************************************************/ # ******************************************************************************/
#include <QtWidgets/QApplication> #include <QApplication>
#include <QtWidgets/QSplashScreen> #include <QSplashScreen>
#include <QString> #include <QString>
#include "caesium.h" #include "caesium.h"
#include "global.h" #include "global.h"
#include <QDebug> #include <QDebug>
#include <QTextStream> #include <QTextStream>
#include <QDir>
#include <QTranslator>
#include <QBitmap>
// QM_FILE_INSTALL_DIR should be defined from the CMakeLists file. // QM_FILE_INSTALL_DIR should be defined from the CMakeLists file.
#ifndef QM_FILE_INSTALL_DIR #ifndef QM_FILE_INSTALL_DIR
@ -42,7 +45,9 @@ int main(int argc, char *argv[])
QApplication a(argc, argv); QApplication a(argc, argv);
Q_INIT_RESOURCE(icons); Q_INIT_RESOURCE(icons);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings.setIniCodec("UTF-8"); settings.setIniCodec("UTF-8");
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
a.addLibraryPath(a.applicationDirPath() + "/lib/"); a.addLibraryPath(a.applicationDirPath() + "/lib/");

2
preferences.cpp
View File

@ -44,7 +44,9 @@ Preferences::Preferences(QWidget *parent) :
ui(new Ui::Preferences) ui(new Ui::Preferences)
{ {
ui->setupUi(this); ui->setupUi(this);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings.setIniCodec("UTF-8"); settings.setIniCodec("UTF-8");
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
loadSettings(); loadSettings();
loadLanguages(); loadLanguages();
Preferences::on_pngLevelSlider_valueChanged(settings.value("Preferences/pnglevel").value<int>()); Preferences::on_pngLevelSlider_valueChanged(settings.value("Preferences/pnglevel").value<int>());

8
qdroptreewidget.cpp
View File

@ -26,9 +26,13 @@
#include "global.h" #include "global.h"
#include "caesium.h" #include "caesium.h"
#include <QtWidgets/QAction> #include <QAction>
#include <QtWidgets/QMenu> #include <QMenu>
#include <QStringList> #include <QStringList>
#include <QImageReader>
#include <QDirIterator>
#include <QDesktopServices>
#include <QMimeData>
QDropTreeWidget::QDropTreeWidget(QWidget *parent) QDropTreeWidget::QDropTreeWidget(QWidget *parent)
: QTreeWidget(parent) : QTreeWidget(parent)

2
startupupdater.h
View File

@ -1,7 +1,7 @@
#ifndef STARTUPUPDATER_H #ifndef STARTUPUPDATER_H
#define STARTUPUPDATER_H #define STARTUPUPDATER_H
#include <QtGui> #include <QThread>
#include <QNetworkReply> #include <QNetworkReply>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>

1
updater.cpp
View File

@ -30,6 +30,7 @@
#include <QtCore> #include <QtCore>
#include <QtGui> #include <QtGui>
#include <QtNetwork> #include <QtNetwork>
#include <QMessageBox>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

5
updater.h
View File

@ -1,12 +1,11 @@
#ifndef UPDATER_H #ifndef UPDATER_H
#define UPDATER_H #define UPDATER_H
#include <QtWidgets/QDialog> #include <QDialog>
#include <QtWidgets/QMessageBox>
#include <QCloseEvent> #include <QCloseEvent>
#include <QFile> #include <QFile>
#include <QTimer> #include <QTimer>
#include <QtNetwork> #include <QNetworkReply>
namespace Ui { namespace Ui {
class Updater; class Updater;