Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Commit 4a8994c

Browse files
committed
feat(app): add right click to delete snapshot
1 parent 240f745 commit 4a8994c

7 files changed

Lines changed: 96 additions & 5 deletions

File tree

WindowsLayoutSnapshot/Language/en.Designer.cs

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WindowsLayoutSnapshot/Language/en.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
<data name="clear" xml:space="preserve">
124124
<value>Clear Snapshots</value>
125125
</data>
126+
<data name="confirmDesc" xml:space="preserve">
127+
<value>Restore completed !</value>
128+
</data>
126129
<data name="quit" xml:space="preserve">
127130
<value>Quit</value>
128131
</data>
@@ -135,4 +138,10 @@
135138
<data name="snapshotName" xml:space="preserve">
136139
<value>Snapshot name :</value>
137140
</data>
141+
<data name="warningDesc" xml:space="preserve">
142+
<value>Restore in progress. Please DON'T DO ANYTHING before restore is complete !</value>
143+
</data>
144+
<data name="warningTitle" xml:space="preserve">
145+
<value>Restore Snapshot</value>
146+
</data>
138147
</root>

WindowsLayoutSnapshot/Language/fr.Designer.cs

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WindowsLayoutSnapshot/Language/fr.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
<data name="clear" xml:space="preserve">
124124
<value>Supprimer toutes les sauvegardes</value>
125125
</data>
126+
<data name="confirmDesc" xml:space="preserve">
127+
<value>Restauration terminée !</value>
128+
</data>
126129
<data name="quit" xml:space="preserve">
127130
<value>Quitter</value>
128131
</data>
@@ -135,4 +138,10 @@
135138
<data name="snapshotName" xml:space="preserve">
136139
<value>Nom de la sauvegarde :</value>
137140
</data>
141+
<data name="warningDesc" xml:space="preserve">
142+
<value>Restauration en cours. Veuillez NE RIEN FAIRE tant que la restauration n'est pas terminée !</value>
143+
</data>
144+
<data name="warningTitle" xml:space="preserve">
145+
<value>Restauration</value>
146+
</data>
138147
</root>

WindowsLayoutSnapshot/Snapshot.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ internal void RestoreAndPreserveMenu(object sender, EventArgs e) { // ignore ext
149149

150150
internal void Restore(object sender, EventArgs e) { // ignore extra params
151151
// first, restore the window rectangles and normal/maximized/minimized states
152-
MessageBox.Show("Restore in progress. Please DON'T DO ANYTHING before restore is complete.", "Restore Snapshot");
153152
foreach (var placement in m_infos) {
154153

155154
var processId = placement.Key;
@@ -268,7 +267,6 @@ internal void Restore(object sender, EventArgs e) { // ignore extra params
268267
0, 0, 0, 0, DeferWindowPosCommands.SWP_NOMOVE | DeferWindowPosCommands.SWP_NOSIZE | DeferWindowPosCommands.SWP_NOACTIVATE);
269268
}
270269
EndDeferWindowPos(positionStructure);
271-
MessageBox.Show("Restore complete !", "Restore Snapshot");
272270
}
273271

274272
private static Rectangle GetRectInsideNearestMonitor(WinInfo win) {

WindowsLayoutSnapshot/TrayIconForm.Designer.cs

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WindowsLayoutSnapshot/TrayIconForm.cs

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,25 @@ private void UpdateRestoreChoicesInMenu() {
221221
foreach (var snapshot in snapshotsOldestFirst) {
222222
var menuItem = new RightImageToolStripMenuItem(snapshot.GetDisplayString());
223223
menuItem.Tag = snapshot;
224-
menuItem.Click += snapshot.Restore;
225-
//menuItem.MouseEnter += SnapshotMousedOver;
224+
void onRestore(object sender, EventArgs e)
225+
{ // ignore extra params
226+
// first, restore the window rectangles and normal/maximized/minimized states
227+
MessageBox.Show(getTrad("warningDesc"), getTrad("warningTitle"));
228+
229+
snapshot.Restore(sender, e);
230+
231+
MessageBox.Show(getTrad("confirmDesc"), getTrad("warningTitle"));
232+
}
233+
void onMouseDown(object sender, MouseEventArgs e)
234+
{
235+
if(e.Button == MouseButtons.Right)
236+
{
237+
//Remove this snapshot
238+
m_snapshots.Remove(snapshot);
239+
UpdateRestoreChoicesInMenu();
240+
}
241+
}
242+
menuItem.MouseDown += onMouseDown;
226243
if (snapshot.UserInitiated) {
227244
menuItem.Font = new Font(menuItem.Font, FontStyle.Bold);
228245
}
@@ -240,8 +257,11 @@ private void UpdateRestoreChoicesInMenu() {
240257
}
241258

242259
//newMenuItems.Add(justNowToolStripMenuItem);
243-
if(m_snapshots.Count > 0)
260+
261+
this.snapshotListStartLine.Visible = m_snapshots.Count > 0;
262+
if (m_snapshots.Count > 0)
244263
{
264+
245265
newMenuItems.Add(snapshotListStartLine);
246266
}
247267
newMenuItems.Add(clearSnapshotsToolStripMenuItem);

0 commit comments

Comments
 (0)