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

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

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

Log Message:
-----------
Had to revert back to using QWebView's back(), forward(), and reload().

Modified Paths:
--------------
    trunk/browser/Doc/RELEASE-NOTES
    trunk/browser/Include/dfilemanager.h
    trunk/browser/Include/dftpbrowser.h
    trunk/browser/Include/dview.h
    trunk/browser/Source/dfilemanager.cc
    trunk/browser/Source/dftpbrowser.cc
    trunk/browser/Source/dooble.cc
    trunk/browser/Source/dview.cc

Modified: trunk/browser/Doc/RELEASE-NOTES
===================================================================
--- trunk/browser/Doc/RELEASE-NOTES	2011-02-21 13:42:46 UTC (rev 1985)
+++ trunk/browser/Doc/RELEASE-NOTES	2011-02-21 15:08:19 UTC (rev 1986)
@@ -54,6 +54,8 @@
 30. Improved the functionality of the url widget's completer.
 31. Reimplemented QWebPage::javaScriptAlert() as the default implementation
     may cause segmentation faults.
+32. Reusing QWebView's back(), forward(), and reload() methods.
+    (Please refer to version 1.17's item #5.)
 
 1.17
 

Modified: trunk/browser/Include/dfilemanager.h
===================================================================
--- trunk/browser/Include/dfilemanager.h	2011-02-21 13:42:46 UTC (rev 1985)
+++ trunk/browser/Include/dfilemanager.h	2011-02-21 15:08:19 UTC (rev 1986)
@@ -71,10 +71,10 @@
   static QFileSystemModel *treeModel;
   static dfilesystemmodel *tableModel;
   QUrl url(void) const;
-  QUrl back(void);
-  QUrl reload(void);
-  QUrl forward(void);
+  void back(void);
   void load(const QUrl &url);
+  void reload(void);
+  void forward(void);
   QString html(void) const;
   QString title(void) const;
 

Modified: trunk/browser/Include/dftpbrowser.h
===================================================================
--- trunk/browser/Include/dftpbrowser.h	2011-02-21 13:42:46 UTC (rev 1985)
+++ trunk/browser/Include/dftpbrowser.h	2011-02-21 15:08:19 UTC (rev 1986)
@@ -65,11 +65,11 @@
   dftpbrowser(QWidget *parent);
   ~dftpbrowser();
   QUrl url(void) const;
-  QUrl back(void);
-  QUrl reload(void);
-  QUrl forward(void);
+  void back(void);
   void load(const QUrl &url);
   void stop(void);
+  void reload(void);
+  void forward(void);
   QString html(void) const;
   QString title(void) const;
 

Modified: trunk/browser/Include/dview.h
===================================================================
--- trunk/browser/Include/dview.h	2011-02-21 13:42:46 UTC (rev 1985)
+++ trunk/browser/Include/dview.h	2011-02-21 15:08:19 UTC (rev 1986)
@@ -102,12 +102,12 @@
   bool canGoBack(void) const;
   bool canGoForward(void) const;
   QUrl url(void) const;
-  QUrl back(void);
-  QUrl reload(void);
-  QUrl forward(void);
+  void back(void);
   void load(const QUrl &url);
   void stop(void);
   void print(QPrinter *printer);
+  void reload(void);
+  void forward(void);
   void setFocus(void);
   void setTabAction(QAction *action);
   QIcon icon(void) const;

Modified: trunk/browser/Source/dfilemanager.cc
===================================================================
--- trunk/browser/Source/dfilemanager.cc	2011-02-21 13:42:46 UTC (rev 1985)
+++ trunk/browser/Source/dfilemanager.cc	2011-02-21 15:08:19 UTC (rev 1986)
@@ -69,6 +69,10 @@
 	  SIGNAL(clicked(const QModelIndex &)),
 	  this,
 	  SLOT(slotClicked(const QModelIndex &)));
+  connect(ui.treeView,
+	  SIGNAL(activated(const QModelIndex &)),
+	  this,
+	  SLOT(slotClicked(const QModelIndex &)));
   connect(ui.tableView,
 	  SIGNAL(doubleClicked(const QModelIndex &)),
 	  this,
@@ -204,23 +208,19 @@
   return m_url.toString(QUrl::StripTrailingSlash);
 }
 
-QUrl dfilemanager::reload(void)
+void dfilemanager::reload(void)
 {
-  return m_url;
+  load(m_url);
 }
 
-QUrl dfilemanager::back(void)
+void dfilemanager::back(void)
 {
-  dwebhistoryitem item(m_history->back());
-
-  return item.url();
+  load(m_history->back().url());
 }
 
-QUrl dfilemanager::forward(void)
+void dfilemanager::forward(void)
 {
-  dwebhistoryitem item(m_history->forward());
-
-  return item.url();
+  load(m_history->forward().url());
 }
 
 QString dfilemanager::html(void) const

Modified: trunk/browser/Source/dftpbrowser.cc
===================================================================
--- trunk/browser/Source/dftpbrowser.cc	2011-02-21 13:42:46 UTC (rev 1985)
+++ trunk/browser/Source/dftpbrowser.cc	2011-02-21 15:08:19 UTC (rev 1986)
@@ -130,6 +130,12 @@
 {
   clearContents();
   setRowCount(0);
+
+  /*
+  ** m_url is set to m_tmpUrl if and only if the load
+  ** was successful.
+  */
+
   m_tmpUrl = url;
   m_selectedUrl.clear();
   m_cdCommandId = -1;
@@ -198,14 +204,14 @@
     return m_tmpUrl;
 }
 
-QUrl dftpbrowser::reload(void)
+void dftpbrowser::reload(void)
 {
   stop();
 
   if(m_url.isValid())
-    return m_url;
+    load(m_url);
   else
-    return m_tmpUrl;
+    load(m_tmpUrl);
 }
 
 QString dftpbrowser::title(void) const
