Fix HaikuArchives#1. A lot of UI improvements

Author: janus2

DeskNoteApp.cpp

@@ -78,7 +78,7 @@ DeskNoteApp::DeskNoteApp ():BApplication (app_signature)
 		}
 
 	} else {
-		rect.Set (100,80,240,160);				// Inital size for the window.
+		rect.Set (100,80,340,260);				// Inital size for the window.
 	}
 
 	myNote = new DeskNoteWindow (rect);

DeskNoteTextView.cpp

@@ -30,8 +30,12 @@ status_t DeskNoteTextView::Archive (BMessage *data, bool deep) const
 void DeskNoteTextView::MouseDown (BPoint point)
 {
 	if (!Window () -> IsActive ()) Window () -> Activate (true);
+	BPoint mousePoint;
+	uint32 mouseButtons;
+	GetMouse (&mousePoint, &mouseButtons, false);
+	if (mouseButtons != B_SECONDARY_MOUSE_BUTTON)
+		BTextView::MouseDown (point);
 	Parent () -> MouseDown (point);
-	BTextView::MouseDown (point);
 }
 
 

DeskNoteView.cpp

@@ -7,6 +7,7 @@
 #include "DeskNoteView.h"
 #include "FontColourWindow.h"
 #include <Invoker.h>
+#include <LayoutBuilder.h>
 #include <Message.h>
 #include <SupportKit.h>
 #include <OS.h>
@@ -53,9 +54,8 @@ DeskNoteView::DeskNoteView(BRect rect)
 	textView -> SetText (defaultText, strlen (defaultText));
 	AddChild (textView);
 	SetViewColor (B_TRANSPARENT_COLOR);
-	background.red = background.green = 255;
-	background.blue = 0;
-	foreground.red = foreground.green = foreground.blue = 0;
+	background = kDefaultBackgroundColor;
+	foreground = kDefaultForegroundColor;
 	CascadeFontAndColour();
 	propertiesWindow = NULL;
 }
@@ -214,30 +214,57 @@ void DeskNoteView::MouseDown(BPoint point)
 		if (resizeThread > 0) resume_thread (resizeThread);
 
 	} else if (mouseButtons == B_SECONDARY_MOUSE_BUTTON) {
-		popupMenu = new BPopUpMenu ("Popup Menu!");
-		popupMenu -> SetTargetForItems ((BHandler *)this);
-		msg = new BMessage (B_ABOUT_REQUESTED);
-		menuItem = new BMenuItem ("About Desknotes", msg);
-		popupMenu -> AddItem (menuItem);
-		msg = new BMessage (DN_FNT_CLR);
-		menuItem = new BMenuItem ("Properties", msg);
-		popupMenu -> AddItem (menuItem);
-
-		// If we are replicant add the launch desknotes command to the menu.
-		if (WeAreAReplicant) {
-			msg = new BMessage (DN_LAUNCH);
-			menuItem = new BMenuItem ("Launch DeskNotes", msg);
-			popupMenu -> AddItem (menuItem);
-		}
-		menuItem = popupMenu -> Go (ConvertToScreen (mousePoint), false, false, false);
-		if (menuItem) {
-			Window () -> PostMessage (menuItem -> Message(), (BHandler *)this);
-		}
-		delete popupMenu;
+		_ShowContextMenu(mousePoint);
 	}
 }
 
 
