Skip to content

Commit 3d9d2eb

Browse files
ThymesterThymester
authored
Add files via upload
1 parent 02dfb55 commit 3d9d2eb

2 files changed

Lines changed: 55 additions & 26 deletions

File tree

‎SafeNotes/AppManager.cs‎

Lines changed: 50 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ private void SaveEntryButton_Click(object sender, EventArgs e)
484484
// Show a notification that the entry has been edited
485485
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
486486
notiPopup.TitleText = "SafeNotes";
487-
notiPopup.ContentText = "Entry edited";
487+
notiPopup.ContentText = "Entry has been edited.";
488488
notiPopup.Popup();
489489
}
490490
}
@@ -521,10 +521,10 @@ private void SaveEntryButton_Click(object sender, EventArgs e)
521521

522522
if (DisableNotificationsCheckbox.Checked == false)
523523
{
524-
// Show a notification that the entry has been edited
524+
// Show a notification that the entry has been saved
525525
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
526526
notiPopup.TitleText = "SafeNotes";
527-
notiPopup.ContentText = "Entry edited";
527+
notiPopup.ContentText = "Entry has been saved.";
528528
notiPopup.Popup();
529529
}
530530
}
@@ -535,15 +535,6 @@ private void SaveEntryButton_Click(object sender, EventArgs e)
535535
JournalEntryBox.Text = "";
536536
// Update the entries count label and save entries to settings
537537
UpdateEntriesCountAndSaveToFile();
538-
539-
if (EntriesListBox.Items.Count > 1)
540-
{
541-
DeleteEntriesButton.Enabled = true;
542-
}
543-
else
544-
{
545-
DeleteEntriesButton.Enabled = false;
546-
}
547538
}
548539
else
549540
{
@@ -579,10 +570,10 @@ private void ChangeNameButton_Click(object sender, EventArgs e)
579570

580571
if (DisableNotificationsCheckbox.Checked == false)
581572
{
582-
// Show a notification that the entry has been edited
573+
// Show a notification that the your name has been updated
583574
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
584575
notiPopup.TitleText = "SafeNotes";
585-
notiPopup.ContentText = "Entry edited";
576+
notiPopup.ContentText = "Your name has been updated.";
586577
notiPopup.Popup();
587578
}
588579
}
@@ -597,6 +588,14 @@ private void ChangeNameButton_Click(object sender, EventArgs e)
597588
ChangeNameButton.Visible = false;
598589
ChangeNameButton.Visible = true;
599590
}
591+
592+
if (YourNameBox.Text == "")
593+
{
594+
this.Text = "SafeNotes - v" + Application.ProductVersion;
595+
} else
596+
{
597+
this.Text = "SafeNotes - v" + Application.ProductVersion + " / " + YourNameBox.Text;
598+
}
600599
}
601600

602601
private void JournalEntryPage_Click(object sender, EventArgs e)
@@ -630,10 +629,10 @@ private void EntriesListBox_MouseDoubleClick(object sender, MouseEventArgs e)
630629

631630
if (DisableNotificationsCheckbox.Checked == false)
632631
{
633-
// Show a notification that the entry has been edited
632+
// Show a notification that the entry has been deleted
634633
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
635634
notiPopup.TitleText = "SafeNotes";
636-
notiPopup.ContentText = "Entry edited";
635+
notiPopup.ContentText = "Entry has been deleted.";
637636
notiPopup.Popup();
638637
}
639638
}
@@ -842,6 +841,15 @@ private void UserLoginButton_Click(object sender, EventArgs e)
842841
{
843842
MessageBox.Show("The password does not match the record on file...", "Password Mismatch", MessageBoxButtons.OK, MessageBoxIcon.Error);
844843
}
844+
845+
if (ChangeNameButton.Text == "Save name" && _settings.IsUserLoggedIn)
846+
{
847+
this.Text = "SafeNotes - v" + Application.ProductVersion;
848+
}
849+
else if (ChangeNameButton.Text == "Change name" && _settings.IsUserLoggedIn)
850+
{
851+
this.Text = "SafeNotes - v" + Application.ProductVersion + " / " + YourNameBox.Text;
852+
}
845853
}
846854
}
847855

@@ -978,10 +986,10 @@ private void ExportEntriesButton_Click(object sender, System.EventArgs e)
978986

