diff --git a/src/Dyt.qrc b/src/Dyt.qrc index f397bcc4..a29cfdf2 100644 --- a/src/Dyt.qrc +++ b/src/Dyt.qrc @@ -22,6 +22,7 @@ res/default/menu_restart.png res/default/menu_setting_restore.png res/default/menu_setting.png + res/default/menu_uisetting.png diff --git a/src/res/default/menu_uisetting.png b/src/res/default/menu_uisetting.png new file mode 100644 index 00000000..1d30f4da Binary files /dev/null and b/src/res/default/menu_uisetting.png differ diff --git a/src/translations/Dyt_zh_CN.qm b/src/translations/Dyt_zh_CN.qm index 1a4a4312..a5866928 100644 Binary files a/src/translations/Dyt_zh_CN.qm and b/src/translations/Dyt_zh_CN.qm differ diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts index 0080a8d7..b0ef5fe8 100644 --- a/src/translations/Dyt_zh_CN.ts +++ b/src/translations/Dyt_zh_CN.ts @@ -6,22 +6,22 @@ ParamSetting - + 参数设置 input param name - + 参数名 input param descript - + 参数描述 input value - + 值 @@ -29,7 +29,7 @@ AddParamSetting - + @@ -92,22 +92,22 @@ ChartPlotMenu - + 图表绘图 2D Curver - + 2D 2D(lg) Curver - + 2D(lg) 3D Curver - + 3D @@ -115,7 +115,7 @@ &file - + 文件(&f) @@ -209,7 +209,7 @@ ... - + ... @@ -366,7 +366,22 @@ FileManagerMenu - + 文件 + + + + new workspace + 新建 + + + + open workspace + 打开 + + + + save workspace + 保存 @@ -377,7 +392,7 @@ open dyt file - + 打开空间 @@ -388,7 +403,7 @@ save dyt file - + 保存空间 @@ -396,7 +411,7 @@ FitCurveChartView - + @@ -453,37 +468,34 @@ Dyt - + file manager - + 文件 - view manager - + 视图管理 - plan manager - + 想定管理 - dynamic display - + 动态显示 system manager - + 系统管理 play manager - + 回放管理 @@ -496,7 +508,7 @@ model elements - + 模型元素 @@ -632,7 +644,7 @@ ParamSetting - + 参数设置 @@ -650,7 +662,7 @@ model elements - + 模型元素 @@ -676,7 +688,7 @@ Release Track - + 取消跟踪 @@ -711,7 +723,7 @@ Track - + 跟随 @@ -790,7 +802,7 @@ question - + 询问 @@ -934,7 +946,7 @@ ... - + ... @@ -1136,7 +1148,7 @@ ... - + ... @@ -1144,7 +1156,7 @@ Name - + 名称 @@ -1157,7 +1169,7 @@ ... - + ... @@ -1245,7 +1257,7 @@ Name - + 名称 @@ -1287,7 +1299,7 @@ Path - + 路径 @@ -1480,7 +1492,7 @@ ... - + ... @@ -1537,7 +1549,7 @@ Name - + 名称 @@ -1591,53 +1603,22 @@ exit - - - - - restart - + 退出 - setting - - - - - setting restore - - - - - help - - - - - license - - - - - logs - - - - - - clean logs - + ui setting + ui设置 question - + 询问 are you sure to exit - + 是否退出 @@ -1696,47 +1677,52 @@ New WorkSpace - + 工作空间 Name - + 名称 Path - + 路径 input workspace name - + 输入名称 select workspace save path - + 选择路径 ... - + ... describe - + 描述 Sure - + 确定 Cancel - + 取消 + + + + new workspace + 新建 @@ -1747,47 +1733,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/Dialog.cpp b/src/ui/Dialog.cpp index f7125fa1..10ec3d6c 100644 --- a/src/ui/Dialog.cpp +++ b/src/ui/Dialog.cpp @@ -27,6 +27,14 @@ void Dialog::SetTitleBar(FrameTitleBar* titleBar) { layout->insertWidget(0, titleBar, 0); } +void Dialog::SetTitle(const QString& title) { + if (!delegate_) { + return; + } + + delegate_->SetTitle(title); +} + void Dialog::hideEvent(QHideEvent*) { } @@ -57,7 +65,7 @@ void Dialog::InitFrame() { FrameTitleBar* titleBar = new FrameTitleBar(this); titleBar->SetMainWidget(this); - titleBar->SetSysButton(FrameTitleBar::FTB_ICON | FrameTitleBar::FTB_CLOSE); + titleBar->SetSysButton(FrameTitleBar::FTB_ICON | FrameTitleBar::FTB_CLOSE | FrameTitleBar::FTB_TTILE); QVBoxLayout* layout = new QVBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/ui/Dialog.h b/src/ui/Dialog.h index 2177dbab..081e7a01 100644 --- a/src/ui/Dialog.h +++ b/src/ui/Dialog.h @@ -14,6 +14,7 @@ public: void DeleteThisOnClose(); void SetTitleBar(FrameTitleBar* titleBar); + void SetTitle(const QString& title); protected: diff --git a/src/ui/FrameTitleBar.cpp b/src/ui/FrameTitleBar.cpp index c9dc1fbd..c1589750 100644 --- a/src/ui/FrameTitleBar.cpp +++ b/src/ui/FrameTitleBar.cpp @@ -36,7 +36,7 @@ FrameTitleBar::~FrameTitleBar() { } void FrameTitleBar::SetTitle(const QString& title) { - // ui->sys_title->setText(title); + ui->sys_title->setText(title); if (mainWidget_) { mainWidget_->setWindowTitle(title); } diff --git a/src/ui/FramelessDelegate.cpp b/src/ui/FramelessDelegate.cpp index bd8ea896..f3ae03e3 100644 --- a/src/ui/FramelessDelegate.cpp +++ b/src/ui/FramelessDelegate.cpp @@ -46,6 +46,12 @@ void FramelessDelegate::SetTitleBar(FrameTitleBar* titleBar) { } } +void FramelessDelegate::SetTitle(const QString& title) { + if (nullptr != titleBar_) { + titleBar_->SetTitle(title); + } +} + bool FramelessDelegate::eventFilter(QObject* watched, QEvent* event) { if (nullptr != mainWidget_ && mainWidget_ == watched) { if (QEvent::Show == event->type()) { diff --git a/src/ui/FramelessDelegate.h b/src/ui/FramelessDelegate.h index c21db2ca..4396e2e8 100644 --- a/src/ui/FramelessDelegate.h +++ b/src/ui/FramelessDelegate.h @@ -14,6 +14,7 @@ public: static FramelessDelegate* Create(QWidget* paranet); void SetTitleBar(FrameTitleBar* titleBar); + void SetTitle(const QString& title); #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) virtual bool nativeEvent(const QByteArray& eventType, void* message, long* result); diff --git a/src/ui/MainFrame.cpp b/src/ui/MainFrame.cpp index d71cd058..689c2aa8 100644 --- a/src/ui/MainFrame.cpp +++ b/src/ui/MainFrame.cpp @@ -98,9 +98,9 @@ void MainFrame::InitUI() { FileManagerMenu* fileMenu = new FileManagerMenu(this); AddMenuWidget("file_manager", tr("file manager"), fileMenu); - AddMenuWidget("view_manager", tr("view manager"), new ViewManagerMenu(this)); - AddMenuWidget("plan_manager", tr("plan manager"), new PlanManagerMenu(this)); - AddMenuWidget("dynamic_display", tr("dynamic display"), new DynamicDisplayMenu(this)); + //AddMenuWidget("view_manager", tr("view manager"), new ViewManagerMenu(this)); + //AddMenuWidget("plan_manager", tr("plan manager"), new PlanManagerMenu(this)); + //AddMenuWidget("dynamic_display", tr("dynamic display"), new DynamicDisplayMenu(this)); SystemManagerMenu* system_ = new SystemManagerMenu(this); AddMenuWidget("system_manager", tr("system manager"), system_); diff --git a/src/ui/Menu/FileManagerMenu.ui b/src/ui/Menu/FileManagerMenu.ui index 2c5ecdc2..d356a9e2 100644 --- a/src/ui/Menu/FileManagerMenu.ui +++ b/src/ui/Menu/FileManagerMenu.ui @@ -16,6 +16,9 @@ + + new workspace + @@ -23,6 +26,9 @@ + + open workspace + @@ -30,6 +36,9 @@ + + save workspace + @@ -45,90 +54,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Qt::Vertical - - - - - - - - - - - - - - Qt::Vertical - - - - - - - - - - - - - - Qt::Vertical - - - - - - - - - - diff --git a/src/ui/Menu/SystemManagerMenu.ui b/src/ui/Menu/SystemManagerMenu.ui index 02a67a7b..abc68b9d 100644 --- a/src/ui/Menu/SystemManagerMenu.ui +++ b/src/ui/Menu/SystemManagerMenu.ui @@ -24,36 +24,6 @@ - - - - restart - - - - - - - - - - setting - - - - - - - - - - setting restore - - - - - - @@ -64,71 +34,10 @@ - - - - help - - - - - - - - - - Qt::Vertical - - - - - - - license - - - - - - - - - - Qt::Vertical - - - - - - - logs - - - - - - - - - - clean logs - - - - - - - - - - Qt::Vertical - - - - clean logs + ui setting diff --git a/src/ui/WorkSpace/WorkSpaceDlg.cpp b/src/ui/WorkSpace/WorkSpaceDlg.cpp index b9104d72..69338f35 100644 --- a/src/ui/WorkSpace/WorkSpaceDlg.cpp +++ b/src/ui/WorkSpace/WorkSpaceDlg.cpp @@ -23,7 +23,7 @@ WorkSpaceDlg::WorkSpaceDlg(QWidget* parent) SetupUI(ui); InitConnect(); - + SetTitle(tr("new workspace")); //setFixedHeight(500); }