software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

chore: update files of project

Browse Source
This commit is contained in:
wuhai 2024-03-28 09:31:12 +08:00
parent 5075af52bf
commit 36bc0e192d
6 changed files with 99 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -132,6 +132,9 @@ endif()
if(X_TOOLS_BLUETOOTH_MODULE_IS_VALID)
target_link_libraries(xTools PRIVATE Qt${QT_VERSION_MAJOR}::Bluetooth)
endif()
if(X_TOOLS_PRIVATE_MODULE_IS_VALID)
target_link_libraries(xTools PRIVATE QtAES::QtAES)
endif()
# -------------------------------------------------------------------------------------------------
# Assistant applications

6
Source/Application.cpp
View File

@ -18,8 +18,12 @@
#include "xToolsSettings.h"
Application::Application(int argc, char** argv)
Application::Application(int argc, char **argv)
#ifdef X_TOOLS_IMPORT_MODULE_PRIVATE
: xToolsPrivateApplication(argc, argv)
#else
: xToolsApplication(argc, argv)
#endif
{
// Setup ui language.
QString language = xToolsSettings::instance()->language();

10
Source/Application.h
View File

@ -8,11 +8,17 @@
**************************************************************************************************/
#pragma once
#include <QSplashScreen>
#ifdef X_TOOLS_IMPORT_MODULE_PRIVATE
#include "xToolsPrivateApplication.h"
#else
#include "xToolsApplication.h"
#endif
#ifdef X_TOOLS_IMPORT_MODULE_PRIVATE
class Application : public xToolsPrivateApplication
#else
class Application : public xToolsApplication
#endif
{
Q_OBJECT
public:

6
Source/MainWindow.cpp
View File

@ -53,7 +53,11 @@
#endif
MainWindow::MainWindow(QWidget* parent)
#ifdef X_TOOLS_IMPORT_MODULE_PRIVATE
: xToolsPrivateMainWindow(parent)
#else
: xToolsMainWindow(parent)
#endif
{
#ifdef Q_OS_WIN
// Setup system tray icon.
@ -246,7 +250,7 @@ void MainWindow::initHelpMenu()
void MainWindow::initLinksMenu()
{
QMenu* linksMenu = new QMenu(tr("&Links"), this);
QMenu* linksMenu = new QMenu(tr("Links"), this);
menuBar()->insertMenu(m_helpMenu->menuAction(), linksMenu);
struct Link

8
Source/MainWindow.h
View File

@ -21,9 +21,17 @@
#include <QTabWidget>
#include <QTranslator>
#ifdef X_TOOLS_IMPORT_MODULE_PRIVATE
#include "xToolsPrivateMainWindow.h"
#else
#include "xToolsMainWindow.h"
#endif
#ifdef X_TOOLS_IMPORT_MODULE_PRIVATE
class MainWindow : public xToolsPrivateMainWindow
#else
class MainWindow : public xToolsMainWindow
#endif
{
Q_OBJECT
public:

108
Source/ToolBox/ToolBoxUI/xToolsToolBoxUi.ui
View File

@ -106,28 +106,10 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<pointsize>9</pointsize>
<italic>true</italic>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Output control</string>
</property>
</widget>
<item row="4" column="1">
<widget class="xToolsTextFormatComboBox" name="comboBoxOutputFormat"/>
</item>
<item row="2" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<item row="5" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_5">
<item row="1" column="0">
<widget class="xToolsCheckBox" name="checkBoxOutputDate">
@ -173,20 +155,7 @@
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<item row="6" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QPushButton" name="pushButtonOutputSettings">
@ -204,9 +173,6 @@
</item>
</layout>
</item>
<item row="3" column="1">
<widget class="xToolsTextFormatComboBox" name="comboBoxOutputFormat"/>
</item>
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@ -225,9 +191,75 @@
</item>
</layout>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<pointsize>9</pointsize>
<italic>true</italic>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Output control</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>8</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="widget_3" native="true">
<layout class="QGridLayout" name="gridLayout_7">