Skip to content

Commit

Permalink
#62, #63, #64
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrReSc
MrReSc committed Feb 5, 2020
1 parent d133974 commit bc3bfc2
Show file tree
Hide file tree
Showing 11 changed files with 722 additions and 201 deletions.
4 changes: 2 additions & 2 deletions IEC Mate/IEC Mate.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
<AssemblyFileVersionSettings>None.None.Increment.DateStamp</AssemblyFileVersionSettings>
<AssemblyInfoVersionSettings>None.None.Increment.DateStamp</AssemblyInfoVersionSettings>
<AssemblyVersion>1.0.1548.20036</AssemblyVersion>
<AssemblyVersion>1.0.1567.20036</AssemblyVersion>
<PublishUrl>C:\Users\r.scheidegger\Downloads\IEC Mate\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -42,7 +42,7 @@
<ProductName>IEC-Mate</ProductName>
<PublisherName>Remo Scheidegger</PublisherName>
<ApplicationRevision>19222</ApplicationRevision>
<ApplicationVersion>1.0.1548.20036</ApplicationVersion>
<ApplicationVersion>1.0.1567.20036</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
Expand Down
165 changes: 153 additions & 12 deletions IEC Mate/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1635,6 +1635,8 @@
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="50" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="5" />
</Grid.ColumnDefinitions>
Expand All @@ -1655,21 +1657,17 @@
</StackPanel>
</Button>

<Button x:Name="btn_open_postcheckout" Click="Btn_open_postcheckout_Click">
<Button x:Name="bt_openDataViewFolder" Click="Bt_openDataViewFolder_Click">
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="PlayCircleOutline" Foreground="Green"/>
<Label Content="{x:Static p:Resources.lb_dataview_PostCheckoutNoPause}"/>
<iconPacks:PackIconMaterial Kind="FolderOpen"/>
<Label Content="{x:Static p:Resources.lb_pojectFolder}"/>
</StackPanel>
</Button>

</StackPanel>

<StackPanel Grid.Column="3" Grid.Row="1">

<Button x:Name="bt_openDataViewFolder" Click="Bt_openDataViewFolder_Click">
<Button x:Name="bt_openDataViewBilderFolder" Click="Bt_openDataViewBilderFolder_Click">
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="FolderOpen"/>
<Label Content="{x:Static p:Resources.lb_pojectFolder}"/>
<Label Content="{x:Static p:Resources.lb_dataview_bilder_ordner}"/>
</StackPanel>
</Button>

Expand All @@ -1680,13 +1678,156 @@
</StackPanel>
</Button>

<Button x:Name="bt_openDataViewBilderFolder" Click="Bt_openDataViewBilderFolder_Click">
<Button x:Name="btn_open_postcheckout" Click="Btn_open_postcheckout_Click">
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="FolderOpen"/>
<Label Content="{x:Static p:Resources.lb_dataview_bilder_ordner}"/>
<iconPacks:PackIconMaterial Kind="PlayCircleOutline" Foreground="Green"/>
<Label Content="{x:Static p:Resources.lb_dataview_PostCheckoutNoPause}"/>
</StackPanel>
</Button>

</StackPanel>

<StackPanel Grid.Column="3" Grid.Row="1">

<Button x:Name="btn_open_framework" Click="Btn_open_framework_Click" >
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="FileOutline"/>
<Label Content="{x:Static p:Resources.lb_framework}"/>
</StackPanel>
</Button>

<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>

<Grid.Resources>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource MetroButton}">
<Setter Property="Background" Value="Transparent"></Setter>
<Setter Property="BorderThickness" Value="1"></Setter>
<Setter Property="Controls:ButtonHelper.CornerRadius" Value="2"></Setter>
<Setter Property="Width" Value="150"></Setter>
<Setter Property="HorizontalAlignment" Value="Left"></Setter>
<Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
<Setter Property="Margin" Value="0,0,0,10"></Setter>
<Setter Property="Focusable" Value="False"></Setter>
</Style>
</Grid.Resources>

