Skip to content

Commit 5dccdd2

Browse files
author
RandomEngy
committed
Some refactoring fixes. Also fixed a bug where numbers could get copied from from preset to another when switching between them.
1 parent ca3d468 commit 5dccdd2

7 files changed

Lines changed: 29 additions & 30 deletions

File tree

VidCoder/Controls/NumberBox.xaml.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,7 @@ private static void OnNumberChanged(DependencyObject dependencyObject, Dependenc
107107
{
108108
var numBox = dependencyObject as NumberBox;
109109

110-
if (!numBox.haveFocus)
111-
{
112-
numBox.RefreshNumberBox();
113-
}
110+
numBox.RefreshNumberBox();
114111
}
115112
}
116113

VidCoder/View/MainWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@
870870
</TabControl.Background>
871871
<TabItem Name="queueTab" Visibility="Collapsed">
872872
<TabItem.Header>
873-
<TextBlock Text="{Binding QueuedTabHeader}" />
873+
<TextBlock Text="{Binding ProcessingVM.QueuedTabHeader}" />
874874
</TabItem.Header>
875875
<ListView
876876
BorderThickness="0"
@@ -930,7 +930,7 @@
930930
</TabItem>
931931
<TabItem Name="completedTab" Visibility="Collapsed">
932932
<TabItem.Header>
933-
<TextBlock Text="{Binding CompletedTabHeader}">
933+
<TextBlock Text="{Binding ProcessingVM.CompletedTabHeader}">
934934
<TextBlock.ContextMenu>
935935
<ContextMenu>
936936
<MenuItem Header="Clear Completed" Command="{Binding ProcessingVM.ClearCompletedCommand}">

VidCoder/ViewModel/Components/OutputPathViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public string ResolveOutputPathConflicts(string initialOutputPath, HashSet<strin
196196
// Continue and prompt user for resolution
197197

198198
var conflictDialog = new FileConflictDialogViewModel(initialOutputPath, (bool)conflict);
199-
WindowManager.OpenDialog(conflictDialog, this);
199+
WindowManager.OpenDialog(conflictDialog, this.main);
200200

201201
switch (conflictDialog.FileConflictResolution)
202202
{

VidCoder/ViewModel/Components/PresetsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public PresetViewModel SelectedPreset
129129

130130
if (this.selectedPreset != null && this.selectedPreset.Preset.IsModified)
131131
{
132-
MessageBoxResult dialogResult = Utilities.MessageBox.Show(this, "Do you want to save changes to your current preset?", "Save current preset?", MessageBoxButton.YesNoCancel);
132+
MessageBoxResult dialogResult = Utilities.MessageBox.Show(this.main, "Do you want to save changes to your current preset?", "Save current preset?", MessageBoxButton.YesNoCancel);
133133
if (dialogResult == MessageBoxResult.Yes)
134134
{
135135
this.SavePreset();

VidCoder/ViewModel/Components/ProcessingViewModel.cs

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,27 @@ public bool PauseVisible
253253
}
254254
}
255255

256+
public string QueuedTabHeader
257+
{
258+
get
259+
{
260+
if (this.EncodeQueue.Count == 0)
261+
{
262+
return "Queued";
263+
}
264+
265+
return "Queued (" + this.EncodeQueue.Count + ")";
266+
}
267+
}
268+
269+
public string CompletedTabHeader
270+
{
271+
get
272+
{
273+
return "Completed (" + this.CompletedJobs.Count + ")";
274+
}
275+
}
276+
256277
public bool CanEnqueueMultipleTitles
257278
{
258279
get
@@ -511,7 +532,7 @@ public ICommand QueueTitlesCommand
511532
this.queueTitlesCommand = new RelayCommand(param =>
512533
{
513534
var queueTitlesDialog = new QueueTitlesDialogViewModel(this.main.SourceData.Titles);
514-
WindowManager.OpenDialog(queueTitlesDialog, this);
535+
WindowManager.OpenDialog(queueTitlesDialog, this.main);
515536

516537
if (queueTitlesDialog.DialogResult)
517538
{
@@ -847,7 +868,7 @@ public void QueueMultiple(IEnumerable<string> filesToQueue)
847868

848869
// This dialog will scan the items in the list, calculating length.
849870
var scanMultipleDialog = new ScanMultipleDialogViewModel(itemsToQueue);
850-
WindowManager.OpenDialog(scanMultipleDialog, this);
871+
WindowManager.OpenDialog(scanMultipleDialog, this.main);
851872

852873
var failedFiles = new List<string>();
853874
foreach (EncodeJobViewModel jobVM in itemsToQueue)

VidCoder/ViewModel/Components/WindowManagerViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void OpenEncodingWindow()
128128
// focus on the app altogether.
129129
WindowManager.FocusWindow(this.main);
130130
};
131-
WindowManager.OpenWindow(encodingWindow);
131+
WindowManager.OpenWindow(encodingWindow, this.main);
132132
}
133133
else
134134
{

VidCoder/ViewModel/MainViewModel.cs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,26 +1299,7 @@ public VideoSource SourceData
12991299
}
13001300
}
13011301

1302-
public string QueuedTabHeader
1303-
{
1304-
get
1305-
{
1306-
if (this.ProcessingVM.EncodeQueue.Count == 0)
1307-
{
1308-
return "Queued";
1309-
}
13101302

1311-
return "Queued (" + this.ProcessingVM.EncodeQueue.Count + ")";
1312-
}
1313-
}
1314-
1315-
public string CompletedTabHeader
1316-
{
1317-
get
1318-
{
1319-
return "Completed (" + this.ProcessingVM.CompletedJobs.Count + ")";
1320-
}
1321-
}
13221303

13231304
public bool ShowTrayIcon
13241305
{

0 commit comments

Comments
 (0)