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

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

Revision: 1966
          http://dooble.svn.sourceforge.net/dooble/?rev=1966&view=rev
Author:   textfield
Date:     2011-02-17 18:00:11 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
Simple improvements. Store states.

Modified Paths:
--------------
    trunk/browser/Include/dfilemanager.h
    trunk/browser/Include/dftpbrowser.h
    trunk/browser/Source/dfilemanager.cc
    trunk/browser/Source/dftpbrowser.cc
    trunk/browser/Source/dhistory.cc
    trunk/browser/Source/dooble.cc
    trunk/browser/Source/durlwidget.cc
    trunk/browser/Source/dview.cc

Modified: trunk/browser/Include/dfilemanager.h
===================================================================
--- trunk/browser/Include/dfilemanager.h	2011-02-17 02:18:08 UTC (rev 1965)
+++ trunk/browser/Include/dfilemanager.h	2011-02-17 18:00:11 UTC (rev 1966)
@@ -103,6 +103,7 @@
   void slotTreeMenuAction(void);
   void slotTableMenuAction(void);
   void slotDirectoryRemoved(const QModelIndex &index, int start, int end);
+  void slotSaveTableHeaderState(void);
   void slotCustomContextMenuRequest(const QPoint &pos);
 
  signals:

Modified: trunk/browser/Include/dftpbrowser.h
===================================================================
--- trunk/browser/Include/dftpbrowser.h	2011-02-17 02:18:08 UTC (rev 1965)
+++ trunk/browser/Include/dftpbrowser.h	2011-02-17 18:00:11 UTC (rev 1966)
@@ -97,6 +97,7 @@
   void slotOpenLinkInNewTab(void);
   void slotItemDoubleClicked(QTableWidgetItem *item);
   void slotOpenLinkInNewWindow(void);
+  void slotSaveTableHeaderState(void);
   void slotCustomContextMenuRequest(const QPoint &point);
 
  signals:

Modified: trunk/browser/Source/dfilemanager.cc
===================================================================
--- trunk/browser/Source/dfilemanager.cc	2011-02-17 02:18:08 UTC (rev 1965)
+++ trunk/browser/Source/dfilemanager.cc	2011-02-17 18:00:11 UTC (rev 1966)
@@ -109,6 +109,18 @@
 	  SIGNAL(customContextMenuRequested(const QPoint &)),
 	  this,
 	  SLOT(slotCustomContextMenuRequest(const QPoint &)));
+  connect(ui.tableView->horizontalHeader(),
+	  SIGNAL(sectionMoved(int, int, int)),
+	  this,
+	  SLOT(slotSaveTableHeaderState(void)));
+  connect(ui.tableView->horizontalHeader(),
+	  SIGNAL(sectionClicked(int)),
+	  this,
+	  SLOT(slotSaveTableHeaderState(void)));
+  connect(ui.tableView->horizontalHeader(),
+	  SIGNAL(sectionResized(int, int, int)),
+	  this,
+	  SLOT(slotSaveTableHeaderState(void)));
   connect
     (ui.treeView->itemDelegate(),
      SIGNAL(closeEditor(QWidget *, QAbstractItemDelegate::EndEditHint)),
@@ -120,13 +132,35 @@
      this,
      SLOT(slotCloseEditor(QWidget *, QAbstractItemDelegate::EndEditHint)));
 
-  for(int i = 0; i < ui.tableView->horizontalHeader()->count(); i++)
-    ui.tableView->resizeColumnToContents(i);
+  if(dooble::s_settings.contains("mainWindow/fileManagerColumnsState"))
+    if(!ui.tableView->horizontalHeader()->restoreState
+       (dooble::s_settings.value
+	("mainWindow/fileManagerColumnsState", "").toByteArray()))
+      {
+	ui.tableView->sortByColumn(0, Qt::AscendingOrder);
+
+	for(int i = 0; i < ui.tableView->horizontalHeader()->count(); i++)
+	  ui.tableView->resizeColumnToContents(i);
+      }
 }
 
+void dfilemanager::slotSaveTableHeaderState(void)
+{
+  dooble::s_settings["mainWindow/fileManagerColumnsState"] =
+    ui.tableView->horizontalHeader()->saveState();
+}
+
 dfilemanager::~dfilemanager()
 {
-  delete m_history;
+  /*
+  ** Do not attempt to save the table header's state here.
+  */
+
+  if(m_history)
+    {
+      delete m_history;
+      m_history = 0;
+    }
 }
 
 void dfilemanager::load(const QUrl &url)

Modified: trunk/browser/Source/dftpbrowser.cc
===================================================================
--- trunk/browser/Source/dftpbrowser.cc	2011-02-17 02:18:08 UTC (rev 1965)
+++ trunk/browser/Source/dftpbrowser.cc	2011-02-17 18:00:11 UTC (rev 1966)
@@ -53,6 +53,7 @@
 #include <QFileIconProvider>
 
 #include "dmisc.h"
+#include "dooble.h"
 #include "dftpbrowser.h"
 
 dftpbrowser::dftpbrowser(QWidget *parent):QTableWidget(parent)
@@ -70,6 +71,18 @@
 	  SIGNAL(customContextMenuRequested(const QPoint &)),
 	  this,
 	  SLOT(slotCustomContextMenuRequest(const QPoint &)));
