From 59c9cc5c3fd81fc1a5f34d8718f51949149ab4e2 Mon Sep 17 00:00:00 2001
From: Jaidyn Ann <jadedctrl@teknik.io>
Date: Tue, 23 Mar 2021 14:24:47 -0500
Subject: [PATCH] Redesign FeedEditWindow buttons, add tooltips

---
 src/FeedEditWindow.cpp | 34 ++++++++++------------------------
 src/FeedEditWindow.h   |  9 ++++-----
 src/FeedsView.cpp      |  2 ++
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/src/FeedEditWindow.cpp b/src/FeedEditWindow.cpp
index 693e1ea..d4c6421 100644
--- a/src/FeedEditWindow.cpp
+++ b/src/FeedEditWindow.cpp
@@ -33,8 +33,6 @@ FeedEditWindow::FeedEditWindow()
 {
 	_InitInterface();
 	MoveOnScreen();
-	fDeleteButton->SetEnabled(false);
-
 	fFeed = Feed();
 }
 
@@ -48,8 +46,6 @@ FeedEditWindow::FeedEditWindow(BEntry feedEntry)
 
 	fFeedNameText->SetText(fFeed.Title().String());
 	fFeedUrlText->SetText(fFeed.XmlUrl().UrlString().String());
-
-	fDeleteButton->SetEnabled(true);
 }
 
 
@@ -71,14 +67,14 @@ FeedEditWindow::MessageReceived(BMessage* msg)
 {
 	switch (msg->what)
 	{
-		case kSaveButton:
+		case kOkButton:
 		{
 			_SaveFeed();
 			break;
 		}
-		case kDeleteButton:
+		case kCancelButton:
 		{
-			_DeleteFeed();
+			Quit();
 			break;
 		}
 	}
@@ -94,11 +90,11 @@ FeedEditWindow::_InitInterface()
 	fFeedUrlLabel = new BStringView("feedUrlLabel", B_TRANSLATE("Feed URL:"));
 	fFeedUrlText = new BTextControl("feedUrl", "", "", NULL);
 
-	// Save/Delete
-	fSaveButton = new BButton("save", B_TRANSLATE("Save"),
-		new BMessage(kSaveButton));
-	fDeleteButton = new BButton("delete", B_TRANSLATE("Delete"),
-		new BMessage(kDeleteButton));
+	// OK/Cancel
+	fOkButton = new BButton("ok", B_TRANSLATE("OK"),
+		new BMessage(kOkButton));
+	fCancelButton = new BButton("cancel", B_TRANSLATE("Cancel"),
+		new BMessage(kCancelButton));
 
 	BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
 		.SetInsets(0, B_USE_DEFAULT_SPACING, 0, 0)
@@ -119,9 +115,9 @@ FeedEditWindow::_InitInterface()
 
 		.Add(new BSeparatorView(B_HORIZONTAL))
 		.AddGroup(B_HORIZONTAL)
+			.Add(fCancelButton)
 			.AddGlue()
-			.Add(fDeleteButton)
-			.Add(fSaveButton)
+			.Add(fOkButton)
 			.SetInsets(B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING,
 				B_USE_DEFAULT_SPACING, B_USE_WINDOW_SPACING)
 		.End()
@@ -194,13 +190,3 @@ FeedEditWindow::_SaveFeed()
 }
 
 
-void
-FeedEditWindow::_DeleteFeed()
-{
-	fFeed.Unfiletize();
-	BMessage edited(kFeedsEdited);
-	((App*)be_app)->PostMessage(&edited);
-	Quit();
-}
-
-
diff --git a/src/FeedEditWindow.h b/src/FeedEditWindow.h
index ca6fbad..1029e62 100644
--- a/src/FeedEditWindow.h
+++ b/src/FeedEditWindow.h
@@ -18,8 +18,8 @@ class FeedListItem;
 
 enum
 {
-	kSaveButton		= 'esav',
-	kDeleteButton	= 'edel'
+	kOkButton		= 'edok',
+	kCancelButton	= 'ecan'
 };
 
 
@@ -36,7 +36,6 @@ private:
 	void _InitInterface();
 
 	void _SaveFeed();
-	void _DeleteFeed();
 
 	BString fFeedPath;
 	Feed fFeed;
@@ -46,8 +45,8 @@ private:
 	BStringView*	fFeedUrlLabel;
 	BTextControl*	fFeedUrlText;
 
-	BButton* fSaveButton;
-	BButton* fDeleteButton;
+	BButton* fOkButton;
+	BButton* fCancelButton;
 };
 
 
diff --git a/src/FeedsView.cpp b/src/FeedsView.cpp
index f227274..18ecea3 100644
--- a/src/FeedsView.cpp
+++ b/src/FeedsView.cpp
@@ -126,6 +126,8 @@ FeedsView::_InitInterface()
 	// Add, Remove, Edit
 	fAddButton = new BButton("addFeed", "+", new BMessage(kFeedsAddButton));
 	fRemoveButton = new BButton("removeFeed", "-", new BMessage(kFeedsRemoveButton));
+	fAddButton->SetToolTip(B_TRANSLATE("Add new feed"));
+	fRemoveButton->SetToolTip(B_TRANSLATE("Remove selected feed"));
 	fEditButton = new BButton("editFeed", B_TRANSLATE("Edit…"),
 		new BMessage(kFeedsEditButton));