aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerghei Cebotari <serghei@cebotari.ru>2023-12-12 23:43:10 +0300
committerSerghei Cebotari <serghei@cebotari.ru>2023-12-12 23:43:10 +0300
commitaf2363b01107ebfd250cef1f522d5212a351f264 (patch)
tree49f0cda376a2739ca966b8c86a37f87c816ab2f7
parent3996b2175a8b49a4e65a5d1c7608c35c1b8f177b (diff)
Ribbon update
-rw-r--r--RhSolutions.AddIn/Controllers/RibbonController.cs14
-rw-r--r--RhSolutions.AddIn/Images/Coupling.pngbin0 -> 25091 bytes
-rw-r--r--RhSolutions.AddIn/Images/Sleeve.pngbin0 -> 48640 bytes
-rw-r--r--RhSolutions.AddIn/RhSolutions-AddIn.dna2
-rw-r--r--RhSolutions.AddIn/RhSolutions.AddIn.csproj6
5 files changed, 17 insertions, 5 deletions
diff --git a/RhSolutions.AddIn/Controllers/RibbonController.cs b/RhSolutions.AddIn/Controllers/RibbonController.cs
index 4015149..f7fdd1d 100644
--- a/RhSolutions.AddIn/Controllers/RibbonController.cs
+++ b/RhSolutions.AddIn/Controllers/RibbonController.cs
@@ -28,12 +28,16 @@ public class RibbonController : ExcelRibbon
<button id='export' getEnabled='GetExportEnabled' label='Экспорт в новый файл' size='normal' image='RhSolutions' onAction='OnToolPressed'/>
<button id='convert' getEnabled='GetConvertEnabled' label='Актуализировать' size='normal' imageMso='FileUpdate' onAction='OnToolPressed'/>
<button id='merge' label='Объединить' size='normal' imageMso='Copy' onAction='OnToolPressed'/>
- <button id='guess' getEnabled='GetGuessEnabled' label='Найти и экспортировать' size='normal' imageMso='ControlWizards' onAction='OnToolPressed'/>
- <button id='fillsleeves' getEnabled='GetFittingsCalcEnabled' label='Подобрать гильзы' size='normal' imageMso='CreateQueryFromWizard' onAction='OnToolPressed'/>
- <button id='fillcouplings' getEnabled='GetFittingsCalcEnabled' label='Подобрать муфты' size='normal' imageMso='CreateQueryFromWizard' onAction='OnToolPressed'/>
- <button id='dxfexport' getEnabled='GetDxfEnabled' label='Экспортировать в DXF' size='normal' image='DXF' onAction='OnToolPressed'/>
+ <button id='guess' getEnabled='GetGuessEnabled' label='Найти и экспортировать' size='large' imageMso='ControlWizards' onAction='OnToolPressed'/>
</group>
- <group id='rausettings' getLabel='GetVersionLabel'>
+ <group id='fittingsCalc' label='Расчет фитингов'>
+ <button id='fillsleeves' getEnabled='GetFittingsCalcEnabled' label='Гильзы' size='large' image='Sleeve' onAction='OnToolPressed'/>
+ <button id='fillcouplings' getEnabled='GetFittingsCalcEnabled' label='Муфты' size='large' image='Coupling' onAction='OnToolPressed'/>
+ </group>
+ <group id='exportTab' label='Экспорт'>
+ <button id='dxfexport' getEnabled='GetDxfEnabled' label='DXF' size='large' image='DXF' onAction='OnToolPressed'/>
+ </group>
+ <group id='settings' getLabel='GetVersionLabel'>
<button id='setPriceList' getLabel='GetPriceListPathLabel' size='large' image='RhSolutions' onAction='OnSetPricePressed'/>
</group>
</tab>
diff --git a/RhSolutions.AddIn/Images/Coupling.png b/RhSolutions.AddIn/Images/Coupling.png
new file mode 100644
index 0000000..97ce2bc
--- /dev/null
+++ b/RhSolutions.AddIn/Images/Coupling.png
Binary files differ
diff --git a/RhSolutions.AddIn/Images/Sleeve.png b/RhSolutions.AddIn/Images/Sleeve.png
new file mode 100644
index 0000000..e3c52d8
--- /dev/null
+++ b/RhSolutions.AddIn/Images/Sleeve.png
Binary files differ
diff --git a/RhSolutions.AddIn/RhSolutions-AddIn.dna b/RhSolutions.AddIn/RhSolutions-AddIn.dna
index 9835141..cb2de7a 100644
--- a/RhSolutions.AddIn/RhSolutions-AddIn.dna
+++ b/RhSolutions.AddIn/RhSolutions-AddIn.dna
@@ -25,4 +25,6 @@
<Reference Path="System.ValueTuple.dll" Pack="true" />
<Image Name='RhSolutions' Path='Images\RhSolutions.png' Pack='true' />
<Image Name='DXF' Path='Images\DXF.png' Pack='true' />
+ <Image Name='Sleeve' Path='Images\Sleeve.png' Pack='true' />
+ <Image Name='Coupling' Path='Images\Coupling.png' Pack='true' />
</DnaLibrary>
diff --git a/RhSolutions.AddIn/RhSolutions.AddIn.csproj b/RhSolutions.AddIn/RhSolutions.AddIn.csproj
index 0cd800f..cdd5ac6 100644
--- a/RhSolutions.AddIn/RhSolutions.AddIn.csproj
+++ b/RhSolutions.AddIn/RhSolutions.AddIn.csproj
@@ -46,11 +46,17 @@
<ProjectReference Include="..\RhSolutions.ProductSku\RhSolutions.ProductSku.csproj" />
</ItemGroup>
<ItemGroup>
+ <None Update="Images\Coupling.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Update="Images\DXF.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Images\RhSolutions.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Images\Sleeve.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project> \ No newline at end of file