Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
89a9a919e3 | ||
|
|
8dcf1810d4 | ||
|
|
ef7c3c268f |
@@ -113,6 +113,16 @@ public static class SchemaMigration
|
|||||||
obj["expLabEnable"] = JToken.FromObject(new PdfExportSettings().expLabEnable);
|
obj["expLabEnable"] = JToken.FromObject(new PdfExportSettings().expLabEnable);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!obj.ContainsKey("expInt"))
|
||||||
|
{
|
||||||
|
obj["expInt"] = JToken.FromObject(new PdfExportSettings().expInt);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!obj.ContainsKey("expNat"))
|
||||||
|
{
|
||||||
|
obj["expNat"] = JToken.FromObject(new PdfExportSettings().expNat);
|
||||||
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -118,6 +118,9 @@ public class PdfExportSettings
|
|||||||
public int rsNumGrouped { get; set; } = 25;
|
public int rsNumGrouped { get; set; } = 25;
|
||||||
public bool rsPvSt { get; set; } = true;
|
public bool rsPvSt { get; set; } = true;
|
||||||
|
|
||||||
|
public bool expInt { get; set; } = true;
|
||||||
|
public bool expNat { get; set; } = true;
|
||||||
|
|
||||||
public string rsKNrAbs { get; set; } = "";
|
public string rsKNrAbs { get; set; } = "";
|
||||||
public string rsKNrEmp { get; set; } = "";
|
public string rsKNrEmp { get; set; } = "";
|
||||||
public string rsZKZ { get; set; } = "";
|
public string rsZKZ { get; set; } = "";
|
||||||
|
|||||||
+19
-4
@@ -331,7 +331,23 @@
|
|||||||
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
||||||
<ScrollViewer Grid.Column="1">
|
<ScrollViewer Grid.Column="1">
|
||||||
<StackPanel Margin="5,5,5,5" Orientation="Vertical" Spacing="20" Background="AliceBlue" >
|
<StackPanel Margin="5,5,5,5" Orientation="Vertical" Spacing="20" Background="AliceBlue" >
|
||||||
<CheckBox Content="Versandetiketten erstellen" x:Name="CbExpLabEnable" Margin="10,10,10,0"></CheckBox>
|
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0">
|
||||||
|
<StackPanel Orientation="Vertical" Spacing="10">
|
||||||
|
<Label Content="Was soll exportiert werden?" FontWeight="Bold"></Label>
|
||||||
|
<CheckBox Content="National exportieren" IsChecked="True" x:Name="CbExpNat"></CheckBox>
|
||||||
|
<CheckBox Content="International exportieren" IsChecked="True" x:Name="CbExpInt"></CheckBox>
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
|
||||||
|
<Label Content="Versandetiketten-Export" FontWeight="Bold"></Label>
|
||||||
|
<CheckBox Content="Versandetiketten erstellen" x:Name="CbExpLabEnable"></CheckBox>
|
||||||
|
<CheckBox Content="PvSt" IsChecked="True" x:Name="CbExpRnsPvSt"></CheckBox>
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
|
||||||
|
<Label Content="Leitzettel-Export" FontWeight="Bold"></Label>
|
||||||
|
<CheckBox Content="Bundleitzettel erstellen" x:Name="CbExpRnsEnable"></CheckBox>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
<Grid Height="1" MaxHeight="1" MinHeight="1" Background="DarkGray" Margin="10,10,10,0"></Grid>
|
||||||
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0">
|
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0">
|
||||||
<StackPanel Orientation="Vertical" Spacing="10">
|
<StackPanel Orientation="Vertical" Spacing="10">
|
||||||
<Grid ColumnDefinitions="*,*">
|
<Grid ColumnDefinitions="*,*">
|
||||||
@@ -350,9 +366,8 @@
|
|||||||
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
|
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
|
||||||
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
||||||
</Grid>
|
</Grid>
|
||||||
<CheckBox Content="Bundleitzettel erstellen" x:Name="CbExpRnsEnable"></CheckBox>
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
|
</StackPanel>
|
||||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
|
||||||
<Grid ColumnDefinitions="*,*">
|
<Grid ColumnDefinitions="*,*">
|
||||||
<Label Content="Zellenabstand oben"></Label>
|
<Label Content="Zellenabstand oben"></Label>
|
||||||
@@ -393,9 +408,9 @@
|
|||||||
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
|
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
|
||||||
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
|
||||||
</Grid>
|
</Grid>
|
||||||
<CheckBox Content="PvSt" IsChecked="True" x:Name="CbExpRnsPvSt"></CheckBox>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
<Grid Height="1" MaxHeight="1" MinHeight="1" Background="DarkGray" Margin="10,10,10,0"></Grid>
|
||||||
<Grid ColumnDefinitions="*,*" ColumnSpacing="20" Margin="10,10,10,0">
|
<Grid ColumnDefinitions="*,*" ColumnSpacing="20" Margin="10,10,10,0">
|
||||||
<StackPanel Grid.Column="0" Orientation="Vertical" Spacing="10">
|
<StackPanel Grid.Column="0" Orientation="Vertical" Spacing="10">
|
||||||
<Grid ColumnDefinitions="*,2*">
|
<Grid ColumnDefinitions="*,2*">
|
||||||
|
|||||||
@@ -998,6 +998,9 @@ public partial class MainWindow : Window
|
|||||||
CbExpRnsPvSt.IsChecked = options.rsPvSt;
|
CbExpRnsPvSt.IsChecked = options.rsPvSt;
|
||||||
CbExpRnsEnable.IsChecked = options.exportRunningSheets;
|
CbExpRnsEnable.IsChecked = options.exportRunningSheets;
|
||||||
|
|
||||||
|
CbExpNat.IsChecked = options.expNat;
|
||||||
|
CbExpInt.IsChecked = options.expInt;
|
||||||
|
|
||||||
TbExpRnsKNrAbs.Text = options.rsKNrAbs;
|
TbExpRnsKNrAbs.Text = options.rsKNrAbs;
|
||||||
TbExpRnsKNrEmp.Text = options.rsKNrEmp;
|
TbExpRnsKNrEmp.Text = options.rsKNrEmp;
|
||||||
TbExpRnsZKZ.Text = options.rsZKZ;
|
TbExpRnsZKZ.Text = options.rsZKZ;
|
||||||
@@ -1046,6 +1049,8 @@ public partial class MainWindow : Window
|
|||||||
rsPalNr = ReadInt(NudExpRnsPalNr, 1),
|
rsPalNr = ReadInt(NudExpRnsPalNr, 1),
|
||||||
rsBundNrPal = ReadInt(NudExpRnsBundNrPal, 20),
|
rsBundNrPal = ReadInt(NudExpRnsBundNrPal, 20),
|
||||||
rsNumGrouped = ReadInt(NudExpRnsPlzcount, 25),
|
rsNumGrouped = ReadInt(NudExpRnsPlzcount, 25),
|
||||||
|
expNat = CbExpNat.IsChecked.Value,
|
||||||
|
expInt = CbExpInt.IsChecked.Value,
|
||||||
|
|
||||||
rsPvSt = CbExpRnsPvSt.IsChecked.Value,
|
rsPvSt = CbExpRnsPvSt.IsChecked.Value,
|
||||||
exportRunningSheets = CbExpRnsEnable.IsChecked.Value
|
exportRunningSheets = CbExpRnsEnable.IsChecked.Value
|
||||||
|
|||||||
+2
-2
@@ -181,8 +181,8 @@ public class PdfBuilder
|
|||||||
Logger.Log("Skipping label pdf generation cause it was disabled by user");
|
Logger.Log("Skipping label pdf generation cause it was disabled by user");
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
if(addresses_german.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath, pvst);
|
if(addresses_german.Count > 0 && Settings._instance.pdfExport.expNat) CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath, pvst);
|
||||||
if(addresses_inter.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter, pvst);
|
if(addresses_inter.Count > 0 && Settings._instance.pdfExport.expInt) CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter, pvst);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user