<Button x:Name="bt_dvStartAdmin" Grid.Column="0"
ToolTip="{x:Static p:Resources.tt_dataview_start_admin}" Click="Bt_dvStartAdmin_Click">
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="Account" Foreground="Purple"/>
<Label Content="{x:Static p:Resources.lb_dataview_start_admin}"/>
</StackPanel>
</Button>

<Button x:Name="bt_dvStartUser" Grid.Column="2"
ToolTip="{x:Static p:Resources.tt_dataview_start_admin}" Click="Bt_dvStartUser_Click" >
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="AccountArrowLeft" Foreground="Purple"/>
<Label Content="{x:Static p:Resources.lb_dataview_start_user}"/>
</StackPanel>
</Button>

</Grid>

<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="10" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>

<Grid.Resources>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource MetroButton}">
<Setter Property="Background" Value="Transparent"></Setter>
<Setter Property="BorderThickness" Value="1"></Setter>
<Setter Property="Controls:ButtonHelper.CornerRadius" Value="2"></Setter>
<Setter Property="Width" Value="150"></Setter>
<Setter Property="HorizontalAlignment" Value="Left"></Setter>
<Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
<Setter Property="Margin" Value="0,0,0,10"></Setter>
<Setter Property="Focusable" Value="False"></Setter>
</Style>
</Grid.Resources>

<Button x:Name="bt_dvStartVoll" Grid.Column="0"
ToolTip="{x:Static p:Resources.tt_dataview_start_voll}" Click="Bt_dvStartVoll_Click" >
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="CellphoneScreenshot" Foreground="Purple"/>
<Label Content="{x:Static p:Resources.lb_dataview_start_voll}"/>
</StackPanel>
</Button>

<Button x:Name="bt_dvStartHalb" Grid.Column="2"
ToolTip="{x:Static p:Resources.tt_dataview_start_voll}" Click="Bt_dvStartHalb_Click" >
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="MonitorScreenshot" Foreground="Purple"/>
<Label Content="{x:Static p:Resources.lb_dataview_start_halb}"/>
</StackPanel>
</Button>

</Grid>

<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>

<Grid.Resources>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource MetroButton}">
<Setter Property="Background" Value="Transparent"></Setter>
<Setter Property="BorderThickness" Value="1"></Setter>
<Setter Property="Controls:ButtonHelper.CornerRadius" Value="2"></Setter>
<Setter Property="Width" Value="96"></Setter>
<Setter Property="HorizontalAlignment" Value="Left"></Setter>
<Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
<Setter Property="Margin" Value="0,0,0,10"></Setter>
<Setter Property="Focusable" Value="False"></Setter>
</Style>

<Style TargetType="{x:Type Label}" BasedOn="{StaticResource MetroLabel}">
<Setter Property="FontSize" Value="10"></Setter>
</Style>
</Grid.Resources>

<Button x:Name="bt_dvStartPri" Grid.Column="0"
ToolTip="{x:Static p:Resources.tt_dataview_start_pri}" Click="Bt_dvStartPri_Click" >
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="Monitor" Foreground="Purple"/>
<Label Content="{x:Static p:Resources.lb_dataview_start_pri}"/>
</StackPanel>
</Button>

<Button x:Name="bt_dvStartSec" Grid.Column="2"
ToolTip="{x:Static p:Resources.tt_dataview_start_pri}" Click="Bt_dvStartSec_Click" >
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="Monitor" Foreground="Purple"/>
<Label Content="{x:Static p:Resources.lb_dataview_start_sec}"/>
</StackPanel>
</Button>

<Button x:Name="bt_dvStartThird" Grid.Column="4"
ToolTip="{x:Static p:Resources.tt_dataview_start_pri}" Click="Bt_dvStartThird_Click" >
<StackPanel Orientation="Horizontal">
<iconPacks:PackIconMaterial Kind="Monitor" Foreground="Purple"/>
<Label Content="{x:Static p:Resources.lb_dataview_start_third}"/>
</StackPanel>
</Button>

</Grid>





</StackPanel>

</Grid>
Expand Down
Loading

0 comments on commit bc3bfc2

Please sign in to comment.