Skip to content

Commit

Permalink
Edited various UI elements to make them more editable
Browse files Browse the repository at this point in the history
  • Loading branch information
thepigeonfighter committed Nov 20, 2018
1 parent e75a580 commit 8473ae1
Show file tree
Hide file tree
Showing 35 changed files with 196 additions and 208 deletions.
Binary file modified .vs/AutomatedDesktopBackground/v15/.suo
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 5 additions & 6 deletions AutomatedDesktopBackgroundUI/Config/Styles.xaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:AutomatedDesktopBackgroundUI">
<SolidColorBrush x:Key="backgroundColor" Color="#FFDBDBDB"></SolidColorBrush>
<SolidColorBrush x:Key="fontColor" Color="#FF535252"></SolidColorBrush>
<Style x:Key="myHeaderStyle" TargetType="{x:Type GridViewColumnHeader}">
<Setter Property="Visibility" Value="Collapsed" />
</Style>
Expand Down Expand Up @@ -233,8 +235,8 @@
<Setter.Value>
<ControlTemplate TargetType="Button" >

<Border Name="RootElement" >
<TextBlock x:Name="buttonText" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF535252"
<Border Name="RootElement" BorderThickness="1" CornerRadius="3" BorderBrush="{StaticResource fontColor}">
<TextBlock x:Name="buttonText" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{StaticResource fontColor}"
Text="{TemplateBinding ContentStringFormat}"/>

<VisualStateManager.VisualStateGroups>
Expand All @@ -260,10 +262,7 @@
<!--The Disabled state is omitted for brevity.-->
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<Border.Background >
<ImageBrush x:Name="ImageBrush" ImageSource="/Automated Desktop;component/Images/Border.png" >
</ImageBrush>
</Border.Background>

</Border>
</ControlTemplate>
</Setter.Value>
Expand Down
69 changes: 31 additions & 38 deletions AutomatedDesktopBackgroundUI/Views/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,25 @@

Title="MainWindow" Height="450" Width="900" WindowStartupLocation="CenterScreen"
MinWidth="900" MinHeight="450" Icon="pack://siteoforigin:,,,/Images/Icon.ico" AllowsTransparency="True"
Foreground="White" WindowStyle="None" VisualBitmapScalingMode="Fant"
WindowStyle="None" VisualBitmapScalingMode="Fant"
Background="Transparent"
>

<Window.Background>
<ImageBrush ImageSource="/Automated Desktop;component/Images/MainWindowPane.png"/>
</Window.Background>

<Border Background="{StaticResource backgroundColor}" BorderBrush="{StaticResource fontColor}" BorderThickness="2" CornerRadius="10">
<Grid>

<Label x:Name="header" Content="Automated Desktop Background" HorizontalAlignment="Left" Padding="30,14,15,10" Margin="10,15,0,0" VerticalAlignment="Top" FontFamily="MS Gothic" FontSize="36" Foreground="#FF535252" Height="66" Width="661" RenderTransformOrigin="0.5,0.5" Background="{x:Null}"/>
<TextBox x:Name="queryTextBox" HorizontalAlignment="Left" Height="41" Padding="20,4,10,10" Margin="465,194,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="219" Background="#FF535252" SelectionBrush="#FF828587" Foreground="#FFDBDBDB" FontSize="18" FontWeight="Bold" >
<TextBox.BorderBrush>
<ImageBrush ImageSource="/Automated Desktop;component/Images/Border.png"/>
</TextBox.BorderBrush>
<TextBox x:Name="queryTextBox" HorizontalAlignment="Left" Height="41" Padding="20,4,10,10" Margin="465,194,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="219" Background="{StaticResource fontColor}" SelectionBrush="#FF828587" Foreground="{StaticResource backgroundColor}" FontSize="18" FontWeight="Bold" >

</TextBox>
<Button x:Name="querySearchButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Add Interest" HorizontalAlignment="Left" Margin="465,245,0,0" VerticalAlignment="Top" Width="219" Click="QuerySearchButton_Click" Height="42" BorderBrush="#FFDBDBDB" FontFamily="Tahoma" FontWeight="Bold">
<Button x:Name="querySearchButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Add Interest" HorizontalAlignment="Left" Margin="465,245,0,0" VerticalAlignment="Top" Width="219" Click="QuerySearchButton_Click" Height="35" BorderBrush="#FFDBDBDB" FontFamily="Tahoma" FontWeight="Bold">

