Skip to content

Aesthetic changes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qlands wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Aesthetic changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f5fd0d2
Update readme
Aug 30, 2020
1d78238
Improve messages. Few minor stetic changes
Aug 30, 2020
f4c2680
New icons
Aug 30, 2020
196d43e
Remove old icons
Aug 30, 2020
04cdbf4
Add documentation to read me file
Aug 30, 2020
4bbbc3a
Fix typos
Aug 30, 2020
4e8945c
Update download link
Aug 30, 2020
3c839a8
Update README.md
Aug 1, 2022
8f74c8e
Upgrade libraries and support TLS 1.2
Oct 21, 2022
24c43db
Merge branch 'master' of https://github.com/qlands/MrBot-OData-Add-In…
Oct 21, 2022
40c6bde
Update readme
Oct 21, 2022
841f457
Update about screen
Oct 21, 2022
7bdd038
Update README.md
Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 66 additions & 37 deletions MrBotAddIn/MrBotAddIn.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@
<NoStandardLibraries>false</NoStandardLibraries>
<RootNamespace>MrBotAddIn</RootNamespace>
<AssemblyName>MrBotAddIn</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<DefineConstants>VSTO40</DefineConstants>
<IsWebBootstrapper>False</IsWebBootstrapper>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<BootstrapperEnabled>true</BootstrapperEnabled>
<PublishUrl>C:\Users\laptop HP\Desktop\</PublishUrl>
<InstallUrl />
Expand All @@ -52,6 +55,11 @@
<ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
Expand Down Expand Up @@ -129,46 +137,72 @@
-->
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
<Private>True</Private>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
<Reference Include="Microsoft.Data.Edm, Version=5.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.Edm.5.8.5\lib\net40\Microsoft.Data.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Spatial, Version=7.5.3.21218, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Spatial.7.5.3\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll</HintPath>
<Private>True</Private>
<Reference Include="Microsoft.Data.OData, Version=5.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.OData.5.8.5\lib\net40\Microsoft.Data.OData.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OData.Core, Version=7.12.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.OData.Core.7.12.4\lib\net45\Microsoft.OData.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OData.Edm, Version=7.12.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.OData.Edm.7.12.4\lib\net45\Microsoft.OData.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Spatial, Version=7.12.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Spatial.7.12.4\lib\net45\Microsoft.Spatial.dll</HintPath>
</Reference>
<Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Simple.OData.Client.Core, Version=5.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Simple.OData.Client.5.12.0\lib\netstandard2.0\Simple.OData.Client.Core.dll</HintPath>
<Private>True</Private>
<Reference Include="Simple.OData.Client.Core, Version=5.26.0.0, Culture=neutral, PublicKeyToken=58885f4495efc1ae, processorArchitecture=MSIL">
<HintPath>..\packages\Simple.OData.Client.5.26.0\lib\net461\Simple.OData.Client.Core.dll</HintPath>
</Reference>
<Reference Include="Simple.OData.Client.Dynamic, Version=5.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Simple.OData.Client.5.12.0\lib\netstandard2.0\Simple.OData.Client.Dynamic.dll</HintPath>
<Private>True</Private>
<Reference Include="Simple.OData.Client.Dynamic, Version=5.26.0.0, Culture=neutral, PublicKeyToken=58885f4495efc1ae, processorArchitecture=MSIL">
<HintPath>..\packages\Simple.OData.Client.5.26.0\lib\net461\Simple.OData.Client.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Simple.OData.Client.V3.Adapter, Version=5.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Simple.OData.Client.5.12.0\lib\netstandard2.0\Simple.OData.Client.V3.Adapter.dll</HintPath>
<Private>True</Private>
<Reference Include="Simple.OData.Client.V3.Adapter, Version=5.26.0.0, Culture=neutral, PublicKeyToken=58885f4495efc1ae, processorArchitecture=MSIL">
<HintPath>..\packages\Simple.OData.Client.5.26.0\lib\net461\Simple.OData.Client.V3.Adapter.dll</HintPath>
</Reference>
<Reference Include="Simple.OData.Client.V4.Adapter, Version=5.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Simple.OData.Client.5.12.0\lib\netstandard2.0\Simple.OData.Client.V4.Adapter.dll</HintPath>
<Private>True</Private>
<Reference Include="Simple.OData.Client.V4.Adapter, Version=5.26.0.0, Culture=neutral, PublicKeyToken=58885f4495efc1ae, processorArchitecture=MSIL">
<HintPath>..\packages\Simple.OData.Client.5.26.0\lib\net461\Simple.OData.Client.V4.Adapter.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll</HintPath>
<Private>True</Private>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Spatial, Version=5.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.Spatial.5.8.5\lib\net40\System.Spatial.dll</HintPath>
</Reference>
<Reference Include="System.Text.Encodings.Web, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.6.0.0\lib\net461\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Expand Down Expand Up @@ -313,15 +347,6 @@
</Compile>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Iconos WEB MrBot fondo blanco-141.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Iconos WEB MrBot fondo blanco-17.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Iconos WEB MrBot fondo blanco-16.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Icono 145x72px-03.png" />
</ItemGroup>
Expand All @@ -337,9 +362,6 @@
<ItemGroup>
<None Include="Resources\favicon%281%29.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\download_more.png" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
Expand Down Expand Up @@ -375,4 +397,11 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.0\build\System.Text.Json.targets'))" />
</Target>
</Project>
40 changes: 0 additions & 40 deletions MrBotAddIn/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 2 additions & 14 deletions MrBotAddIn/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Iconos WEB MrBot fondo blanco-16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Iconos WEB MrBot fondo blanco-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Iconos WEB MrBot fondo blanco-17" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Iconos WEB MrBot fondo blanco-17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Icono 145x72px-03" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icono 145x72px-03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Iconos WEB MrBot fondo blanco-141" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Iconos WEB MrBot fondo blanco-141.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</data>
<data name="MrBot-03" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MrBot-03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand All @@ -145,7 +136,4 @@
<data name="favicon(1)1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\favicon(1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="download_more" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\download_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
10 changes: 5 additions & 5 deletions MrBotAddIn/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed MrBotAddIn/Resources/Iconos WEB MrBot fondo blanco-141.png
View file
Open in desktop
Binary file not shown.
Binary file removed MrBotAddIn/Resources/Iconos WEB MrBot fondo blanco-16.png
View file
Open in desktop
Binary file not shown.
Binary file removed MrBotAddIn/Resources/Iconos WEB MrBot fondo blanco-17.png
View file
Open in desktop
Binary file not shown.
Binary file removed MrBotAddIn/Resources/download_more.png
View file
Open in desktop
Binary file not shown.
Binary file added MrBotAddIn/Resources/new_icos/add_row.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MrBotAddIn/Resources/new_icos/commit.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MrBotAddIn/Resources/new_icos/connect.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MrBotAddIn/Resources/new_icos/delete_row.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MrBotAddIn/Resources/new_icos/getmore.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MrBotAddIn/Resources/new_icos/refresh.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions MrBotAddIn/Resultados.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public void MostrarDetallesAEditar()
var updates = listOfChanges.Where(x => x.ch_action == "update");
var deletes = listOfChanges.Where(x => x.ch_action == "delete");
var groupsOfUpdates = updates.GroupBy(x => x.ch_idRow);
ChangeText("Number of lines to EDIT:"+ groupsOfUpdates.Count().ToString()+ "\n", Color.Orange);
ChangeText("Number of lines to DELETE:"+ deletes.Count().ToString()+ "\n", Color.Orange);
ChangeText("Number of lines to INSERT:" + numberOfInserts.Count.ToString() + "\n", Color.Orange);
ChangeText("Click 'Start' to start the process ...\n", Color.Black);
ChangeText("Number of edited lines to be committed: "+ groupsOfUpdates.Count().ToString()+ "\n", Color.Orange);
ChangeText("Number of deleted lines to be committed: " + deletes.Count().ToString()+ "\n", Color.Orange);
ChangeText("Number of inserted lines to be committed: " + numberOfInserts.Count.ToString() + "\n", Color.Orange);
ChangeText("Click the 'Commit button' to start the process ...\n", Color.Black);
progressBar1.Maximum = groupsOfUpdates.Count() + deletes.Count() + numberOfInserts.Count;
}

Expand Down
Loading