diff options
| author | sr55 <[email protected]> | 2009-03-07 12:53:48 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-03-07 12:53:48 +0000 |
| commit | 6748576ffc395f6c5d4bee4afd597b6b8dc44be4 (patch) | |
| tree | f9399d8ee7d8b1063c3ed7c3ba2ba8c5b3160f10 /win/C#/frmQueue.cs | |
| parent | 984a832a50fe4ec38140e5f5a8cbdaab670b09c4 (diff) | |
WinGui:
- Remove old decomb option from the Options windows
- Added patch by ExDeus which allows multi-select on the queue window, and re-adding of the currently running job.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2239 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#/frmQueue.cs')
| -rw-r--r-- | win/C#/frmQueue.cs | 107 |
1 files changed, 78 insertions, 29 deletions
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index 86549a20f..ceb127fb4 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -215,61 +215,108 @@ namespace Handbrake // Do Nothing
}
}
-
- // Queue Management
- private void btn_up_Click(object sender, EventArgs e)
+ private void deleteSelectedItems()
{
- if (list_queue.SelectedIndices.Count != 0)
+ // If there are selected items
+ if (list_queue.SelectedIndices.Count > 0)
{
- int selected = list_queue.SelectedIndices[0];
+ // Save the selected indices to select them after the move
+ List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);
+ foreach (int selectedIndex in list_queue.SelectedIndices)
+ selectedIndices.Add(selectedIndex);
+
+ int firstSelectedIndex = selectedIndices[0];
+
+ // Reverse the list to delete the items from last to first (preserves indices)
+ selectedIndices.Reverse();
+
+ // Remove each selected item
+ foreach (int selectedIndex in selectedIndices)
+ queue.remove(selectedIndex);
- queue.moveUp(selected);
queue.write2disk("hb_queue_recovery.xml"); // Update the queue recovery file
updateUIElements();
- if (selected - 1 > 0)
- list_queue.Items[selected - 1].Selected = true;
+ // Select the item where the first deleted item was previously
+ if (firstSelectedIndex < list_queue.Items.Count)
+ list_queue.Items[firstSelectedIndex].Selected = true;
+ }
+
+ list_queue.Select(); // Activate the control to show the selected items
+ }
- list_queue.Select();
+ // Queue Management
+ private void btn_re_add_Click(object sender, EventArgs e)
+ {
+ if (queue.getLastQueryItem() != null)
+ {
+ queue.add(queue.getLastQueryItem().Query, queue.getLastQueryItem().Source, queue.getLastQueryItem().Destination);
+ queue.write2disk("hb_queue_recovery.xml"); // Update the queue recovery file
+ updateUIElements();
}
}
- private void btn_down_Click(object sender, EventArgs e)
+ private void btn_up_Click(object sender, EventArgs e)
{
- if (list_queue.SelectedIndices.Count != 0)
+ // If there are selected items and the first item is not selected
+ if (list_queue.SelectedIndices.Count > 0 && ! list_queue.SelectedIndices.Contains(0))
{
- int selected = list_queue.SelectedIndices[0];
+ // Copy the selected indices to preserve them during the movement
+ List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);
+ foreach (int selectedIndex in list_queue.SelectedIndices)
+ selectedIndices.Add(selectedIndex);
+
+ // Move up each selected item
+ foreach (int selectedIndex in selectedIndices)
+ queue.moveUp(selectedIndex);
- queue.moveDown(list_queue.SelectedIndices[0]);
queue.write2disk("hb_queue_recovery.xml"); // Update the queue recovery file
updateUIElements();
- if (selected + 1 < list_queue.Items.Count)
- list_queue.Items[selected + 1].Selected = true;
-
- list_queue.Select();
+ // Keep the selected item(s) selected, now moved up one index
+ foreach (int selectedIndex in selectedIndices)
+ if (selectedIndex - 1 > -1) // Defensive programming: ensure index is good
+ list_queue.Items[selectedIndex - 1].Selected = true;
}
+
+ list_queue.Select(); // Activate the control to show the selected items
}
- private void btn_delete_Click(object sender, EventArgs e)
+ private void btn_down_Click(object sender, EventArgs e)
{
- if (list_queue.SelectedIndices.Count != 0)
+ // If there are selected items and the last item is not selected
+ if (list_queue.SelectedIndices.Count > 0 &&
+ ! list_queue.SelectedIndices.Contains(list_queue.Items[list_queue.Items.Count-1].Index))
{
- queue.remove(list_queue.SelectedIndices[0]);
+ // Copy the selected indices to preserve them during the movement
+ List<int> selectedIndices = new List<int>(list_queue.SelectedIndices.Count);
+ foreach (int selectedIndex in list_queue.SelectedIndices)
+ selectedIndices.Add(selectedIndex);
+
+ // Reverse the indices to move the items down from last to first (preserves indices)
+ selectedIndices.Reverse();
+
+ // Move down each selected item
+ foreach (int selectedIndex in selectedIndices)
+ queue.moveDown(selectedIndex);
+
queue.write2disk("hb_queue_recovery.xml"); // Update the queue recovery file
updateUIElements();
- lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending";
+
+ // Keep the selected item(s) selected, now moved down one index
+ foreach (int selectedIndex in selectedIndices)
+ if (selectedIndex + 1 < list_queue.Items.Count) // Defensive programming: ensure index is good
+ list_queue.Items[selectedIndex + 1].Selected = true;
}
+
+ list_queue.Select(); // Activate the control to show the selected items
+ }
+ private void btn_delete_Click(object sender, EventArgs e)
+ {
+ deleteSelectedItems();
}
private void list_queue_deleteKey(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Delete)
- {
- if (list_queue.SelectedIndices.Count != 0)
- {
- queue.remove(list_queue.SelectedIndices[0]);
- queue.write2disk("hb_queue_recovery.xml"); // Update the queue recovery file
- updateUIElements();
- }
- }
+ deleteSelectedItems();
}
// Queue Import/Export Features
@@ -305,5 +352,7 @@ namespace Handbrake this.Hide();
base.OnClosing(e);
}
+
+
}
}
|