+void DeskNoteView::_ShowContextMenu(BPoint where)
+{
+	bool isRedo;
+	undo_state state = textView->UndoState(&isRedo);
+	bool isUndo = state != B_UNDO_UNAVAILABLE && !isRedo;
+
+	int32 start;
+	int32 finish;
+	textView->GetSelection(&start, &finish);
+
+	bool canEdit = textView->IsEditable();
+	int32 length = textView->TextLength();
+
+	BPopUpMenu* menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
+
+	BLayoutBuilder::Menu<>(menu)
+		.AddItem("Undo", B_UNDO/*, 'Z'*/)
+			.SetEnabled(canEdit && isUndo)
+		.AddItem("Redo", B_UNDO/*, 'Z', B_SHIFT_KEY*/)
+			.SetEnabled(canEdit && isRedo)
+		.AddSeparator()
+		.AddItem("Cut", B_CUT, 'X')
+			.SetEnabled(canEdit && start != finish)
+		.AddItem("Copy", B_COPY, 'C')
+			.SetEnabled(start != finish)
+		.AddItem("Paste", B_PASTE, 'V')
+			.SetEnabled(canEdit && be_clipboard->SystemCount() > 0)
+		.AddSeparator()
+		.AddItem("Select All", B_SELECT_ALL, 'A')
+			.SetEnabled(!(start == 0 && finish == length))
+		// custom menu
+		.AddSeparator()
+		.AddItem("About Desknotes" B_UTF8_ELLIPSIS, new BMessage (B_ABOUT_REQUESTED))
+		.AddItem("Properties" B_UTF8_ELLIPSIS, new BMessage (DN_FNT_CLR))
+	;
+
+	// If we are replicant add the launch desknotes command to the menu.
+	if (WeAreAReplicant) {
+		menu -> AddItem (new BMenuItem ("Launch DeskNotes" , new BMessage (DN_LAUNCH)));
+	}
+
+	menu->SetTargetForItems(textView);
+	ConvertToScreen(&where);
+	menu->Go(where, true, true, true);
+}
+
 void DeskNoteView::CascadeFontAndColour (void)
 {
 	BFont fnt;

DeskNoteView.h

@@ -49,6 +49,7 @@ class DeskNoteView : public BView
 		static const char aboutText[];
 
 	private:
+		void _ShowContextMenu(BPoint where);
 		bool WeAreAReplicant;
 		DeskNoteTextView *textView;
 		BRect ourSize;

DeskNoteWindow.cpp

@@ -7,7 +7,7 @@
 #include "DeskNoteWindow.h"
 
 DeskNoteWindow::DeskNoteWindow (BRect rect):BWindow (rect,
-	"DeskNotes", B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_RESIZABLE)
+	"DeskNotes", B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_AUTO_UPDATE_SIZE_LIMITS)
 {
 	// B_TITLED_WINDOW_LOOK
 

FontColourWindow.cpp

@@ -4,75 +4,105 @@
 // Date: $Date: 2011/03/20 21:57:39 $
 #include "FontColourWindow.h"
 // Bring the maths library in.
+
 #include <math.h>
+#include <MenuField.h>
+#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
 
 FontColourWindow::FontColourWindow(
 		BRect rect, BMessenger *msg, BMessage *initial)
 	:
 	BWindow (rect, "DeskNotes",
-			B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_RESIZABLE)
+			B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS | B_ASYNCHRONOUS_CONTROLS)
 {
 	// B_TITLED_WINDOW_LOOK
-	BRect viewSize, otherSize;
-	font_height fntHeight;
-	int y;
 	messenger = new BMessenger (*msg);
-	BMessage *modelMsg;
-	const char *pointer;
 	ssize_t dataSize;
 	const void *dataPointer;
 
 	// Take a copy of the inital values to restore to if we cancel.
-	orginalSettings = new BMessage (*initial);
-	be_plain_font -> GetHeight (&fntHeight);
-	y = (int)ceil (fntHeight.ascent + fntHeight.descent + fntHeight.leading) + 2;
-	viewSize.Set (0, 0 , (rect.right - rect.left), (int)ceil (fntHeight.ascent) + 2);
-	initial -> FindString ("title", &pointer);
-	title = new BStringView (viewSize, "The Title", pointer);
-	title -> SetAlignment (B_ALIGN_CENTER);
-	AddChild (title);
-
+	orginalSettings = new BMessage(*initial);
 	// Now find out what font we start with, and what colour we use.
 	initial -> FindData ("background_colour", B_RGB_COLOR_TYPE, &dataPointer, &dataSize);
 	background = (*(rgb_color *)dataPointer);
+	originalBackground = background;
 
 	initial -> FindData ("foreground_colour", B_RGB_COLOR_TYPE, &dataPointer, &dataSize);
 	foreground = (*(rgb_color *)dataPointer);
+	originalForeground = foreground;
 
 	initial -> FindData ("font_family_name", B_STRING_TYPE, &dataPointer, &dataSize);
 	strncpy(fontFamily, (const char*)dataPointer, dataSize);
 
 	initial -> FindData ("font_face", B_UINT16_TYPE, &dataPointer, &dataSize);
 	fontFace = (*(uint16 *)dataPointer);
 
-	viewSize.OffsetBy (3, viewSize.bottom + 2);
-	colourMenu = new BMenuBar (viewSize, "Colour Menu", 0);
 	colourPopupMenu = new BPopUpMenu ("Background Colour");
-	modelMsg = new BMessage (DN_COLOUR_MENU);
-	backgroundColourItem = new BMenuItem ("Background Colour", modelMsg);
-	modelMsg = new BMessage (DN_COLOUR_MENU);
-	foregroundColourItem = new BMenuItem ("Foreground Colour", modelMsg);
-	currentSelection = backgroundColourItem;
+	backgroundColourItem = new BMenuItem ("Background Colour", new BMessage (DN_COLOUR_MENU));
+	foregroundColourItem = new BMenuItem ("Foreground Colour",  new BMessage (DN_COLOUR_MENU));
+
 	colourPopupMenu -> AddItem (backgroundColourItem);
 	colourPopupMenu -> AddItem (foregroundColourItem);
+	backgroundColourItem -> SetMarked(true);
+
+	colourMenu = new BMenuField(rect, "", "", colourPopupMenu);
+
+	colourMenu->SetDivider(0);
 	colourPopupMenu -> SetTargetForItems (this);
-	colourMenu -> AddItem (colourPopupMenu);
-	AddChild (colourMenu);
-	otherSize = colourMenu -> Bounds();
-	viewSize.OffsetBy (0, otherSize.bottom - otherSize.top + 2);
-	modelMsg = new BMessage (DN_COLOUR_CHANGE);
-	colourControl = new BColorControl (viewSize.LeftTop (),
-			B_CELLS_32x8, 2, "Colour Selector", modelMsg);
-	AddChild (colourControl);
+	colourControl = new BColorControl (B_ORIGIN,
+			B_CELLS_32x8, 8.0, "Colour Selector", new BMessage (DN_COLOUR_CHANGE));
 	colourControl -> SetValue (background);
 
+	defaultsButton = new BButton ("Defaults", "Defaults", new BMessage (DN_PROPERTIES_DEFAULTS));
 	// Add the revert button, taking away the border added earlier.
-	viewSize.OffsetTo (-3, colourControl -> Frame().bottom + 2);
-	viewSize.left += 70;
-	viewSize.right -= 70;
-	modelMsg = new BMessage (DN_PROPERTIES_REVERT);
-	revertButton = new BButton (viewSize, "Revert", "Revert", modelMsg);
-	AddChild (revertButton);
+	revertButton = new BButton ("Revert", "Revert", new BMessage (DN_PROPERTIES_REVERT));
+
+	SetLayout(new BGroupLayout(B_VERTICAL));
+
+	AddChild(BLayoutBuilder::Group<>(B_VERTICAL)
+		.Add(colourMenu)
+		.Add(colourControl)
+		.AddGroup(B_HORIZONTAL)
+			.Add(defaultsButton)
+			.Add(revertButton)
+			.AddGlue()
+		.End()
+		.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
+			B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
+	);
+	_CheckButtons();
+}
+
+
+bool FontColourWindow::IsDefaultsColor ()
+{
+	return background == kDefaultBackgroundColor
+		&& foreground == kDefaultForegroundColor;
+}
+
+
+bool FontColourWindow::IsRevertableColor ()
+{
+	return background != originalBackground
+		|| foreground != originalForeground;
+
+}
+
+
+void FontColourWindow::_CheckButtons()
+{
+	defaultsButton->SetEnabled(!IsDefaultsColor());
+	revertButton->SetEnabled(IsRevertableColor());
+}
+
+
+void FontColourWindow::_UpdateColorControl()
+{
+	if (colourPopupMenu->FindMarked() == backgroundColourItem)
+		colourControl -> SetValue (background);
+	if (colourPopupMenu->FindMarked() == foregroundColourItem)
+		colourControl -> SetValue (foreground);
 }
 
 
@@ -82,34 +112,48 @@ void FontColourWindow::MessageReceived (BMessage *msg)
 	BMessage *newMsg;
 	switch (msg -> what) {
 		case DN_COLOUR_MENU:
-			msg -> FindPointer ("source", &pointer);
-			if ((BMenuItem *) pointer != currentSelection) {
-				currentSelection = (BMenuItem *) pointer;
-				if (currentSelection == backgroundColourItem)
+				if (colourPopupMenu->FindMarked() == backgroundColourItem)
 					colourControl -> SetValue (background);
-				if (currentSelection == foregroundColourItem)
+				if (colourPopupMenu->FindMarked() == foregroundColourItem)
 					colourControl -> SetValue (foreground);
-			}
 			break;
 
 		case DN_COLOUR_CHANGE:
 			newMsg = new BMessage (orginalSettings->what);
-			if (currentSelection == backgroundColourItem)
+			if (colourPopupMenu->FindMarked() == backgroundColourItem)
 				background = colourControl -> ValueAsColor();
-			if (currentSelection == foregroundColourItem)
+			if (colourPopupMenu->FindMarked() == foregroundColourItem)
 				foreground = colourControl -> ValueAsColor();
 			newMsg -> AddData ("background_colour",
 					B_RGB_COLOR_TYPE, &background, sizeof (rgb_color));
 			newMsg -> AddData ("foreground_colour",
 					B_RGB_COLOR_TYPE, &foreground, sizeof (rgb_color));
 			messenger -> SendMessage (newMsg);
 			delete newMsg;
+			_CheckButtons();
 			break;
 
 		case DN_PROPERTIES_REVERT:
 			// Restore the original settings.
 			messenger -> SendMessage (orginalSettings);
+			background = originalBackground;
+			foreground = originalForeground;
+			_UpdateColorControl();
+			_CheckButtons();
+			break;
+
+		case DN_PROPERTIES_DEFAULTS: {
+			// Restore the default settings.
+			BMessage defaultSettings(*orginalSettings);
+			background = kDefaultBackgroundColor;
+			foreground = kDefaultForegroundColor;
+			defaultSettings.ReplaceData ("background_colour", B_RGB_COLOR_TYPE, &background, sizeof (rgb_color));
+			defaultSettings.ReplaceData ("foreground_colour", B_RGB_COLOR_TYPE, &foreground, sizeof (rgb_color));
+			messenger -> SendMessage (&defaultSettings);
+			_UpdateColorControl();
+			_CheckButtons();
 			break;
+		}
 
 		case DN_PROPERTIES_URGENT_CLOSE:
 			// We need to close quickly - no messages should be sent back.

FontColourWindow.h

@@ -10,9 +10,13 @@
 #define DN_COLOUR_MENU 'dnCM'
 #define DN_COLOUR_CHANGE 'dnCH'
 #define DN_PROPERTIES_REVERT 'dnRT'
+#define DN_PROPERTIES_DEFAULTS 'dnDF'
 #define DN_PROPERTIES_CLOSE 'dnCL'
 #define DN_PROPERTIES_URGENT_CLOSE 'dnUC'
 
+const rgb_color kDefaultBackgroundColor = { 255, 255, 0, 255 };
+const rgb_color kDefaultForegroundColor = { 0, 0, 0, 255 };
+
 
 class FontColourWindow : public BWindow
 {
@@ -22,17 +26,22 @@ class FontColourWindow : public BWindow
 		~FontColourWindow ();
 
 		bool QuitRequested ();
+		bool IsDefaultsColor ();
+		bool IsRevertableColor ();
+
 
 		static void CalculateWindowFrame (BRect *windowFrame, BRect parentFrame);
 
 	private:
+		void _CheckButtons();
+		void _UpdateColorControl();
 		BMessenger *messenger;
 		BMessage *orginalSettings;
 		int fontSize;
 		font_family fontFamily;
 		uint16 fontFace;
 		rgb_color background, foreground;
-
+		rgb_color originalBackground, originalForeground;
 		// The interface components go here.
 		// The Font family
 		BMenuBar *fontFamilyMenu;
@@ -41,17 +50,17 @@ class FontColourWindow : public BWindow
 		// The font size.
 		BMenuBar *fontSizeMenu;
 		// Whether to change the foreground or background colours.
-		BMenuBar *colourMenu;
+		BMenuField *colourMenu;
 		BPopUpMenu *colourPopupMenu;
 		BMenuItem *backgroundColourItem;
 		BMenuItem *foregroundColourItem;
-		BMenuItem *currentSelection;
 		BColorControl *colourControl;
 
 		BStringView *title;
 		BTextView *exampleText;
 
 		BButton *revertButton;
+		BButton *defaultsButton;
 };
 
 #endif