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.

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

Dnenov restyle visual restyle #13075

Merged
merged 23 commits into from
Jul 19, 2022
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
10 changes: 6 additions & 4 deletions src/DynamoCore/Properties/Resources.Designer.cs

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

8 changes: 5 additions & 3 deletions src/DynamoCore/Properties/Resources.en-US.resx
Original file line number Diff line number Diff line change
Expand Up @@ -657,13 +657,15 @@ value : bool = false</value>
<comment>The default name of home workspace</comment>
</data>
<data name="UnresolvedNodesWarningShortMessage" xml:space="preserve">
<value>This graph cannot be saved until unresolved nodes are removed or resolved.</value>
<value>The graph has unresolved nodes and cannot be saved.</value>
</data>
<data name="UnresolvedNodesWarningTitle" xml:space="preserve">
<value>Graph Contains Unresolved Nodes and Cannot Be Saved.</value>
<value>Unable to save graph</value>
</data>
<data name="UnresolvedNodesWarningMessage" xml:space="preserve">
<value>This graph currently contains some unresolved nodes, and cannot be saved until the nodes are resolved. If the graph is saved using SaveAs - the unresolved nodes will be removed from the file.</value>
<value>This may be caused by a missing package, incompatible package version, or missing host program. If you Save As, the unresolved nodes will be removed.

Resolve or remove the unresolved nodes and try again.</value>
</data>
<data name="CodeBlockTempIdentifierOutputLabel" xml:space="preserve">
<value>Value of expression at line {0}</value>
Expand Down
8 changes: 5 additions & 3 deletions src/DynamoCore/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -668,13 +668,15 @@ value : bool = false</value>
<comment>The default name of home workspace</comment>
</data>
<data name="UnresolvedNodesWarningMessage" xml:space="preserve">
<value>This graph currently contains some unresolved nodes, and cannot be saved until the nodes are resolved. If the graph is saved using SaveAs - the unresolved nodes will be removed from the file.</value>
<value>This may be caused by a missing package, incompatible package version, or missing host program. If you Save As, the unresolved nodes will be removed.

Resolve or remove the unresolved nodes and try again.</value>
</data>
<data name="UnresolvedNodesWarningShortMessage" xml:space="preserve">
<value>This graph cannot be saved until unresolved nodes are removed or resolved.</value>
<value>The graph has unresolved nodes and cannot be saved.</value>
</data>
<data name="UnresolvedNodesWarningTitle" xml:space="preserve">
<value>Graph Contains Unresolved Nodes and Cannot Be Saved.</value>
<value>Unable to save graph</value>
</data>
<data name="CodeBlockTempIdentifierOutputLabel" xml:space="preserve">
<value>Value of expression at line {0}</value>
Expand Down
18 changes: 18 additions & 0 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
</PropertyGroup>
<ItemGroup>
<None Remove="UI\Images\AboutWindow\logo_about_dark.png" />
<None Remove="UI\Images\Alignment\align_bottom.png" />
<None Remove="UI\Images\Alignment\align_left.png" />
<None Remove="UI\Images\Alignment\align_right.png" />
Expand All @@ -21,6 +22,13 @@
<None Remove="UI\Images\Alignment\align_x_distribute.png" />
<None Remove="UI\Images\Alignment\align_y_average.png" />
<None Remove="UI\Images\Alignment\align_y_distribute.png" />
<None Remove="UI\Images\dynamonotext.png" />
<None Remove="UI\Images\maximize_16px_blue.png" />
<None Remove="UI\Images\maximize_16px_grey.png" />
<None Remove="UI\Images\minimize_16px_blue.png" />
<None Remove="UI\Images\minimize_16px_grey.png" />
<None Remove="UI\Images\minus_16px_blue.png" />
<None Remove="UI\Images\minus_16px_grey.png" />
<None Remove="UI\Images\NodeStates\alert-64px.png" />
<None Remove="UI\Images\NodeStates\error-64px.png" />
<None Remove="UI\Images\NodeStates\frozen-64px.png" />
Expand Down Expand Up @@ -647,6 +655,9 @@
<EmbeddedResource Include="UI\GuidedTour\DynamoOnboardingGuide_HouseCreationDS.dyn">
</EmbeddedResource>
<None Include="ViewModels\Watch3D\shaderSource\CompileShaders.bat" />
<Resource Include="UI\Images\AboutWindow\logo_about_dark.png">
<CopyToOutputDirectory></CopyToOutputDirectory>
</Resource>
<Resource Include="UI\Images\Alignment\align_bottom.png" />
<Resource Include="UI\Images\Alignment\align_left.png" />
<Resource Include="UI\Images\Alignment\align_right.png" />
Expand Down Expand Up @@ -788,6 +799,13 @@
</ItemGroup>
<ItemGroup>
<Resource Include="UI\Images\closetab_normal.png" />
<Resource Include="UI\Images\dynamonotext.png" />
<Resource Include="UI\Images\maximize_16px_blue.png" />
<Resource Include="UI\Images\maximize_16px_grey.png" />
<Resource Include="UI\Images\minimize_16px_blue.png" />
<Resource Include="UI\Images\minimize_16px_grey.png" />
<Resource Include="UI\Images\minus_16px_blue.png" />
<Resource Include="UI\Images\minus_16px_grey.png" />
<Resource Include="UI\Images\NodeStates\alert-64px.png" />
<Resource Include="UI\Images\NodeStates\error-64px.png" />
<Resource Include="UI\Images\NodeStates\frozen-64px.png" />
Expand Down
12 changes: 6 additions & 6 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs

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

