[Themis-devcvs] SF.net SVN: themis:[610] trunk/themis/framework

[CVS C. to T. <the...@li...>]

Revision: 610
          http://themis.svn.sourceforge.net/themis/?rev=610&view=rev
Author:   mark_hellegers
Date:     2011-01-16 14:09:08 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
Moved sending message to open a new url to its own function.

Modified Paths:
--------------
    trunk/themis/framework/win.cpp
    trunk/themis/framework/win.h

Modified: trunk/themis/framework/win.cpp
===================================================================
--- trunk/themis/framework/win.cpp	2011-01-16 13:54:14 UTC (rev 609)
+++ trunk/themis/framework/win.cpp	2011-01-16 14:09:08 UTC (rev 610)
@@ -162,6 +162,19 @@
 
 }
 
+void Win :: SendUrlOpenMessage(const char * aUrl, bool aAddToHistory) {
+	
+	BMessage * message = new BMessage(URL_OPEN);
+	message->AddString("url_to_open", aUrl);
+	if (!aAddToHistory) {
+		message->AddBool("no_history_add", true);
+	}
+	BMessenger msgr(this);
+	msgr.SendMessage(message);
+	delete message;
+
+}
+
 bool Win :: QuitRequested() {
 
  	if (fQuitConfirmed == false) {
@@ -181,6 +194,8 @@
 
 void Win :: MessageReceived(BMessage * msg) {
 
+	msg->PrintToStream();
+
 	switch (msg->what) {
 		case B_ABOUT_REQUESTED: {
 			be_app_messenger.SendMessage(B_ABOUT_REQUESTED);
@@ -221,13 +236,7 @@
 			const char * previous = NULL;
 			previous = ((ThemisTab *)tabview->TabAt(tabview->Selection()))->GetHistory()->GetPreviousEntry();
 			if (previous != NULL) {
-				BMessage * backmsg = new BMessage(URL_OPEN);
-				backmsg->AddString("url_to_open", previous);
-				backmsg->AddBool("no_history_add", true);
-				BMessenger * msgr = new BMessenger(this);
-				msgr->SendMessage(backmsg);
-				delete backmsg;
-				delete msgr;
+				SendUrlOpenMessage(previous, false);
 			}
 			break;
 		}
@@ -235,13 +244,7 @@
 			const char * next = NULL;
 			next = ((ThemisTab *)tabview->TabAt(tabview->Selection()))->GetHistory()->GetNextEntry();
 			if (next != NULL) {
-				BMessage * fwdmsg = new BMessage(URL_OPEN);
-				fwdmsg->AddString("url_to_open", next);
-				fwdmsg->AddBool("no_history_add", true);
-				BMessenger* msgr = new BMessenger(this);
-				msgr->SendMessage(fwdmsg);
-				delete fwdmsg;
-				delete msgr;
+				SendUrlOpenMessage(next, false);
 			}
 			else
 			{
@@ -255,14 +258,7 @@
 		case BUTTON_HOME: {
 			BString homepage;
 			AppSettings->FindString(kPrefsHomePage, &homepage);
-			
-			BMessage * homemsg = new BMessage(URL_OPEN);
-			homemsg->AddString("url_to_open", homepage.String());
-			BMessenger * msgr = new BMessenger(this);
-			msgr->SendMessage(homemsg);
-			delete homemsg;
-			delete msgr;
-
+			SendUrlOpenMessage(homepage.String());
 			break;
 		}
 		case CLOSE_OTHER_TABS: {

Modified: trunk/themis/framework/win.h
===================================================================
--- trunk/themis/framework/win.h	2011-01-16 13:54:14 UTC (rev 609)
+++ trunk/themis/framework/win.h	2011-01-16 14:09:08 UTC (rev 610)
@@ -68,6 +68,8 @@
 		ThemisTabView * tabview;
 		ThemisStatusView * statusview;
 		BBitmap * bitmaps[10];
+		
+		void SendUrlOpenMessage(const char * aUrl, bool aAddToHistory = true);
 
 	public:
 		Win(BRect frame,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.