Added AccountDialog and AccountView, previously the code was in PreferencesAccounts.cpp.

application/Jamfile

@@ -29,7 +29,9 @@ Application caya :
 	WindowsManager.cpp
 
 	# preferences
+	AccountDialog.cpp
 	AccountListItem.cpp
+	AccountView.cpp
 	PreferencesDialog.cpp
 	PreferencesAccounts.cpp
 

application/preferences/AccountDialog.cpp

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2009-2010, Pier Luigi Fiorini. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Pier Luigi Fiorini, pierluigi.fiorini@gmail.com
+ */
+
+#include <Button.h>
+#include <ControlLook.h>
+#include <GroupLayout.h>
+#include <GroupLayoutBuilder.h>
+#include <TextControl.h>
+#include <String.h>
+
+#include <libinterface/Divider.h>
+
+#include "AccountDialog.h"
+#include "AccountView.h"
+#include "ProtocolSettings.h"
+
+const uint32 kCancel       = 'CANC';
+const uint32 kOK           = 'SAVE';
+
+
+AccountDialog::AccountDialog(const char* title, CayaProtocol* cayap,
+							 const char* account = NULL)
+	: BWindow(BRect(0, 0, 1, 1), title, B_MODAL_WINDOW, B_NOT_RESIZABLE |
+		B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE)
+{
+	fSettings = new ProtocolSettings(cayap);
+
+	fAccountName = new BTextControl("accountName", "Account name:", NULL, NULL);
+	fAccountName->SetFont(be_bold_font);
+	if (account) {
+		fAccountName->SetText(account);
+		fAccountName->SetEnabled(false);
+	} else
+		fAccountName->MakeFocus(true);
+
+	Divider* divider = new Divider("divider", B_WILL_DRAW);
+
+	fTop = new AccountView("top");
+	if (account)
+		fSettings->Load(account, fTop);
+	else
+		fSettings->LoadTemplate(fTop);
+
+	BButton* cancel = new BButton("Cancel", new BMessage(kCancel));
+	BButton* ok = new BButton("OK", new BMessage(kOK));
+
+	const float spacing = be_control_look->DefaultItemSpacing();
+
+	SetLayout(new BGroupLayout(B_VERTICAL, spacing));
+	AddChild(BGroupLayoutBuilder(B_VERTICAL, spacing)
+		.Add(fAccountName)
+		.Add(divider)
+		.Add(fTop)
+		.AddGroup(B_HORIZONTAL, spacing)
+			.AddGlue()
+			.Add(cancel)
+			.Add(ok)
+		.End()
+		.AddGlue()
+		.SetInsets(spacing, spacing, spacing, 0)
+	);
+
+	CenterOnScreen();
+}
+
+
+void
+AccountDialog::MessageReceived(BMessage* msg)
+{
+	switch (msg->what) {
+		case kOK:
+			if (fSettings->Save(fAccountName->Text(), fTop) == B_OK)
+				Close();
+// TODO: Error!
+			break;
+		case kCancel:
+			Close();
+			break;
+		case kChanged:
+			msg->PrintToStream();
+			break;
+		default:
+			BWindow::MessageReceived(msg);
+	}
+}

application/preferences/AccountDialog.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2009-2010, Pier Luigi Fiorini. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _ACCOUNT_DIALOG_H
+#define _ACCOUNT_DIALOG_H
+
+#include <Window.h>
+
+class BTextControl;
+
+class AccountView;
+class CayaProtocol;
+class ProtocolSettings;
+
+class AccountDialog : public BWindow {
+public:
+						AccountDialog(const char* title, CayaProtocol* cayap,
+					    	          const char* account = NULL);
+
+	virtual	void		MessageReceived(BMessage* msg);
+
+private:
+	ProtocolSettings*	fSettings;
+	AccountView*		fTop;
+	BTextControl*		fAccountName;
+};
+
+#endif	// _ACCOUNT_DIALOG_H

