Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Alice
Submodule Alice updated from 09d408 to 08d339
2 changes: 2 additions & 0 deletions Designer/Data/UiApplicationConfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<Include href="TitleBarConfig.xml"/>
<!-- functiona area config file -->
<Include href="FunctionAreaConfig.xml"/>
<!-- workbench config file -->
<Include href="WorkBenchConfig.xml"/>

<Theme darkMode="true">
<Palette base="#121212" text="#E0E0E0" accent="#FF9E00"/>
Expand Down
128 changes: 128 additions & 0 deletions Designer/Data/WorkBenchConfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<WorkbenchConfig version="1">
<Workbenches>
<Workbench id="workbench.home" displayName="Home" uiContext="ctx.home">
<AppliesTo>
<DocumentType id="doc.none"/>
</AppliesTo>
<RibbonPages>
</RibbonPages>

<RibbonPages>
</RibbonPages>

<ClassicMenus>
</ClassicMenus>

<DockPanels>
<Panel id="panel.history"/>
</DockPanels>
<InitialViews>
<ViewKind id="view.startcenter"/>
</InitialViews>

<!-- 可选 -->
<LayoutProfiles>
<Layout id="default" isDefault="true"/>
</LayoutProfiles>
</Workbench>

<Workbench id="workbench.part" displayName="Part" uiContext="ctx.part">
<AppliesTo>
<DocumentType id="doc.part"/>
</AppliesTo>

<!-- 可选:未来把 ribbonPage/menuRoot 切到 workbench 级别管理 -->
<RibbonPages>
<Page id="ribbon.part.main"/>
</RibbonPages>
<ClassicMenus>
<Root id="menu.part"/>
</ClassicMenus>
<DockPanels>
<Panel id="panel.modeltree"/>
<Panel id="panel.properties"/>
</DockPanels>
<InitialViews>
<ViewKind id="view.model3d"/>
</InitialViews>

<LayoutProfiles>
<Layout id="default" isDefault="true"/>
<Layout id="dualMonitor" isDefault="false"/>
</LayoutProfiles>
</Workbench>

<Workbench id="workbench.assembly" displayName="Assembly" uiContext="ctx.assembly">
<AppliesTo>
<DocumentType id="doc.assembly"/>
</AppliesTo>

<RibbonPages>
<Page id="ribbon.assembly.main"/>
</RibbonPages>

<ClassicMenus>
<Root id="menu.assembly"/>
</ClassicMenus>

<DockPanels>
<Panel id="panel.assemblytree"/>
<Panel id="panel.properties"/>
</DockPanels>
<InitialViews>
<ViewKind id="view.asm3d"/>
</InitialViews>
<LayoutProfiles>
<Layout id="default" isDefault="true"/>
</LayoutProfiles>
</Workbench>

<Workbench id="workbench.drawing" displayName="Drawing" uiContext="ctx.drawing">
<AppliesTo>
<DocumentType id="doc.drawing"/>
</AppliesTo>
<DockPanels>
<Panel id="panel.drawingtree"/>
<Panel id="panel.properties"/>
</DockPanels>
<InitialViews>
<ViewKind id="view.drawing"/>
</InitialViews>
<LayoutProfiles>
<Layout id="default" isDefault="true"/>
</LayoutProfiles>
</Workbench>

<Workbench id="workbench.bim" displayName="Bim" uiContext="ctx.bim">
<AppliesTo>
<DocumentType id="doc.bim"/>
</AppliesTo>
<DockPanels>
<Panel id="panel.bimtree"/>
<Panel id="panel.properties"/>
</DockPanels>
<InitialViews>
<ViewKind id="view.bim"/>
</InitialViews>
<LayoutProfiles>
<Layout id="default" isDefault="true"/>
</LayoutProfiles>
</Workbench>