</Button>
<Label Content="Interests" HorizontalAlignment="Left" Margin="34,159.38,0,0" VerticalAlignment="Top" Width="74" FontSize="14" RenderTransformOrigin="0.527,0.804" Foreground="#FF535252" FontFamily="Tahoma"/>
<Button x:Name="removeInterestButton" Style="{StaticResource simpleButtonStyle}" ToolTip="Removes any images that are associated with this interest unless they have been marked as favorite." ContentStringFormat="Remove Interest" HorizontalAlignment="Left" Margin="24,378,0,0" VerticalAlignment="Top" Width="152" Click="RemoveInterestButton_Click" BorderBrush="{x:Null}" Height="31" FontFamily="Tahoma" FontWeight="Bold">
<Button.Background>
<ImageBrush ImageSource="/Automated Desktop;component/Images/Border.png" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
</Button.Background>
<Button x:Name="removeInterestButton" Style="{StaticResource simpleButtonStyle}" ToolTip="Removes any images that are associated with this interest unless they have been marked as favorite." ContentStringFormat="Remove Interest" HorizontalAlignment="Left" Margin="34,378,0,0" VerticalAlignment="Top" Width="152" Click="RemoveInterestButton_Click" BorderBrush="{x:Null}" Height="31" FontFamily="Tahoma" FontWeight="Bold">
</Button>
<Button x:Name="downloadButton" Style="{StaticResource simpleButtonStyle}" Padding="10"
ToolTip="Select an interest from the interest list to download a new collection." ContentStringFormat="Download New Collection"
HorizontalAlignment="Left" Margin="465,301,0,0" VerticalAlignment="Top" Width="219" Height="42" Click="DownloadButton_Click" BorderBrush="{x:Null}" FontFamily="Tahoma" FontWeight="Bold" >
HorizontalAlignment="Left" Margin="465,301,0,0" VerticalAlignment="Top" Width="219" Height="35" Click="DownloadButton_Click" BorderBrush="{x:Null}" FontFamily="Tahoma" FontWeight="Bold" >

</Button>
<ProgressBar x:Name="downloadProgressBar" HorizontalAlignment="Left" Height="15" Margin="475,358,0,0" VerticalAlignment="Top" Width="192" Foreground="#FF9CD4A6" />
Expand All @@ -45,13 +37,13 @@
</Button>
<Label x:Name="backgroundRefreshLabel" Content="Background is Refreshing" HorizontalAlignment="Left" Margin="451,95.03,0,0" VerticalAlignment="Top" Width="209" Height="29" Foreground="#FF535252" FontFamily="Tahoma" FontSize="14" FontWeight="Bold"/>
<Label x:Name ="collectionRefreshLabel" Content="Collections are refreshing" HorizontalAlignment="Left" Margin="451,132,0,0" VerticalAlignment="Top" Width="196.228" Height="29" Foreground="#FF535252" FontFamily="Tahoma" FontSize="14" FontWeight="Bold"/>
<Button x:Name="stopBackgroundRefreshButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Stop" HorizontalAlignment="Left" Margin="675,101,0,0" VerticalAlignment="Top" Width="96" Click="StopBackgroundRefreshButton_Click" BorderBrush="{x:Null}" Height="30" FontFamily="Tahoma" FontWeight="Bold">
<Button x:Name="stopBackgroundRefreshButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Stop" HorizontalAlignment="Left" Margin="675,101,0,0" VerticalAlignment="Top" Width="85" Click="StopBackgroundRefreshButton_Click" BorderBrush="{x:Null}" Height="25" FontFamily="Tahoma" FontWeight="Bold">
</Button>
<Button x:Name="stopCollectionRefreshButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Stop" HorizontalAlignment="Left" Margin="675,131,0,0" VerticalAlignment="Top" Width="96" Click="StopCollectionRefreshButton_Click" Height="30" BorderBrush="{x:Null}" FontFamily="Tahoma" FontWeight="Bold">
<Button x:Name="stopCollectionRefreshButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Stop" HorizontalAlignment="Left" Margin="675,136,0,0" VerticalAlignment="Top" Width="85" Click="StopCollectionRefreshButton_Click" Height="25" BorderBrush="{x:Null}" FontFamily="Tahoma" FontWeight="Bold">
</Button>
<Button x:Name="startBackgroundRefreshButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Start" HorizontalAlignment="Left" Margin="785,100,0,0" VerticalAlignment="Top" Width="96" Click="StartBackgroundRefreshButton_Copy_Click" BorderBrush="{x:Null}" Height="30" FontFamily="Tahoma" FontWeight="Bold">
<Button x:Name="startBackgroundRefreshButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Start" HorizontalAlignment="Left" Margin="785,100,0,0" VerticalAlignment="Top" Width="85" Click="StartBackgroundRefreshButton_Copy_Click" BorderBrush="{x:Null}" Height="25" FontFamily="Tahoma" FontWeight="Bold" Foreground="{x:Null}">
</Button>
<Button x:Name="startCollectionRefreshButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Start" HorizontalAlignment="Left" Margin="785,131,0,0" VerticalAlignment="Top" Width="96" Click="StartCollectionRefreshButton_Copy_Click" Height="30" BorderBrush="{x:Null}" FontFamily="Tahoma" FontWeight="Bold" >
<Button x:Name="startCollectionRefreshButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Start" HorizontalAlignment="Left" Margin="785,136,0,0" VerticalAlignment="Top" Width="85" Click="StartCollectionRefreshButton_Copy_Click" Height="25" BorderBrush="{x:Null}" FontFamily="Tahoma" FontWeight="Bold" >
</Button>
<Grid Margin="42,86,470,334">
<Viewbox HorizontalAlignment="Left">
Expand All @@ -66,36 +58,37 @@
</Button>
<Button x:Name="HateImageButton" Padding="5" Style="{StaticResource hateItButtonStyle}" ToolTip="Deletes an image and bans the image from being downloaded again in the future" HorizontalAlignment="Left" Margin="267,114,0,0" VerticalAlignment="Top" Width="42" Click="HateImage_Click" BorderBrush="{x:Null}" Height="45" FontFamily="Tahoma" FontWeight="Bold">
</Button>
<ListView x:Name="interestListView" Padding="10" HorizontalAlignment="Left" Height="185" Margin="24,188,0,0"
<Border BorderBrush="{StaticResource fontColor}" BorderThickness="1" Margin="22,161,518,77" CornerRadius="3" />
<ListView x:Name="interestListView" Padding="10" HorizontalAlignment="Left" Height="185" Margin="24,188,0,0"
VerticalAlignment="Top" Width="350" SelectionChanged="InterestListView_SelectionChanged"
BorderBrush="{x:Null}" Foreground="#FF5B5B5B"
Foreground="#FF5B5B5B" Background="Transparent" BorderBrush="{x:Null}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontFamily="Tahoma"
>
<ListView.Background>
<ImageBrush ImageSource="/Automated Desktop;component/Images/RoundedSquare.png"/>
</ListView.Background>
<ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle}">
<GridViewColumn x:Name="InterestHeader" Header="Interest Name" Width="200" DisplayMemberBinding="{Binding Name}" >
</GridViewColumn>
<GridViewColumn x:Name="ResultsHeader" Header="Total Results" Width="200" DisplayMemberBinding="{Binding TotalImages}" >
</GridViewColumn>
</GridView>
</ListView.View>
</ListView>
<Label x:Name="connectionLabel" Content="Connected" HorizontalAlignment="Left" Height="24" Margin="564,66.03,0,0" VerticalAlignment="Top" Width="182" Foreground="#FF5C9C68" FontWeight="Bold" FontFamily="SimSun"/>

<ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle}">
<GridViewColumn x:Name="InterestHeader" Header="Interest Name" Width="200" DisplayMemberBinding="{Binding Name}" >
</GridViewColumn>
<GridViewColumn x:Name="ResultsHeader" Header="Total Results" Width="200" DisplayMemberBinding="{Binding TotalImages}" >
</GridViewColumn>
</GridView>
</ListView.View>
</ListView>

