Merge pull request #147 from SoftBIM/dev

Improvement UI/UX - Fix small bug
architecture-building-systems · Sep 20, 2023 · c95f364 · c95f364
2 parents 0fb62ee + b702a64
commit c95f364
Show file tree

Hide file tree

Showing 14 changed files with 177 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog
+- 2023-09-13 **2.0.2**
+  - Improvement user interface and user experience with coding.
+  - Add new button create new file
+  - Add new button save as file
+  - Fix bug output with language is chines or Japanese
+  - Follow up package IronPython latest.
+  - Add more shortcut default.
 - 2023-04-14 **2.0.1**
   - Support Autodesk Revit version 2024.
 - 2022-12-16 **2.0.0**

diff --git a/Installer/Installer.cs b/Installer/Installer.cs
@@ -12,7 +12,7 @@
 const string projectName = "RevitPythonShell";
 const string outputName = "RevitPythonShell";
 const string outputDir = "output";
-const string version = "2.0.1";
+const string version = "2.0.2";
 
 var fileName = new StringBuilder().Append(outputName).Append("-").Append(version);
 var project = new Project

diff --git a/PythonConsoleControl/PythonConsoleControl.csproj b/PythonConsoleControl/PythonConsoleControl.csproj
@@ -13,8 +13,8 @@
     <DebugType>full</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AvalonEdit" Version="6.0.1" />
-    <PackageReference Include="IronPython" Version="3.4.0" />
+    <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
+    <PackageReference Include="IronPython" Version="3.4.1" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="IronPython">

diff --git a/PythonConsoleControl/PythonOutputStream.cs b/PythonConsoleControl/PythonOutputStream.cs
@@ -1,7 +1,9 @@
 // Copyright (c) 2010 Joe Moorhouse
 
+using System;
 using System.IO;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace PythonConsoleControl
 {
@@ -63,8 +65,18 @@ public override int Read(byte[] buffer, int offset, int count)
         /// </summary>
         public override void Write(byte[] buffer, int offset, int count)
         {
-            string text = UTF8Encoding.UTF8.GetString(buffer, offset, count);
+            string text = Encoding.UTF8.GetString(buffer, offset, count);
+            text = DecodeUnicodeEscapes(text);
             textEditor.Write(text);
         }
+        private string DecodeUnicodeEscapes(string input)
+        {
+            return Regex.Replace(input, @"\\u[0-9a-fA-F]{4}", match =>
+            {
+                var hex = match.Value.Substring(2);
+                int charValue = Convert.ToInt32(hex, 16);
+                return char.ConvertFromUtf32(charValue);
+            });
+        }
     }
 }
diff --git a/RevitPythonShell/Properties/launchSettings.json b/RevitPythonShell/Properties/launchSettings.json
@@ -51,6 +51,10 @@
     "Revit 2023": {
       "commandName": "Executable",
       "executablePath": "%ProgramW6432%\\Autodesk\\Revit 2023\\Revit.exe"
+    },
+    "Revit 2024": {
+      "commandName": "Executable",
+      "executablePath": "%ProgramW6432%\\Autodesk\\Revit 2024\\Revit.exe"
     }
   }
 }
diff --git a/RevitPythonShell/Resources/Theme/New.png b/RevitPythonShell/Resources/Theme/New.png
diff --git a/RevitPythonShell/Resources/Theme/Open.png b/RevitPythonShell/Resources/Theme/Open.png
diff --git a/RevitPythonShell/Resources/Theme/Run.png b/RevitPythonShell/Resources/Theme/Run.png
diff --git a/RevitPythonShell/Resources/Theme/Save.png b/RevitPythonShell/Resources/Theme/Save.png
diff --git a/RevitPythonShell/Resources/Theme/SaveAs.png b/RevitPythonShell/Resources/Theme/SaveAs.png
diff --git a/RevitPythonShell/RevitPythonShell.csproj b/RevitPythonShell/RevitPythonShell.csproj
@@ -62,7 +62,7 @@
     <PublishTrimmed>true</PublishTrimmed>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AvalonEdit" Version="6.0.1" />
+    <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="IronPython">
@@ -87,6 +87,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Controls.Ribbon" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
@@ -133,6 +134,8 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\Theme\SaveAs.png" />
+    <Resource Include="Resources\Theme\New.png" />
     <None Include="RevitPythonShell.addin" />
     <None Include="Manifests\AddinTemplate.addin">
       <Generator>MSDataSetGenerator</Generator>