12 changes: 6 additions & 6 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<comment>About window title</comment>
</data>
<data name="AboutWindowUpToDate" xml:space="preserve">
<value>(Up-to-date)</value>
<value>(Up to date)</value>
<comment>To indicate Dynamo is up to date</comment>
</data>
<data name="ActionMember" xml:space="preserve">
Expand Down Expand Up @@ -372,9 +372,9 @@
<comment>Copy crash details</comment>
</data>
<data name="CrashPromptDialogCrashMessage" xml:space="preserve">
<value>Uh oh... something went wrong and {0} has crashed, sorry about that.
<value>Something went wrong and Dynamo has closed unexpectedly.

You will get a chance to save your work.</value>
Don't worry, you'll have the option to save your work.</value>
</data>
<data name="CrashPromptDialogDetailButton" xml:space="preserve">
<value>Details</value>
Expand All @@ -385,11 +385,11 @@ You will get a chance to save your work.</value>
<comment>Open folder that contains crash report</comment>
</data>
<data name="CrashPromptDialogSubmitBugButton" xml:space="preserve">
<value>Submit Bug To Github</value>
<value>Submit bug to GitHub</value>
<comment>Submit a bug on github</comment>
</data>
<data name="CrashPromptDialogTitle" xml:space="preserve">
<value>{0} has crashed</value>
<value>{0} has closed unexpectedly</value>
</data>
<data name="CreateMember" xml:space="preserve">
<value>Create</value>
Expand Down Expand Up @@ -2106,7 +2106,7 @@ Installing the latest update requires Dynamo and any host applications to close.
Do you want to install the latest Dynamo update?</value>
</data>
<data name="UsageReportPromptDialogTitle" xml:space="preserve">
<value>Agreement to collect usability data on your use of {0}</value>
<value>Agreement to Collect Usability Data</value>
</data>
<data name="UseLevelKeepListStructureHint" xml:space="preserve">
<value>Keep 1 input list's nesting</value>
Expand Down
12 changes: 6 additions & 6 deletions src/DynamoCoreWpf/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
<comment>About window title</comment>
</data>
<data name="AboutWindowUpToDate" xml:space="preserve">
<value>(Up-to-date)</value>
<value>(Up to date)</value>
<comment>To indicate Dynamo is up to date</comment>
</data>
<data name="ChangeScaleFactorPromptCaptionText" xml:space="preserve">
Expand Down Expand Up @@ -1078,9 +1078,9 @@ To avoid unintended behavior, uninstall the conflicting loaded package(s), resta
<comment>Copy crash details</comment>
</data>
<data name="CrashPromptDialogCrashMessage" xml:space="preserve">
<value>Uh oh... something went wrong and {0} has crashed, sorry about that.
<value>Something went wrong and Dynamo has closed unexpectedly.

You will get a chance to save your work.</value>
Don't worry, you'll have the option to save your work.</value>
</data>
<data name="CrashPromptDialogDetailButton" xml:space="preserve">
<value>Details</value>
Expand All @@ -1091,11 +1091,11 @@ You will get a chance to save your work.</value>
<comment>Open folder that contains crash report</comment>
</data>
<data name="CrashPromptDialogSubmitBugButton" xml:space="preserve">
<value>Submit Bug To Github</value>
<value>Submit bug to GitHub</value>
<comment>Submit a bug on github</comment>
</data>
<data name="CrashPromptDialogTitle" xml:space="preserve">
<value>{0} has crashed</value>
<value>{0} has closed unexpectedly</value>
</data>
<data name="DownloadWarningMessageBoxTitle" xml:space="preserve">
<value>Download Warning</value>
Expand Down Expand Up @@ -1141,7 +1141,7 @@ You will get a chance to save your work.</value>
<value>Cancel</value>
</data>
<data name="UsageReportPromptDialogTitle" xml:space="preserve">
<value>Agreement to collect usability data on your use of {0}</value>
<value>Agreement to Collect Usability Data</value>
</data>
<data name="DynamoViewContextMenuClearLog" xml:space="preserve">
<value>Clear</value>
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/UI/DefaultBrandingResourceProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public string GetString(ResourceNames.ConsentForm resourceName)
switch (resourceName)
{
case ResourceNames.ConsentForm.Title:
resource = string.Format(Properties.Resources.UsageReportPromptDialogTitle,ProductName);
resource = Properties.Resources.UsageReportPromptDialogTitle;
break;
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/dynamonotext.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/minus_16px_blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/minus_16px_grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/DynamoCoreWpf/UI/Images/task_dialog_crash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/DynamoCoreWpf/UI/Images/task_dialog_future_file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading