HaikuArchives · Dec 19, 2021 · Dec 19, 2021
Showing with 51 additions and 93 deletions.

+5 −3 src/App.cpp

+2 −2 src/CategoryWindow.cpp

+1 −1 src/CategoryWindow.h

+33 −66 src/PreferenceWindow.cpp

+10 −21 src/PreferenceWindow.h
diff --git a/src/App.cpp b/src/App.cpp
@@ -67,15 +67,16 @@ App::AboutRequested()
 {
 	const char* authors[] = {
 		"Akshay Agarwal",
-		"humdinger",
+		"Humdinger",
 		"Jaidyn Levesque",
 		"malbx",
 		"Fredrik Modéen",
 		"Bach Nguyen",
 		NULL
 	};
 	BAboutWindow* aboutW = new BAboutWindow(kAppName, kSignature);
-	aboutW->AddDescription(B_TRANSLATE("A native Calendar application for Haiku."));
+	aboutW->AddDescription(B_TRANSLATE(
+		"A calendar application to manage your appointments."));
 	aboutW->AddCopyright(2017, "Akshay Agarwal");
 	aboutW->AddAuthors(authors);
 	aboutW->Show();
@@ -122,7 +123,8 @@ App::MessageReceived(BMessage* message)
 		case kMenuAppPref:
 		{
 			if (fPreferenceWindow == NULL) {
-				fPreferenceWindow = new PreferenceWindow(fPreferences);
+				fPreferenceWindow = new PreferenceWindow(fMainWindow->Frame(),
+					fPreferences);
 				fPreferenceWindow->Show();
 			}
 

diff --git a/src/CategoryWindow.cpp b/src/CategoryWindow.cpp
@@ -186,7 +186,7 @@ CategoryWindow::_InitInterface()
 	fCategoryListView->SetSelectionMessage(new BMessage(kCategorySelected));
 	fCategoryListView->SetInvocationMessage(new BMessage(kCategoryEditSelected));
 
-	fAddButton = new BButton("AddButton", B_TRANSLATE("Add" B_UTF8_ELLIPSIS),
+	fNewButton = new BButton("NewButton", B_TRANSLATE("New" B_UTF8_ELLIPSIS),
 		new BMessage(kAddPressed));
 	fDeleteButton = new BButton("DeleteButton", B_TRANSLATE("Delete"),
 		new BMessage(kDeletePressed));
@@ -200,7 +200,7 @@ CategoryWindow::_InitInterface()
 		.AddGroup(B_HORIZONTAL, B_USE_HALF_ITEM_SPACING)
 			.Add(fDeleteButton)
 			.AddGlue()
-			.Add(fAddButton)
+			.Add(fNewButton)
 			.Add(fEditButton)
 		.End()
 	.End();

diff --git a/src/CategoryWindow.h b/src/CategoryWindow.h
@@ -43,7 +43,7 @@ class CategoryWindow: public BWindow {
 	BView*			fMainView;
 	BListView*		fCategoryListView;
 	BScrollView*	fCategoryScroll;
-	BButton*		fAddButton;
+	BButton*		fNewButton;
 	BButton*		fDeleteButton;
 	BButton*		fEditButton;
 	CategoryEditWindow*	fCategoryEditWindow;

diff --git a/src/PreferenceWindow.cpp b/src/PreferenceWindow.cpp
@@ -1,22 +1,22 @@
 /*
  * Copyright 2017 Akshay Agarwal, agarwal.akshay.akshay8@gmail.com
  * All rights reserved. Distributed under the terms of the MIT license.
+ * Contributed by:
+ *	Humdinger <humdingerb@gmail.com>, 2021
  */
 
 
 #include "PreferenceWindow.h"
 
 #include <Application.h>
-#include <Box.h>
 #include <Button.h>
 #include <Catalog.h>
-#include <ColorMenuItem.h>
 #include <CheckBox.h>
+#include <ColorMenuItem.h>
 #include <LayoutBuilder.h>
 #include <PopUpMenu.h>
 #include <MenuField.h>
-#include <StringView.h>
-#include <View.h>
+#include <SeparatorView.h>
 #include <Window.h>
 
 #include "App.h"
@@ -28,9 +28,10 @@
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "PreferenceWindow"
 
-PreferenceWindow::PreferenceWindow(Preferences* preferences)
-	:BWindow(BRect(), B_TRANSLATE("Settings"), B_TITLED_WINDOW,
-		B_NOT_ZOOMABLE | B_NOT_RESIZABLE| B_AUTO_UPDATE_SIZE_LIMITS)
+PreferenceWindow::PreferenceWindow(BRect frame, Preferences* preferences)
+	:
+	BWindow(BRect(), B_TRANSLATE("Settings"), B_TITLED_WINDOW,
+		B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	fCurrentPreferences = preferences;
 
@@ -43,8 +44,8 @@ PreferenceWindow::PreferenceWindow(Preferences* preferences)
 	fDBManager = new QueryDBManager();
 
 	_InitInterface();
-	CenterOnScreen();
 
+	CenterIn(frame);
 	_SyncPreferences(fCurrentPreferences);
 }
 
@@ -101,6 +102,7 @@ PreferenceWindow::MessageReceived(BMessage* message)
 			BMenuItem* item = fDefaultCatMenu->FindMarked();
 			fTempPreferences->fDefaultCategory = BString(item->Label());
 			_PreferencesModified();
+			break;
 		}
 
 		default:
@@ -121,9 +123,6 @@ PreferenceWindow::QuitRequested()
 void
 PreferenceWindow::_InitInterface()
 {
-	fMainView = new BView("MainView", B_WILL_DRAW);
-	fMainView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
-
 	fDayOfWeekMenu = new BPopUpMenu("DayOfWeekMenu");
 	fDefaultCatMenu = new BPopUpMenu("DefaultCatMenu");
 
@@ -136,7 +135,8 @@ PreferenceWindow::_InitInterface()
 		fDayOfWeekMenu->AddItem(new BMenuItem(startOfWeekItems[i],
 			new BMessage(kStartOfWeekChangeMessage)));
 	fDayOfWeekMenu->ItemAt(0)->SetMarked(true);
-	fDayOfWeekMenuField = new BMenuField("DayOfWeekMenu", NULL, fDayOfWeekMenu);
+	fDayOfWeekMenuField = new BMenuField("DayOfWeekMenu", B_TRANSLATE(
+		"First day of the week:"), fDayOfWeekMenu);
 
 	BList* categories = fDBManager->GetAllCategories();
 	for (int i = 0; i < categories->CountItems(); i++) {
@@ -145,22 +145,11 @@ PreferenceWindow::_InitInterface()
 			new BMessage(kDefaultCategoryChangeMessage), category->GetColor()));
 	}
 	fDefaultCatMenu->ItemAt(0)->SetMarked(true);
-	fDefaultCatMenuField = new BMenuField("DefaultCatMenu", NULL, fDefaultCatMenu);
-
-	fWeekCategoryLabel = new BStringView("PrefCategory", "Week");
-	fOrgCategoryLabel = new BStringView("PrefCategory", "Organization");
-	BFont font;
-	fWeekCategoryLabel->GetFont(&font);
-	font.SetSize(font.Size() * 1.2);
-	font.SetFace(B_BOLD_FACE);
-	fWeekCategoryLabel->SetFont(&font, B_FONT_ALL);
-	fOrgCategoryLabel->SetFont(&font, B_FONT_ALL);
-
-	fStartOfWeekLabel = new BStringView("StartOfWeek", B_TRANSLATE("First day of week"));
-	fDefaultCatLabel = new BStringView("DefaultCat", B_TRANSLATE("Default category"));
-
-	fWeekNumberHeaderCB = new BCheckBox("WeekNumberHeader",
-		B_TRANSLATE("Show week number in Calendar"), new BMessage(kShowWeekChangeMessage));
+	fDefaultCatMenuField = new BMenuField("DefaultCatMenu", B_TRANSLATE(
+		"Default category:"), fDefaultCatMenu);
+
+	fWeekNumberHeaderCB = new BCheckBox("WeekNumberHeader", B_TRANSLATE(
+		"Show week numbers in calendar"), new BMessage(kShowWeekChangeMessage));
 	fWeekNumberHeaderCB->SetValue(B_CONTROL_OFF);
 
 	fApplyButton = new BButton(B_TRANSLATE("Apply"), new BMessage(kApplyPreferencesMessage));
@@ -169,53 +158,31 @@ PreferenceWindow::_InitInterface()
 	fApplyButton->SetEnabled(false);
 	fRevertButton->SetEnabled(false);
 
-	fWeekPreferencesBox = new BBox("Week");
-	fOrgPreferencesBox = new BBox("Organization");
-
-	BLayoutBuilder::Group<>(fWeekPreferencesBox, B_VERTICAL, B_USE_HALF_ITEM_SPACING)
-			.SetInsets(B_USE_ITEM_INSETS)
-			.AddStrut(B_USE_ITEM_SPACING)
-			.Add(fStartOfWeekLabel)
-			.Add(fDayOfWeekMenuField)
-			.AddStrut(B_USE_HALF_ITEM_SPACING)
-			.Add(fWeekNumberHeaderCB)
-	.End();
-	fWeekPreferencesBox->SetLabel(fWeekCategoryLabel);
-
-	BLayoutBuilder::Group<>(fOrgPreferencesBox, B_VERTICAL, B_USE_HALF_ITEM_SPACING)
-			.SetInsets(B_USE_ITEM_INSETS)
-			.AddStrut(B_USE_HALF_ITEM_SPACING)
-			.Add(fDefaultCatLabel)
-			.Add(fDefaultCatMenuField)
-	.End();
-	fOrgPreferencesBox->SetLabel(fOrgCategoryLabel);
-
-
-	BLayoutBuilder::Group<>(fMainView, B_VERTICAL, B_USE_DEFAULT_SPACING)
-			.SetInsets(B_USE_SMALL_INSETS)
-			.Add(fWeekPreferencesBox)
-			.Add(fOrgPreferencesBox)
-			.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
-				.Add(fRevertButton)
-				.AddGlue()
-				.Add(fApplyButton)
+	BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING)
+		.AddGrid(B_USE_DEFAULT_SPACING, B_USE_SMALL_SPACING)
+			.SetInsets(B_USE_SMALL_INSETS, B_USE_SMALL_INSETS, B_USE_SMALL_INSETS, 0)
+			.AddMenuField(fDefaultCatMenuField, 0, 0)
+			.AddMenuField(fDayOfWeekMenuField, 0, 1)
+			.Add(fWeekNumberHeaderCB, 0, 2, 2)
 			.End()
-	.End();
-
-	BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
-			.Add(fMainView)
-	.End();
+		.Add(new BSeparatorView(B_HORIZONTAL))
+		.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
+			.SetInsets(B_USE_SMALL_INSETS, 0, B_USE_SMALL_INSETS, B_USE_SMALL_INSETS)
+			.Add(fRevertButton)
+			.AddGlue()
+			.Add(fApplyButton)
+			.End()
+		.End();
 }
 
 
 void
 PreferenceWindow::_SyncPreferences(Preferences* preferences)
 {
-	if(preferences->fHeaderVisible == true) {
+	if (preferences->fHeaderVisible == true)
 		fWeekNumberHeaderCB->SetValue(B_CONTROL_ON);
-	} else {
+	else
 		fWeekNumberHeaderCB->SetValue(B_CONTROL_OFF);
-	}
 
 	BMenuItem* item = fDayOfWeekMenu->ItemAt(preferences->fStartOfWeekOffset);
 	item->SetMarked(true);

diff --git a/src/PreferenceWindow.h b/src/PreferenceWindow.h
@@ -7,13 +7,10 @@
 
 #include <Window.h>
 
-class BBox;
 class BButton;
 class BCheckBox;
 class BPopUpMenu;
 class BMenuField;
-class BStringView;
-class BView;
 class Preferences;
 class QueryDBManager;
 
@@ -24,8 +21,8 @@ const uint32 kAppPreferencesChanged	= 'kpcd';
 
 class PreferenceWindow : public BWindow {
 public:
-						PreferenceWindow(Preferences* preferences);
-						~PreferenceWindow();
+					PreferenceWindow(BRect position, Preferences* preferences);
+					~PreferenceWindow();
 
 		void				MessageReceived(BMessage *message);
 		bool				QuitRequested();
@@ -35,31 +32,23 @@ class PreferenceWindow : public BWindow {
 		void				_SyncPreferences(Preferences* preferences);
 		void				_PreferencesModified();
 
-		static const int		kStartOfWeekChangeMessage 		= 1000;
-		static const int 		kShowWeekChangeMessage		= 1001;
-		static const int		kApplyPreferencesMessage		= 1002;
-		static const int		kRevertPreferencesMessage		= 1003;
-		static const int		kDefaultCategoryChangeMessage 	= 1004;
+		static const int	kStartOfWeekChangeMessage 		= 1000;
+		static const int 	kShowWeekChangeMessage		= 1001;
+		static const int	kApplyPreferencesMessage		= 1002;
+		static const int	kRevertPreferencesMessage		= 1003;
+		static const int	kDefaultCategoryChangeMessage 	= 1004;
 
-
-		BView*				fMainView;
 		BCheckBox*			fWeekNumberHeaderCB;
-		BStringView*			fWeekCategoryLabel;
-		BStringView*			fOrgCategoryLabel;
-		BStringView*			fStartOfWeekLabel;
-		BStringView*			fDefaultCatLabel;
 		BPopUpMenu*			fDayOfWeekMenu;
 		BPopUpMenu*			fDefaultCatMenu;
 		BMenuField*			fDayOfWeekMenuField;
 		BMenuField*			fDefaultCatMenuField;
-		BBox*				fWeekPreferencesBox;
-		BBox*				fOrgPreferencesBox;
 		BButton*			fApplyButton;
 		BButton*			fRevertButton;
 
-		Preferences*			fStartPreferences;
-		Preferences*			fCurrentPreferences;
-		Preferences*			fTempPreferences;
+		Preferences*		fStartPreferences;
+		Preferences*		fCurrentPreferences;
+		Preferences*		fTempPreferences;
 
 		QueryDBManager*		fDBManager;
 };