mirror of
https://github.com/x-tools-author/x-tools.git
synced 2025-09-15 15:28:40 +08:00
chore: update files of project
This commit is contained in:
parent
581c675cf2
commit
2bd7add3e7
@ -215,7 +215,7 @@ set(SAK_APP_SOURCES
|
||||
${TOOLS_SOURCES}
|
||||
${TOOLS_UI_SOURCES}
|
||||
${APP_SOURCES}
|
||||
SAKResources.qrc
|
||||
qtswissarmyknife.qrc
|
||||
windows.rc)
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/QtSwissArmyKnife")
|
||||
@ -260,6 +260,14 @@ execute_process(
|
||||
OUTPUT_VARIABLE GIT_COMMIT
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
message(STATUS "Last commit: ${GIT_COMMIT}")
|
||||
add_compile_definitions(SAK_GIT_COMMIT="${GIT_COMMIT}")
|
||||
execute_process(
|
||||
COMMAND git log -1 --format=%ci
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
OUTPUT_VARIABLE LAST_COMMIT_DATE
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
message(STATUS "Last commit time: ${LAST_COMMIT_DATE}")
|
||||
add_compile_definitions(SAK_COMMIT_DATE="${LAST_COMMIT_DATE}")
|
||||
|
||||
option(SAK_AUTO_DEPLOY "" ON)
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Windows" AND SAK_AUTO_DEPLOY)
|
||||
|
||||
@ -67,5 +67,6 @@
|
||||
<file>resources/palette/SAKAppPaletteLight</file>
|
||||
<file>resources/palette/SAKAppPaletteDark</file>
|
||||
<file>resources/icon/IconBuy.svg</file>
|
||||
<file>resources/icon/IconQQ.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
@ -1,5 +1,16 @@
|
||||
file(GLOB BASE64_ASSISTANT_SOURCES "src/*.h" "src/*.cc" "src/*.ui")
|
||||
set(APP_BASE64_ASSISTANT_SOURCES ${BASE64_ASSISTANT_SOURCES} main.cc)
|
||||
set(APP_BASE64_ASSISTANT_SOURCES
|
||||
${BASE64_ASSISTANT_SOURCES}
|
||||
../../common/commonui/sakcommonmainwindow.h
|
||||
../../common/commonui/sakcommonmainwindow.cc
|
||||
../../common/common/SAKInterface.h
|
||||
../../common/common/SAKInterface.cc
|
||||
../../common/common/SAKTranslator.h
|
||||
../../common/common/SAKTranslator.cc
|
||||
../../common/common/SAKSettings.h
|
||||
../../common/common/SAKSettings.cc
|
||||
main.cc
|
||||
${CMAKE_SOURCE_DIR}/qtswissarmyknife.qrc)
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/QtSwissArmyKnife")
|
||||
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
|
||||
@ -15,6 +26,8 @@ endif()
|
||||
|
||||
target_link_libraries(Base64Assistant PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
|
||||
|
||||
add_compile_definitions(SAK_QT_CONF=qApp->applicationDirPath\(\)+\"/qt.conf\")
|
||||
|
||||
set_target_properties(
|
||||
Base64Assistant
|
||||
PROPERTIES ${BUNDLE_ID_OPTION} MACOSX_BUNDLE_BUNDLE_VERSION
|
||||
|
||||
@ -7,16 +7,46 @@
|
||||
* QtSwissArmyKnife is licensed according to the terms in the file LICENCE in
|
||||
* the root of the source code directory.
|
||||
******************************************************************************/
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QLoggingCategory>
|
||||
#include <QStyleFactory>
|
||||
|
||||
#include "SAKInterface.h"
|
||||
#include "SAKSettings.h"
|
||||
#include "sakbase64assistant.h"
|
||||
#include "sakcommonmainwindow.h"
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
QCoreApplication::setOrganizationName(QString("Qsaker"));
|
||||
QCoreApplication::setOrganizationDomain(QString("IT"));
|
||||
QCoreApplication::setApplicationName(QString("Base64Assistant"));
|
||||
|
||||
// Application style.
|
||||
QLoggingCategory logging_category{"SAK.Base64Assistant"};
|
||||
QString style = SAKSettings::instance()->appStyle();
|
||||
if (!style.isEmpty() && QStyleFactory::keys().contains(style)) {
|
||||
qCInfo(logging_category) << "The application style is:" << style;
|
||||
QApplication::setStyle(QStyleFactory::create(style));
|
||||
}
|
||||
|
||||
// High dpi settings.
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
|
||||
int policy = SAKSettings::instance()->hdpiPolicy();
|
||||
if (SAKInterface::isQtHighDpiScalePolicy(policy)) {
|
||||
auto cookedPolicy = Qt::HighDpiScaleFactorRoundingPolicy(policy);
|
||||
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(cookedPolicy);
|
||||
}
|
||||
#endif
|
||||
|
||||
QApplication app(argc, argv);
|
||||
|
||||
SAKBase64Assisatnt assistant;
|
||||
assistant.show();
|
||||
SAKCommonMainWindow main_window;
|
||||
SAKBase64Assisatnt* central_widget = new SAKBase64Assisatnt(&main_window);
|
||||
main_window.setWindowTitle(central_widget->windowTitle());
|
||||
main_window.setCentralWidget(central_widget);
|
||||
main_window.resize(main_window.height() * 1.732, main_window.height());
|
||||
main_window.show();
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#include "ui_sakbase64assistant.h"
|
||||
|
||||
SAKBase64Assisatnt::SAKBase64Assisatnt(QWidget* parent)
|
||||
: QDialog(parent), ui_(new Ui::SAKBase64Assisatnt) {
|
||||
: QWidget(parent), ui_(new Ui::SAKBase64Assisatnt) {
|
||||
ui_->setupUi(this);
|
||||
connect(ui_->image_, &QPushButton::clicked, this,
|
||||
&SAKBase64Assisatnt::OnImageClicked);
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
#ifndef SAKBASE64ASSISTANT_H
|
||||
#define SAKBASE64ASSISTANT_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QWidget>
|
||||
|
||||
namespace Ui {
|
||||
class SAKBase64Assisatnt;
|
||||
}
|
||||
|
||||
class SAKBase64Assisatnt : public QDialog {
|
||||
class SAKBase64Assisatnt : public QWidget {
|
||||
Q_OBJECT
|
||||
public:
|
||||
Q_INVOKABLE SAKBase64Assisatnt(QWidget* parent = Q_NULLPTR);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user