Help file update, more Maemo and usability improvements

Author: Jeremy Bowman

CHANGES

@@ -1,3 +1,12 @@
+2010-05-02  JMB  Help file update, more Maemo and usability improvements
+
+    Updated the English help file to match the current state of the code.
+    Added a note to the file properties dialog about how to access the column
+    statistics dialog.  Fixed a bug in launching the column statistics dialog
+    on Fremantle.  Fixed the appearance of the password and slideshow dialogs
+    on Maemo.  Added a missing include for PBDialog that might cause compiling
+    problems on some platforms.
+
 2010-04-30  JMB  Proper D-Bus support, more bugfixes and Maemo improvements
 
     Added code to correctly register with D-Bus on Maemo; this allows PortaBase

image/slideshowdialog.cpp

@@ -33,7 +33,7 @@
  * @param parent This dialog's parent widget
  */
 SlideshowDialog::SlideshowDialog(QStringList columns, View *view, QWidget *parent)
-  : PBDialog(tr("Slideshow"), parent), fullScreen(0)
+  : PBDialog(tr("Slideshow"), parent, true), fullScreen(0)
 {
     currentView = view;
     QGridLayout *grid = Factory::gridLayout(vbox);

passdialog.cpp

@@ -21,7 +21,6 @@
 #include "database.h"
 #include "factory.h"
 #include "passdialog.h"
-#include "pbdialog.h"
 #include "encryption/crypto.h"
 
 /**
@@ -32,9 +31,9 @@
  * @param parent This dialog's parent widget
  */
 PasswordDialog::PasswordDialog(Database *dbase, DialogMode dlgMode, QWidget *parent)
-  : QQDialog("", parent), db(dbase), mode(dlgMode)
+  : PBDialog(tr("Password"), parent, true), db(dbase), mode(dlgMode)
 {
-    QGridLayout *grid = Factory::gridLayout(this, true);
+    QGridLayout *grid = Factory::gridLayout(vbox);
     int currentRow = 0;
     if (mode == ChangePassword) {
         grid->addWidget(new QLabel(tr("Old password") + ":", this), 0, 0);
@@ -57,15 +56,7 @@ PasswordDialog::PasswordDialog(Database *dbase, DialogMode dlgMode, QWidget *par
         grid->addWidget(repeatPass, currentRow, 1);
         currentRow++;
     }
-
-    QDialogButtonBox::StandardButtons buttons(QDialogButtonBox::Ok |
-                                              QDialogButtonBox::Cancel);
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(buttons,
-                                                       Qt::Horizontal, this);
-    grid->addWidget(buttonBox, currentRow, 0, 2, 1);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    finishConstruction();
+    finishLayout();
 }
 
 /**

passdialog.h

@@ -1,7 +1,7 @@
 /*
  * passdialog.h
  *
- * (c) 2003-2004,2009 by Jeremy Bowman <[email protected]>
+ * (c) 2003-2004,2009-2010 by Jeremy Bowman <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 #ifndef PASSDIALOG_H
 #define PASSDIALOG_H
 
-#include "qqutil/qqdialog.h"
+#include "pbdialog.h"
 
 class Database;
 class QLineEdit;
@@ -26,7 +26,7 @@ class QLineEdit;
  * encrypted file, opening an encrypted file, or changing the password on an
  * open encrypted file.
  */
-class PasswordDialog: public QQDialog
+class PasswordDialog: public PBDialog
 {
     Q_OBJECT
 public:

pbdialog.h

@@ -16,6 +16,7 @@
 #ifndef PBDIALOG_H
 #define PBDIALOG_H
 
+#include <QStringList>
 #include "qqutil/qqdialog.h"
 
 class QDialogButtonBox;

portabase.cpp

@@ -495,7 +495,8 @@ void PortaBase::viewProperties()
     count = filters.count();
     message += tr("Filters") + ": " + locale.toString(count) + "\n";
     count = db->listEnums().count();
-    message += tr("Enums") + ": " + locale.toString(count);
+    message += tr("Enums") + ": " + locale.toString(count) + "\n";
+    message += tr("For statistics on a particular column, press and hold that column's header for at least half of a second");
     QString title = tr("File Properties") + " - " + qApp->applicationName();
     QMessageBox mb(title, message, QMessageBox::NoIcon,
                    QMessageBox::Ok, QMessageBox::NoButton,

resources/help/html/PortaBase.html

@@ -25,6 +25,7 @@
 #include <QStackedWidget>
 #include <QStringList>
 #include <QTextDocument>
+#include <QTimer>
 #include <QToolButton>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
@@ -48,8 +49,8 @@
  * @param parent This widget's parent widget
  */
 ViewDisplay::ViewDisplay(PortaBase *pbase, QWidget *parent) : QWidget(parent),
-    portabase(pbase), propogateColWidths(false), booleanToggle(false),
-    paged(true), singleClickShow(true)
+    portabase(pbase), propogateColWidths(false), pressedHeader(-1),
+    booleanToggle(false), paged(true), singleClickShow(true)
 {
     timer.start();
     QVBoxLayout *vbox = Factory::vBoxLayout(this, true);
@@ -711,8 +712,8 @@ void ViewDisplay::cellReleased(const QModelIndex &index)
  */
 void ViewDisplay::headerPressed(int column)
 {
-    pressedIndex = column;
-    timer.restart();
+    pressedHeader = column;
+    QTimer::singleShot(500, this, SLOT(showStatistics()));
 }
 
 /**
@@ -724,13 +725,12 @@ void ViewDisplay::headerPressed(int column)
  */
 void ViewDisplay::headerReleased(int column)
 {
-    if (column != pressedIndex) {
+    if (column != pressedHeader) {
+        pressedHeader = -1;
         return;
     }
-    if (timer.elapsed() > 500) {
-        showStatistics(column);
-    }
     else {
+        pressedHeader = -1;
         sort(column);
     }
 }
@@ -772,11 +772,14 @@ void ViewDisplay::sort(int column)
  * Show a dialog containing summary statistics for a particular column of
  * data.  Only values in records matching the current filter are factored
  * into the statistics.
- *
- * @param column The position index of the column to show data for
  */
-void ViewDisplay::showStatistics(int column)
+void ViewDisplay::showStatistics()
 {
+    if (pressedHeader == -1) {
+        return;
+    }
+    int column = pressedHeader;
+    pressedHeader = -1;
     QStringList stats = model->view()->getStatistics(column);
     QString content("<qt><center><b>");
     content += model->headerData(column, Qt::Horizontal).toString();
@@ -786,9 +789,15 @@ void ViewDisplay::showStatistics(int column)
         content += stats[i] + "<br/>";
     }
     content += "</qt>";
-    QMessageBox mb(qApp->applicationName(), content, QMessageBox::NoIcon,
-                   QMessageBox::Ok, QMessageBox::NoButton,
-                   QMessageBox::NoButton, this);
+    QMessageBox mb(this);
+#if defined(Q_WS_MAEMO_5)
+    mb.setStandardButtons(QMessageBox::Ok|QMessageBox::Cancel);
+#else
+    mb.setStandardButtons(QMessageBox::Ok);
+#endif
+    mb.setText(content);
+    mb.setWindowTitle(qApp->applicationName());
+    mb.setWindowModality(Qt::ApplicationModal);
     mb.exec();
 }
 

viewdisplay.cpp

@@ -82,7 +82,6 @@ public slots:
     int selectedRowIndex();
     int selectedRowId();
     void sort(int column);
-    void showStatistics(int column);
 
 private slots:
     void changePage(int id);
@@ -94,6 +93,7 @@ private slots:
     void cellReleased(const QModelIndex &index);
     void headerPressed(int column);
     void headerReleased(int column);
+    void showStatistics();
     void columnResized(int column, int oldWidth, int newWidth);
     void updateButtons(int currentPage, int totalPages);
     void matchNewView(View *view);
@@ -113,6 +113,7 @@ private slots:
     QToolButton *pageButtons[PAGE_BUTTON_COUNT]; /**< Array of page navigation buttons */
     bool propogateColWidths; /**< True if column width resizes are to be passed to the view */
     int pressedIndex; /**< Index of the column in which the mouse has been pressed (while waiting for a release) */
+    int pressedHeader; /**< Index of the column header which has been pressed (while waiting for a release) */
     QTime timer; /**< Time elapsed between the last mouse press and release */
     bool booleanToggle; /**< True if boolean field values can be toggled by clicking on them in the display */
     bool paged; /**< False if all records in the view are always shown on one scrolling page */