Merge pull request #75 from Ludwigstrasse/Development_Hananiah

Development hananiah

Author: hananiahhsu

Alice

@@ -20,6 +20,11 @@
                 workbench="workbench.assembly"
                 defaultTab="tab_asm_home"/>
 
+        <ribbon id="sd.drawing"
+                label="SD - Drawing"
+                workbench="workbench.drawing"
+                defaultTab="tab_drawing_home"/>
+
         <ribbon id="sd.home"
                 label="SD - Home"
                 workbench="workbench.home"
@@ -529,6 +534,25 @@
             </tab>
 
         </layout>
+
+
+        <!-- ===================== Drawing environment ===================== -->
+        <layout ribbon="sd.drawing">
+
+            <tab id="tab_drawing_home" label="Drawing" order="10">
+                <group id="grp_drawing_data" label="Data" order="10">
+                    <control type="large-button" commandRef="file.new"    row="0" column="0" rowSpan="3"/>
+                    <control type="large-button" commandRef="file.open"   row="0" column="1" rowSpan="3"/>
+                </group>
+
+                <group id="grp_drawing_view" label="View" order="20">
+                    <control type="small-button" commandRef="view.front"     row="0" column="0"/>
+                    <control type="small-button" commandRef="view.right"     row="1" column="0"/>
+                    <control type="small-button" commandRef="view.top"       row="2" column="0"/>
+                    <control type="small-button" commandRef="view.trimetric" row="0" column="1"/>
+                </group>
+            </tab>
+        </layout>
         <!-- ===================== Sketch environment ===================== -->
         <layout ribbon="sd.sketch">
 
@@ -585,10 +609,6 @@
                     <control type="small-button" commandRef="datum.geometry.cs" row="2" column="0" />
                 </group>
 
-                <group id="grp_sketch_construction_mode" label="Construction Mode" order="45">
-                    <control type="large-button" commandRef="sketch.constructionMode" row="0" column="0" rowSpan="3" />
-                </group>
-
                 <group id="grp_sketch_sketching" label="Sketching" order="50">
                     <SplitButton type="small-button" commandRef="sketch.line" row="0" column="0">
                         <SubMenu type="command" commandRef="sketch.line" />
@@ -649,12 +669,15 @@
                     <control type="small-button" commandRef="sketch.modify.offset" row="0" column="3" />
                     <control type="small-button" commandRef="sketch.thicken" row="1" column="3" />
                     <control type="small-button" commandRef="sketch.project" row="2" column="3" />
-					
+
                     <control type="small-button" commandRef="sketch.construction.centerline" row="0" column="4"/>
                     <control type="small-button" commandRef="sketch.construction.point" row="1" column="4" />
                     <control type="small-button" commandRef="sketch.constrcution.cs" row="2" column="4" />
-					
-                    <control type="large-button" commandRef="sketch.palette" row="0" column="5" rowSpan="3" />
+
+                    <LauncherMenu>
+                        <SubMenu type="command" commandRef="sketch.constructionMode" />
+                        <SubMenu type="command" commandRef="sketch.palette" />
+                    </LauncherMenu>
                 </group>
 
                 <group id="grp_sketch_editing" label="Editing" order="60">

Designer/Data/FunctionAreaConfig.xml

@@ -57,7 +57,9 @@
                          id="app"
                          commandRef="ui.appMenu"
                          order="5"
-                         iconRef="app"
+                         iconRef="app_wordmark"
+                         iconSize="100,28"
+                         fixedSize="110,30"
                          tooltip="SolidDesigner"/>
 
                 <!-- QAT: new/open/save/undo/redo/regenerate/windows/dropdown -->
@@ -153,7 +155,9 @@
                          id="app"
                          commandRef="ui.appMenu"
                          order="5"
-                         iconRef="app"
+                         iconRef="app_wordmark"
+                         iconSize="100,28"
+                         fixedSize="110,30"
                          tooltip="SolidDesigner"/>
 
                 <control type="command-button"
@@ -242,7 +246,9 @@
                          id="app"
                          commandRef="ui.appMenu"
                          order="5"
-                         icon=":/TitleBar/brand/app.svg"
+                         iconRef="app_wordmark"
+                         iconSize="100,28"
+                         fixedSize="110,30"
                          tooltip="SolidDesigner"/>
 
                 <control type="command-button"
@@ -323,7 +329,9 @@
                 <control type="brand-button"
                          id="app"
                          commandRef="ui.appMenu"
-                         iconRef="app"
+                         iconRef="app_wordmark"
+                         iconSize="100,28"
+                         fixedSize="110,30"
                          order="5"
                          tooltip="SolidDesigner"/>
 
