Merge pull request #9 from schebotar/dev

Move to /src
This commit is contained in:
Serghei Cebotari 2021-12-26 19:37:46 +03:00 committed by GitHub
commit fc870d1955
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 22 additions and 22 deletions

View File

@ -91,7 +91,7 @@ namespace RehauSku.PriceListTools
catch(Exception ex) catch(Exception ex)
{ {
System.Windows.Forms.MessageBox.Show System.Windows.Forms.MessageBox.Show
($"{RegistryUtil.PriceListPath} не является файлом прайслиста \n\n {ex.Message}", ($"{RegistryUtil.PriceListPath} не является файлом прайс-листа \n\n {ex.Message}",
"Неверный файл прайс-листа!", "Неверный файл прайс-листа!",
System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxButtons.OK,
System.Windows.Forms.MessageBoxIcon.Error); System.Windows.Forms.MessageBoxIcon.Error);

View File

@ -32,7 +32,7 @@ namespace RehauSku.PriceListTools
catch (Exception ex) catch (Exception ex)
{ {
System.Windows.Forms.MessageBox.Show System.Windows.Forms.MessageBox.Show
( $"{wb.Name} не является файлом прайслиста \n\n {ex.Message}", ( $"{wb.Name} не является файлом прайс-листа \n\n {ex.Message}",
"Неверный файл прайс-листа!", "Неверный файл прайс-листа!",
System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxButtons.OK,
System.Windows.Forms.MessageBoxIcon.Error); System.Windows.Forms.MessageBoxIcon.Error);
@ -65,7 +65,7 @@ namespace RehauSku.PriceListTools
catch (Exception ex) catch (Exception ex)
{ {
System.Windows.Forms.MessageBox.Show System.Windows.Forms.MessageBox.Show
($"{RegistryUtil.PriceListPath} не является файлом прайслиста \n\n {ex.Message}", ($"{RegistryUtil.PriceListPath} не является файлом прайс-листа \n\n {ex.Message}",
"Неверный файл прайс-листа!", "Неверный файл прайс-листа!",
System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxButtons.OK,
System.Windows.Forms.MessageBoxIcon.Error); System.Windows.Forms.MessageBoxIcon.Error);

View File

@ -100,28 +100,28 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Source\Forms\Dialog.cs" /> <Compile Include="Forms\Dialog.cs" />
<Compile Include="Source\AddIn\RegistryUtil.cs" /> <Compile Include="AddIn\RegistryUtil.cs" />
<Compile Include="Source\AddIn\MemoryCacheUtil.cs" /> <Compile Include="AddIn\MemoryCacheUtil.cs" />
<Compile Include="Source\Assistant\ParseUtil.cs" /> <Compile Include="Assistant\ParseUtil.cs" />
<Compile Include="Source\Assistant\RequestModifier.cs" /> <Compile Include="Assistant\RequestModifier.cs" />
<Compile Include="Source\Assistant\SkuExtensions.cs" /> <Compile Include="Assistant\SkuExtensions.cs" />
<Compile Include="Source\PriceListTools\MergeTool.cs" /> <Compile Include="PriceListTools\MergeTool.cs" />
<Compile Include="Source\PriceListTools\PriceList.cs" /> <Compile Include="PriceListTools\PriceList.cs" />
<Compile Include="Source\PriceListTools\PriceListUtil.cs" /> <Compile Include="PriceListTools\PriceListUtil.cs" />
<Compile Include="Source\Ribbon\RibbonController.cs" /> <Compile Include="Ribbon\RibbonController.cs" />
<Compile Include="Source\Assistant\HttpClientUtil.cs" /> <Compile Include="Assistant\HttpClientUtil.cs" />
<Compile Include="Source\Assistant\StoreResponse.cs" /> <Compile Include="Assistant\StoreResponse.cs" />
<Compile Include="Source\PriceListTools\ExportTool.cs" /> <Compile Include="PriceListTools\ExportTool.cs" />
<Compile Include="Source\AddIn\AddIn.cs" /> <Compile Include="AddIn\AddIn.cs" />
<Compile Include="Source\Assistant\IProduct.cs" /> <Compile Include="Assistant\IProduct.cs" />
<Compile Include="Source\AddIn\Functions.cs" /> <Compile Include="AddIn\Functions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Source\Assistant\SkuAssist.cs" /> <Compile Include="Assistant\SkuAssist.cs" />
<Compile Include="Source\Forms\SettingsForm.cs"> <Compile Include="Forms\SettingsForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="Source\Forms\SettingsForm.Designer.cs"> <Compile Include="Forms\SettingsForm.Designer.cs">
<DependentUpon>SettingsForm.cs</DependentUpon> <DependentUpon>SettingsForm.cs</DependentUpon>
</Compile> </Compile>
</ItemGroup> </ItemGroup>