- As promised, style cleanup. Hey, it's not even in the build atm, just

noticed :-D


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27160 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/preferences/appearance/MenuView.cpp

@@ -1,3 +1,11 @@
+/*
+ * Copyright 2005-2008, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		<unknown, please fill in who knows>		
+ */
+
 #include "MenuView.h"
 #include <Roster.h>
 #include <Message.h>
@@ -11,6 +19,7 @@
 #define SET_DEFAULTS 'sdef'
 #define REVERT_SETTINGS 'rvst'
 
+
 MenuView::MenuView(BRect frame, const char *name, int32 resize, int32 flags)
 	: BView(frame, name, resize, flags)
 {
@@ -74,45 +83,37 @@ MenuView::MenuView(BRect frame, const char *name, int32 resize, int32 flags)
 	switch((int32)menuinfo.font_size)
 	{
 		case 10:
-		{
 			item = fontsizemenu->FindItem("10");
 			break;
-		}
+		
 		case 11:
-		{
 			item = fontsizemenu->FindItem("11");
 			break;
-		}
+		
 		case 12:
-		{
 			item = fontsizemenu->FindItem("12");
 			break;
-		}
+		
 		case 14:
-		{
 			item = fontsizemenu->FindItem("14");
 			break;
-		}
+		
 		case 18:
-		{
 			item = fontsizemenu->FindItem("18");
 			break;
-		}
+		
 		case 20:
-		{
 			item = fontsizemenu->FindItem("20");
 			break;
-		}
+		
 		case 22:
-		{
 			item = fontsizemenu->FindItem("22");
 			break;
-		}
+			
 		case 24:
-		{
 			item = fontsizemenu->FindItem("24");
 			break;
-		}
+			
 		default:
 		{
 			char fontsizestr[10];
@@ -126,7 +127,6 @@ MenuView::MenuView(BRect frame, const char *name, int32 resize, int32 flags)
 	}
 	item->SetMarked(true);	
 	
-	
 	BRect r(10, 10, 210, 40);
 	r.OffsetTo((Bounds().Width() - r.Width()) / 2, 10);
 	fontfield=new BMenuField(r, "fontfield", "", fontmenu);
@@ -175,7 +175,6 @@ MenuView::MenuView(BRect frame, const char *name, int32 resize, int32 flags)
 	revertbutton = new BButton(r, "revertbutton", "Revert", new BMessage(REVERT_SETTINGS));
 	revertbutton->ResizeToPreferred();	
 	
-	
 	defaultsbutton->MoveTo( (Bounds().Width() -
 			(defaultsbutton->Bounds().Width() + revertbutton->Bounds().Width() + 10)) / 2,
 			radiobox->Frame().bottom + 20);
@@ -184,17 +183,18 @@ MenuView::MenuView(BRect frame, const char *name, int32 resize, int32 flags)
 	AddChild(defaultsbutton);
 	AddChild(revertbutton);
 	revertbutton->SetEnabled(false);	
-	
 }
 
+
 MenuView::~MenuView(void)
 {
 }
 
-void MenuView::AttachedToWindow(void)
+
-{
+void
-	for(int32 i=0; i<fontmenu->CountItems(); i++)
+MenuView::AttachedToWindow(void)
 {
+	for(int32 i = 0; i < fontmenu->CountItems(); i++) {
 		BMenu *menu = fontmenu->SubmenuAt(i);
 		if (menu)
 			menu->SetTargetForItems(this);
@@ -208,15 +208,15 @@ void MenuView::AttachedToWindow(void)
 	revertbutton->SetTarget(this);
 }
 
-void MenuView::MessageReceived(BMessage *msg)
+
-{
+void
-	switch(msg->what)
+MenuView::MessageReceived(BMessage *msg)
 {
+	switch(msg->what) {
 		case B_MODIFIERS_CHANGED:
-		{
 			MarkCommandKey();
 			break;
-		}
+			
 		case MENU_FONT_FAMILY:
 		case MENU_FONT_STYLE:
 		{
@@ -247,34 +247,30 @@ void MenuView::MessageReceived(BMessage *msg)
 			break;
 		}	
 		case ALT_COMMAND:
-		{
 			if (!revert)
 				revertbutton->SetEnabled(true);
 			revert = true;
 			altcommand = true;
 			SetCommandKey(altcommand);
 			break;
-		}
+			
 		case CTRL_COMMAND:
-		{
 			if (!revert)
 				revertbutton->SetEnabled(true);
 			revert = true;
 			altcommand = false;
 			SetCommandKey(altcommand);
 			break;
-		}
+			
 		case TOGGLE_TRIGGERS:
-		{
 			if (!revert)
 				revertbutton->SetEnabled(true);
 			revert = true;
 			menuinfo.triggers_always_shown = (showtriggers->Value() == B_CONTROL_ON);
 			set_menu_info(&menuinfo);
 			break;
-		}
+			
 		case REVERT_SETTINGS:
-		{
 			revert = false;
 			revertbutton->SetEnabled(false);
 			SetCommandKey(revertaltcmd);
@@ -282,12 +278,11 @@ void MenuView::MessageReceived(BMessage *msg)
 			MarkCommandKey();
 			menuinfo = revertinfo;
 			fontmenu->Update();
-			showtriggers->SetValue( (menuinfo.triggers_always_shown)?B_CONTROL_ON:B_CONTROL_OFF);
+			showtriggers->SetValue(menuinfo.triggers_always_shown ? B_CONTROL_ON : B_CONTROL_OFF);
 			set_menu_info(&revertinfo);
 			break;
-		}
+	
 		case SET_DEFAULTS:
-		{
 			if (!revert)
 				revertbutton->SetEnabled(true);
 			revert = true;
@@ -302,16 +297,18 @@ void MenuView::MessageReceived(BMessage *msg)
 			altcommand = true;
 			SetCommandKey(altcommand);
 			MarkCommandKey();
-			showtriggers->SetValue( (menuinfo.triggers_always_shown)?B_CONTROL_ON:B_CONTROL_OFF);
+			showtriggers->SetValue(menuinfo.triggers_always_shown ? B_CONTROL_ON : B_CONTROL_OFF);
 			break;
-		}
+	
 		default:
 			BView::MessageReceived(msg);
 			break;
 	}
 }
 
-void MenuView::MarkCommandKey(void)
+
+void
+MenuView::MarkCommandKey(void)
 {
 	key_map *keys; 
 	char *chars; 
@@ -330,20 +327,16 @@ void MenuView::MarkCommandKey(void)
 		ctrlcmd->SetValue(B_CONTROL_ON);
 }
 
-void MenuView::SetCommandKey(bool use_alt)
+
-{
+void
-	if(use_alt)
+MenuView::SetCommandKey(bool useAlt)
 {
+	if (useAlt)	{
 		set_modifier_key(B_LEFT_COMMAND_KEY, 0x5d);
 		set_modifier_key(B_LEFT_CONTROL_KEY, 0x5c);
-		
+	} else {
-		be_roster->Broadcast(new BMessage(B_MODIFIERS_CHANGED));
-	}
-	else
-	{
 		set_modifier_key(B_LEFT_COMMAND_KEY, 0x5c);
 		set_modifier_key(B_LEFT_CONTROL_KEY, 0x5d);
-
+	}
 	be_roster->Broadcast(new BMessage(B_MODIFIERS_CHANGED));
 }
-}

src/preferences/appearance/MenuView.h

@@ -1,3 +1,10 @@
+/*
+ * Copyright 2005-2008, Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		<unknown, please fill in who knows>		
+ */
 #ifndef MENUVIEW_H_
 #define MENUVIEW_H_
 
@@ -21,6 +28,7 @@ public:
 	void 	MessageReceived(BMessage *msg);
 	void 	MarkCommandKey(void);
 	void 	SetCommandKey(bool use_alt);
+	
 private:
 	BMenuField 		*fontfield, *fontsizefield;
 	BMenu 			*fontsizemenu;