diff --git a/RevitPythonShell/Views/IronPythonConsole.xaml b/RevitPythonShell/Views/IronPythonConsole.xaml
@@ -14,132 +14,135 @@
     -->
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="50*" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="30*" />
+            <RowDefinition Height="20*" />
+            <RowDefinition Height="10" />
+            <RowDefinition Height="12*" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0" Grid.Row="0">
-            <console:IronPythonConsoleControl Name="consoleControl" />
-        </Grid>
-        <GridSplitter
-            Grid.Row="1"
-            Height="10"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Center" />
-        <DockPanel Grid.Column="0" Grid.Row="2">
-            <ToolBar DockPanel.Dock="Top">
-                <ToolBar.Resources>
+        <DockPanel Grid.Column="0" Grid.Row="0">
+            <Ribbon Margin="0,-22,0,0" 
+                    KeyboardNavigation.TabIndex="0"
+                    ContextMenu="{x:Null}"
+                    AllowDrop="False">
+                <Ribbon.Resources>
                     <Style TargetType="{x:Type Image}">
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type ButtonBase}, AncestorLevel=1}, Path=IsEnabled}" Value="False">
+                            <DataTrigger
+                                Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type ButtonBase}, AncestorLevel=1}, Path=IsEnabled}"
+                                Value="False">
                                 <Setter Property="Opacity" Value="0.30" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