application/preferences/AccountView.cpp

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2009-2010, Pier Luigi Fiorini. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Pier Luigi Fiorini, pierluigi.fiorini@gmail.com
+ */
+
+#include <Button.h>
+#include <ControlLook.h>
+#include <CheckBox.h>
+#include <GroupLayout.h>
+#include <GroupLayoutBuilder.h>
+#include <PopUpMenu.h>
+#include <MenuField.h>
+#include <MenuItem.h>
+#include <ScrollView.h>
+#include <TextControl.h>
+#include <Window.h>
+
+#include <libinterface/NotifyingTextView.h>
+
+#include "AccountView.h"
+
+
+AccountView::AccountView(const char* name)
+	: BView(name, B_WILL_DRAW)
+{
+}
+
+
+void
+AccountView::AttachedToWindow()
+{
+	// Once we are attached to window, the GUI is already created
+	// so we can set our window as target for messages
+	for (int32 i = 0; i < CountChildren(); i++) {
+		BView* child = ChildAt(i);
+
+		BMenu* menu = dynamic_cast<BMenu*>(child);
+		BMenuField* menuField
+			= dynamic_cast<BMenuField*>(child);
+		BTextControl* textControl
+			= dynamic_cast<BTextControl*>(child);
+		NotifyingTextView* textView
+			= dynamic_cast<NotifyingTextView*>(child);
+		BCheckBox* checkBox = dynamic_cast<BCheckBox*>(child);
+
+		if (menuField)
+			menu = menuField->Menu();
+
+		if (menu) {
+			for (int32 j = 0; j < menu->CountItems(); j++) {
+				BMenuItem* item = menu->ItemAt(j);
+				item->SetMessage(new BMessage(kChanged));
+				item->SetTarget(Window());
+			}
+
+			menu->SetTargetForItems(Window());
+		}
+
+		if (textControl) {
+			textControl->SetMessage(new BMessage(kChanged));
+			textControl->SetTarget(Window());
+		}
+
+		if (checkBox) {
+			checkBox->SetMessage(new BMessage(kChanged));
+			checkBox->SetTarget(Window());
+		}
+
+		if (textView) {
+			textView->SetMessage(new BMessage(kChanged));
+			textView->SetTarget(Window());
+		}
+	}
+}

application/preferences/AccountView.h

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2009-2010, Pier Luigi Fiorini. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _ACCOUNT_VIEW_H
+#define _ACCOUNT_VIEW_H
+
+#include <View.h>
+
+const uint32 kChanged      = 'CHGD';
+
+class AccountView : public BView {
+public:
+					AccountView(const char* name);
+
+	virtual	void	AttachedToWindow();
+};
+
+#endif	// _ACCOUNT_VIEW_H

application/preferences/PreferencesAccounts.cpp

@@ -8,21 +8,16 @@
 
 #include <Button.h>
 #include <ControlLook.h>
-#include <CheckBox.h>
 #include <GroupLayout.h>
 #include <GroupLayoutBuilder.h>
 #include <ListView.h>
 #include <PopUpMenu.h>
-#include <MenuField.h>
 #include <ScrollView.h>
-#include <TextControl.h>
-#include <Window.h>
 
 #include <libinterface/BitmapMenuItem.h>
-#include <libinterface/Divider.h>
-#include <libinterface/NotifyingTextView.h>
 #include <libinterface/ToolButton.h>
 
+#include "AccountDialog.h"
 #include "AccountListItem.h"
 #include "CayaProtocol.h"
 #include "PreferencesAccounts.h"
@@ -34,138 +29,6 @@ const uint32 kEditAccount  = 'EDAC';
 const uint32 kDelAccount   = 'DLAC';
 const uint32 kSelect       = 'SELT';
 
