Skip to content

Commit

Permalink
- Nuget Updates:
Browse files Browse the repository at this point in the history
  - - CommandLine parser to 2.5.0
  - - KryptonComponents to 1103
  - - Nlog to 4.6.3
  - - TaskSchedular to 2.8.11
- Update tooltip locations
-Fix Documentation link
- Streamline the "Change Theme" process
- Fix some text not showing in some themes
  • Loading branch information
Smurf-IV committed May 27, 2019
1 parent c676b36 commit 1a20946
Show file tree
Hide file tree
Showing 11 changed files with 62 additions and 2,265 deletions.
2 changes: 1 addition & 1 deletion Elucidate/Elucidate Windows Installer/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<Property Id="STARTAPP" Value="false"/>

<!-- Support Information shown in Add/Remove programs -->
<Property Id="ARPHELPLINK" Value="https://github.com/Smurf-IV/Elucidate/docs" />
<Property Id="ARPHELPLINK" Value="https://github.com/Smurf-IV/Elucidate/blob/master/docs/Documentation.md" />
<Property Id="ARPCOMMENTS" Value="https://github.com/Smurf-IV/Elucidate/issues"/>
<Property Id="ARPCONTACT" Value="Smurf-IV" />
<Property Id="ARPURLINFOABOUT" Value="https://github.com/Smurf-IV/Elucidate" />
Expand Down
4 changes: 4 additions & 0 deletions Elucidate/Elucidate/Controls/LiveRunLogControl.Designer.cs

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

25 changes: 8 additions & 17 deletions Elucidate/Elucidate/Elucidate.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</AssemblyInfoVersionSettings>
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
<AssemblyInfoFilePath>Properties\AssemblyInfo.cs</AssemblyInfoFilePath>
<AssemblyVersion>19.3.969.10</AssemblyVersion>
<AssemblyVersion>19.4.971.11</AssemblyVersion>
<UpdatePackageVersion>False</UpdatePackageVersion>
<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
<InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
Expand Down Expand Up @@ -130,12 +130,6 @@
<Compile Include="ExtendedToolkit\KryptonCommandLinkButtonDesigner.cs" />
<Compile Include="ExtendedToolkit\KryptonCommandLinkVersion1.cs" />
<Compile Include="ExtendedToolkit\ViewDrawCommandLinkButton.cs" />
<Compile Include="Forms\ThemeSelector.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Forms\ThemeSelector.designer.cs">
<DependentUpon>ThemeSelector.cs</DependentUpon>
</Compile>
<Compile Include="HelperClasses\AdvancedSettingsHelper.cs" />
<Compile Include="CmdLine\CheckVerb.cs" />
<Compile Include="CmdLine\DiffVerb.cs" />
Expand Down Expand Up @@ -228,9 +222,6 @@
<EmbeddedResource Include="Controls\LiveRunLogControl.resx">
<DependentUpon>LiveRunLogControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\ThemeSelector.resx">
<DependentUpon>ThemeSelector.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="TabPages\CommonTab.resx">
<DependentUpon>CommonTab.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -307,25 +298,25 @@
<Version>2.2.6</Version>
</PackageReference>
<PackageReference Include="ByteSize">
<Version>1.3.0</Version>
<Version>2.0.0-alpha2</Version>
</PackageReference>
<PackageReference Include="CommandLineParser">
<Version>2.4.3</Version>
<Version>2.5.0</Version>
</PackageReference>
<PackageReference Include="Exceptionless.NLog">
<Version>4.3.2022</Version>
<Version>4.3.2027</Version>
</PackageReference>
<PackageReference Include="Exceptionless.Windows">
<Version>4.3.2022</Version>
<Version>4.3.2027</Version>
</PackageReference>
<PackageReference Include="KryptonToolkitSuite5472">
<Version>5.472.770</Version>
<Version>5.472.1103</Version>
</PackageReference>
<PackageReference Include="NLog">
<Version>4.6.0-rc2</Version>
<Version>4.6.3</Version>
</PackageReference>
<PackageReference Include="TaskSchedulerEditor">
<Version>2.8.8</Version>
<Version>2.8.11</Version>
</PackageReference>
</ItemGroup>
<ItemGroup />
Expand Down
3 changes: 3 additions & 0 deletions Elucidate/Elucidate/Forms/CalculateBlockSize.Designer.cs

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

28 changes: 19 additions & 9 deletions Elucidate/Elucidate/Forms/ElucidateForm.Designer.cs

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

11 changes: 5 additions & 6 deletions Elucidate/Elucidate/Forms/ElucidateForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ public ElucidateForm()

// Hook into changes in the global palette
KryptonManager.GlobalPaletteChanged += OnPaletteChanged;

ThemeManager.PropagateThemeSelector(themeComboBox);
themeComboBox.Text = ThemeManager.ReturnPaletteModeManagerAsString(PaletteModeManager.Office2007Blue, kryptonManager1);
}

private void ElucidateForm_Load(object sender, EventArgs e)
Expand Down Expand Up @@ -345,12 +346,10 @@ private void tabControl_SelectedPageChanged(object sender, EventArgs e)
Log.Trace("tabControl_SelectedPageChanged - OUT");
}

private void changeTheThemeToolStripMenuItem_Click(object sender, EventArgs e)
private void themeComboBox_SelectedIndexChanged(object sender, EventArgs e)
{
using (ThemeSelector ts = new ThemeSelector())
{
ts.ShowDialog(this);
}
ThemeManager.SetTheme(themeComboBox.Text, kryptonManager1);

}
}
}
182 changes: 0 additions & 182 deletions Elucidate/Elucidate/Forms/ThemeSelector.cs

This file was deleted.

Loading

0 comments on commit 1a20946

Please sign in to comment.