-                </ToolBar.Resources>
-                <Button Click="openFileClick">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Open.png"
-                        ToolTip="Open Python Script" />
-                </Button>
-                <Button Click="saveFileClick">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Save.png"
-                        ToolTip="Save This Script Into File" />
-                </Button>
-                <Separator />
-                <Button Command="Cut">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Cut.png"
-                        ToolTip="Cut Selected" />
-                </Button>
-                <Button Command="Copy">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Copy.png"
-                        ToolTip="Copy Selected" />
-                </Button>
-                <Button Command="Paste">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Paste.png"
-                        ToolTip="Paste Into Script Editor" />
-                </Button>
-                <Button Command="Delete">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Delete.png"
-                        ToolTip="Delete Selected" />
-                </Button>
-                <Separator />
-                <Button Command="Undo">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Undo.png"
-                        ToolTip="Undo" />
-                </Button>
-                <Button Command="Redo">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Redo.png"
-                        ToolTip="Redo" />
-                </Button>
-                <Separator />
-                <CheckBox IsChecked="{Binding ElementName=textEditor, Path=WordWrap}">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/WordWrap.png"
-                        ToolTip="Toggle Word Wrap" />
-                </CheckBox>
-                <CheckBox IsChecked="{Binding ElementName=textEditor, Path=ShowLineNumbers}">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Number.png"
-                        ToolTip="Toggle Line Numbers" />
-                </CheckBox>
-                <CheckBox IsChecked="{Binding ElementName=textEditor, Path=Options.ShowEndOfLine}">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Paragraph.png"
-                        ToolTip="Toggle Show End of Line" />
-                </CheckBox>
-                <Separator />
-                <Button Click="runClick">
-                    <Image
-                        Height="16"
-                        SnapsToDevicePixels="True"
-                        Source="/RevitPythonShell;component/Resources/Theme/Run.png"
-                        ToolTip="Run Script. Results will be displayed in the IronPython prompt." />
-                </Button>
-            </ToolBar>
-            <Grid DockPanel.Dock="Bottom">
-                <avalonEdit:TextEditor
-                    FontFamily="Consolas"
-                    FontSize="10pt"
-                    GotFocus="textEditor_GotFocus"
-                    Name="textEditor">
-                    # IronPython Pad. Write code snippets here and F5 to run.
-                </avalonEdit:TextEditor>
-            </Grid>
+                </Ribbon.Resources>
+                <Ribbon.ApplicationMenu>
+                    <RibbonApplicationMenu Visibility="Collapsed">
+                    </RibbonApplicationMenu>
+                </Ribbon.ApplicationMenu>
+                <RibbonTab Header="Home" ContextMenu="{x:Null}">
+                    <RibbonGroup Header="File">
+                        <RibbonButton Label="New" LargeImageSource="../Resources/Theme/New.png"
+                                      ToolTip="New (Ctrl + N)"
+                                      SnapsToDevicePixels="True"
+                                     Click="newFileClick" />
+                        <RibbonButton Label="Open" LargeImageSource="../Resources/Theme/Open.png"
+                                      ToolTip="Open (Ctrl + O)"
+                                      Click="openFileClick" />
+                        <RibbonButton Label="Save" LargeImageSource="../Resources/Theme/Save.png"
+                                      ToolTip="Save (Ctrl + S)"
+                                      Click="saveFileClick"
+                                      SnapsToDevicePixels="True" />
+                        <RibbonButton Label="Save As" LargeImageSource="../Resources/Theme/SaveAs.png"
+                                      ToolTip="Save As (Ctrl + Shift + S)"
+                                      SnapsToDevicePixels="True"
+                                      Click="saveAsFileClick" />
+                    </RibbonGroup>
+                    <RibbonGroup Header="Modify">
+                        <RibbonButton Label="Cut" SmallImageSource="../Resources/Theme/Cut.png"
+                                      ToolTip="Cut Selected"
+                                      SnapsToDevicePixels="True"
+                                      Command="Cut" />
+                        <RibbonButton Label="Copy" SmallImageSource="../Resources/Theme/Save.png"
+                                      ToolTip="Copy Selected"
+                                      SnapsToDevicePixels="True"
+                                      Command="Copy" />
+                        <RibbonButton Label="Paste" SmallImageSource="../Resources/Theme/Paste.png"
+                                      ToolTip="Paste Into Script Editor"
+                                      SnapsToDevicePixels="True"
+                                      Command="Paste" />
+                    </RibbonGroup>
+                    <RibbonGroup Header="Edit">
+                        <RibbonToggleButton Label="Undo"
+                                            SmallImageSource="../Resources/Theme/Undo.png"
+                                            SnapsToDevicePixels="True"
+                                            ToolTip="Undo"
+                                            Command="Undo" />
+                        <RibbonButton Label="Redo" SmallImageSource="../Resources/Theme/Redo.png"
+                                      ToolTip="Redo"
+                                      SnapsToDevicePixels="True"
+                                      Command="Redo" />
+                        <RibbonButton Label="Delete" SmallImageSource="../Resources/Theme/Delete.png"
+                                      ToolTip="Delete Selected"
+                                      SnapsToDevicePixels="True"
+                                      Command="Delete" />
+                    </RibbonGroup>
+                    <RibbonGroup Header="Cell">
+                        <RibbonCheckBox Label="WordWrap" SmallImageSource="../Resources/Theme/WordWrap.png"
+                                        ToolTip="Toggle Word Wrap"
+                                        SnapsToDevicePixels="True"
+                                        IsChecked="{Binding ElementName=textEditor, Path=WordWrap}" />
+                        <RibbonCheckBox Label="Paragraph" SmallImageSource="../Resources/Theme/Paragraph.png"
+                                        ToolTip="Toggle Show End of Line"
+                                        SnapsToDevicePixels="True"
+                                        IsChecked="{Binding ElementName=textEditor, Path=Options.ShowEndOfLine}"
+                                        />
+                        <RibbonCheckBox Label="Number" SmallImageSource="../Resources/Theme/Number.png"
+                                        IsChecked="{Binding ElementName=textEditor, Path=ShowLineNumbers}"
+                                        ToolTip="Toggle Line Numbers"
+                                        SnapsToDevicePixels="True"/>
+                    </RibbonGroup>
+                    <RibbonGroup Header="Execute">
+                        <RibbonButton Label="Run" LargeImageSource="../Resources/Theme/Run.png"
+                                      SnapsToDevicePixels="True"
+                                      Click="runClick"
+                                      ToolTip="(F5) Run Script. Results will be displayed in the IronPython prompt." />
+                    </RibbonGroup>
+                </RibbonTab>
+            </Ribbon>
+            <!-- <ToolBar DockPanel.Dock="Top"> -->
+            <!--     <Separator /> -->
+            <!--     <CheckBox IsChecked="{Binding ElementName=textEditor, Path=ShowLineNumbers}"> -->
+            <!--         <Image -->
+            <!--             Height="16" -->
+            <!--             SnapsToDevicePixels="True" -->
+            <!--             Source="/RevitPythonShell;component/Resources/Theme/Number.png" -->
+            <!--             ToolTip="Toggle Line Numbers" /> -->
+            <!--     </CheckBox> -->
+            <!-- </ToolBar> -->
         </DockPanel>
+        <Grid Grid.Column="0" Grid.Row="1">
+            <avalonEdit:TextEditor
+                FontFamily="Consolas"
+                FontSize="10pt"
+                GotFocus="textEditor_GotFocus"
+                Name="textEditor">
+                # IronPython Pad. Write code snippets here and F5 to run.
+            </avalonEdit:TextEditor>
+        </Grid>
+        <GridSplitter
+            Grid.Row="2"
+            Grid.Column="0"
+            Height="10"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Center" />
+
+        <Grid Grid.Row="3" MinHeight="20">
+            <console:IronPythonConsoleControl Name="consoleControl" />
+        </Grid>
 
     </Grid>
-</Window>
+</Window>