MainWindow: Merge both sync buttons into a single one
All checks were successful
Test / Run tests (push) Successful in 2m32s
All checks were successful
Test / Run tests (push) Successful in 2m32s
This commit is contained in:
@@ -64,6 +64,23 @@
|
||||
</MenuItem.Icon>
|
||||
</MenuItem>
|
||||
</MenuItem>
|
||||
<MenuItem Header="Synchronisieren" x:Name="Menu_Sync" IsEnabled="false">
|
||||
<MenuItem x:Name="Menu_Sync_Download" Header="Mitgliederdaten und Lieferungen herunterladen" Click="Menu_Sync_Download_Click">
|
||||
<MenuItem.Icon>
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||
</MenuItem.Icon>
|
||||
</MenuItem>
|
||||
<MenuItem x:Name="Menu_Sync_UploadBranchDeliveries" Header="Lieferungen dieser Saison/Zweigstelle hochladen" Click="Menu_Sync_UploadBranchDeliveries_Click">
|
||||
<MenuItem.Icon>
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||
</MenuItem.Icon>
|
||||
</MenuItem>
|
||||
<MenuItem x:Name="Menu_Sync_UploadModified" Header="Geänderte Mitglieder und Lieferungen hochladen" Click="Menu_Sync_UploadModified_Click">
|
||||
<MenuItem.Icon>
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||
</MenuItem.Icon>
|
||||
</MenuItem>
|
||||
</MenuItem>
|
||||
<MenuItem Header="Waage">
|
||||
<MenuItem Header="Datum und Uhrzeit setzen" Click="Menu_Scale_SetDateTime_Click">
|
||||
<MenuItem.Icon>
|
||||
@@ -174,16 +191,18 @@
|
||||
</Grid>
|
||||
</Button>
|
||||
|
||||
<Button x:Name="DownloadButton" Click="DownloadButton_Click"
|
||||
Margin="310,135,0,0" Padding="0.375,0.5,0,0" Height="30" Width="30"
|
||||
Content="" FontFamily="Segoe MDL2 Assets" FontSize="16"
|
||||
HorizontalContentAlignment="Center"
|
||||
ToolTip="Lieferungen und Mitgliederdaten anderer Zweigstellen herunterladen"/>
|
||||
<Button x:Name="UploadButton" Click="UploadButton_Click"
|
||||
<Button x:Name="SyncButton" Click="SyncButton_Click"
|
||||
Margin="375,135,0,0" Padding="1.0,0.5,0,0" Height="30" Width="30"
|
||||
Content="" FontFamily="Segoe MDL2 Assets" FontSize="16"
|
||||
FontFamily="Segoe MDL2 Assets" FontSize="16"
|
||||
HorizontalContentAlignment="Center"
|
||||
ToolTip="Lieferungen dieser Zweigstelle hochladen"/>
|
||||
ToolTip="Geänderte Mitgliederdaten und Lieferungen synchronisieren">
|
||||
<Button.Content>
|
||||
<Grid TextElement.FontFamily="Segoe MDL2 Assets">
|
||||
<TextBlock x:Name="SyncButton_1" Text=""/>
|
||||
<TextBlock x:Name="SyncButton_2" Text="" Foreground="DarkOrange"/>
|
||||
</Grid>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<Expander x:Name="SeasonFinish" Header="Leseabschluss" SnapsToDevicePixels="True"
|
||||
Expanded="SeasonFinish_Expanded" Collapsed="SeasonFinish_Collapsed"
|
||||
|
||||
Reference in New Issue
Block a user