<Workbench id="workbench.debug" displayName="Debug" uiContext="ctx.debug">
<AppliesTo>
<DocumentType id="doc.debug"/>
</AppliesTo>
<DockPanels>
<Panel id="panel.debugtree"/>
<Panel id="panel.properties"/>
</DockPanels>
<InitialViews>
<ViewKind id="view.debug"/>
</InitialViews>
<LayoutProfiles>
<Layout id="default" isDefault="true"/>
</LayoutProfiles>
</Workbench>
</Workbenches>
</WorkbenchConfig>
56 changes: 56 additions & 0 deletions Designer/Data/WorkBenchPreference.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"schemaVersion": 1,
"lastActiveWorkbenchId": "workbench.home",
"preferredWorkbenchByDocType":
{
"doc.part": "workbench.part",
"doc.assembly": "workbench.assembly",
"doc.drawing": "workbench.drawing",
"doc.none": "workbench.home"
},
"workbenchSwitcher":
{
"orderedIds": ["workbench.home","workbench.part","workbench.assembly","workbench.drawing"],
"hiddenIds": [],
"pinnedIds": ["workbench.part","workbench.assembly"],
"showIcons": true,
"showText": true
},
"preferredWorkbenchByDocumentGuid":
{
"{0F8F64D5-3C6E-4C88-9A9A-2E6B0C0E11B1}": "workbench.part"
},
"openViewPolicy":
{
"openInitialViewsOnActivate": true,
"reuseExistingViews": true,
"openOnlyIfNoneOfKindExists": true
},

"layoutsByWorkbench":
{
"workbench.part":
{
"activeLayoutId": "default",
"layouts":
{
"default":
{
"dockState": "BASE64...",
"mdiState": "BASE64..."
},
"dualMonitor":
{
"dockState": "BASE64...",
"mdiState": "BASE64..."
}
}
}
},

"recentWorkbenches":
[
"workbench.part",
"workbench.assembly"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ using namespace sdr;

AppCommandBase::AppCommandBase() noexcept
: m_id()
, m_strModuleId(GuidUtils::ToString(soliddesignercommand::MODULE_ID))
, m_strModuleId(GuidUtils::ToWString(soliddesignercommand::MODULE_ID))
{

}

AppCommandBase::AppCommandBase(std::string id) noexcept
: m_id(std::move(id))
, m_strModuleId(GuidUtils::ToString(soliddesignercommand::MODULE_ID))
, m_strModuleId(GuidUtils::ToWString(soliddesignercommand::MODULE_ID))
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ bool SolidDesignerCommandRegister::UnRegisterCommands()
ICommandRegistry* pCmdRegistry = pCmdRouter->GetCommandRegistry();
DIAG_RETURN_FALSE_IF_FALSE(pCmdRegistry, "pCmdRouter is null", "hananiah", "2025.11.2");

std::wstring strModuleId = GuidUtils::ToString(soliddesignercommand::MODULE_ID);
std::wstring strModuleId = GuidUtils::ToWString(soliddesignercommand::MODULE_ID);
pCmdRegistry->UnRegisterCommandByModule(strModuleId);
return true;
}
Expand Down
30 changes: 30 additions & 0 deletions Designer/UIResource/TitleBar/brand/sd_mark_16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions Designer/UIResource/TitleBar/ui/speech_16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Designer/UIResource/TitleBar/ui/window_minimize_16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions Externals/3rdParty/include/rapidjson/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
message("=====================================Start RapidJSON=======================================")

CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)

Expand Down Expand Up @@ -194,7 +196,7 @@ install(FILES readme.md

# Add an interface target to export it
add_library(RapidJSON INTERFACE)

set_target_properties(RapidJSON PROPERTIES FOLDER "Externals")
target_include_directories(RapidJSON INTERFACE $<INSTALL_INTERFACE:include>)

install(DIRECTORY include/rapidjson
Expand Down Expand Up @@ -254,4 +256,6 @@ IF(CMAKE_INSTALL_DIR)

INSTALL(TARGETS RapidJSON EXPORT RapidJSON-targets)
INSTALL(EXPORT RapidJSON-targets DESTINATION ${CMAKE_INSTALL_DIR})
ENDIF()
ENDIF()

message("=====================================End RapidJSON=======================================")
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.10)

if(POLICY CMP0054)
cmake_policy(SET CMP0054 NEW)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 3.10)

if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ else()
cmake_policy(SET CMP0048 NEW)
project(gtest VERSION 1.9.0 LANGUAGES CXX C)
endif()
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 3.10)

if (POLICY CMP0063) # Visibility
cmake_policy(SET CMP0063 NEW)
Expand Down
3 changes: 2 additions & 1 deletion Externals/spdlog/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright(c) 2019 spdlog authors Distributed under the MIT License (http://opensource.org/licenses/MIT)

message("=====================================Start spdlog=======================================")
cmake_minimum_required(VERSION 3.10...3.21)

# ---------------------------------------------------------------------------------------
Expand Down Expand Up @@ -407,3 +407,4 @@ if(SPDLOG_INSTALL)
# ---------------------------------------------------------------------------------------
include(cmake/spdlogCPack.cmake)
endif()
message("=====================================End spdlog=======================================")
Loading