@@ -409,16 +415,12 @@
     m_ftp->deleteLater();
 }
 
-QUrl dftpbrowser::back(void)
+void dftpbrowser::back(void)
 {
-  dwebhistoryitem item(m_history->back());
-
-  return item.url();
+  load(m_history->back().url());
 }
 
-QUrl dftpbrowser::forward(void)
+void dftpbrowser::forward(void)
 {
-  dwebhistoryitem item(m_history->forward());
-
-  return item.url();
+  load(m_history->forward().url());
 }

Modified: trunk/browser/Source/dooble.cc
===================================================================
--- trunk/browser/Source/dooble.cc	2011-02-21 13:42:46 UTC (rev 1985)
+++ trunk/browser/Source/dooble.cc	2011-02-21 15:08:19 UTC (rev 1986)
@@ -1239,7 +1239,13 @@
   dview *p = qobject_cast<dview *> (ui.tabWidget->currentWidget());
 
   if(p)
-    loadPage(p->reload());
+    {
+      sb.progressBar->setVisible(true); 	 
+      ui.reloadStopWidget->setCurrentIndex(0); 	 
+      ui.stopToolButton->setEnabled(true); 	 
+      ui.actionStop->setEnabled(true);
+      p->reload();
+    }
 }
 
 void dooble::slotBack(void)
@@ -1249,7 +1255,11 @@
   if(p)
     {
       ui.forwardToolButton->setEnabled(p->canGoForward());
-      loadPage(p->back());
+      sb.progressBar->setVisible(true);
+      ui.reloadStopWidget->setCurrentIndex(0); 	 
+      ui.stopToolButton->setEnabled(true); 	 
+      ui.actionStop->setEnabled(true);
+      p->back();
     }
 }
 
@@ -1260,7 +1270,11 @@
   if(p)
     {
       ui.backToolButton->setEnabled(p->canGoBack());
-      loadPage(p->forward());
+      sb.progressBar->setVisible(true);
+      ui.reloadStopWidget->setCurrentIndex(0); 	 
+      ui.stopToolButton->setEnabled(true); 	 
+      ui.actionStop->setEnabled(true);
+      p->forward();
     }
 }
 

Modified: trunk/browser/Source/dview.cc
===================================================================
--- trunk/browser/Source/dview.cc	2011-02-21 13:42:46 UTC (rev 1985)
+++ trunk/browser/Source/dview.cc	2011-02-21 15:08:19 UTC (rev 1986)
@@ -538,19 +538,21 @@
   ftpBrowser->stop();
 }
 
-QUrl dview::reload(void)
+void dview::reload(void)
 {
   if(currentIndex() == 0)
-    return webView->url();
+    {
+      webView->page()->networkAccessManager()->setProxy 	 
+	(dmisc::proxyByUrl(webView->url())); 	 
+      webView->reload();
+    }
   else if(currentIndex() == 1)
-    return fileManager->reload();
+    fileManager->reload();
   else if(currentIndex() == 2)
-    return ftpBrowser->reload();
-  else
-    return QUrl();
+    ftpBrowser->reload();
 }
 
-QUrl dview::back(void)
+void dview::back(void)
 {
   int index = -1;
   dwebhistoryitem item(m_history->back());
@@ -558,7 +560,7 @@
   if((index = indexForUrl(item.url())) == -1)
     {
       emit loadFinished(false);
-      return QUrl();
+      return;
     }
 
   foreach(QNetworkReply *reply,
@@ -573,28 +575,32 @@
   ftpBrowser->stop();
 
   if(index == 0)
-    return item.url();
+    webView->back();
   else if(index == 1)
     {
       if(fileManager->history()->canGoBack())
 	if(fileManager->history()->currentItem().url() != item.url())
-	  return fileManager->back();
+	  {
+	    fileManager->back();
+	    return;
+	  }
 
-      return item.url();
+      load(item.url());
     }
   else if(index == 2)
     {
       if(ftpBrowser->history()->canGoBack())
 	if(ftpBrowser->history()->currentItem().url() != item.url())
-	  return ftpBrowser->back();
+	  {
+	    ftpBrowser->back();
+	    return;
+	  }
 
-      return item.url();
+      load(item.url());
     }
-
-  return QUrl();
 }
 
-QUrl dview::forward(void)
+void dview::forward(void)
 {
   int index = -1;
   dwebhistoryitem item(m_history->forward());
@@ -602,7 +608,7 @@
   if((index = indexForUrl(item.url())) == -1)
     {
       emit loadFinished(false);
-      return QUrl();
+      return;
     }
 
   foreach(QNetworkReply *reply,
@@ -617,25 +623,29 @@
   ftpBrowser->stop();
 
   if(index == 0)
-    return item.url();
+    webView->back();
   else if(index == 1)
     {
       if(fileManager->history()->canGoForward())
 	if(fileManager->history()->currentItem().url() != item.url())
-	  return fileManager->forward();
+	  {
+	    fileManager->forward();
+	    return;
+	  }
 
-      return item.url();
+      load(item.url());
     }
   else if(index == 2)
     {
       if(ftpBrowser->history()->canGoForward())
 	if(ftpBrowser->history()->currentItem().url() != item.url())
-	  return ftpBrowser->forward();
+	  {
+	    ftpBrowser->forward();
+	    return;
+	  }
 
-      return item.url();
+      load(item.url());
     }
-
-  return QUrl();
 }
 
 QString dview::title(void) const
@@ -743,7 +753,7 @@
 
 void dview::slotReload(void)
 {
-  load(reload());
+  reload();
 }
 
 bool dview::isDir(void) const


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