diff --git a/src/Dyt.qrc b/src/Dyt.qrc index 53582c31..5f8096ca 100644 --- a/src/Dyt.qrc +++ b/src/Dyt.qrc @@ -11,7 +11,10 @@ res/default/menu_new_file.png res/default/menu_open_file.png res/default/menu_save_file.png - res/default/menu_save_as_file.png + res/default/menu_wave_file.png + res/default/menu_light_file.png + res/default/menu_table_file.png + res/default/menu_surface_file.png res/default/menu_save_shape_file.png res/default/menu_save_store_file.png res/default/menu_report_mesh.png diff --git a/src/config/skin/default.qss b/src/config/skin/default.qss index d4c2f311..122b0a08 100644 --- a/src/config/skin/default.qss +++ b/src/config/skin/default.qss @@ -219,6 +219,18 @@ QWidget#FileManagerMenu > QToolButton#menu_save_shape_file { QWidget#FileManagerMenu > QToolButton#menu_save_shape_file { qproperty-icon: url(:/res/default/menu_report_mesh.png); } +QWidget#FileManagerMenu > QToolButton#menu_wave_file { + qproperty-icon: url(:/res/default/menu_wave_file.png); +} +QWidget#FileManagerMenu > QToolButton#menu_surface_file { + qproperty-icon: url(:/res/default/menu_surface_file.png); +} +QWidget#FileManagerMenu > QToolButton#menu_table_file { + qproperty-icon: url(:/res/default/menu_table_file.png); +} +QWidget#FileManagerMenu > QToolButton#menu_light_file { + qproperty-icon: url(:/res/default/menu_light_file.png); +} QWidget#SystemManagerMenu > QToolButton#menu_exit { qproperty-icon: url(:/res/default/menu_exit.png); @@ -322,6 +334,7 @@ QMenu { background: #212F3C; color: #e0e0e0; padding: 4px; + border-radius: 3px; } QMenu::item { padding: 6px 30px 6px 20px; @@ -340,4 +353,4 @@ QMenu::separator { height: 1px; background: #555; margin: 5px 10px; -} +} \ No newline at end of file diff --git a/src/res/default/menu_light_file.png b/src/res/default/menu_light_file.png new file mode 100644 index 00000000..c0279ec8 Binary files /dev/null and b/src/res/default/menu_light_file.png differ diff --git a/src/res/default/menu_surface_file.png b/src/res/default/menu_surface_file.png new file mode 100644 index 00000000..836ed95e Binary files /dev/null and b/src/res/default/menu_surface_file.png differ diff --git a/src/res/default/menu_table_file.png b/src/res/default/menu_table_file.png new file mode 100644 index 00000000..16dfbe72 Binary files /dev/null and b/src/res/default/menu_table_file.png differ diff --git a/src/res/default/menu_wave_file.png b/src/res/default/menu_wave_file.png new file mode 100644 index 00000000..5ae4cd95 Binary files /dev/null and b/src/res/default/menu_wave_file.png differ diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts index d83e8bd1..9fd52a0a 100644 --- a/src/translations/Dyt_zh_CN.ts +++ b/src/translations/Dyt_zh_CN.ts @@ -381,6 +381,26 @@ save workspace + + + new wave file + + + + + new surface file + + + + + new table file + + + + + new light file + + Dyt (*.dyt) @@ -711,12 +731,12 @@ OsgWidget - + warning - + open dyt file failed diff --git a/src/ui/EntityBrowser.cpp b/src/ui/EntityBrowser.cpp new file mode 100644 index 00000000..404b8348 --- /dev/null +++ b/src/ui/EntityBrowser.cpp @@ -0,0 +1,48 @@ +#include "EntityBrowser.h" + +#include +#include + +#include "DockTitleBar.h" +#include "DockWidget.h" +// #include "ModelBrowser/ModelTreeWidget.h" +#include "workspace/WorkSpaceManager.h" + +EntityBrowser::EntityBrowser(QWidget *parent) : + QWidget(parent) { + + InitUI(); +} + +EntityBrowser::~EntityBrowser() { + +} + +void EntityBrowser::AttachDock(DockWidget* dockWidget) { + if (nullptr == dockWidget) { + qDebug() << __FUNCTION__ << "dockwidget is nullptr"; + return; + } + + dockWidget->SetDockWidgetTitleBar(nullptr); + dockWidget->setWidget(this); + + DockTitleBar* dockTitleBar = new DockTitleBar; + dockWidget->SetDockWidgetTitleBar(dockTitleBar); +} + +void EntityBrowser::InitUI() { + // QBoxLayout* layout = new QVBoxLayout(this); + // layout->setContentsMargins(0, 0, 0, 0); + + // treeWidget_ = new ModelTreeWidget; + // treeWidget_->setHeaderHidden(true); + // layout->addWidget(treeWidget_); + + // connect(&WorkSpaceManager::Get(), &WorkSpaceManager::WorkSpaceChanged, + // treeWidget_, &ModelTreeWidget::OnWorkspaceChange); + + // //ModelTreeWidget* treeWidget = modelBrowserPannal_->GetModelTreeWidget(); + // connect(treeWidget_, &ModelTreeWidget::WorkSpaceChange, this, &ModelBrowser::WorkSpaceChange); + // connect(treeWidget_, &ModelTreeWidget::EntityChange, this, &ModelBrowser::EntityChange); +} diff --git a/src/ui/EntityBrowser.h b/src/ui/EntityBrowser.h new file mode 100644 index 00000000..07412fae --- /dev/null +++ b/src/ui/EntityBrowser.h @@ -0,0 +1,24 @@ +#pragma once + +#include + +class EntityBrowser : public QWidget { + Q_OBJECT + +public: + explicit EntityBrowser(QWidget *parent = nullptr); + ~EntityBrowser() override; + + void AttachDock(class DockWidget* dockWidget); + +Q_SIGNALS: + void WorkSpaceChange(const QVariant& workSpace); + void EntityChange(const QVariant& workSpace); + +private: + void InitUI(); + +private: + // class ModelTreeWidget* treeWidget_; +}; + diff --git a/src/ui/Menu/FileManagerMenu.ui b/src/ui/Menu/FileManagerMenu.ui index d356a9e2..0aa0b80b 100644 --- a/src/ui/Menu/FileManagerMenu.ui +++ b/src/ui/Menu/FileManagerMenu.ui @@ -54,6 +54,46 @@ + + + + new wave file + + + + + + + + + + new surface file + + + + + + + + + + new table file + + + + + + + + + + new light file + + + + + +