Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-picking into 2.18.1 #14002

Merged
merged 2 commits into from
May 18, 2023
Merged

Cherry-picking into 2.18.1 #14002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5597d5
Insert shortcut change (#13995)
dnenov May 16, 2023
50550a7
class keyword designscript align (#13998)
dnenov May 16, 2023
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
4 changes: 2 additions & 2 deletions src/DynamoCoreWpf/UI/Resources/DesignScript.Resources.SyntaxHighlighting.xshd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
<Key word="local" />
<Key word="static" />
<Key word="this" />
<Key word="extends" />
</KeyWords>
<KeyWords name="ClassStatement" color="#F2A9F2">
<KeyWords name="ClassStatement" color="#6AC0E7">
<Key word="class" />
<Key word="extends" />
</KeyWords>
<KeyWords name="ExceptionHandlingStatements" color="#F2A9F2">
<Key word="throw" />
Expand Down
6 changes: 3 additions & 3 deletions src/DynamoCoreWpf/Views/Core/DynamoView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
Modifiers="Control"
Command="{Binding Path=DataContext.ShowOpenDialogAndOpenResultCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:DynamoView}}}" />
<KeyBinding Key="I"
Modifiers="Control"
Modifiers="Control+Shift"
Command="{Binding Path=DataContext.ShowInsertDialogAndInsertResultCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:DynamoView}}}" />
<KeyBinding Key="H"
Modifiers="Control"
Expand Down Expand Up @@ -344,11 +344,11 @@
<MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuInsert}"
Command="{Binding ShowInsertDialogAndInsertResultCommand}"
Name="insertButton"
InputGestureText="Ctrl + I">
InputGestureText="Ctrl + Shift + I">
</MenuItem>
<MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuRecentFiles}"
ItemsSource="{Binding RecentFiles}">
<MenuItem.ItemContainerStyle>
<MenuItem.ItemContainerStyle>
<Style TargetType="MenuItem">
<Setter Property="Header"
Value="{Binding Converter={StaticResource FilePathDisplayConverter}}" />
Expand Down