Skip to content

Commit c88bbf8

Browse files
authored
Dnenov restyle visual restyle (#13075)
* Terms of Use Restyle - part of the overall visual restyle in Q3 2022 - style matched to the existing DynamoMessageBox - interim commit * Icon Change - swapped window icons * Edit Text Window Restyle - restyle Edit text pop-up window * About Window Restyle - restyle to the Dynamo About window * Edit Node Name Dark Theme - changed Edit Node to dark theme as per Figma * Small Visual Changes - small tweaks to UI of Edit, About and TermsOfUse Windows * UsageReportingAgreement Restyle - visual update to the Usage Reporting Agreement Window - changed the fontsize for all RichTextFiles (this is a limitation) * Crash Window Restyle (White) - restyle to Dynamo crash window * Generic Task Dialog Restyle - the Generic Task Dialog is the base class that is used to display the 'Graph Contains Unresolved Nodes and Cannot be Saved dialog.' Restyled to match the new Theme. * Zoomed-in Node Rename -contextually rename Node directly when under the ZoomThreshold * About Dialog Fix - small visual fix to the About Dialog - added documentation for the new methods incorporated in the NodeView * Restyle Comments - Graph contains unresolved nodes dialog: - blue button, image change - Dynamo has crashed - image change - About Dynamo - Dynamo icon text needs to be changed to darker color. Same for version text * Remove Old Icons - removed png files that are no longer needed * Text Update - multiple dialog texts have been updated - crash dialog - unresolved nodes - minor alignment to control buttons of dialogs * About Dialog Comments - updated 'About' dialog following team meeting - green color of (Up-to-date) changed - (Up-to-date) changed to (Up to date) - the dialog is now resizable with grip (slow performance noted, not sure how to optimize or if it is possible) - minimize, maximize buttons added * Edit Window Adjustments - implemented a version of the high-density design style - generally less margins all around * Escape Closes Dialog Window - added the ability to close down a dialog window by hitting the Escape key * Crash Prompt Detail Text Box Fix - fixed the style of the text box displaying the details of a crash, if expanded - a new style created, old style is still in use so remains unchanged * Crash Dialog Title Text Change - fixed the double 'Dynamo' text of the Crash Dialog Title inside the US Recourses * BugFix - causing a crash when opening Custom Nodes * TextFix - introducing a TextBox to allow for inline rename was causing a test to fail
1 parent cc082e2 commit c88bbf8

38 files changed

+1698
-516
lines changed

src/DynamoCore/Properties/Resources.Designer.cs

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/DynamoCore/Properties/Resources.en-US.resx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -657,13 +657,15 @@ value : bool = false</value>
657657
<comment>The default name of home workspace</comment>
658658
</data>
659659
<data name="UnresolvedNodesWarningShortMessage" xml:space="preserve">
660-
<value>This graph cannot be saved until unresolved nodes are removed or resolved.</value>
660+
<value>The graph has unresolved nodes and cannot be saved.</value>
661661
</data>
662662
<data name="UnresolvedNodesWarningTitle" xml:space="preserve">
663-
<value>Graph Contains Unresolved Nodes and Cannot Be Saved.</value>
663+
<value>Unable to save graph</value>
664664
</data>
665665
<data name="UnresolvedNodesWarningMessage" xml:space="preserve">
666-
<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>
666+
<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.
667+
668+
Resolve or remove the unresolved nodes and try again.</value>
667669
</data>
668670
<data name="CodeBlockTempIdentifierOutputLabel" xml:space="preserve">
669671
<value>Value of expression at line {0}</value>

src/DynamoCore/Properties/Resources.resx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -668,13 +668,15 @@ value : bool = false</value>
668668
<comment>The default name of home workspace</comment>
669669
</data>
670670
<data name="UnresolvedNodesWarningMessage" xml:space="preserve">
671-
<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>
671+
<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.
672+
673+
Resolve or remove the unresolved nodes and try again.</value>
672674
</data>
673675
<data name="UnresolvedNodesWarningShortMessage" xml:space="preserve">
674-
<value>This graph cannot be saved until unresolved nodes are removed or resolved.</value>
676+
<value>The graph has unresolved nodes and cannot be saved.</value>
675677
</data>
676678
<data name="UnresolvedNodesWarningTitle" xml:space="preserve">
677-
<value>Graph Contains Unresolved Nodes and Cannot Be Saved.</value>
679+
<value>Unable to save graph</value>
678680
</data>
679681
<data name="CodeBlockTempIdentifierOutputLabel" xml:space="preserve">
680682
<value>Value of expression at line {0}</value>

src/DynamoCoreWpf/DynamoCoreWpf.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
1414
</PropertyGroup>
1515
<ItemGroup>
16+
<None Remove="UI\Images\AboutWindow\logo_about_dark.png" />
1617
<None Remove="UI\Images\Alignment\align_bottom.png" />
1718
<None Remove="UI\Images\Alignment\align_left.png" />
1819
<None Remove="UI\Images\Alignment\align_right.png" />
@@ -21,6 +22,13 @@
2122
<None Remove="UI\Images\Alignment\align_x_distribute.png" />
2223
<None Remove="UI\Images\Alignment\align_y_average.png" />
2324
<None Remove="UI\Images\Alignment\align_y_distribute.png" />
25+
<None Remove="UI\Images\dynamonotext.png" />
26+
<None Remove="UI\Images\maximize_16px_blue.png" />
27+
<None Remove="UI\Images\maximize_16px_grey.png" />
28+
<None Remove="UI\Images\minimize_16px_blue.png" />
29+
<None Remove="UI\Images\minimize_16px_grey.png" />
30+
<None Remove="UI\Images\minus_16px_blue.png" />
31+
<None Remove="UI\Images\minus_16px_grey.png" />
2432
<None Remove="UI\Images\NodeStates\alert-64px.png" />
2533
<None Remove="UI\Images\NodeStates\error-64px.png" />
2634
<None Remove="UI\Images\NodeStates\frozen-64px.png" />
@@ -647,6 +655,9 @@
647655
<EmbeddedResource Include="UI\GuidedTour\DynamoOnboardingGuide_HouseCreationDS.dyn">
648656
</EmbeddedResource>
649657
<None Include="ViewModels\Watch3D\shaderSource\CompileShaders.bat" />
658+
<Resource Include="UI\Images\AboutWindow\logo_about_dark.png">
659+
<CopyToOutputDirectory></CopyToOutputDirectory>
660+
</Resource>
650661
<Resource Include="UI\Images\Alignment\align_bottom.png" />
651662
<Resource Include="UI\Images\Alignment\align_left.png" />
652663
<Resource Include="UI\Images\Alignment\align_right.png" />
@@ -788,6 +799,13 @@
788799
</ItemGroup>
789800
<ItemGroup>
790801
<Resource Include="UI\Images\closetab_normal.png" />
802+
<Resource Include="UI\Images\dynamonotext.png" />
803+
<Resource Include="UI\Images\maximize_16px_blue.png" />
804+
<Resource Include="UI\Images\maximize_16px_grey.png" />
805+
<Resource Include="UI\Images\minimize_16px_blue.png" />
806+
<Resource Include="UI\Images\minimize_16px_grey.png" />
807+
<Resource Include="UI\Images\minus_16px_blue.png" />
808+
<Resource Include="UI\Images\minus_16px_grey.png" />
791809
<Resource Include="UI\Images\NodeStates\alert-64px.png" />
792810
<Resource Include="UI\Images\NodeStates\error-64px.png" />
793811
<Resource Include="UI\Images\NodeStates\frozen-64px.png" />

src/DynamoCoreWpf/Properties/Resources.Designer.cs

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/DynamoCoreWpf/Properties/Resources.en-US.resx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<comment>About window title</comment>
131131
</data>
132132
<data name="AboutWindowUpToDate" xml:space="preserve">
133-
<value>(Up-to-date)</value>
133+
<value>(Up to date)</value>
134134
<comment>To indicate Dynamo is up to date</comment>
135135
</data>
136136
<data name="ActionMember" xml:space="preserve">
@@ -372,9 +372,9 @@
372372
<comment>Copy crash details</comment>
373373
</data>
374374
<data name="CrashPromptDialogCrashMessage" xml:space="preserve">
375-
<value>Uh oh... something went wrong and {0} has crashed, sorry about that.
375+
<value>Something went wrong and Dynamo has closed unexpectedly.
376376

377-
You will get a chance to save your work.</value>
377+
Don't worry, you'll have the option to save your work.</value>
378378
</data>
379379
<data name="CrashPromptDialogDetailButton" xml:space="preserve">
380380
<value>Details</value>
@@ -385,11 +385,11 @@ You will get a chance to save your work.</value>
385385
<comment>Open folder that contains crash report</comment>
386386
</data>
387387
<data name="CrashPromptDialogSubmitBugButton" xml:space="preserve">
388-
<value>Submit Bug To Github</value>
388+
<value>Submit bug to GitHub</value>
389389
<comment>Submit a bug on github</comment>
390390
</data>
391391
<data name="CrashPromptDialogTitle" xml:space="preserve">
392-
<value>{0} has crashed</value>
392+
<value>{0} has closed unexpectedly</value>
393393
</data>
394394
<data name="CreateMember" xml:space="preserve">
395395
<value>Create</value>
@@ -2106,7 +2106,7 @@ Installing the latest update requires Dynamo and any host applications to close.
21062106
Do you want to install the latest Dynamo update?</value>
21072107
</data>
21082108
<data name="UsageReportPromptDialogTitle" xml:space="preserve">
2109-
<value>Agreement to collect usability data on your use of {0}</value>
2109+
<value>Agreement to Collect Usability Data</value>
21102110
</data>
21112111
<data name="UseLevelKeepListStructureHint" xml:space="preserve">
21122112
<value>Keep 1 input list's nesting</value>

src/DynamoCoreWpf/Properties/Resources.resx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<comment>About window title</comment>
131131
</data>
132132
<data name="AboutWindowUpToDate" xml:space="preserve">
133-
<value>(Up-to-date)</value>
133+
<value>(Up to date)</value>
134134
<comment>To indicate Dynamo is up to date</comment>
135135
</data>
136136
<data name="ChangeScaleFactorPromptCaptionText" xml:space="preserve">
@@ -1078,9 +1078,9 @@ To avoid unintended behavior, uninstall the conflicting loaded package(s), resta
10781078
<comment>Copy crash details</comment>
10791079
</data>
10801080
<data name="CrashPromptDialogCrashMessage" xml:space="preserve">
1081-
<value>Uh oh... something went wrong and {0} has crashed, sorry about that.
1081+
<value>Something went wrong and Dynamo has closed unexpectedly.
10821082

1083-
You will get a chance to save your work.</value>
1083+
Don't worry, you'll have the option to save your work.</value>
10841084
</data>
10851085
<data name="CrashPromptDialogDetailButton" xml:space="preserve">
10861086
<value>Details</value>
@@ -1091,11 +1091,11 @@ You will get a chance to save your work.</value>
10911091
<comment>Open folder that contains crash report</comment>
10921092
</data>
10931093
<data name="CrashPromptDialogSubmitBugButton" xml:space="preserve">
1094-
<value>Submit Bug To Github</value>
1094+
<value>Submit bug to GitHub</value>
10951095
<comment>Submit a bug on github</comment>
10961096
</data>
10971097
<data name="CrashPromptDialogTitle" xml:space="preserve">
1098-
<value>{0} has crashed</value>
1098+
<value>{0} has closed unexpectedly</value>
10991099
</data>
11001100
<data name="DownloadWarningMessageBoxTitle" xml:space="preserve">
11011101
<value>Download Warning</value>
@@ -1141,7 +1141,7 @@ You will get a chance to save your work.</value>
11411141
<value>Cancel</value>
11421142
</data>
11431143
<data name="UsageReportPromptDialogTitle" xml:space="preserve">
1144-
<value>Agreement to collect usability data on your use of {0}</value>
1144+
<value>Agreement to Collect Usability Data</value>
11451145
</data>
11461146
<data name="DynamoViewContextMenuClearLog" xml:space="preserve">
11471147
<value>Clear</value>

src/DynamoCoreWpf/UI/DefaultBrandingResourceProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public string GetString(ResourceNames.ConsentForm resourceName)
5959
switch (resourceName)
6060
{
6161
case ResourceNames.ConsentForm.Title:
62-
resource = string.Format(Properties.Resources.UsageReportPromptDialogTitle,ProductName);
62+
resource = Properties.Resources.UsageReportPromptDialogTitle;
6363
break;
6464
}
6565

15 KB
Loading
1.19 KB
Loading

0 commit comments

Comments
 (0)