DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes to share output (#886)

Browse Source 
* Make some tweaks to share output

* adjust strings

* one more tweak

* Remove unneeded span
This commit is contained in:
Pepe Rivera 2020-01-03 10:45:51 -08:00 committed by Eric Wong
parent 3942662c9d
commit 3b916dcec3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Calculator/Resources/en-US/Resources.resw
View File

@ -3912,15 +3912,15 @@
<comment>Used on the dismiss button of the share action error dialog.</comment> <comment>Used on the dismiss button of the share action error dialog.</comment>
</data> </data>
<data name="ShareActionTitle" xml:space="preserve"> <data name="ShareActionTitle" xml:space="preserve">
<value>Look what I graphed.</value> <value>Look what I graphed with Windows Calculator</value>
<comment>Sent as part of the shared content. The title for the share.</comment> <comment>Sent as part of the shared content. The title for the share.</comment>
</data> </data>
<data name="EquationsShareHeader" xml:space="preserve"> <data name="EquationsShareHeader" xml:space="preserve">
<value>Equations:</value> <value>Equations</value>
<comment>Header that appears over the equations section when sharing</comment> <comment>Header that appears over the equations section when sharing</comment>
</data> </data>
<data name="VariablesShareHeader" xml:space="preserve"> <data name="VariablesShareHeader" xml:space="preserve">
<value>Variables:</value> <value>Variables</value>
<comment>Header that appears over the variables section when sharing</comment> <comment>Header that appears over the variables section when sharing</comment>
</data> </data>
<data name="GraphImageAltText" xml:space="preserve"> <data name="GraphImageAltText" xml:space="preserve">

12
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
View File

@ -218,7 +218,7 @@ void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataReque
equationHtml << L"<span style=\"color: rgb(68, 114, 196); font-style: bold; font-size : 13pt;\">"; equationHtml << L"<span style=\"color: rgb(68, 114, 196); font-style: bold; font-size : 13pt;\">";
equationHtml << resourceLoader->GetString(L"EquationsShareHeader")->Data(); equationHtml << resourceLoader->GetString(L"EquationsShareHeader")->Data();
equationHtml << L"</span>"; equationHtml << L"</span>";
equationHtml << L"<table cellpadding=\"0\">"; equationHtml << L"<table cellpadding=\"0\" cellspacing=\"0\" >";
for (auto equation : equations) for (auto equation : equations)
{ {
@ -237,8 +237,8 @@ void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataReque
equationColorHtml << L"color:rgb(" << color.R.ToString()->Data() << L"," << color.G.ToString()->Data() << L"," << color.B.ToString()->Data() equationColorHtml << L"color:rgb(" << color.R.ToString()->Data() << L"," << color.G.ToString()->Data() << L"," << color.B.ToString()->Data()
<< L");"; << L");";
equationHtml << L"<tr><td><span style=\"line-height: 0; font-size: 24pt;" << equationColorHtml.str() equationHtml << L"<tr style=\"margin: 0pt 0pt 0pt 0pt; padding: 0pt 0pt 0pt 0pt; \"><td><span style=\"font-size: 22pt; line-height: 0;" << equationColorHtml.str()
<< L"\">&#x25A0;</span></td><td><div style=\"margin: 4pt 0pt 0pt 0pt; \">"; << L"\">&#x25A0;</span></td><td><div style=\"margin: 4pt 0pt 0pt 6pt;\">";
equationHtml << EscapeHtmlSpecialCharacters(expression)->Data(); equationHtml << EscapeHtmlSpecialCharacters(expression)->Data();
equationHtml << L"</div></td>"; equationHtml << L"</div></td>";
} }
@ -256,9 +256,9 @@ void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataReque
{ {
auto localizedSeperator = LocalizationSettings::GetInstance().GetListSeparator() + L" "; auto localizedSeperator = LocalizationSettings::GetInstance().GetListSeparator() + L" ";
rawHtml << L"<span style=\"color: rgb(68, 114, 196); font-style: bold; font-size: 13pt;\">"; rawHtml << L"<br><span style=\"color: rgb(68, 114, 196); font-style: bold; font-size: 13pt;\">";
rawHtml << resourceLoader->GetString(L"VariablesShareHeader")->Data(); rawHtml << resourceLoader->GetString(L"VariablesShareHeader")->Data();
rawHtml << L"</span><br><span>"; rawHtml << L"</span><br><div style=\"margin: 4pt 0pt 0pt 0pt;\">";
for (unsigned i = 0; i < variables->Size; i++) for (unsigned i = 0; i < variables->Size; i++)
{ {
@ -277,7 +277,7 @@ void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataReque
} }
} }
rawHtml << L"</span>"; rawHtml << L"</div>";
} }
rawHtml << L"<br><br>"; rawHtml << L"<br><br>";