@@ -405,7 +413,9 @@
                 <control type="brand-button"
                          id="app"
                          commandRef="ui.appMenu"
-                         iconRef="app"
+                         iconRef="app_wordmark"
+                         iconSize="100,28"
+                         fixedSize="110,30"
                          order="5"
                          tooltip="SolidDesigner"/>
 
@@ -485,7 +495,9 @@
                 <control type="brand-button"
                          id="app"
                          commandRef="ui.appMenu"
-                         iconRef="app"
+                         iconRef="app_wordmark"
+                         iconSize="100,28"
+                         fixedSize="110,30"
                          order="5"
                          tooltip="SolidDesigner"/>
 
@@ -567,7 +579,9 @@
                 <control type="brand-button"
                          id="app"
                          commandRef="ui.appMenu"
-                         iconRef="app"
+                         iconRef="app_wordmark"
+                         iconSize="100,28"
+                         fixedSize="110,30"
                          order="5"
                          tooltip="SolidDesigner"/>
 

Designer/Data/IconLibraryConfig.xml

@@ -53,6 +53,26 @@
       </LayoutProfiles>
     </Workbench>
 
+    <Workbench id="workbench.sketch" displayName="Sketch" uiContext="ctx.sketch">
+      <AppliesTo>
+        <DocumentType id="doc.sketch"/>
+      </AppliesTo>
+
+      <DockPanels>
+        <Panel id="panel.modeltree"/>
+        <Panel id="panel.properties"/>
+        <Panel id="panel.codeEditor"/>
+      </DockPanels>
+
+      <InitialViews>
+        <ViewKind id="view.sketch2d"/>
+      </InitialViews>
+
+      <LayoutProfiles>
+        <Layout id="default" isDefault="true"/>
+      </LayoutProfiles>
+    </Workbench>
+
     <Workbench id="workbench.assembly" displayName="Assembly" uiContext="ctx.assembly">
       <AppliesTo>
         <DocumentType id="doc.assembly"/>
@@ -71,7 +91,7 @@
         <Panel id="panel.properties"/>
       </DockPanels>
       <InitialViews>
-        <ViewKind id="view.asm3d"/>
+        <ViewKind id="view.model3d"/>
       </InitialViews>
       <LayoutProfiles>
         <Layout id="default" isDefault="true"/>
@@ -88,7 +108,7 @@
         <Panel id="panel.codeEditor"/>
       </DockPanels>
       <InitialViews>
-        <ViewKind id="view.drawing"/>
+        <ViewKind id="view.drawing.sheet"/>
       </InitialViews>
       <LayoutProfiles>
         <Layout id="default" isDefault="true"/>
@@ -104,7 +124,7 @@
         <Panel id="panel.properties"/>
       </DockPanels>
       <InitialViews>
-        <ViewKind id="view.bim"/>
+        <ViewKind id="view.bim.plan"/>
       </InitialViews>
       <LayoutProfiles>
         <Layout id="default" isDefault="true"/>

Designer/Data/TitleBarConfig.xml

@@ -4,15 +4,16 @@
   "preferredWorkbenchByDocType": 
   {
     "doc.part": "workbench.part",
+    "doc.sketch": "workbench.sketch",
     "doc.assembly": "workbench.assembly",
     "doc.drawing": "workbench.drawing",
     "doc.none": "workbench.home"
   },
  "workbenchSwitcher": 
   {
-    "orderedIds": ["workbench.home","workbench.part","workbench.assembly","workbench.drawing"],
+    "orderedIds": ["workbench.home","workbench.part","workbench.sketch","workbench.assembly","workbench.drawing"],
     "hiddenIds": [],
-    "pinnedIds": ["workbench.part","workbench.assembly"],
+    "pinnedIds": ["workbench.part","workbench.sketch","workbench.assembly"],
     "showIcons": true,
     "showText": true
   },
@@ -51,6 +52,7 @@
   "recentWorkbenches": 
   [
     "workbench.part",
+    "workbench.sketch",
     "workbench.assembly"
   ]
 }

Designer/Data/WorkBenchConfig.xml

