[developerteam getadooble] SF.net SVN: dooble:[1987] trunk/browser

[<tex...@us...>]

Revision: 1987
          http://dooble.svn.sourceforge.net/dooble/?rev=1987&view=rev
Author:   textfield
Date:     2011-02-21 15:49:06 +0000 (Mon, 21 Feb 2011)

Log Message:
-----------
Bug fix... set the current tab's widget to the newly-created page.
Another bug fix in the works. Opening a new tab will set the
url widget's contents to the new tab's url. Not good.

Modified Paths:
--------------
    trunk/browser/Include/dooble.h
    trunk/browser/Source/dooble.cc
    trunk/browser/Source/dwebpage.cc

Modified: trunk/browser/Include/dooble.h
===================================================================
--- trunk/browser/Include/dooble.h	2011-02-21 15:08:19 UTC (rev 1986)
+++ trunk/browser/Include/dooble.h	2011-02-21 15:49:06 UTC (rev 1987)
@@ -77,6 +77,7 @@
   void copyLink(const QUrl &url);
   void closeTab(const int index);
   void closeEvent(QCloseEvent *event);
+  void setCurrentPage(dview *p);
 
  private:
   int m_lastReplacedHistoryPosition;

Modified: trunk/browser/Source/dooble.cc
===================================================================
--- trunk/browser/Source/dooble.cc	2011-02-21 15:08:19 UTC (rev 1986)
+++ trunk/browser/Source/dooble.cc	2011-02-21 15:49:06 UTC (rev 1987)
@@ -1694,8 +1694,9 @@
 	   allKeys[i].contains("myRetrievedFiles")))
 	continue;
 
-      QUrl url(QUrl::fromUserInput(dooble::s_settings.value(allKeys[i],
-							    "").toString().trimmed()));
+      QUrl url(QUrl::fromUserInput(dooble::s_settings.value
+				   (allKeys[i],
+				    "").toString().trimmed()));
 
       if(url.isValid())
 	{
@@ -1882,7 +1883,8 @@
   dview *p = newTab(url);
 
   if(p)
-    if(dooble::s_settings.value("settingsWindow/proceedToNewTab", true).toBool())
+    if(dooble::s_settings.value("settingsWindow/proceedToNewTab",
+				true).toBool())
       ui.tabWidget->setCurrentWidget(p);
 }
 
@@ -2519,7 +2521,8 @@
 {
   QSettings settings;
 
-  settings.setValue("mainWindow/showHiddenFiles", ui.actionShow_Hidden_Files->isChecked());
+  settings.setValue("mainWindow/showHiddenFiles",
+		    ui.actionShow_Hidden_Files->isChecked());
   dooble::s_settings["mainWindow/showHiddenFiles"] =
     ui.actionShow_Hidden_Files->isChecked();
 
@@ -3056,3 +3059,9 @@
 	ui.splitter->saveState();
     }
 }
+
+void dooble::setCurrentPage(dview *p)
+{
+  if(p)
+    ui.tabWidget->setCurrentWidget(p);
+}

Modified: trunk/browser/Source/dwebpage.cc
===================================================================
--- trunk/browser/Source/dwebpage.cc	2011-02-21 15:08:19 UTC (rev 1986)
+++ trunk/browser/Source/dwebpage.cc	2011-02-21 15:49:06 UTC (rev 1987)
@@ -422,6 +422,11 @@
 
       dview *new_page = findDooble()->newTab(url);
 
+      /*
+      ** The new page must be set as the tab's current widget.
+      */
+
+      findDooble()->setCurrentPage(new_page);
       return new_page->page();
     }
   else if(m_navigationSuggestedAction == DoobleNavigationType::NewWindow)


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