Update

README.md

@@ -1,23 +1,46 @@
 # TTKTinyTools
-Qt 自定义小工具集合 
+![TTKTinyTools](https://img.shields.io/badge/Greedysky-TTKTinyTools-green.svg?style=flat-square)
+![Version](https://img.shields.io/badge/Version-2.6.0.0-blue.svg?style=flat-square)
+![License](https://img.shields.io/badge/License-GPL%20V3-yellowgreen.svg?style=flat-square)
+
+![LOGO](https://github.com/Greedysky/TTKTinyTools/blob/master/TTKResource/logo_banner.png?raw=true)
+
+### **|[About](https://github.com/Greedysky/TTKTinyTools#usage)|[License](https://github.com/Greedysky/TTKTinyTools#license)|[Download](https://github.com/Greedysky/TTKTinyTools#download)|[Features](https://github.com/Greedysky/TTKTinyTools#features)|[Screenshots](https://github.com/Greedysky/TTKTinyTools#screenshots)|[Copyright](https://github.com/Greedysky/TTKTinyTools#copyright)|[Contribute](https://github.com/Greedysky/TTKTinyTools#how-to-contribute)|**
+
+Usage
+--------
+**TTKTinyTools 是基于 Qt 的自定义小工具集合，支持Windows和Linux平台.**
 
 ## CI Status
- * Qt stable version be tested on Qt4.8.7 for windows-mingw 32bit
- * Qt stable version be tested on Qt4.8.7 for ubuntu-linux-gcc 64bit
- * Qt stable version be tested on Qt5.9.9 for ubuntu-linux-gcc 64bit
- * Qt stable version be tested on Qt5.5.1 for windows-msvc 32bit
- * Qt stable version be tested on Qt5.x for windows-mingw 32bit
- * Qt stable version be tested on Qt6.x for windows-mingw 64bit
-
-| Platform | Qt & Compiler                 | Status                                                                 |
-| :---:    | :---:                         | :---:                                                                  |
-| Linux    | 4.8.7 GCC & 5.9.9 GCC         | ![Linux](https://img.shields.io/badge/build-passing-brightgreen.svg)   |
-| Windows  | 4.8.7 GCC & 5.x GCC & 6.x GCC | ![Windows](https://img.shields.io/badge/build-passing-brightgreen.svg) |
-| Windows  | 5.5.1 MSVC                    | ![Windows](https://img.shields.io/badge/build-passing-brightgreen.svg) |
-| OS X     | Clang                         | ![OSX](https://img.shields.io/badge/build-unknown-lightgrey.svg)       |
-
-Module
-----
+ * Qt stable version is tested on Qt4.x for windows-mingw 32bit
+ * Qt stable version is tested on Qt4.x for ubuntu-linux-gcc 64bit
+ * Qt stable version is tested on Qt5.x for ubuntu-linux-gcc 64bit
+ * Qt stable version is tested on Qt5.x for windows-msvc 32bit
+ * Qt stable version is tested on Qt5.x for windows-msvc 64bit
+ * Qt stable version is tested on Qt5.x for windows-mingw 32bit
+ * Qt stable version is tested on Qt6.x for windows-mingw 64bit
+
+| Platform | Qt & Compiler               | Status                                                                 |
+| :---:    | :---:                       | :---:                                                                  |
+| Linux    | 4.x GCC & 5.x GCC           | ![Linux](https://img.shields.io/badge/build-passing-brightgreen.svg)   |
+| Windows  | 4.x GCC & 5.x GCC & 6.x GCC | ![Windows](https://img.shields.io/badge/build-passing-brightgreen.svg) |
+| Windows  | 5.x MSVC                    | ![Windows](https://img.shields.io/badge/build-passing-brightgreen.svg) |
+| OS X     | Clang                       | ![OSX](https://img.shields.io/badge/build-unknown-lightgrey.svg)       |
+
+# For Developers
+
+License
+--------
+TTKTinyTools is free software licensed under the term of [Licence GPL v3](https://github.com/Greedysky/TTKTinyTools/blob/master/LICENSE). If you use TTKTinyTools or its constituent libraries, you must adhere to the terms of the license in question.
+
+Download
+--------
+Gitee URL: **<u>https://gitee.com/Greedysky/TTKTinyTools</u>**
+
+Github URL: **<u>https://github.com/Greedysky/TTKTinyTools</u>**
+
+Features
+--------
 | Module | Description | Status |
 | :---:  | :---:       | :---:  |
 | TTKPngHelper    | Qt 去除加载png图像文件时候的iccp警告     |   完成   |
@@ -49,14 +72,17 @@ Module
 | TTKWaterWave  | Qt 图片水波效果     |   完成   |
 | TTKNetTraffic  | Qt CPU内存网速显示     |   完成   |
 
+Screenshots
+--------
+
 Copyright
--------
+--------
  * This file is part of the TTK Tiny Tools project.
  * Copyright (C) 2015 - 2023 Greedysky Studio.
- * mail: [email protected].
+ * Mail: [email protected].
 
 How To Contribute
--------
+--------
  * Fork this project on github and make a branch. Commit in that branch, and push, then create a pull request to be reviewed and merged.
  * Create an issue if you have any problem when using project or you find a bug, etc.
  * What you can do: translation, write document, wiki, find or fix bugs, give your idea for this project etc.

TTKCommon/CMakeLists.txt

@@ -1,13 +1,4 @@
 cmake_minimum_required(VERSION 2.8.11)
 
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 OLD)
-  cmake_policy(SET CMP0005 OLD)
-  cmake_policy(SET CMP0028 OLD)
-endif(COMMAND cmake_policy)
-
-add_definitions(-DQT_NO_DEBUG)
-add_definitions(-DQT_THREAD)
-
 add_subdirectory(TTKLibrary)
 add_subdirectory(TTKDumper)

TTKCommon/TTKCommon.pri

@@ -31,15 +31,18 @@ win32{
             $$PWD/TTKLibrary/ttkabstractresizeinterface.h \
             $$PWD/TTKLibrary/ttkabstractthread.h \
             $$PWD/TTKLibrary/ttkabstractxml.h \
+            $$PWD/TTKLibrary/ttkany.h \
             $$PWD/TTKLibrary/ttkclickedgroup.h \
             $$PWD/TTKLibrary/ttkclickedlabel.h \
             $$PWD/TTKLibrary/ttkclickedslider.h \
             $$PWD/TTKLibrary/ttkcommandline.h \
+            $$PWD/TTKLibrary/ttkconcurrentqueue.h \
             $$PWD/TTKLibrary/ttkcryptographichash.h \
             $$PWD/TTKLibrary/ttkdesktopwrapper.h \
             $$PWD/TTKLibrary/ttkglobalhelper.h \
             $$PWD/TTKLibrary/ttkitemdelegate.h \
             $$PWD/TTKLibrary/ttklibrary.h \
+            $$PWD/TTKLibrary/ttklibraryversion.h \
             $$PWD/TTKLibrary/ttksemaphoreloop.h \
             $$PWD/TTKLibrary/ttksuperenum.h \
             $$PWD/TTKLibrary/ttktabbutton.h \

TTKCommon/TTKDumper/miniprocess.cpp

@@ -77,7 +77,7 @@ static bool killProcess(LPCWSTR processName)
    return true;
 }
 
-void TTKObject::killProcessByName(const QString &process)
+void TTK::killProcessByName(const QString &process)
 {
     const QStringList list(processList());
     if(list.contains(process) && killProcess(process.toStdWString().c_str()))
@@ -86,7 +86,7 @@ void TTKObject::killProcessByName(const QString &process)
     }
 }
 
-void TTKObject::killProcessByName(const QStringList &processes)
+void TTK::killProcessByName(const QStringList &processes)
 {
     const QStringList list(processList());
     for(const QString &process : qAsConst(processes))
@@ -146,7 +146,7 @@ static bool killProcess(int pid)
     return true;
 }
 
-void TTKObject::killProcessByName(const QString &process)
+void TTK::killProcessByName(const QString &process)
 {
     const QList<PIDInfo> list(processList());
     for(const PIDInfo &info : qAsConst(list))
@@ -159,7 +159,7 @@ void TTKObject::killProcessByName(const QString &process)
     }
 }
 
-void TTKObject::killProcessByName(const QStringList &processes)
+void TTK::killProcessByName(const QStringList &processes)
 {
     const QList<PIDInfo> list(processList());
     for(const QString &process : qAsConst(processes))

TTKCommon/TTKDumper/miniprocess.h

@@ -21,7 +21,7 @@
 
 #include "ttkglobaldefine.h"
 
-namespace TTKObject
+namespace TTK
 {
     /*!
      * Kill process by name.

TTKCommon/TTKDumper/ttkdumper.cpp

@@ -86,7 +86,7 @@ LONG TTKDumperPrivate::errorHandler(EXCEPTION_POINTERS *info)
 
     if(instance)
     {
-        MINIDUMPWRITEDUMP dump = TTKVoid_cast(MINIDUMPWRITEDUMP)GetProcAddress(instance, "MiniDumpWriteDump");
+        MINIDUMPWRITEDUMP dump = TTKVoidCast(MINIDUMPWRITEDUMP)GetProcAddress(instance, "MiniDumpWriteDump");
         if(dump)
         {
             WCHAR dumpPath[_MAX_PATH];

TTKCommon/TTKLibrary/CMakeLists.txt

@@ -2,44 +2,39 @@ cmake_minimum_required(VERSION 2.8.11)
 
 project(TTKLibrary)
 
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 OLD)
-  cmake_policy(SET CMP0005 OLD)
-  cmake_policy(SET CMP0028 OLD)
-endif(COMMAND cmake_policy)
-
-add_definitions(-DQT_NO_DEBUG)
-add_definitions(-DQT_THREAD)
-
-set(MUSIC_HEADERS
+set(HEADER_FILES
   ttkabstractmovedialog.h
   ttkabstractmoveresizewidget.h
   ttkabstractmovewidget.h
   ttkabstractresizeinterface.h
   ttkabstractthread.h
   ttkabstractxml.h
+  ttkany.h
   ttkclickedgroup.h
   ttkclickedlabel.h
   ttkclickedslider.h
   ttkcommandline.h
+  ttkconcurrentqueue.h
   ttkcryptographichash.h
   ttkdesktopwrapper.h
   ttkglobalhelper.h
   ttkitemdelegate.h
   ttklibrary.h
+  ttklibraryversion.h
   ttksemaphoreloop.h
   ttksuperenum.h
   ttktabbutton.h
   ttktime.h
   ttktoastlabel.h
 )
 
-set(MUSIC_SOURCES
+set(SOURCE_FILES
   ttkabstractmovedialog.cpp
   ttkabstractmoveresizewidget.cpp
   ttkabstractmovewidget.cpp
   ttkabstractthread.cpp
   ttkabstractxml.cpp
+  ttkany.cpp
   ttkclickedgroup.cpp
   ttkclickedlabel.cpp
   ttkclickedslider.cpp
@@ -55,34 +50,34 @@ set(MUSIC_SOURCES
   ttktoastlabel.cpp
 )
 
-SET(MUSIC_QRC
+SET(QRC_FILES
   ${PROJECT_NAME}.qrc
 )
 
 if(WIN32)
-  list(APPEND MUSIC_SOURCES ${PROJECT_NAME}.rc)
+  list(APPEND SOURCE_FILES ${PROJECT_NAME}.rc)
 endif()
 
 if(TTK_QT_VERSION VERSION_GREATER "4")
-  QT5_WRAP_CPP(MUSIC_MOC_H ${MUSIC_HEADERS})
-  QT5_ADD_RESOURCES(MUSIC_RCC_SRCS ${MUSIC_QRC})
+  qt5_wrap_cpp(MOC_FILES ${HEADER_FILES})
+  qt5_add_resources(RCC_FILES ${QRC_FILES})
 
   if(TTK_BUILD_SHARED)
-    add_library(${PROJECT_NAME} SHARED ${MUSIC_SOURCES} ${MUSIC_MOC_H} ${MUSIC_HEADERS})
+    add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${MOC_FILES} ${HEADER_FILES})
   else()
-    add_library(${PROJECT_NAME} STATIC ${MUSIC_SOURCES}  ${MUSIC_MOC_H} ${MUSIC_HEADERS})
+    add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES}  ${MOC_FILES} ${HEADER_FILES})
   endif()
 
   set(QT5_LIBS Qt5::Core Qt5::Xml Qt5::Gui Qt5::Widgets)
   target_link_libraries(${PROJECT_NAME} ${QT5_LIBS})
 else()
-  QT4_WRAP_CPP(MUSIC_MOC_H ${MUSIC_HEADERS})
-  QT4_ADD_RESOURCES(MUSIC_RCC_SRCS ${MUSIC_QRC})
+  qt4_wrap_cpp(MOC_FILES ${HEADER_FILES})
+  qt4_add_resources(RCC_FILES ${QRC_FILES})
 
   if(TTK_BUILD_SHARED)
-    add_library(${PROJECT_NAME} SHARED ${MUSIC_SOURCES} ${MUSIC_MOC_H} ${MUSIC_RCC_SRCS} ${MUSIC_HEADERS})
+    add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${MOC_FILES} ${RCC_FILES} ${HEADER_FILES})
   else()
-    add_library(${PROJECT_NAME} STATIC ${MUSIC_SOURCES} ${MUSIC_MOC_H} ${MUSIC_RCC_SRCS} ${MUSIC_HEADERS})
+    add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${MOC_FILES} ${RCC_FILES} ${HEADER_FILES})
   endif()
 
   set(QT4_LIBS ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY})

TTKCommon/TTKLibrary/TTKLibrary.pro

@@ -46,7 +46,7 @@ INCLUDEPATH += $$PWD/../
 HEADERS += \
     $$PWD/../ttkversion.h \
     $$PWD/../ttksingleton.h \
-    $$PWD/../ttkqtwrapper.h \
+    $$PWD/../ttkqtcompat.h \
     $$PWD/../ttkprivate.h \
     $$PWD/../ttklogger.h \
     $$PWD/../ttknumberdefine.h \
@@ -60,15 +60,18 @@ HEADERS += \
     $$PWD/ttkabstractresizeinterface.h \
     $$PWD/ttkabstractthread.h \
     $$PWD/ttkabstractxml.h \
+    $$PWD/ttkany.h \
     $$PWD/ttkclickedgroup.h \
     $$PWD/ttkclickedlabel.h \
     $$PWD/ttkclickedslider.h \
     $$PWD/ttkcommandline.h \
+    $$PWD/ttkconcurrentqueue.h \
     $$PWD/ttkcryptographichash.h \
     $$PWD/ttkdesktopwrapper.h \
     $$PWD/ttkglobalhelper.h \
     $$PWD/ttkitemdelegate.h \
     $$PWD/ttklibrary.h \
+    $$PWD/ttklibraryversion.h \
     $$PWD/ttksemaphoreloop.h \
     $$PWD/ttksuperenum.h \
     $$PWD/ttktabbutton.h \
@@ -81,6 +84,7 @@ SOURCES += \
     $$PWD/ttkabstractmovewidget.cpp \
     $$PWD/ttkabstractthread.cpp \
     $$PWD/ttkabstractxml.cpp \
+    $$PWD/ttkany.cpp \
     $$PWD/ttkclickedgroup.cpp \
     $$PWD/ttkclickedlabel.cpp \
     $$PWD/ttkclickedslider.cpp \

TTKCommon/TTKLibrary/ttkabstractmovedialog.cpp

@@ -23,7 +23,7 @@ void TTKAbstractMoveDialog::paintEvent(QPaintEvent *event)
     if(m_showShadow)
     {
         QPainter painter(this);
-        TTKObject::setBorderShadow(this, &painter);
+        TTK::setBorderShadow(this, &painter);
     }
 }
 
@@ -35,7 +35,7 @@ void TTKAbstractMoveDialog::mousePressEvent(QMouseEvent *event)
         m_leftButtonPress = true;
     }
 
-    m_pressAt = QtMouseEventGlobalPos(event);
+    m_pressAt = QtMouseGlobalPos(event);
 }
 
 void TTKAbstractMoveDialog::mouseMoveEvent(QMouseEvent *event)
@@ -47,15 +47,15 @@ void TTKAbstractMoveDialog::mouseMoveEvent(QMouseEvent *event)
         return;
     }
 
-    const int xpos = QtMouseEventGlobalX(event) - m_pressAt.x();
-    const int ypos = QtMouseEventGlobalY(event) - m_pressAt.y();
-    m_pressAt = QtMouseEventGlobalPos(event);
+    const int xpos = QtMouseGlobalX(event) - m_pressAt.x();
+    const int ypos = QtMouseGlobalY(event) - m_pressAt.y();
+    m_pressAt = QtMouseGlobalPos(event);
     move(x() + xpos, y() + ypos);
 }
 
 void TTKAbstractMoveDialog::mouseReleaseEvent(QMouseEvent *event)
 {
     QDialog::mouseReleaseEvent(event);
-    m_pressAt = QtMouseEventGlobalPos(event);
+    m_pressAt = QtMouseGlobalPos(event);
     m_leftButtonPress = false;
 }