From 3ca23ea27615cd49a660e9de214c3ef3fcfe7c19 Mon Sep 17 00:00:00 2001 From: feiyangqingyun Date: Thu, 8 Jul 2021 08:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/designer.pro | 28 +++++++ designer/{designer => }/designer.qrc | 0 designer/designer/designer.pro | 69 ------------------ designer/{designer => form}/appfontdialog.cpp | 0 designer/{designer => form}/appfontdialog.h | 0 .../{designer => form}/assistantclient.cpp | 0 designer/{designer => form}/assistantclient.h | 0 designer/{designer => form}/fontpanel.cpp | 0 designer/{designer => form}/fontpanel.h | 0 designer/form/form.pri | 26 +++++++ designer/{designer => form}/mainwindow.cpp | 0 designer/{designer => form}/mainwindow.h | 0 designer/{designer => form}/newform.cpp | 0 designer/{designer => form}/newform.h | 0 .../{designer => form}/preferencesdialog.cpp | 0 .../{designer => form}/preferencesdialog.h | 0 .../{designer => form}/preferencesdialog.ui | 0 .../{designer => form}/qttoolbardialog.cpp | 0 designer/{designer => form}/qttoolbardialog.h | 0 .../{designer => form}/qttoolbardialog.ui | 0 .../{designer => form}/saveformastemplate.cpp | 0 .../{designer => form}/saveformastemplate.h | 0 .../{designer => form}/saveformastemplate.ui | 0 designer/{designer => form}/versiondialog.cpp | 0 designer/{designer => form}/versiondialog.h | 0 designer/{designer => }/images/back.png | Bin designer/{designer => }/images/designer.png | Bin .../{designer => }/images/designer_zh_CN.qm | Bin designer/{designer => }/images/down.png | Bin designer/{designer => }/images/forward.png | Bin designer/{designer => }/images/minus.png | Bin designer/{designer => }/images/plus.png | Bin designer/{designer => }/images/up.png | Bin designer/{designer => }/main.cpp | 0 designer/{designer => }/main.ico | Bin designer/{designer => }/main.rc | 0 .../{designer => qdesigner}/designer_enums.h | 0 .../{designer => qdesigner}/qdesigner.cpp | 0 designer/{designer => qdesigner}/qdesigner.h | 0 designer/qdesigner/qdesigner.pri | 23 ++++++ .../qdesigner_actions.cpp | 0 .../qdesigner_actions.h | 0 .../qdesigner_appearanceoptions.cpp | 0 .../qdesigner_appearanceoptions.h | 0 .../qdesigner_appearanceoptions.ui | 0 .../qdesigner_formwindow.cpp | 0 .../qdesigner_formwindow.h | 0 .../{designer => qdesigner}/qdesigner_pch.h | 0 .../qdesigner_server.cpp | 0 .../qdesigner_server.h | 0 .../qdesigner_settings.cpp | 0 .../qdesigner_settings.h | 0 .../qdesigner_toolwindow.cpp | 0 .../qdesigner_toolwindow.h | 0 .../qdesigner_workbench.cpp | 0 .../qdesigner_workbench.h | 0 designer/readme.txt | 2 +- 57 files changed, 78 insertions(+), 70 deletions(-) create mode 100644 designer/designer.pro rename designer/{designer => }/designer.qrc (100%) delete mode 100644 designer/designer/designer.pro rename designer/{designer => form}/appfontdialog.cpp (100%) rename designer/{designer => form}/appfontdialog.h (100%) rename designer/{designer => form}/assistantclient.cpp (100%) rename designer/{designer => form}/assistantclient.h (100%) rename designer/{designer => form}/fontpanel.cpp (100%) rename designer/{designer => form}/fontpanel.h (100%) create mode 100644 designer/form/form.pri rename designer/{designer => form}/mainwindow.cpp (100%) rename designer/{designer => form}/mainwindow.h (100%) rename designer/{designer => form}/newform.cpp (100%) rename designer/{designer => form}/newform.h (100%) rename designer/{designer => form}/preferencesdialog.cpp (100%) rename designer/{designer => form}/preferencesdialog.h (100%) rename designer/{designer => form}/preferencesdialog.ui (100%) rename designer/{designer => form}/qttoolbardialog.cpp (100%) rename designer/{designer => form}/qttoolbardialog.h (100%) rename designer/{designer => form}/qttoolbardialog.ui (100%) rename designer/{designer => form}/saveformastemplate.cpp (100%) rename designer/{designer => form}/saveformastemplate.h (100%) rename designer/{designer => form}/saveformastemplate.ui (100%) rename designer/{designer => form}/versiondialog.cpp (100%) rename designer/{designer => form}/versiondialog.h (100%) rename designer/{designer => }/images/back.png (100%) rename designer/{designer => }/images/designer.png (100%) rename designer/{designer => }/images/designer_zh_CN.qm (100%) rename designer/{designer => }/images/down.png (100%) rename designer/{designer => }/images/forward.png (100%) rename designer/{designer => }/images/minus.png (100%) rename designer/{designer => }/images/plus.png (100%) rename designer/{designer => }/images/up.png (100%) rename designer/{designer => }/main.cpp (100%) rename designer/{designer => }/main.ico (100%) rename designer/{designer => }/main.rc (100%) rename designer/{designer => qdesigner}/designer_enums.h (100%) rename designer/{designer => qdesigner}/qdesigner.cpp (100%) rename designer/{designer => qdesigner}/qdesigner.h (100%) create mode 100644 designer/qdesigner/qdesigner.pri rename designer/{designer => qdesigner}/qdesigner_actions.cpp (100%) rename designer/{designer => qdesigner}/qdesigner_actions.h (100%) rename designer/{designer => qdesigner}/qdesigner_appearanceoptions.cpp (100%) rename designer/{designer => qdesigner}/qdesigner_appearanceoptions.h (100%) rename designer/{designer => qdesigner}/qdesigner_appearanceoptions.ui (100%) rename designer/{designer => qdesigner}/qdesigner_formwindow.cpp (100%) rename designer/{designer => qdesigner}/qdesigner_formwindow.h (100%) rename designer/{designer => qdesigner}/qdesigner_pch.h (100%) rename designer/{designer => qdesigner}/qdesigner_server.cpp (100%) rename designer/{designer => qdesigner}/qdesigner_server.h (100%) rename designer/{designer => qdesigner}/qdesigner_settings.cpp (100%) rename designer/{designer => qdesigner}/qdesigner_settings.h (100%) rename designer/{designer => qdesigner}/qdesigner_toolwindow.cpp (100%) rename designer/{designer => qdesigner}/qdesigner_toolwindow.h (100%) rename designer/{designer => qdesigner}/qdesigner_workbench.cpp (100%) rename designer/{designer => qdesigner}/qdesigner_workbench.h (100%) diff --git a/designer/designer.pro b/designer/designer.pro new file mode 100644 index 0000000..b3c5b0c --- /dev/null +++ b/designer/designer.pro @@ -0,0 +1,28 @@ +QT += xml network +LIBS += -lQtDesignerComponents -lQtDesigner + +TARGET = designer +TEMPLATE = app +MOC_DIR = temp/moc +RCC_DIR = temp/rcc +UI_DIR = temp/ui +OBJECTS_DIR = temp/obj +DESTDIR = $$PWD/../bin +RC_FILE = main.rc +TRANSLATIONS = designer_zh_CN.ts + +SOURCES += main.cpp +CONFIG += warn_off release +RESOURCES += designer.qrc + +include($$PWD/form/form.pri) +include($$PWD/qdesigner/qdesigner.pri) + +INCLUDEPATH += $$PWD +INCLUDEPATH += $$PWD/form +INCLUDEPATH += $$PWD/qdesigner + +INCLUDEPATH += $$PWD/lib/sdk +INCLUDEPATH += $$PWD/lib/extension +INCLUDEPATH += $$PWD/lib/shared +INCLUDEPATH += $$PWD/lib/uilib diff --git a/designer/designer/designer.qrc b/designer/designer.qrc similarity index 100% rename from designer/designer/designer.qrc rename to designer/designer.qrc diff --git a/designer/designer/designer.pro b/designer/designer/designer.pro deleted file mode 100644 index 0352fe0..0000000 --- a/designer/designer/designer.pro +++ /dev/null @@ -1,69 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-04-07T09:15:51 -# -#------------------------------------------------- - -QT += xml network -CONFIG += warn_off release -RESOURCES += designer.qrc -LIBS += -lQtDesignerComponents -lQtDesigner - -INCLUDEPATH += $$PWD -INCLUDEPATH += ../lib/sdk ../lib/extension ../lib/shared ../lib/uilib - -TARGET = designer -TEMPLATE = app -MOC_DIR = temp/moc -RCC_DIR = temp/rcc -UI_DIR = temp/ui -OBJECTS_DIR = temp/obj -DESTDIR = bin -TRANSLATIONS = designer_zh_CN.ts -PRECOMPILED_HEADER = qdesigner_pch.h -win32:RC_FILE = main.rc - -HEADERS += \ - qdesigner.h \ - qdesigner_toolwindow.h \ - qdesigner_formwindow.h \ - qdesigner_workbench.h \ - qdesigner_settings.h \ - qdesigner_actions.h \ - qdesigner_server.h \ - qdesigner_appearanceoptions.h \ - saveformastemplate.h \ - newform.h \ - versiondialog.h \ - designer_enums.h \ - appfontdialog.h \ - preferencesdialog.h \ - assistantclient.h \ - mainwindow.h \ - qttoolbardialog.h \ - fontpanel.h - -SOURCES += main.cpp \ - qdesigner.cpp \ - qdesigner_toolwindow.cpp \ - qdesigner_formwindow.cpp \ - qdesigner_workbench.cpp \ - qdesigner_settings.cpp \ - qdesigner_server.cpp \ - qdesigner_actions.cpp \ - qdesigner_appearanceoptions.cpp \ - saveformastemplate.cpp \ - newform.cpp \ - versiondialog.cpp \ - appfontdialog.cpp \ - preferencesdialog.cpp \ - assistantclient.cpp \ - mainwindow.cpp \ - qttoolbardialog.cpp \ - fontpanel.cpp - -FORMS += saveformastemplate.ui \ - preferencesdialog.ui \ - qdesigner_appearanceoptions.ui \ - qttoolbardialog.ui - diff --git a/designer/designer/appfontdialog.cpp b/designer/form/appfontdialog.cpp similarity index 100% rename from designer/designer/appfontdialog.cpp rename to designer/form/appfontdialog.cpp diff --git a/designer/designer/appfontdialog.h b/designer/form/appfontdialog.h similarity index 100% rename from designer/designer/appfontdialog.h rename to designer/form/appfontdialog.h diff --git a/designer/designer/assistantclient.cpp b/designer/form/assistantclient.cpp similarity index 100% rename from designer/designer/assistantclient.cpp rename to designer/form/assistantclient.cpp diff --git a/designer/designer/assistantclient.h b/designer/form/assistantclient.h similarity index 100% rename from designer/designer/assistantclient.h rename to designer/form/assistantclient.h diff --git a/designer/designer/fontpanel.cpp b/designer/form/fontpanel.cpp similarity index 100% rename from designer/designer/fontpanel.cpp rename to designer/form/fontpanel.cpp diff --git a/designer/designer/fontpanel.h b/designer/form/fontpanel.h similarity index 100% rename from designer/designer/fontpanel.h rename to designer/form/fontpanel.h diff --git a/designer/form/form.pri b/designer/form/form.pri new file mode 100644 index 0000000..7482a1b --- /dev/null +++ b/designer/form/form.pri @@ -0,0 +1,26 @@ +FORMS += \ + $$PWD/preferencesdialog.ui \ + $$PWD/qttoolbardialog.ui \ + $$PWD/saveformastemplate.ui + +HEADERS += \ + $$PWD/appfontdialog.h \ + $$PWD/assistantclient.h \ + $$PWD/fontpanel.h \ + $$PWD/mainwindow.h \ + $$PWD/newform.h \ + $$PWD/preferencesdialog.h \ + $$PWD/qttoolbardialog.h \ + $$PWD/saveformastemplate.h \ + $$PWD/versiondialog.h + +SOURCES += \ + $$PWD/appfontdialog.cpp \ + $$PWD/assistantclient.cpp \ + $$PWD/fontpanel.cpp \ + $$PWD/mainwindow.cpp \ + $$PWD/newform.cpp \ + $$PWD/preferencesdialog.cpp \ + $$PWD/qttoolbardialog.cpp \ + $$PWD/saveformastemplate.cpp \ + $$PWD/versiondialog.cpp diff --git a/designer/designer/mainwindow.cpp b/designer/form/mainwindow.cpp similarity index 100% rename from designer/designer/mainwindow.cpp rename to designer/form/mainwindow.cpp diff --git a/designer/designer/mainwindow.h b/designer/form/mainwindow.h similarity index 100% rename from designer/designer/mainwindow.h rename to designer/form/mainwindow.h diff --git a/designer/designer/newform.cpp b/designer/form/newform.cpp similarity index 100% rename from designer/designer/newform.cpp rename to designer/form/newform.cpp diff --git a/designer/designer/newform.h b/designer/form/newform.h similarity index 100% rename from designer/designer/newform.h rename to designer/form/newform.h diff --git a/designer/designer/preferencesdialog.cpp b/designer/form/preferencesdialog.cpp similarity index 100% rename from designer/designer/preferencesdialog.cpp rename to designer/form/preferencesdialog.cpp diff --git a/designer/designer/preferencesdialog.h b/designer/form/preferencesdialog.h similarity index 100% rename from designer/designer/preferencesdialog.h rename to designer/form/preferencesdialog.h diff --git a/designer/designer/preferencesdialog.ui b/designer/form/preferencesdialog.ui similarity index 100% rename from designer/designer/preferencesdialog.ui rename to designer/form/preferencesdialog.ui diff --git a/designer/designer/qttoolbardialog.cpp b/designer/form/qttoolbardialog.cpp similarity index 100% rename from designer/designer/qttoolbardialog.cpp rename to designer/form/qttoolbardialog.cpp diff --git a/designer/designer/qttoolbardialog.h b/designer/form/qttoolbardialog.h similarity index 100% rename from designer/designer/qttoolbardialog.h rename to designer/form/qttoolbardialog.h diff --git a/designer/designer/qttoolbardialog.ui b/designer/form/qttoolbardialog.ui similarity index 100% rename from designer/designer/qttoolbardialog.ui rename to designer/form/qttoolbardialog.ui diff --git a/designer/designer/saveformastemplate.cpp b/designer/form/saveformastemplate.cpp similarity index 100% rename from designer/designer/saveformastemplate.cpp rename to designer/form/saveformastemplate.cpp diff --git a/designer/designer/saveformastemplate.h b/designer/form/saveformastemplate.h similarity index 100% rename from designer/designer/saveformastemplate.h rename to designer/form/saveformastemplate.h diff --git a/designer/designer/saveformastemplate.ui b/designer/form/saveformastemplate.ui similarity index 100% rename from designer/designer/saveformastemplate.ui rename to designer/form/saveformastemplate.ui diff --git a/designer/designer/versiondialog.cpp b/designer/form/versiondialog.cpp similarity index 100% rename from designer/designer/versiondialog.cpp rename to designer/form/versiondialog.cpp diff --git a/designer/designer/versiondialog.h b/designer/form/versiondialog.h similarity index 100% rename from designer/designer/versiondialog.h rename to designer/form/versiondialog.h diff --git a/designer/designer/images/back.png b/designer/images/back.png similarity index 100% rename from designer/designer/images/back.png rename to designer/images/back.png diff --git a/designer/designer/images/designer.png b/designer/images/designer.png similarity index 100% rename from designer/designer/images/designer.png rename to designer/images/designer.png diff --git a/designer/designer/images/designer_zh_CN.qm b/designer/images/designer_zh_CN.qm similarity index 100% rename from designer/designer/images/designer_zh_CN.qm rename to designer/images/designer_zh_CN.qm diff --git a/designer/designer/images/down.png b/designer/images/down.png similarity index 100% rename from designer/designer/images/down.png rename to designer/images/down.png diff --git a/designer/designer/images/forward.png b/designer/images/forward.png similarity index 100% rename from designer/designer/images/forward.png rename to designer/images/forward.png diff --git a/designer/designer/images/minus.png b/designer/images/minus.png similarity index 100% rename from designer/designer/images/minus.png rename to designer/images/minus.png diff --git a/designer/designer/images/plus.png b/designer/images/plus.png similarity index 100% rename from designer/designer/images/plus.png rename to designer/images/plus.png diff --git a/designer/designer/images/up.png b/designer/images/up.png similarity index 100% rename from designer/designer/images/up.png rename to designer/images/up.png diff --git a/designer/designer/main.cpp b/designer/main.cpp similarity index 100% rename from designer/designer/main.cpp rename to designer/main.cpp diff --git a/designer/designer/main.ico b/designer/main.ico similarity index 100% rename from designer/designer/main.ico rename to designer/main.ico diff --git a/designer/designer/main.rc b/designer/main.rc similarity index 100% rename from designer/designer/main.rc rename to designer/main.rc diff --git a/designer/designer/designer_enums.h b/designer/qdesigner/designer_enums.h similarity index 100% rename from designer/designer/designer_enums.h rename to designer/qdesigner/designer_enums.h diff --git a/designer/designer/qdesigner.cpp b/designer/qdesigner/qdesigner.cpp similarity index 100% rename from designer/designer/qdesigner.cpp rename to designer/qdesigner/qdesigner.cpp diff --git a/designer/designer/qdesigner.h b/designer/qdesigner/qdesigner.h similarity index 100% rename from designer/designer/qdesigner.h rename to designer/qdesigner/qdesigner.h diff --git a/designer/qdesigner/qdesigner.pri b/designer/qdesigner/qdesigner.pri new file mode 100644 index 0000000..83781a8 --- /dev/null +++ b/designer/qdesigner/qdesigner.pri @@ -0,0 +1,23 @@ +FORMS += \ + $$PWD/qdesigner_appearanceoptions.ui + +HEADERS += \ + $$PWD/designer_enums.h \ + $$PWD/qdesigner.h \ + $$PWD/qdesigner_actions.h \ + $$PWD/qdesigner_appearanceoptions.h \ + $$PWD/qdesigner_formwindow.h \ + $$PWD/qdesigner_server.h \ + $$PWD/qdesigner_settings.h \ + $$PWD/qdesigner_toolwindow.h \ + $$PWD/qdesigner_workbench.h + +SOURCES += \ + $$PWD/qdesigner.cpp \ + $$PWD/qdesigner_actions.cpp \ + $$PWD/qdesigner_appearanceoptions.cpp \ + $$PWD/qdesigner_formwindow.cpp \ + $$PWD/qdesigner_server.cpp \ + $$PWD/qdesigner_settings.cpp \ + $$PWD/qdesigner_toolwindow.cpp \ + $$PWD/qdesigner_workbench.cpp diff --git a/designer/designer/qdesigner_actions.cpp b/designer/qdesigner/qdesigner_actions.cpp similarity index 100% rename from designer/designer/qdesigner_actions.cpp rename to designer/qdesigner/qdesigner_actions.cpp diff --git a/designer/designer/qdesigner_actions.h b/designer/qdesigner/qdesigner_actions.h similarity index 100% rename from designer/designer/qdesigner_actions.h rename to designer/qdesigner/qdesigner_actions.h diff --git a/designer/designer/qdesigner_appearanceoptions.cpp b/designer/qdesigner/qdesigner_appearanceoptions.cpp similarity index 100% rename from designer/designer/qdesigner_appearanceoptions.cpp rename to designer/qdesigner/qdesigner_appearanceoptions.cpp diff --git a/designer/designer/qdesigner_appearanceoptions.h b/designer/qdesigner/qdesigner_appearanceoptions.h similarity index 100% rename from designer/designer/qdesigner_appearanceoptions.h rename to designer/qdesigner/qdesigner_appearanceoptions.h diff --git a/designer/designer/qdesigner_appearanceoptions.ui b/designer/qdesigner/qdesigner_appearanceoptions.ui similarity index 100% rename from designer/designer/qdesigner_appearanceoptions.ui rename to designer/qdesigner/qdesigner_appearanceoptions.ui diff --git a/designer/designer/qdesigner_formwindow.cpp b/designer/qdesigner/qdesigner_formwindow.cpp similarity index 100% rename from designer/designer/qdesigner_formwindow.cpp rename to designer/qdesigner/qdesigner_formwindow.cpp diff --git a/designer/designer/qdesigner_formwindow.h b/designer/qdesigner/qdesigner_formwindow.h similarity index 100% rename from designer/designer/qdesigner_formwindow.h rename to designer/qdesigner/qdesigner_formwindow.h diff --git a/designer/designer/qdesigner_pch.h b/designer/qdesigner/qdesigner_pch.h similarity index 100% rename from designer/designer/qdesigner_pch.h rename to designer/qdesigner/qdesigner_pch.h diff --git a/designer/designer/qdesigner_server.cpp b/designer/qdesigner/qdesigner_server.cpp similarity index 100% rename from designer/designer/qdesigner_server.cpp rename to designer/qdesigner/qdesigner_server.cpp diff --git a/designer/designer/qdesigner_server.h b/designer/qdesigner/qdesigner_server.h similarity index 100% rename from designer/designer/qdesigner_server.h rename to designer/qdesigner/qdesigner_server.h diff --git a/designer/designer/qdesigner_settings.cpp b/designer/qdesigner/qdesigner_settings.cpp similarity index 100% rename from designer/designer/qdesigner_settings.cpp rename to designer/qdesigner/qdesigner_settings.cpp diff --git a/designer/designer/qdesigner_settings.h b/designer/qdesigner/qdesigner_settings.h similarity index 100% rename from designer/designer/qdesigner_settings.h rename to designer/qdesigner/qdesigner_settings.h diff --git a/designer/designer/qdesigner_toolwindow.cpp b/designer/qdesigner/qdesigner_toolwindow.cpp similarity index 100% rename from designer/designer/qdesigner_toolwindow.cpp rename to designer/qdesigner/qdesigner_toolwindow.cpp diff --git a/designer/designer/qdesigner_toolwindow.h b/designer/qdesigner/qdesigner_toolwindow.h similarity index 100% rename from designer/designer/qdesigner_toolwindow.h rename to designer/qdesigner/qdesigner_toolwindow.h diff --git a/designer/designer/qdesigner_workbench.cpp b/designer/qdesigner/qdesigner_workbench.cpp similarity index 100% rename from designer/designer/qdesigner_workbench.cpp rename to designer/qdesigner/qdesigner_workbench.cpp diff --git a/designer/designer/qdesigner_workbench.h b/designer/qdesigner/qdesigner_workbench.h similarity index 100% rename from designer/designer/qdesigner_workbench.h rename to designer/qdesigner/qdesigner_workbench.h diff --git a/designer/readme.txt b/designer/readme.txt index 78653a9..bc1c125 100644 --- a/designer/readme.txt +++ b/designer/readme.txt @@ -1,3 +1,3 @@ -双击运行designer目录下的designer.pro文件,编译运行即可。 +双击运行designer.pro文件,编译运行即可。 PS:只支持Qt5以下的版本。 qdesigner.cpp最后一行代码改成了启动程序后自动加载qui.ui \ No newline at end of file