diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts index 70270304..77b8f3ed 100644 --- a/src/translations/Dyt_zh_CN.ts +++ b/src/translations/Dyt_zh_CN.ts @@ -97,7 +97,7 @@ Run Simu - 运行 + @@ -199,7 +199,7 @@ ... - ... + @@ -340,16 +340,6 @@ ModelBrowserPannal - - - 新建列 - - - - - 新建项目 - - FileManagerMenu @@ -361,17 +351,17 @@ new workspace - 新建空间 + open workspace - 打开空间 + save workspace - 保存空间 + @@ -382,7 +372,7 @@ open dyt file - 打开空间文件 + @@ -393,7 +383,7 @@ save dyt file - 保存空间文件 + @@ -458,27 +448,27 @@ Dyt - Dyt + file manager - 文件管理 + simu manager - 仿真管理 + play manager - 回放管理 + system manager - 系统管理 + @@ -491,7 +481,7 @@ model elements - 实体 + @@ -553,7 +543,7 @@ attribute - 属性 + @@ -645,73 +635,65 @@ model elements - 实体 - - - - ModelBrowserPannal - - - ModelBrowserPannal ModelTreeWidget - + Release Track - 取消关注 + - + Add boke Entity - + Add lsjhqt Entity - + Add nimizi Entity - + Add tkdlj Entity - + Add jiaofan Entity - + Add satellite Entity - + Track - 关注 + - + Add Mesh Component - + Add Path Component - + Delete - 删除 + @@ -735,12 +717,12 @@ play - 播放 + stop - 停止 + @@ -760,12 +742,12 @@ up - 加速 + down - 减速 + @@ -777,7 +759,7 @@ question - 询问 + @@ -789,14 +771,14 @@ has not workspace - 未找到对应的空间 + pause - 暂停 + @@ -804,7 +786,7 @@ attribute - 属性 + @@ -834,7 +816,7 @@ Open File - 选择文件 + @@ -847,7 +829,7 @@ Open File - 选择文件 + @@ -860,17 +842,17 @@ error - 错误 + the appliaction is crash - 程序出现了问题 + List all tabs - 所有标签 + @@ -935,7 +917,7 @@ ... - ... + @@ -1137,7 +1119,7 @@ ... - ... + @@ -1145,7 +1127,7 @@ Name - 名称 + @@ -1158,7 +1140,7 @@ ... - ... + @@ -1246,7 +1228,7 @@ Name - 名称 + @@ -1270,17 +1252,17 @@ warning - 警告 + default workspace failed - 加载默认空间失败 + open dyt file failed - 打开空间文件失败 + @@ -1294,7 +1276,7 @@ Path - 路径 + @@ -1487,7 +1469,7 @@ ... - ... + @@ -1544,7 +1526,7 @@ Name - 名称 + @@ -1605,7 +1587,7 @@ SimuRunMenu - 运行 + @@ -1631,22 +1613,22 @@ exit - 退出 + ui setting - ui设置 + question - 询问 + are you sure to exit - 确定退出 + @@ -1705,52 +1687,52 @@ New WorkSpace - 新建空间 + Name - 名称 + input workspace name - 输入空间名称 + Path - 路径 + select workspace save path - 选择空间保存路径 + ... - ... + describe - 描述 + Sure - 确定 + Cancel - 取消 + new workspace - 新建空间 + @@ -1761,47 +1743,47 @@ warning - 警告 + name or save path is empty, please check it - 当前空间已经存在，请确认 + save current workspace? - 保存当前空间？ + current path is contains current folder, do you want to overwrite it? - 当前空间已经存在，是否覆盖当前空间？ + removeRecursively failed - 删除失败 + mkpath failed - 创建空间失败 + name is exits - 空间已经存在 + create workSpace failed - 创建空间失败 + save spaceWork directory - 保存空间路径 + diff --git a/src/ui/ModelBrowser.cpp b/src/ui/ModelBrowser.cpp index 86701e1e..cec6925e 100644 --- a/src/ui/ModelBrowser.cpp +++ b/src/ui/ModelBrowser.cpp @@ -5,8 +5,8 @@ #include "DockTitleBar.h" #include "DockWidget.h" -#include "ModelBrowser/ModelBrowserPannal.h" #include "ModelBrowser/ModelTreeWidget.h" +#include "workspace/WorkSpaceManager.h" ModelBrowser::ModelBrowser(QWidget *parent) : QWidget(parent) { @@ -33,12 +33,18 @@ void ModelBrowser::AttachDock(DockWidget* dockWidget) { } void ModelBrowser::InitUI() { - modelBrowserPannal_ = new ModelBrowserPannal(this); + //modelBrowserPannal_ = new ModelBrowserPannal(this); QBoxLayout* layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(modelBrowserPannal_); - ModelTreeWidget* treeWidget = modelBrowserPannal_->GetModelTreeWidget(); - connect(treeWidget, &ModelTreeWidget::WorkSpaceChange, this, &ModelBrowser::WorkSpaceChange); - connect(treeWidget, &ModelTreeWidget::EntityChange, this, &ModelBrowser::EntityChange); + 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/ModelBrowser.h b/src/ui/ModelBrowser.h index 98fc5a9b..f8a89656 100644 --- a/src/ui/ModelBrowser.h +++ b/src/ui/ModelBrowser.h @@ -19,6 +19,7 @@ private: void InitUI(); private: - class ModelBrowserPannal* modelBrowserPannal_{ nullptr }; + //class ModelBrowserPannal* modelBrowserPannal_{ nullptr }; + class ModelTreeWidget* treeWidget_; }; diff --git a/src/ui/ModelBrowser/EntityListDialog.ui b/src/ui/ModelBrowser/EntityListDialog.ui index a4c21652..bcfc4872 100644 --- a/src/ui/ModelBrowser/EntityListDialog.ui +++ b/src/ui/ModelBrowser/EntityListDialog.ui @@ -6,7 +6,7 @@ 0 0 - 371 + 412 595 @@ -22,16 +22,6 @@ false - - - 新建列 - - - - - 新建项目 - - diff --git a/src/ui/ModelBrowser/ModelBrowserPannal.cpp b/src/ui/ModelBrowser/ModelBrowserPannal.cpp deleted file mode 100644 index 91b12cd4..00000000 --- a/src/ui/ModelBrowser/ModelBrowserPannal.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "ModelBrowserPannal.h" - -#include -#include - -#include "workspace/WorkSpaceManager.h" - -#include "ui_ModelBrowserPannal.h" - -ModelBrowserPannal::ModelBrowserPannal(QWidget* parent) - : QFrame(parent) - , ui(new Ui::ModelBrowserPannal) { - ui->setupUi(this); - - initUI(); -} - -ModelBrowserPannal::~ModelBrowserPannal() { - delete ui; -} - -ModelTreeWidget* ModelBrowserPannal::GetModelTreeWidget() const { - return ui->modelTreeWidget; -} - -void ModelBrowserPannal::initUI() { - connect(&WorkSpaceManager::Get(), &WorkSpaceManager::WorkSpaceChanged, - ui->modelTreeWidget, &ModelTreeWidget::OnWorkspaceChange); - -} diff --git a/src/ui/ModelBrowser/ModelBrowserPannal.h b/src/ui/ModelBrowser/ModelBrowserPannal.h deleted file mode 100644 index 0dfea524..00000000 --- a/src/ui/ModelBrowser/ModelBrowserPannal.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include - -namespace Ui { - class ModelBrowserPannal; -} - -class ModelBrowserPannal : public QFrame { - Q_OBJECT - -public: - ModelBrowserPannal(QWidget* parent = 0); - ~ModelBrowserPannal() override; - - class ModelTreeWidget* GetModelTreeWidget() const; - -private: - void initUI(); - -private: - Ui::ModelBrowserPannal* ui; -}; \ No newline at end of file diff --git a/src/ui/ModelBrowser/ModelBrowserPannal.ui b/src/ui/ModelBrowser/ModelBrowserPannal.ui deleted file mode 100644 index 7c0694ab..00000000 --- a/src/ui/ModelBrowser/ModelBrowserPannal.ui +++ /dev/null @@ -1,38 +0,0 @@ - - - ModelBrowserPannal - - - - 0 - 0 - 371 - 595 - - - - ModelBrowserPannal - - - - - - false - - - false - - - - - - - - ModelTreeWidget - QTreeWidget -
ui/ModelBrowser/ModelTreeWidget.h
- - - - - diff --git a/src/ui/ModelBrowser/ModelTreeWidget.cpp b/src/ui/ModelBrowser/ModelTreeWidget.cpp index b4393516..87eebfc4 100644 --- a/src/ui/ModelBrowser/ModelTreeWidget.cpp +++ b/src/ui/ModelBrowser/ModelTreeWidget.cpp @@ -17,8 +17,6 @@ #include "viewer/CameraControlManipulator.h" #include "ui/ModelBrowser/EntityConstent.h" -#include "ui_ModelBrowserPannal.h" - ModelTreeWidget::ModelTreeWidget(QWidget* parent) : QTreeWidget(parent){