+  connect(horizontalHeader(),
+	  SIGNAL(sectionMoved(int, int, int)),
+	  this,
+	  SLOT(slotSaveTableHeaderState(void)));
+  connect(horizontalHeader(),
+	  SIGNAL(sectionClicked(int)),
+	  this,
+	  SLOT(slotSaveTableHeaderState(void)));
+  connect(horizontalHeader(),
+	  SIGNAL(sectionResized(int, int, int)),
+	  this,
+	  SLOT(slotSaveTableHeaderState(void)));
   m_history = new dwebhistory();
 
   QStringList labels;
@@ -84,11 +97,33 @@
   setContextMenuPolicy(Qt::CustomContextMenu);
   setShowGrid(false);
   setFrameShape(QFrame::NoFrame);
+
+  if(dooble::s_settings.contains("mainWindow/ftpManagerColumnsState"))
+    if(!horizontalHeader()->restoreState
+       (dooble::s_settings.value
+	("mainWindow/ftpManagerColumnsState", "").toByteArray()))
+      {
+	horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
+	horizontalHeader()->setStretchLastSection(true);
+
+	for(int i = 0; i < horizontalHeader()->count(); i++)
+	  resizeColumnToContents(i);
+      }
 }
 
+void dftpbrowser::slotSaveTableHeaderState(void)
+{
+  dooble::s_settings["mainWindow/ftpManagerColumnsState"] =
+    horizontalHeader()->saveState();
+}
+
 dftpbrowser::~dftpbrowser()
 {
-  delete m_history;
+  if(m_history)
+    {
+      delete m_history;
+      m_history = 0;
+    }
 }
 
 void dftpbrowser::load(const QUrl &url)

Modified: trunk/browser/Source/dhistory.cc
===================================================================
--- trunk/browser/Source/dhistory.cc	2011-02-17 02:18:08 UTC (rev 1965)
+++ trunk/browser/Source/dhistory.cc	2011-02-17 18:00:11 UTC (rev 1966)
@@ -212,6 +212,8 @@
 							 Qt::AscendingOrder);
 	ui.history->horizontalHeader()->setSortIndicatorShown(true);
 	ui.history->horizontalHeader()->setStretchLastSection(true);
+	ui.history->horizontalHeader()->setResizeMode
+	  (QHeaderView::Interactive);
       }
 
   ui.history->horizontalHeader()->setMovable(true);

Modified: trunk/browser/Source/dooble.cc
===================================================================
--- trunk/browser/Source/dooble.cc	2011-02-17 02:18:08 UTC (rev 1965)
+++ trunk/browser/Source/dooble.cc	2011-02-17 18:00:11 UTC (rev 1966)
@@ -1093,6 +1093,14 @@
 			ui.searchLineEdit->width());
       settings.setValue("mainWindow/locationWidth",
 			ui.locationLineEdit->width());
+      settings.setValue
+	("mainWindow/ftpManagerColumnsState",
+	 dooble::s_settings.value
+	 ("mainWindow/ftpManagerColumnsState").toByteArray());
+      settings.setValue
+	("mainWindow/fileManagerColumnsState",
+	 dooble::s_settings.value
+	 ("mainWindow/fileManagerColumnsState").toByteArray());
       dooble::s_settings["mainWindow/geometry"] = geometry();
       dooble::s_settings["mainWindow/searchWidth"] =
 	ui.searchLineEdit->width();

Modified: trunk/browser/Source/durlwidget.cc
===================================================================
--- trunk/browser/Source/durlwidget.cc	2011-02-17 02:18:08 UTC (rev 1965)
+++ trunk/browser/Source/durlwidget.cc	2011-02-17 18:00:11 UTC (rev 1966)
@@ -71,6 +71,10 @@
   m_tableView->horizontalHeader()->setVisible(false);
   m_tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
   setPopup(m_tableView);
+  m_tableView->setStyleSheet
+    ("QTableView {"
+     "background: darkgray; "
+     "}");
 }
 
 durlcompleter::~durlcompleter()
@@ -126,7 +130,7 @@
 
   QList<QStandardItem *> list;
 
-  if(completion.isEmpty())
+  if(completion.trimmed().isEmpty())
     {
       for(int i = 0; i < m_model->rowCount(); i++)
 	if(m_model->item(i))
@@ -139,13 +143,13 @@
       for(int i = 0; i < m_model->rowCount(); i++)
 	if(m_model->item(i))
 	  {
-	    if(m_model->item(i)->text() == completion)
+	    if(m_model->item(i)->text() == completion.trimmed())
 	      tmplists[0].append(m_model->item(i)->clone());
-	    else if(m_model->item(i)->text().startsWith(completion))
+	    else if(m_model->item(i)->text().startsWith(completion.trimmed()))
 	      tmplists[1].append(m_model->item(i)->clone());
-	    else if(m_model->item(i)->text().endsWith(completion))
+	    else if(m_model->item(i)->text().endsWith(completion.trimmed()))
 	      tmplists[2].append(m_model->item(i)->clone());
-	    else if(m_model->item(i)->text().contains(completion))
+	    else if(m_model->item(i)->text().contains(completion.trimmed()))
 	      tmplists[3].append(m_model->item(i)->clone());
 	    else
 	      m_purgedItems.append(m_model->item(i)->clone());

Modified: trunk/browser/Source/dview.cc
===================================================================
--- trunk/browser/Source/dview.cc	2011-02-17 02:18:08 UTC (rev 1965)
+++ trunk/browser/Source/dview.cc	2011-02-17 18:00:11 UTC (rev 1966)
@@ -236,7 +236,11 @@
 
 dview::~dview()
 {
-  delete m_history;
+  if(m_history)
+    {
+      delete m_history;
+      m_history = 0;
+    }
 
   if(m_action)
     m_action->deleteLater();


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