diff options
Diffstat (limited to 'win')
5 files changed, 51 insertions, 23 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs index a805a714b..6a09e5985 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs @@ -92,10 +92,12 @@ namespace HandBrake.ApplicationServices.Services.Encode {
get
{
- string noLog =
- "No log data available... Log data will show when you start an encode. \n\nOpen the log file directory to get previous log files.";
+ string noLog = "There is no log information to display." + Environment.NewLine + Environment.NewLine
+ + "This window will only display logging information after you have started an encode." + Environment.NewLine
+ + Environment.NewLine + "You can find previous log files in the log directory or by clicking the 'Open Log Directory' button above.";
+
return string.IsNullOrEmpty(this.logBuffer.ToString())
- ? this.header + noLog
+ ? noLog
: this.header + this.logBuffer.ToString();
}
}
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs index 3a17e093a..3666ce869 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs @@ -152,8 +152,11 @@ namespace HandBrake.ApplicationServices.Services.Scan {
get
{
- string noLog = "No log data available... Log data will show here after you scan a source. \n\nOpen the log file directory to get previous log files.";
- return string.IsNullOrEmpty(this.logging.ToString()) ? this.header + noLog : this.header + this.logging.ToString();
+ string noLog = "There is no log information to display." + Environment.NewLine + Environment.NewLine
+ + "This window will only display logging information after you have scanned a source." + Environment.NewLine
+ + Environment.NewLine + "You can find previous log files in the log directory or by clicking the 'Open Log Directory' button above.";
+
+ return string.IsNullOrEmpty(this.logging.ToString()) ? noLog : this.header + this.logging.ToString();
}
}
@@ -282,7 +285,7 @@ namespace HandBrake.ApplicationServices.Services.Scan {
Console.WriteLine(e);
}
-
+
return bitmapImage;
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs index 84a3fbf0a..21921b5d6 100644 --- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs @@ -15,13 +15,10 @@ namespace HandBrakeWPF.ViewModels using HandBrake.ApplicationServices.Services.Encode.EventArgs;
using HandBrake.ApplicationServices.Services.Encode.Interfaces;
- using HandBrake.ApplicationServices.Services.Interfaces;
using HandBrake.ApplicationServices.Services.Scan.EventArgs;
using HandBrake.ApplicationServices.Services.Scan.Interfaces;
- using Interfaces;
-
- using HandBrake.ApplicationServices.EventArgs;
+ using HandBrakeWPF.ViewModels.Interfaces;
/// <summary>
/// The Log View Model
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml index f8b2c9327..163133f94 100644 --- a/win/CS/HandBrakeWPF/Views/LogView.xaml +++ b/win/CS/HandBrakeWPF/Views/LogView.xaml @@ -13,6 +13,7 @@ <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<ToolBar Grid.Row="0"
@@ -20,7 +21,7 @@ ToolBarTray.IsLocked="True"
Loaded="ToolBarLoaded"
>
-
+
<Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0">
<StackPanel Orientation="Horizontal">
<Image Width="16" Source="Images/copy.png" />
@@ -36,23 +37,48 @@ </ToolBar>
- <TabControl Grid.Row="1" SelectedIndex="{Binding SelectedTab}">
- <TabItem Header="Encode Log">
- <TextBox Grid.Row="1"
+
+ <TabControl Grid.Row="2" SelectedIndex="{Binding SelectedTab}" Margin="0,3,0,0">
+ <TabItem>
+ <TabItem.Header>
+ <TextBlock Text="Encode Log" Padding="4">
+ <TextBlock.Style>
+ <Style TargetType="TextBlock">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=TabItem}}" Value="True">
+ <Setter Property="FontWeight" Value="Bold"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </TextBlock.Style>
+ </TextBlock>
+ </TabItem.Header>
+
+ <TextBox
AcceptsReturn="True"
IsReadOnly="True"
ScrollViewer.VerticalScrollBarVisibility="Visible"
Text="{Binding EncodeLog, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
TextWrapping="Wrap" />
</TabItem>
-
- <TabItem Header="Scan Log">
- <TextBox Grid.Row="1"
- AcceptsReturn="True"
- IsReadOnly="True"
- ScrollViewer.VerticalScrollBarVisibility="Visible"
- Text="{Binding ScanLog, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
- TextWrapping="Wrap" />
+
+ <TabItem>
+ <TabItem.Header>
+ <TextBlock Text="Scan Log" Padding="4">
+ <TextBlock.Style>
+ <Style TargetType="TextBlock">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=TabItem}}" Value="True">
+ <Setter Property="FontWeight" Value="Bold"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </TextBlock.Style>
+ </TextBlock>
+ </TabItem.Header>
+ <TextBox AcceptsReturn="True" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Visible"
+ Text="{Binding ScanLog, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+ TextWrapping="Wrap" />
</TabItem>
</TabControl>
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index 20bea31e6..900a7af7d 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -332,7 +332,7 @@ <StackPanel Orientation="Vertical" Margin="20,0,0,0">
- <CheckBox Content="Use LibHB for Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" Visibility="Collapsed" />
+ <CheckBox Content="Use LibHB for Encoding (uses hb.dll instead of HandBrakeCLI.exe)" Margin="0,5,0,0" IsChecked="{Binding EnableLibHb}" />
<CheckBox Content="Enable Process Isolation (Run Encodes via an intermediate service)" Margin="20,10,0,0" IsChecked="{Binding EnableProcessIsolation}" Visibility="Collapsed" />
<StackPanel Orientation="Horizontal" Margin="0,10,0,0" Visibility="Collapsed">
<TextBlock Text="Server Port:" VerticalAlignment="Center" />
|