Skip to content

Portable Tool for an Ideal Windows Setup

add ToolTip style & rename style files to plural form

Greedeks422fb915272a
diff --git a/.Source/GTweak/App.xaml b/.Source/GTweak/App.xaml
index bb6b4b49..cfae2ea0 100644
--- a/.Source/GTweak/App.xaml
+++ b/.Source/GTweak/App.xaml
@@ -23,13 +23,14 @@
<ResourceDictionary Source="Styles/Buttons/Buttons.xaml" />
<ResourceDictionary Source="Styles/Buttons/RadioButtons.xaml" />
<ResourceDictionary Source="Styles/Buttons/ToggleButtons.xaml" />
- <ResourceDictionary Source="Styles/Display/ScrollBar.xaml" />
- <ResourceDictionary Source="Styles/Display/TextBlock.xaml" />
+ <ResourceDictionary Source="Styles/Display/ScrollBars.xaml" />
+ <ResourceDictionary Source="Styles/Display/TextBlocks.xaml" />
<ResourceDictionary Source="Styles/Display/Images.xaml" />
- <ResourceDictionary Source="Styles/Inputs/ComboBox.xaml" />
- <ResourceDictionary Source="Styles/Inputs/Slider.xaml" />
- <ResourceDictionary Source="Styles/Inputs/TextBox.xaml" />
- <ResourceDictionary Source="Styles/Inputs/CheckBox.xaml" />
+ <ResourceDictionary Source="Styles/Display/ToolTips.xaml" />
+ <ResourceDictionary Source="Styles/Inputs/ComboBoxes.xaml" />
+ <ResourceDictionary Source="Styles/Inputs/Sliders.xaml" />
+ <ResourceDictionary Source="Styles/Inputs/TextBoxes.xaml" />
+ <ResourceDictionary Source="Styles/Inputs/CheckBoxes.xaml" />
<ResourceDictionary Source="Styles/Page.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index babab10f..8cb41c9e 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -358,7 +358,11 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Styles\Inputs\CheckBox.xaml">
+ <Page Include="Styles\Display\ToolTips.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Styles\Inputs\CheckBoxes.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -366,23 +370,23 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Styles\Display\ScrollBar.xaml">
+ <Page Include="Styles\Display\ScrollBars.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Styles\Display\TextBlock.xaml">
+ <Page Include="Styles\Display\TextBlocks.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Styles\Inputs\ComboBox.xaml">
+ <Page Include="Styles\Inputs\ComboBoxes.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Styles\Inputs\Slider.xaml">
+ <Page Include="Styles\Inputs\Sliders.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Styles\Inputs\TextBox.xaml">
+ <Page Include="Styles\Inputs\TextBoxes.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
diff --git a/.Source/GTweak/Styles/Display/ScrollBar.xaml b/.Source/GTweak/Styles/Display/ScrollBars.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Display/ScrollBar.xaml
rename to .Source/GTweak/Styles/Display/ScrollBars.xaml
diff --git a/.Source/GTweak/Styles/Display/TextBlock.xaml b/.Source/GTweak/Styles/Display/TextBlocks.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Display/TextBlock.xaml
rename to .Source/GTweak/Styles/Display/TextBlocks.xaml
diff --git a/.Source/GTweak/Styles/Display/ToolTips.xaml b/.Source/GTweak/Styles/Display/ToolTips.xaml
new file mode 100644
index 00000000..1962f72e
--- /dev/null
+++ b/.Source/GTweak/Styles/Display/ToolTips.xaml
@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+ <Style TargetType="{x:Type ToolTip}">
+ <Setter Property="FontFamily" Value="{StaticResource Jura}"/>
+ <Setter Property="Background" Value="{StaticResource Brush_Background_ComboBox}"/>
+ <Setter Property="Foreground" Value="{StaticResource Brush_Highlighted}"/>
+ <Setter Property="BorderBrush" Value="{StaticResource Brush_Separator}"/>
+ <Setter Property="BorderThickness" Value="1"/>
+ <Setter Property="Padding" Value="8,5"/>
+ <Setter Property="FontSize" Value="13"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="ToolTip">
+ <Border Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ CornerRadius="5"
+ Padding="{TemplateBinding Padding}">
+ <ContentPresenter/>
+ </Border>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Styles/Inputs/CheckBox.xaml b/.Source/GTweak/Styles/Inputs/CheckBoxes.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Inputs/CheckBox.xaml
rename to .Source/GTweak/Styles/Inputs/CheckBoxes.xaml
diff --git a/.Source/GTweak/Styles/Inputs/ComboBox.xaml b/.Source/GTweak/Styles/Inputs/ComboBoxes.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Inputs/ComboBox.xaml
rename to .Source/GTweak/Styles/Inputs/ComboBoxes.xaml
diff --git a/.Source/GTweak/Styles/Inputs/Slider.xaml b/.Source/GTweak/Styles/Inputs/Sliders.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Inputs/Slider.xaml
rename to .Source/GTweak/Styles/Inputs/Sliders.xaml
diff --git a/.Source/GTweak/Styles/Inputs/TextBox.xaml b/.Source/GTweak/Styles/Inputs/TextBoxes.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Inputs/TextBox.xaml
rename to .Source/GTweak/Styles/Inputs/TextBoxes.xaml