<Label x:Name="connectionLabel" Content="Connected" HorizontalAlignment="Left" Height="24" Margin="564,66.03,0,0" VerticalAlignment="Top" Width="182" Foreground="#FF5C9C68" FontWeight="Bold" FontFamily="SimSun"/>
<Label x:Name="versionLabel" Content="v.1.2" HorizontalAlignment="Left" Margin="564,45.893,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.5,-0.308" Height="28" Width="46"/>
<Label Content="Results" HorizontalAlignment="Left" Margin="235,159.38,0,0" VerticalAlignment="Top" Width="74" FontSize="14" RenderTransformOrigin="0.527,0.804" Foreground="#FF535252" FontFamily="Tahoma"/>
<Button x:Name="quitApplicationButton" Style="{StaticResource simpleButtonStyle}" Padding="10"
ToolTip="Shuts the application down" ContentStringFormat="Exit Application"
HorizontalAlignment="Left" Margin="465,383,0,0" VerticalAlignment="Top" Width="219" Height="42" BorderBrush="{x:Null}" FontFamily="Tahoma" FontWeight="Bold"
HorizontalAlignment="Left" Margin="465,383,0,0" VerticalAlignment="Top" Width="219" Height="35" BorderBrush="{x:Null}" FontFamily="Tahoma" FontWeight="Bold"
Click="ExitApplicationButtonClick"/>
<Button Style="{StaticResource minimizeButtonStyle}" HorizontalAlignment="Left" Margin="705,16,0,0" VerticalAlignment="Top" Width="50" Height="50" Click="OnMinimizeClick">
<Button Style="{StaticResource minimizeButtonStyle}" HorizontalAlignment="Left" Margin="705,16,0,0" VerticalAlignment="Top" Width="50" Height="50" Click="OnMinimizeClick" Foreground="{x:Null}">
<Button.Background>
<ImageBrush ImageSource="/Automated Desktop;component/Images/minimize button.png"/>
</Button.Background>
</Button>
<Button x:Name="ChangeBackgroundButton" Padding="5" Style="{StaticResource nextBackgroundStyle}" ToolTip="Skips to the next desktop background" HorizontalAlignment="Left" Margin="314,116,0,0" VerticalAlignment="Top" Width="42" Click="NextBackground_Click" BorderBrush="{x:Null}" Height="45" FontFamily="Tahoma" FontWeight="Bold"/>

</Grid>
</Border>
</Window>
7 changes: 3 additions & 4 deletions AutomatedDesktopBackgroundUI/Views/SettingsWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:AutomatedDesktopBackgroundUI"
mc:Ignorable="d"
Title="SettingsWindow" Height="450" Width="900" WindowStyle="None" AllowsTransparency="True" WindowStartupLocation="CenterScreen">
<Window.Background>
<ImageBrush ImageSource="/Automated Desktop;component/Images/MainWindowPane.png"/>
</Window.Background>
Title="SettingsWindow" Height="450" Width="900" WindowStyle="None" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Background="Transparent">
<Border Background="{StaticResource backgroundColor}" BorderBrush="{StaticResource fontColor}" BorderThickness="2" CornerRadius="10">
<Grid>
<ComboBox x:Name="backgroundCombobox" HorizontalAlignment="Left" Margin="283,143,0,0" VerticalAlignment="Top" Width="142"/>
<TextBox x:Name="backgroundRefreshTextBox" HorizontalAlignment="Left" Height="23" Margin="70,143,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="120" RenderTransformOrigin="0.486,1.997" PreviewTextInput="CheckIfNumber"/>
Expand All @@ -32,4 +30,5 @@
</TextBlock>
<Border BorderBrush="Black" BorderThickness="1" CornerRadius="3" HorizontalAlignment="Left" Height="149" Margin="572,171,0,0" VerticalAlignment="Top" Width="260"/>
</Grid>
</Border>
</Window>
33 changes: 15 additions & 18 deletions AutomatedDesktopBackgroundUI/Views/WarningWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,19 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:AutomatedDesktopBackgroundUI"
mc:Ignorable="d"
Title="WarningWindow" Height="250" Width="400" Icon="pack://siteoforigin:,,,/Images/Icon.ico" AllowsTransparency="True"
Foreground="White" WindowStyle="None" ResizeMode="NoResize" VisualBitmapScalingMode="Fant" WindowStartupLocation="CenterScreen" >
<Window.Background>
<ImageBrush ImageSource="/Automated Desktop;component/Images/MainWindowPane.png"/>
</Window.Background>
<Grid>
<Image HorizontalAlignment="Left" Height="178" Margin="19,7,0,0" VerticalAlignment="Top" Width="361" Source="/Automated Desktop;component/Images/RoundedSquare.png" Stretch="Fill"/>
<CheckBox x:Name ="warningCheckBox" HorizontalAlignment="Left" Margin="114,119,0,0" VerticalAlignment="Top" Foreground="Gray" Height="16" Width="135">
<CheckBox.Content>
Do not warn again
</CheckBox.Content>
</CheckBox>
<TextBlock x:Name="messageTextBlock" HorizontalAlignment="Left" Margin="55,40,0,0" TextWrapping="Wrap"
Text="The program is not closed, to close click the Exit Application Button" VerticalAlignment="Top" Height="75" Width="285" FontSize="16" Foreground="#FF5B5B5B" FontFamily="Tahoma"/>
<Button x:Name="CloseWarningWindowButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Close" HorizontalAlignment="Left" Margin="90,190,0,0" Padding="1,-1,1,1" VerticalAlignment="Top" Width="226" Height="50" Background="#FFDBDBDB" Foreground="#FF5B5B5B" Click="CloseWarningWindowButton_Click"/>