-const uint32 kCancel       = 'CANC';
-const uint32 kOK           = 'SAVE';
-
-const uint32 kChanged      = 'CHGD';
-
-
-class AccountView : public BView {
-public:
-	AccountView(const char* name)
-		: BView(name, B_WILL_DRAW)
-	{
-	}
-
-	void AttachedToWindow()
-	{
-		// Once we are attached to window, the GUI is already created
-		// so we can set our window as target for messages
-		for (int32 i = 0; i < CountChildren(); i++) {
-			BView* child = ChildAt(i);
-
-			BMenu* menu = dynamic_cast<BMenu*>(child);
-			BMenuField* menuField
-				= dynamic_cast<BMenuField*>(child);
-			BTextControl* textControl
-				= dynamic_cast<BTextControl*>(child);
-			NotifyingTextView* textView
-				= dynamic_cast<NotifyingTextView*>(child);
-			BCheckBox* checkBox = dynamic_cast<BCheckBox*>(child);
-
-			if (menuField)
-				menu = menuField->Menu();
-
-			if (menu) {
-				for (int32 j = 0; j < menu->CountItems(); j++) {
-					BMenuItem* item = menu->ItemAt(j);
-					item->SetMessage(new BMessage(kChanged));
-					item->SetTarget(Window());
-				}
-
-				menu->SetTargetForItems(Window());
-			}
-
-			if (textControl) {
-				textControl->SetMessage(new BMessage(kChanged));
-				textControl->SetTarget(Window());
-			}
-
-			if (checkBox) {
-				checkBox->SetMessage(new BMessage(kChanged));
-				checkBox->SetTarget(Window());
-			}
-
-			if (textView) {
-				textView->SetMessage(new BMessage(kChanged));
-				textView->SetTarget(Window());
-			}
-		}
-	}
-};
-
-
-class AccountDialog : public BWindow {
-public:
-	AccountDialog(const char* title, CayaProtocol* cayap, const char* account = NULL)
-		: BWindow(BRect(0, 0, 1, 1), title, B_MODAL_WINDOW, B_NOT_RESIZABLE |
-			B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE)
-	{
-		fSettings = new ProtocolSettings(cayap);
-
-		fAccountName = new BTextControl("accountName", "Account name:", NULL, NULL);
-		fAccountName->SetFont(be_bold_font);
-		if (account) {
-			fAccountName->SetText(account);
-			fAccountName->SetEnabled(false);
-		} else
-			fAccountName->MakeFocus(true);
-
-		Divider* divider = new Divider("divider", B_WILL_DRAW);
-
-		fTop = new AccountView("top");
-		if (account)
-			fSettings->Load(account, fTop);
-		else
-			fSettings->LoadTemplate(fTop);
-
-		BButton* cancel = new BButton("Cancel", new BMessage(kCancel));
-		BButton* ok = new BButton("OK", new BMessage(kOK));
-
-		const float spacing = be_control_look->DefaultItemSpacing();
-
-		SetLayout(new BGroupLayout(B_VERTICAL, spacing));
-		AddChild(BGroupLayoutBuilder(B_VERTICAL, spacing)
-			.Add(fAccountName)
-			.Add(divider)
-			.Add(fTop)
-			.AddGroup(B_HORIZONTAL, spacing)
-				.AddGlue()
-				.Add(cancel)
-				.Add(ok)
-			.End()
-			.AddGlue()
-			.SetInsets(spacing, spacing, spacing, 0)
-		);
-
-		CenterOnScreen();
-	}
-
-	void MessageReceived(BMessage* msg)
-	{
-		switch (msg->what) {
-			case kOK:
-				if (fSettings->Save(fAccountName->Text(), fTop) == B_OK)
-					Close();
-// TODO: Error!
-				break;
-			case kCancel:
-				Close();
-				break;
-			case kChanged:
-				msg->PrintToStream();
-				break;
-			default:
-				BWindow::MessageReceived(msg);
-		}
-	}
-
-private:
-	ProtocolSettings*	fSettings;
-	AccountView*		fTop;
-	BTextControl*		fAccountName;
-};
-
 
 PreferencesAccounts::PreferencesAccounts()
 	: BView("Accounts", B_WILL_DRAW)

application/preferences/PreferencesDialog.cpp

@@ -15,7 +15,7 @@
 #include "PreferencesDialog.h"
 #include "PreferencesAccounts.h"
 
-const int32 kOK = 'SAVE';
+const uint32 kApply = 'SAVE';
 
 
 PreferencesDialog::PreferencesDialog()
@@ -25,7 +25,7 @@ PreferencesDialog::PreferencesDialog()
 	BTabView* tabView = new BTabView("tabView", B_WIDTH_AS_USUAL);
 	tabView->AddTab(new PreferencesAccounts());
 
-	BButton* ok = new BButton("OK", new BMessage(kOK));
+	BButton* ok = new BButton("OK", new BMessage(kApply));
 
 	const float spacing = be_control_look->DefaultItemSpacing();
 
@@ -49,7 +49,7 @@ void
 PreferencesDialog::MessageReceived(BMessage* msg)
 {
 	switch (msg->what) {
-		case kOK:
+		case kApply:
 			Close();
 			break;
 		default: