maddo/Catalog
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases 2 Packages Wiki Activity Actions

Finito testo

Browse source
This commit is contained in:
Maddo 2017-03-22 11:39:07 +01:00
commit 5a94dce7c9
5 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
WPFCatalog/Controls/GeneralSettingsControl.xaml
View file

@ -6,7 +6,8 @@
xmlns:wpfCatalog="clr-namespace:WPFCatalog" xmlns:wpfCatalog="clr-namespace:WPFCatalog"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
mc:Ignorable="d" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d"
d:DesignHeight="900" d:DesignWidth="500" d:DesignHeight="900" d:DesignWidth="500"
d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}" d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}"
> >
@ -32,12 +33,12 @@
<TextBox Grid.Row="0" Grid.Column="1" x:Name="txtSorgente" Margin="0,5" Text="{Binding DirSorgente}" Controls:TextBoxHelper.ClearTextButton="True" /> <TextBox Grid.Row="0" Grid.Column="1" x:Name="txtSorgente" Margin="0,5" Text="{Binding DirSorgente}" Controls:TextBoxHelper.ClearTextButton="True" />
<Button Grid.Row="0" Grid.Column="2" x:Name="btnSelectSorgente" Margin="5,5" Command="{Binding SelectSourceFolderCommand}"> <Button Grid.Row="0" Grid.Column="2" x:Name="btnSelectSorgente" Margin="5,5" Command="{Binding SelectSourceFolderCommand}">
<Button.Content> <Button.Content>
<Image Source="Icons/document-open-6.png" /> <iconPacks:PackIconMaterial Kind="FolderPlus" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button Grid.Row="0" Grid.Column="3" x:Name="btnOpenSorgente" Margin="5,5" Command="{Binding OpenSourceFolderCommand}"> <Button Grid.Row="0" Grid.Column="3" x:Name="btnOpenSorgente" Margin="5,5" Command="{Binding OpenSourceFolderCommand}">
<Button.Content> <Button.Content>
<Image Source="Icons/document-open-folder.png" /> <iconPacks:PackIconMaterial Kind="FolderOutline" />
</Button.Content> </Button.Content>
</Button> </Button>
@ -45,12 +46,12 @@
<TextBox Grid.Row="1" Grid.Column="1" x:Name="txtDestinazione" Margin="0,5" Text="{Binding DirDestinazione}" Controls:TextBoxHelper.ClearTextButton="True"/> <TextBox Grid.Row="1" Grid.Column="1" x:Name="txtDestinazione" Margin="0,5" Text="{Binding DirDestinazione}" Controls:TextBoxHelper.ClearTextButton="True"/>
<Button Grid.Row="1" Grid.Column="2" x:Name="btnSelectDestinazione" Margin="5,5" Command="{Binding SelectDestinationFolderCommand}"> <Button Grid.Row="1" Grid.Column="2" x:Name="btnSelectDestinazione" Margin="5,5" Command="{Binding SelectDestinationFolderCommand}">
<Button.Content> <Button.Content>
<Image Source="Icons/document-open-6.png" /> <iconPacks:PackIconMaterial Kind="FolderPlus" />
</Button.Content> </Button.Content>
</Button> </Button>
<Button Grid.Row="1" Grid.Column="3" x:Name="btnOpenDestinazione" Margin="5.4,0,4.6,4.6" Command="{Binding OpenDestinationFolderCommand}" Height="19" VerticalAlignment="Bottom"> <Button Grid.Row="1" Grid.Column="3" x:Name="btnOpenDestinazione" Margin="5.4,0,4.6,4.6" Command="{Binding OpenDestinationFolderCommand}" Height="19" VerticalAlignment="Bottom">
<Button.Content> <Button.Content>
<Image Source="Icons/document-open-folder.png" /> <iconPacks:PackIconMaterial Kind="FolderOutline" />
</Button.Content> </Button.Content>
</Button> </Button>
<!--<Controls:ToggleSwitch Grid.Row="2" Grid.Column="1" Header="Aggiorna le sottodirectory" IsChecked="{Binding DirAggiornaSottoDirectory}" />--> <!--<Controls:ToggleSwitch Grid.Row="2" Grid.Column="1" Header="Aggiorna le sottodirectory" IsChecked="{Binding DirAggiornaSottoDirectory}" />-->

36
WPFCatalog/Controls/TextSettingsControl.xaml
View file

@ -98,9 +98,9 @@
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Dimensione Carattere"/> <Label Grid.Row="0" Grid.Column="0" Content="Dimensione Carattere"/>
<TextBox Grid.Row="0" Grid.Column="1" Width="40" Text="{Binding TestoVertDimensioneCarattere}"/> <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding TestoVertDimensioneCarattere}"/>
<Label Grid.Row="1" Grid.Column="0" Content="Margine"/> <Label Grid.Row="1" Grid.Column="0" Content="Margine"/>
<TextBox Grid.Row="1" Grid.Column="1" Width="40" Text="{Binding TestoVertMargine}"/> <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding TestoVertMargine}"/>
</Grid> </Grid>
</GroupBox> </GroupBox>
@ -126,37 +126,37 @@
<RowDefinition /> <RowDefinition />
<RowDefinition /> <RowDefinition />
<RowDefinition /> <RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="Trasparenza(0-100%)" /> <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Content="Trasparenza(0-100%)" />
<TextBox Grid.Row="0" Grid.Column="2" Text="{Binding TestoApplicareTrasparenza}" /> <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding TestoApplicareTrasparenza}" />
<Label Grid.Row="1" Grid.Column="0" Content="Posizione" /> <Label Grid.Row="1" Grid.Column="0" Content="Posizione" />
<ComboBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" /> <ComboBox Grid.Row="1" Grid.Column="1" />
<!--ToDo--> <!--ToDo-->
<CheckBox Grid.Row="2" Grid.Column="1" Content="Orario" IsChecked="{Binding TestoApplicareOrario}"/> <CheckBox Grid.Row="2" Grid.Column="1" Content="Orario" IsChecked="{Binding TestoApplicareOrario}"/>
<CheckBox Grid.Row="2" Grid.Column="2" Content="Tempo Gara" IsChecked="{Binding TestoApplicareTempoGaraCheck}"/> <CheckBox Grid.Row="3" Grid.Column="1" Content="Tempo Gara" IsChecked="{Binding TestoApplicareTempoGaraCheck}"/>
<TextBox Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="2" Text="{Binding TestoApplicareTempoGara}"/> <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding TestoApplicareTempoGara}"/>
<Label Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Content="Margine (pixel)" HorizontalAlignment="Right" /> <Label Grid.Row="5" Grid.Column="0" Content="Margine (pixel)" />
<TextBox Grid.Row="0" Grid.Column="6" Grid.ColumnSpan="2" Text="{Binding TestoApplicareMargine}"/> <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding TestoApplicareMargine}"/>
<Label Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Content="Allineamento" HorizontalAlignment="Right" /> <Label Grid.Row="6" Grid.Column="0" Content="Allineamento" />
<TextBox Grid.Row="1" Grid.Column="6" Grid.ColumnSpan="2" Text="{Binding TestoApplicareAllineamento}"/> <TextBox Grid.Row="6" Grid.Column="1" Text="{Binding TestoApplicareAllineamento}"/>
<Label Grid.Row="2" Grid.Column="5" Content="Partenza" /> <Label Grid.Row="7" Grid.Column="0" Content="Partenza" />
<ComboBox Grid.Row="2" Grid.Column="6" Grid.ColumnSpan="2" /> <ComboBox Grid.Row="7" Grid.Column="1" />
<!--todo--> <!--todo-->
</Grid> </Grid>
</StackPanel> </StackPanel>

17
WPFCatalog/MainWindow.xaml
View file

@ -8,6 +8,7 @@
xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock" xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
xmlns:controls="clr-namespace:WPFCatalog.Controls" xmlns:controls="clr-namespace:WPFCatalog.Controls"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d" mc:Ignorable="d"
Title="Image Catalog" Height="466" Width="772" Title="Image Catalog" Height="466" Width="772"
@ -52,8 +53,8 @@
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="Generale" Margin="0,0,5,0"/> <TextBlock Text="Generale" Margin="0,0,5,0" VerticalAlignment="Center"/>
<Image Source="Icons/camera-photo-5.png" Width="16" Height="16" /> <iconPacks:PackIconMaterial Kind="Camera" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<controls:GeneralSettingsControl ></controls:GeneralSettingsControl> <controls:GeneralSettingsControl ></controls:GeneralSettingsControl>
@ -62,7 +63,7 @@
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Label Content="Testo" VerticalAlignment="Center"/> <Label Content="Testo" VerticalAlignment="Center"/>
<Image Source="Icons/format-justify-left-2.png" /> <iconPacks:PackIconMaterial Kind="Textbox" VerticalAlignment="Center" />
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<controls:TextSettingsControl></controls:TextSettingsControl> <controls:TextSettingsControl></controls:TextSettingsControl>
@ -71,10 +72,8 @@
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Label VerticalAlignment="Center" Content="Miniature" VerticalContentAlignment="Center"/>
<CheckBox VerticalAlignment="Center" /> <iconPacks:PackIconMaterial Kind="Image" VerticalAlignment="Center"/>
<Label VerticalAlignment="Center" Content="Miniature" />
<Image Source="Icons/picture.png" />
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<WrapPanel> <WrapPanel>
@ -118,10 +117,8 @@
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<CheckBox VerticalAlignment="Center" />
<Label VerticalAlignment="Center" Content="Logo" /> <Label VerticalAlignment="Center" Content="Logo" />
<Image Source="Icons/face-smile-2.png"/> <iconPacks:PackIconFontAwesome Kind="SmileOutline" VerticalAlignment="Center"/>
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>

3
WPFCatalog/WPFCatalog.csproj
View file

@ -49,6 +49,9 @@
<Reference Include="MahApps.Metro, Version=1.4.3.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.4.3.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll</HintPath> <HintPath>..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll</HintPath>
</Reference> </Reference>
<Reference Include="MahApps.Metro.IconPacks, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MahApps.Metro.IconPacks.1.7.1\lib\net46\MahApps.Metro.IconPacks.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation"> <Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference> </Reference>

1
WPFCatalog/packages.config
View file

@ -3,6 +3,7 @@
<package id="CommonServiceLocator" version="1.0" targetFramework="net45" /> <package id="CommonServiceLocator" version="1.0" targetFramework="net45" />
<package id="Extended.Wpf.Toolkit" version="3.0" targetFramework="net46" /> <package id="Extended.Wpf.Toolkit" version="3.0" targetFramework="net46" />
<package id="MahApps.Metro" version="1.4.3" targetFramework="net46" /> <package id="MahApps.Metro" version="1.4.3" targetFramework="net46" />
<package id="MahApps.Metro.IconPacks" version="1.7.1" targetFramework="net46" />
<package id="MvvmLight" version="4.1.27.1" targetFramework="net45" /> <package id="MvvmLight" version="4.1.27.1" targetFramework="net45" />
<package id="MvvmLightLibs" version="4.1.27.1" targetFramework="net45" /> <package id="MvvmLightLibs" version="4.1.27.1" targetFramework="net45" />
</packages> </packages>