Version 1.9.0.0

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='guess' getEnabled='GetGuessEnabled' label='Найти и экспортировать' size='large' 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'/>
             </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>

RhSolutions.AddIn/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.5.4")]
+[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.8.5.4")]
+[assembly: AssemblyFileVersion("1.9.0.0")]

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>

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>