更新代码

LiKun-8 · Jul 8, 2021 · ae5e34a · ae5e34a
1 parent 64fb8ac
commit ae5e34a
Show file tree

Hide file tree

Showing 57 changed files with 78 additions and 70 deletions.
diff --git a/designer/designer.pro 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 → designer/designer.qrc b/designer/designer/designer.qrc → designer/designer.qrc
diff --git a/designer/designer/designer.pro b/designer/designer/designer.pro
diff --git a/designer/designer/appfontdialog.cpp → designer/form/appfontdialog.cpp b/designer/designer/appfontdialog.cpp → designer/form/appfontdialog.cpp
diff --git a/designer/designer/appfontdialog.h → designer/form/appfontdialog.h b/designer/designer/appfontdialog.h → designer/form/appfontdialog.h
diff --git a/designer/designer/assistantclient.cpp → designer/form/assistantclient.cpp b/designer/designer/assistantclient.cpp → designer/form/assistantclient.cpp
diff --git a/designer/designer/assistantclient.h → designer/form/assistantclient.h b/designer/designer/assistantclient.h → designer/form/assistantclient.h
diff --git a/designer/designer/fontpanel.cpp → designer/form/fontpanel.cpp b/designer/designer/fontpanel.cpp → designer/form/fontpanel.cpp
diff --git a/designer/designer/fontpanel.h → designer/form/fontpanel.h b/designer/designer/fontpanel.h → designer/form/fontpanel.h
diff --git a/designer/form/form.pri 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 → designer/form/mainwindow.cpp b/designer/designer/mainwindow.cpp → designer/form/mainwindow.cpp
diff --git a/designer/designer/mainwindow.h → designer/form/mainwindow.h b/designer/designer/mainwindow.h → designer/form/mainwindow.h
diff --git a/designer/designer/newform.cpp → designer/form/newform.cpp b/designer/designer/newform.cpp → designer/form/newform.cpp
diff --git a/designer/designer/newform.h → designer/form/newform.h b/designer/designer/newform.h → designer/form/newform.h
diff --git a/designer/designer/preferencesdialog.cpp → designer/form/preferencesdialog.cpp b/designer/designer/preferencesdialog.cpp → designer/form/preferencesdialog.cpp
diff --git a/designer/designer/preferencesdialog.h → designer/form/preferencesdialog.h b/designer/designer/preferencesdialog.h → designer/form/preferencesdialog.h
diff --git a/designer/designer/preferencesdialog.ui → designer/form/preferencesdialog.ui b/designer/designer/preferencesdialog.ui → designer/form/preferencesdialog.ui
diff --git a/designer/designer/qttoolbardialog.cpp → designer/form/qttoolbardialog.cpp b/designer/designer/qttoolbardialog.cpp → designer/form/qttoolbardialog.cpp
diff --git a/designer/designer/qttoolbardialog.h → designer/form/qttoolbardialog.h b/designer/designer/qttoolbardialog.h → designer/form/qttoolbardialog.h
diff --git a/designer/designer/qttoolbardialog.ui → designer/form/qttoolbardialog.ui b/designer/designer/qttoolbardialog.ui → designer/form/qttoolbardialog.ui
diff --git a/designer/designer/saveformastemplate.cpp → designer/form/saveformastemplate.cpp b/designer/designer/saveformastemplate.cpp → designer/form/saveformastemplate.cpp
diff --git a/designer/designer/saveformastemplate.h → designer/form/saveformastemplate.h b/designer/designer/saveformastemplate.h → designer/form/saveformastemplate.h
diff --git a/designer/designer/saveformastemplate.ui → designer/form/saveformastemplate.ui b/designer/designer/saveformastemplate.ui → designer/form/saveformastemplate.ui
diff --git a/designer/designer/versiondialog.cpp → designer/form/versiondialog.cpp b/designer/designer/versiondialog.cpp → designer/form/versiondialog.cpp
diff --git a/designer/designer/versiondialog.h → designer/form/versiondialog.h b/designer/designer/versiondialog.h → designer/form/versiondialog.h
diff --git a/designer/designer/images/back.png → designer/images/back.png b/designer/designer/images/back.png → designer/images/back.png
diff --git a/designer/designer/images/designer.png → designer/images/designer.png b/designer/designer/images/designer.png → designer/images/designer.png
diff --git a/designer/designer/images/designer_zh_CN.qm → designer/images/designer_zh_CN.qm b/designer/designer/images/designer_zh_CN.qm → designer/images/designer_zh_CN.qm
diff --git a/designer/designer/images/down.png → designer/images/down.png b/designer/designer/images/down.png → designer/images/down.png
diff --git a/designer/designer/images/forward.png → designer/images/forward.png b/designer/designer/images/forward.png → designer/images/forward.png
diff --git a/designer/designer/images/minus.png → designer/images/minus.png b/designer/designer/images/minus.png → designer/images/minus.png
diff --git a/designer/designer/images/plus.png → designer/images/plus.png b/designer/designer/images/plus.png → designer/images/plus.png
diff --git a/designer/designer/images/up.png → designer/images/up.png b/designer/designer/images/up.png → designer/images/up.png
diff --git a/designer/designer/main.cpp → designer/main.cpp b/designer/designer/main.cpp → designer/main.cpp
diff --git a/designer/designer/main.ico → designer/main.ico b/designer/designer/main.ico → designer/main.ico
diff --git a/designer/designer/main.rc → designer/main.rc b/designer/designer/main.rc → designer/main.rc
diff --git a/designer/designer/designer_enums.h → designer/qdesigner/designer_enums.h b/designer/designer/designer_enums.h → designer/qdesigner/designer_enums.h
diff --git a/designer/designer/qdesigner.cpp → designer/qdesigner/qdesigner.cpp b/designer/designer/qdesigner.cpp → designer/qdesigner/qdesigner.cpp
diff --git a/designer/designer/qdesigner.h → designer/qdesigner/qdesigner.h b/designer/designer/qdesigner.h → designer/qdesigner/qdesigner.h
diff --git a/designer/qdesigner/qdesigner.pri 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 → designer/qdesigner/qdesigner_actions.cpp b/designer/designer/qdesigner_actions.cpp → designer/qdesigner/qdesigner_actions.cpp
diff --git a/designer/designer/qdesigner_actions.h → designer/qdesigner/qdesigner_actions.h b/designer/designer/qdesigner_actions.h → designer/qdesigner/qdesigner_actions.h
diff --git a/.../designer/qdesigner_appearanceoptions.cpp → ...qdesigner/qdesigner_appearanceoptions.cpp b/.../designer/qdesigner_appearanceoptions.cpp → ...qdesigner/qdesigner_appearanceoptions.cpp
diff --git a/...er/designer/qdesigner_appearanceoptions.h → ...r/qdesigner/qdesigner_appearanceoptions.h b/...er/designer/qdesigner_appearanceoptions.h → ...r/qdesigner/qdesigner_appearanceoptions.h
diff --git a/...r/designer/qdesigner_appearanceoptions.ui → .../qdesigner/qdesigner_appearanceoptions.ui b/...r/designer/qdesigner_appearanceoptions.ui → .../qdesigner/qdesigner_appearanceoptions.ui
diff --git a/designer/designer/qdesigner_formwindow.cpp → designer/qdesigner/qdesigner_formwindow.cpp b/designer/designer/qdesigner_formwindow.cpp → designer/qdesigner/qdesigner_formwindow.cpp
diff --git a/designer/designer/qdesigner_formwindow.h → designer/qdesigner/qdesigner_formwindow.h b/designer/designer/qdesigner_formwindow.h → designer/qdesigner/qdesigner_formwindow.h
diff --git a/designer/designer/qdesigner_pch.h → designer/qdesigner/qdesigner_pch.h b/designer/designer/qdesigner_pch.h → designer/qdesigner/qdesigner_pch.h
diff --git a/designer/designer/qdesigner_server.cpp → designer/qdesigner/qdesigner_server.cpp b/designer/designer/qdesigner_server.cpp → designer/qdesigner/qdesigner_server.cpp
diff --git a/designer/designer/qdesigner_server.h → designer/qdesigner/qdesigner_server.h b/designer/designer/qdesigner_server.h → designer/qdesigner/qdesigner_server.h
diff --git a/designer/designer/qdesigner_settings.cpp → designer/qdesigner/qdesigner_settings.cpp b/designer/designer/qdesigner_settings.cpp → designer/qdesigner/qdesigner_settings.cpp
diff --git a/designer/designer/qdesigner_settings.h → designer/qdesigner/qdesigner_settings.h b/designer/designer/qdesigner_settings.h → designer/qdesigner/qdesigner_settings.h
diff --git a/designer/designer/qdesigner_toolwindow.cpp → designer/qdesigner/qdesigner_toolwindow.cpp b/designer/designer/qdesigner_toolwindow.cpp → designer/qdesigner/qdesigner_toolwindow.cpp
diff --git a/designer/designer/qdesigner_toolwindow.h → designer/qdesigner/qdesigner_toolwindow.h b/designer/designer/qdesigner_toolwindow.h → designer/qdesigner/qdesigner_toolwindow.h
diff --git a/designer/designer/qdesigner_workbench.cpp → designer/qdesigner/qdesigner_workbench.cpp b/designer/designer/qdesigner_workbench.cpp → designer/qdesigner/qdesigner_workbench.cpp
diff --git a/designer/designer/qdesigner_workbench.h → designer/qdesigner/qdesigner_workbench.h b/designer/designer/qdesigner_workbench.h → designer/qdesigner/qdesigner_workbench.h
diff --git a/designer/readme.txt b/designer/readme.txt
@@ -1,3 +1,3 @@
-˫������designerĿ¼�µ�designer.pro�ļ����������м��ɡ�
+˫������designer.pro�ļ����������м��ɡ�
 PS��ֻ֧��Qt5���µİ汾��
 qdesigner.cpp���һ�д���ĳ�������������Զ�����qui.ui