@@ -0,0 +1,73 @@
+// Owner: hananiah
+#include "SolidFileCloseCommand.h"
+#include "SolidDesignerCommands.h"
+#include "AliceCommandParameter.h"
+#include "AliceCoreAppUtil.h"
+#include "AliceISession.h"
+#include "AliceIDocument.h"
+#include "AliceIUiApplicationFactory.h"
+#include "AliceIUiApplication.h"
+#include "AliceIMainWindow.h"
+#include "AliceIOperation.h"
+
+using namespace alice;
+using namespace sdr;
+
+SolidFileCloseCommand::SolidFileCloseCommand() noexcept
+	: AppCommandBase(std::string(Cmd::FILE_CLOSE))
+{
+}
+
+SolidFileCloseCommand::~SolidFileCloseCommand() = default;
+
+bool SolidFileCloseCommand::IsSupported() const
+{
+	ISession* session = CoreAppUtil::GetCurrentSession();
+	if (!session)
+		return false;
+	IUiApplicationFactory* pAppFactory = IUiApplicationFactory::Get();
+	if (!pAppFactory)
+		return false;
+	IUiApplication* pApp = pAppFactory->GetUiApplication();
+	if (!pApp)
+		return false;
+	return pApp->GetMainWindow() != nullptr;
+}
+
+bool SolidFileCloseCommand::IsVisible() const
+{
+	return IsSupported();
+}
+
+bool SolidFileCloseCommand::IsEnabled() const
+{
+	if (!IsSupported())
+		return false;
+	ISession* session = CoreAppUtil::GetCurrentSession();
+	return session && session->GetActiveDocument();
+}
+
+std::string SolidFileCloseCommand::DisabledReason() const
+{
+	ISession* session = CoreAppUtil::GetCurrentSession();
+	if (!session)
+		return "Session is not available.";
+	if (!session->GetActiveDocument())
+		return "There is no active document.";
+	return {};
+}
+
+std::unique_ptr<IOperation> SolidFileCloseCommand::Execute(const CommandParameter& /*param*/)
+{
+	if (!IsSupported())
+		return nullptr;
+
+	IUiApplicationFactory* pAppFactory = IUiApplicationFactory::Get();
+	IUiApplication* pApp = pAppFactory ? pAppFactory->GetUiApplication() : nullptr;
+	IMainWindow* pMainWindow = pApp ? pApp->GetMainWindowFw() : nullptr;
+	if (!pMainWindow)
+		return nullptr;
+
+	pMainWindow->CloseCurrentView();
+	return nullptr;
+}

Designer/Data/WorkBenchPreference.json

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "BaseCommands/SolidBaseCommand.h"
+
+namespace alice
+{
+	struct CommandParameter;
+	class IOperation;
+}
+
+namespace sdr
+{
+	/// \brief Implements "file.close" for the active document view.
+	class SolidFileCloseCommand final : public AppCommandBase
+	{
+	public:
+		SolidFileCloseCommand() noexcept;
+		~SolidFileCloseCommand() override;
+
+		bool IsSupported() const override;
+		bool IsVisible() const override;
+		bool IsEnabled() const override;
+		std::string DisabledReason() const override;
+
+		std::unique_ptr<alice::IOperation> Execute(const alice::CommandParameter& param) override;
+	};
+}

Designer/UI/SolidDesignerCommand/GeneralCommands/SolidFileCloseCommand.cpp

@@ -0,0 +1,40 @@
+#include "SolidFileExitCommand.h"
+#include "SolidDesignerCommands.h"
+#include "AliceCommandParameter.h"
+#include <QCoreApplication>
+#include "AliceIOperation.h"
+
+using namespace sdr;
+
+SolidFileExitCommand::SolidFileExitCommand() noexcept
+	: AppCommandBase(std::string(Cmd::FILE_EXIT))
+{
+}
+
+SolidFileExitCommand::~SolidFileExitCommand() = default;
+
+bool SolidFileExitCommand::IsSupported() const
+{
+	return true;
+}
+
+bool SolidFileExitCommand::IsVisible() const
+{
+	return true;
+}
+
+bool SolidFileExitCommand::IsEnabled() const
+{
+	return true;
+}
+
+std::string SolidFileExitCommand::DisabledReason() const
+{
+	return {};
+}
+
+std::unique_ptr<alice::IOperation> SolidFileExitCommand::Execute(const alice::CommandParameter& /*param*/)
+{
+	QCoreApplication::quit();
+	return nullptr;
+}

Designer/UI/SolidDesignerCommand/GeneralCommands/SolidFileCloseCommand.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "BaseCommands/SolidBaseCommand.h"
+
+namespace alice { struct CommandParameter; class IOperation; }
+
+namespace sdr
+{
+	/// \brief Implements "file.exit".
+	class SolidFileExitCommand final : public AppCommandBase
+	{
+	public:
+		SolidFileExitCommand() noexcept;
+		~SolidFileExitCommand() override;
+
+		bool IsSupported() const override;
+		bool IsVisible() const override;
+		bool IsEnabled() const override;
+		std::string DisabledReason() const override;
+
+		std::unique_ptr<alice::IOperation> Execute(const alice::CommandParameter& param) override;
+	};
+}