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

Multiple globalization UI bug fixes #13419

Merged
merged 2 commits into from
Oct 24, 2022
Merged

Multiple globalization UI bug fixes #13419

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
e241897
UI fixes
zeusongit Oct 21, 2022
f158628
publish dialog
zeusongit Oct 21, 2022
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/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2814,7 +2814,7 @@ This package will be unloaded after the next Dynamo restart.</value>
<value>Add Directory And Its Files To Package</value>
</data>
<data name="PublishPackageViewMarkdownFilesDirectory" xml:space="preserve">
<value>Markdown Files Directory (optional)</value>
<value>Markdown Files Path (optional)</value>
</data>
<data name="PublishPackageViewMarkdownFilesDirectoryToolTip" xml:space="preserve">
<value>An optional location for documenting your package in the markdown format.</value>
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@ If the toggle is off custom packages that are not already loaded will load once
<value>Publish a {0} Package</value>
</data>
<data name="PublishPackageViewMarkdownFilesDirectory" xml:space="preserve">
<value>Markdown Files Directory (optional)</value>
<value>Markdown Files Path (optional)</value>
</data>
<data name="PublishPackageViewMarkdownFilesDirectoryToolTip" xml:space="preserve">
<value>An optional location for documenting your package in the markdown format.</value>
Expand Down
4 changes: 2 additions & 2 deletions src/DynamoCoreWpf/UI/Prompts/EditWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Window x:Class="Dynamo.UI.Prompts.EditWindow"
<Window x:Class="Dynamo.UI.Prompts.EditWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="clr-namespace:Dynamo.UI"
Expand All @@ -7,7 +7,7 @@
MaxHeight="{x:Static SystemParameters.PrimaryScreenHeight}"
MaxWidth="{x:Static SystemParameters.PrimaryScreenWidth}"
MinHeight="170" MinWidth="300"
Height="195" Width="400"
Height="250" Width="400"
Style="{DynamicResource DynamoWindowStyle}"
AllowsTransparency="True"
WindowStyle="None">
Expand Down
15 changes: 8 additions & 7 deletions src/DynamoCoreWpf/UI/Prompts/UsageReportingAgreementPrompt.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Window x:Class="Dynamo.UI.Prompts.UsageReportingAgreementPrompt"
<Window x:Class="Dynamo.UI.Prompts.UsageReportingAgreementPrompt"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="clr-namespace:Dynamo.UI"
xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
xmlns:views="clr-namespace:Dynamo.UI.Views"
WindowStyle="None"
Width="530"
MinWidth="530"
MaxWidth="650"
Height="605"
ResizeMode="NoResize"
ShowInTaskbar="False"
Expand Down Expand Up @@ -98,13 +99,13 @@
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="220"></RowDefinition>
<RowDefinition Height="145"></RowDefinition>
<RowDefinition Height="auto"></RowDefinition>
<RowDefinition Height="auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="auto"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.ColumnDefinitions>


Expand Down Expand Up @@ -165,8 +166,8 @@
Margin="0 15 3 15"
Padding="0">
<ScrollViewer
Margin="0 0 -18 0"
HorizontalScrollBarVisibility="Disabled" >
Margin="0 0 -18 0"
HorizontalScrollBarVisibility="Disabled" >
<views:RichTextFile x:Name="GoogleAnalyticsConsent"
IsReadOnly="True"
IsEnabled="True"
Expand Down
5 changes: 3 additions & 2 deletions src/DynamoCoreWpf/Views/Core/ConnectorContextMenuView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl x:Class="Dynamo.Controls.ConnectorContextMenuView"
<UserControl x:Class="Dynamo.Controls.ConnectorContextMenuView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand All @@ -23,7 +23,8 @@
<ContextMenu Name="MainContextMenu"
Style="{StaticResource ContextMenuStyle}"
Background="#666666"
Width="170"
MinWidth="110"
Width="Auto"
MouseLeave="OnMouseLeaveContextMenu"
ContextMenuClosing="OnContextMenuClosing">
<MenuItem x:Name="BreakItem" Header="{x:Static props:Resources.ConnectorContextMenuHeaderBreakConnection}"
Expand Down
4 changes: 2 additions & 2 deletions src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
xmlns:packagemanager="clr-namespace:Dynamo.PackageManager"
d:DataContext="{d:DesignInstance Type=packagemanager:PublishPackageViewModel}"
Name="PublishInfoControl"
Width="900"
Width="940"
Height="710"
MinWidth="630"
MinHeight="500"
Expand Down Expand Up @@ -906,4 +906,4 @@
</TextBlock>
</DockPanel>
</Grid>
</Window>
</Window>