979987
if (DisableNotificationsCheckbox.Checked == false)
980988
{
981-
// Show a notification that the entry has been edited
989+
// Show a notification that the entries were exported successfully
982990
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
983991
notiPopup.TitleText = "SafeNotes";
984-
notiPopup.ContentText = "Entry edited";
992+
notiPopup.ContentText = "Entries exported to file.";
985993
notiPopup.Popup();
986994
}
987995
ExportEntriesButton.Visible = false;
@@ -1019,6 +1027,22 @@ private void ImportEntriesButton_Click(object sender, System.EventArgs e)
10191027
}
10201028
// Update the savedEntriesCount label
10211029
SavedEntriesCount.Text = "Saved entries: " + EntriesListBox.Items.Count.ToString();
1030+
1031+
// Show notification if the entries were imported successfully
1032+
if (DisableNotificationsCheckbox.Checked == false)
1033+
{
1034+
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
1035+
notiPopup.TitleText = "SafeNotes";
1036+
if (decryptionErrorOccurred)
1037+
{
1038+
notiPopup.ContentText = "Some entries could not be decrypted. Please ensure you used the correct password.";
1039+
}
1040+
else
1041+
{
1042+
notiPopup.ContentText = "Entries imported successfully.";
1043+
}
1044+
notiPopup.Popup();
1045+
}
10221046
}
10231047
ImportEntriesButton.Visible = false;
10241048
ImportEntriesButton.Visible = true;
@@ -1040,10 +1064,10 @@ private void DeleteEntriesButton_Click(object sender, EventArgs e)
10401064

10411065
if (DisableNotificationsCheckbox.Checked == false)
10421066
{
1043-
// Show a notification that the entry has been edited
1067+
// Show a notification that the entry has been deleted
10441068
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
10451069
notiPopup.TitleText = "SafeNotes";
1046-
notiPopup.ContentText = "Entry edited";
1070+
notiPopup.ContentText = "Entry has been deleted.";
10471071
notiPopup.Popup();
10481072
}
10491073
}
@@ -1216,10 +1240,10 @@ private void SaveNotepadButton_Click(object sender, EventArgs e)
12161240

12171241
if (DisableNotificationsCheckbox.Checked == false)
12181242
{
1219-
// Show a notification that the entry has been edited
1243+
// Show a notification that the notepad has been saved
12201244
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
12211245
notiPopup.TitleText = "SafeNotes";
1222-
notiPopup.ContentText = "Entry edited";
1246+
notiPopup.ContentText = "Notepad has been saved.";
12231247
notiPopup.Popup();
12241248
}
12251249
}
@@ -1267,10 +1291,10 @@ private void OpenFileButton_Click(object sender, EventArgs e)
12671291

12681292
if (DisableNotificationsCheckbox.Checked == false)
12691293
{
1270-
// Show a notification that the entry has been edited
1294+
// Show a notification that the notepad has been opened
12711295
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
12721296
notiPopup.TitleText = "SafeNotes";
1273-
notiPopup.ContentText = "Entry edited";
1297+
notiPopup.ContentText = "Notepad has been opened.";
12741298
notiPopup.Popup();
12751299
}
12761300
}
@@ -1297,10 +1321,10 @@ private void ClearNotepadButton_Click(object sender, EventArgs e)
12971321

12981322
if (DisableNotificationsCheckbox.Checked == false)
12991323
{
1300-
// Show a notification that the entry has been edited
1324+
// Show a notification that the notepad has been cleared
13011325
Tulpep.NotificationWindow.PopupNotifier notiPopup = new Tulpep.NotificationWindow.PopupNotifier();
13021326
notiPopup.TitleText = "SafeNotes";
1303-
notiPopup.ContentText = "Entry edited";
1327+
notiPopup.ContentText = "Notepad has been cleared.";
13041328
notiPopup.Popup();
13051329
}
13061330
}

‎SafeNotes/EventHandlers.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// File: SafeNotes/EventHandlers.cs
12
using Newtonsoft.Json.Linq;
23
using System.Net.Http;
34
using System.IO;
@@ -137,6 +138,10 @@ echo Update complete >> ""{logPath}""
137138
MessageBox.Show("Error: The downloaded file is not an executable (.exe).", "Update Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
138139
}
139140
}
141+
else if (latestVersion < currentAppVersion)
142+
{
143+
MessageBox.Show("You are using a development version of SafeNotes that has not been released yet.", "Pre-release Version", MessageBoxButtons.OK, MessageBoxIcon.Information);
144+
}
140145
}
141146
catch (Exception ex)
142147
{

0 commit comments

Comments
 (0)