</Grid>
Title="WarningWindow" Height="150" Width="350" Icon="pack://siteoforigin:,,,/Images/Icon.ico" AllowsTransparency="True"
WindowStyle="None" ResizeMode="NoResize" Background="Transparent" WindowStartupLocation="CenterScreen" >
<Border Background="{StaticResource backgroundColor}" BorderBrush="{StaticResource fontColor}" BorderThickness="1" CornerRadius="10">
<Grid Margin="-2,8,0,0">
<Border Margin="36,0,36,48" BorderBrush="{StaticResource fontColor}" BorderThickness="1" CornerRadius="2"/>
<CheckBox x:Name ="warningCheckBox" HorizontalAlignment="Left" Margin="106,67,0,0" VerticalAlignment="Top" Foreground="Gray" Height="16" Width="135">
<CheckBox.Content>
Do not warn again
</CheckBox.Content>
</CheckBox>
<TextBlock x:Name="messageTextBlock" HorizontalAlignment="Left" Margin="52,10,0,0" TextWrapping="Wrap" TextAlignment="Center"
Text="The program is not closed, to close click the Exit Application Button" VerticalAlignment="Top" Height="70" Width="238" FontSize="14" Foreground="#FF5B5B5B" FontFamily="Tahoma"/>
<Button x:Name="CloseWarningWindowButton" Style="{StaticResource simpleButtonStyle}" ContentStringFormat="Close" HorizontalAlignment="Left" Margin="78,104,0,0" Padding="1,-1,1,1" VerticalAlignment="Top" Width="185" Height="26" Background="#FFDBDBDB" Foreground="#FF5B5B5B" Click="CloseWarningWindowButton_Click"/>
</Grid>
</Border>
</Window>
Binary file modified AutomatedDesktopBackgroundUI/bin/Debug/Automated Desktop.exe
Binary file not shown.
Binary file modified AutomatedDesktopBackgroundUI/bin/Debug/Automated Desktop.pdb
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified AutomatedDesktopBackgroundUI/bin/Release/Automated Desktop.exe
Binary file not shown.
Binary file modified AutomatedDesktopBackgroundUI/bin/Release/Automated Desktop.pdb
Binary file not shown.
Binary file modified AutomatedDesktopBackgroundUI/obj/Debug/Automated Desktop.exe
Binary file not shown.
Binary file not shown.
Binary file modified AutomatedDesktopBackgroundUI/obj/Debug/Automated Desktop.pdb
Binary file not shown.
Binary file not shown.
Binary file modified AutomatedDesktopBackgroundUI/obj/Debug/Config/Styles.baml
Binary file not shown.
Binary file modified AutomatedDesktopBackgroundUI/obj/Debug/Views/MainWindow.baml
Binary file not shown.
Loading

0 comments on commit 8473ae1

Please sign in to comment.