Proper D-Bus support, more bugfixes and Maemo improvements

Author: Jeremy Bowman

CHANGES

@@ -1,3 +1,22 @@
+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
+    to be launched by clicking on a file in the file manager, ensures that only
+    one copy of PortaBase is open, and prevents PortaBase from crashing shortly
+    after being launched from the menu.
+    
+    Moved the "None" date button from the row editor to the date picker dialog,
+    allowing long dates to fit comfortably even on smaller screens.  Fixed a
+    recently-introduced bug in the toggling of column sorting directions.  Use
+    space more efficiently for dialog buttons on Diablo.  Clean up files in the
+    recently used list after they're discovered to no longer exist.  Added an
+    import toolbar button.  Hide the redundant new/open/import buttons on Maemo
+    once there's a recent files list, in order to save screen space.  Alternate
+    row shading in the row viewer, and kinetic scrolling for it in Fremantle.
+    Use screen space a little more efficiently in the Maemo version of the view
+    editor dialog.  Made image icons in the data table a little bigger for
+    Maemo.  Prepared a few files for the upcoming beta release.
+
 2010-04-29  JMB  More Fremantle improvements, added some help text
 
     Fixed the height of several widgets so they look correct on Fremantle.

README.txt

@@ -1,9 +1,8 @@
-PortaBase 1.9 (March 2004)
----------------------------
-PortaBase (portable database) is a personal database application originally
-written for the Linux-based models of Sharp Zaurus PDA (and should work on
-any other Linux PDA using the Qtopia environment.)  It can now also be
-run as a Linux, Mac OS X, or Windows desktop application.
+PortaBase 2.0 beta 1 (May 2010)
+-------------------------------
+PortaBase (portable database) is a program for conveniently managing one-table
+database files. It is available for many platforms, including Linux, Mac OS X,
+Windows, and Maemo (Diablo and Fremantle).
 
 The main features PortaBase currently has are:
 - One data table per file
@@ -14,7 +13,7 @@ The main features PortaBase currently has are:
 - Filter the displayed rows using sets of conditions
 - Sort the rows by any combination of columns, each in ascending or descending
   order
-- Page navigation buttons, with a custom number of rows per page
+- Optional page navigation buttons, with a custom number of rows per page
 - Add, delete, rearrange, and rename columns at any time
 - Specify default values for columns
 - View summary statistics for columns (total, average, min, max, etc.)
@@ -24,30 +23,31 @@ The main features PortaBase currently has are:
   from MobileDB)
 - Data file encryption
 - Unicode support
-- Pick any available font to use throughout the application
-- User-specified alternating row background colors
+- Pick any available font to use throughout the application (except on
+  Mac OS X)
+- User-specified alternating row background colors (except on Fremantle)
 - Simple calculator widget for entering numeric data
-- Customizable menu and toolbar configuration
 
-See the help file (help/html/portabase.html) for more information on features
-and usage.  This help file is also the online help for the application,
-available by clicking the "?" button at the top right of any screen in
-PortaBase for the Zaurus, or Help->Help Contents in desktop PortaBase.
+See the application's help dialog for more information on features and usage.
 
-Zaurus Upgrades
----------------
-To upgrade from a previous version of PortaBase, do the following:
-
-1) uninstall libmetakit1 (if upgrading from 1.5 or earlier) and portabase
-   (your data files will be left alone)
-2) install the new portabase .ipk file
-3) delete the .ipk file (you don't have to, but it frees up space)
+Note for Zaurus Users
+---------------------
+The complete lack of new releases of Qt or Qtopia for the Zaurus has made it
+impractical to continue developing for it; every single feature would need to
+be implemented separately for two different codebases.  However, there are no
+file format changes for PortaBase 2.0; files can still be moved freely between
+the new release and PortaBase 1.9 on the Zaurus.  A future PortaBase 2.1
+release is likely to end this compatibility, however.  Maemo (as used on the
+Nokia N810 and N900) is recommended for people who want to continue using
+PortaBase on a pocketable device.  Ports to Windows Mobile, Symbian S60,
+and/or webOS may be forthcoming as well.
 
-IMPORTANT NOTE: Metakit is no longer installed as a separate library.
-PortaBase now also uses the BeeCrypt and libjpeg libraries, and installing
-each library separately makes things more complicated than most people
-would prefer.  All these libraries are now compiled into the PortaBase
-executable.
+Maemo Installation
+------------------
+PortaBase is being submitted to the extras-devel repository, you should be
+able to download and install it from there.  In time, it should make its way
+to the extras-testing and extras repositories as well, for users who are a
+little less adventurous.
 
 Windows Installation and Upgrades
 ---------------------------------
@@ -57,27 +57,26 @@ just follow the directions.
 Mac OS X Installation
 ---------------------
 Extract the application bundle from the downloaded archive and put it where
-you want it.
+you want it (usually your Applications folder).
 
 Technical Info and Acknowledgements
 -----------------------------------
-PortaBase is written in C++, using the Qt and Qtopia libraries for GUI widgets,
-data structures, and communication with the PDA environment.  It also uses:
-- the Metakit (http://www.equi4.com/metakit) embedded database library for data
-storage and manipulation
-- an enhanced version of the QtaDatePicker widget developed by John McDonald,
-available from http://prdownloads.sourceforge.net/zaurus/
+PortaBase is written in C++, using the Qt 4 library for GUI widgets, data
+structures, and communication with the operating system.  It also uses:
+
+- The Metakit (http://www.equi4.com/metakit) embedded database library for data
+  storage and manipulation
+- The Randomkit library (http://js2007.free.fr/code/index.html#RandomKit) for
+  cryptographic-strength random number generation
+- The Color Picker Qt Solution
+  (http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Widgets/qtcolorpicker)
 - MobileDB import code based on code from ZReader
-(http://www.codecubed.com/zreader/index.html)
+  (http://www.killefiz.de/zaurus/showdetail.php?app=751)
 - CSV import code based on code from KSpread (http://www.koffice.org/kspread/)
-- the BeeCrypt library (http://www.virtualunlimited.com/products/beecrypt/)
-for encryption algorithms and good random number generation
-- the color picker dialog from HTML@Zaurus
-(http://www.codefactor.de/htmlAtZaurus.html), itself based on Qt's QColorDialog
+- Blowfish block cipher code based on the BeeCrypt library
+  (http://beecrypt.sourceforge.net/)
 - a modified version of the calculator widget from KMyMoney2
-(http://kmymoney2.sourceforge.net/)
-- libjpeg (http://www.ijg.org) for efficient loading and manipulation of JPEG
-image files
+  (http://kmymoney2.sourceforge.net/)
 
 License
 -------

datedialog.cpp

@@ -1,7 +1,7 @@
 /*
  * datedialog.cpp
  *
- * (c) 2009 by Jeremy Bowman <[email protected]>
+ * (c) 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
@@ -29,12 +29,15 @@
  * @param parent This dialog's parent widget
  */
 DateDialog::DateDialog(const QDate &date, QWidget *parent)
-  : PBDialog(tr("Select a date"), parent)
+  : PBDialog(tr("Select a date"), parent), noneSelected(false)
 {
     if (!date.isValid()) {
         reject();
     }
     calendar = new QCalendarWidget(this);
+#if defined(Q_WS_MAEMO_5)
+    calendar->setStyleSheet("alternate-background-color: darkblue");
+#endif
     // date limits are for backwards compatibility
     calendar->setMinimumDate(QDate(1752, 9, 15));
     calendar->setMaximumDate(QDate(7000, 12, 31));
@@ -54,6 +57,9 @@ DateDialog::DateDialog(const QDate &date, QWidget *parent)
     QPushButton *todayButton = new QPushButton(tr("Today"));
     buttonBox->addButton(todayButton, QDialogButtonBox::ActionRole);
     connect(todayButton, SIGNAL(clicked()), this, SLOT(gotoToday()));
+    QPushButton *noneButton = new QPushButton(tr("None"));
+    buttonBox->addButton(noneButton, QDialogButtonBox::ActionRole);
+    connect(noneButton, SIGNAL(clicked()), this, SLOT(selectNone()));
 }
 
 /**
@@ -63,7 +69,12 @@ DateDialog::DateDialog(const QDate &date, QWidget *parent)
  */
 QDate DateDialog::selectedDate()
 {
-    return calendar->selectedDate();
+    if (noneSelected) {
+        return QDate(1752, 9, 14);
+    }
+    else {
+        return calendar->selectedDate();
+    }
 }
 
 /**
@@ -74,3 +85,13 @@ void DateDialog::gotoToday()
 {
     calendar->setSelectedDate(QDate::currentDate());
 }
+
+/**
+ * Select the "None" date and close the dialog.  Called when the "None" button
+ * is clicked.
+ */
+void DateDialog::selectNone()
+{
+    noneSelected = true;
+    accept();
+}

datedialog.h

@@ -1,7 +1,7 @@
 /*
  * datedialog.h
  *
- * (c) 2009 by Jeremy Bowman <[email protected]>
+ * (c) 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
@@ -34,10 +34,12 @@ class DateDialog: public PBDialog
     QDate selectedDate();
 
 private slots:
-    void gotoToday(); /**< Today' button handler */
+    void gotoToday(); /**< 'Today' button handler */
+    void selectNone(); /**< 'None' button handler */
 
 private:
     QCalendarWidget *calendar; /**< Calendar display widget */
+    bool noneSelected; /**< True if the 'None' button was clicked */
 };
 
 #endif

datewidget.cpp

@@ -39,12 +39,8 @@ DateWidget::DateWidget(QWidget *parent)
     layout->addWidget(button);
 
     display = new QLabel(toString(dateObj), this);
-    display->setAlignment(Qt::AlignCenter);
+    display->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     layout->addWidget(display, 1);
-
-    noneButton = new QPushButton(tr("None"), this);
-    connect(noneButton, SIGNAL(clicked()), this, SLOT(setToNone()));
-    layout->addWidget(noneButton);
 }
 
 /**
@@ -96,11 +92,10 @@ void DateWidget::updateDisplay()
 {
     if (isNoneDate(dateObj)) {
         display->setText("               ");
-        noneButton->setEnabled(false);
     }
     else {
-        display->setText(toString(dateObj));
-        noneButton->setEnabled(true);
+        QString text(" %1");
+        display->setText(text.arg(toString(dateObj)));
     }
 }
 
@@ -136,16 +131,6 @@ bool DateWidget::isNoneDate(const QDate &date)
     return (date.year() == 1752 && date.month() == 9 && date.day() == 14);
 }
 
-/**
- * Set the selected date to the special "None" value (the first day supported
- * in earlier versions of QDate).  Called when the "None" button is clicked.
- */
-void DateWidget::setToNone()
-{
-    dateObj.setYMD(1752, 9, 14);
-    updateDisplay();
-}
-
 /**
  * Launches a DateDialog which is preset to the currently selected date,
  * and uses the new selection from the dialog as the new date selection if

datewidget.h

@@ -25,9 +25,8 @@ class QPushButton;
 
 /**
  * A widget for selecting and displaying a single date.  It consists of a
- * row of sub-widgets: a button which launches a date selection dialog,
- * a text label showing the currently selected date, and a button to reset
- * the date selection to "None" (blank).  Used by CalcDateEditor,
+ * row of sub-widgets: a text label showing the currently selected date and a
+ * button which launches a date selection dialog.  Used by CalcDateEditor,
  * ConditionEditor, and RowEditor.
  * <p>
  * Note that some of this class's methods use an integer representation for
@@ -47,7 +46,6 @@ class DateWidget: public QWidget
 
 private slots:
     void launchSelector();
-    void setToNone();
 
 private:
     bool isNoneDate(const QDate &date);
@@ -57,7 +55,6 @@ private slots:
 private:
     QDate dateObj; /**< The date currently being shown */
     QLabel *display; /**< The text label showing the date */
-    QPushButton *noneButton; /**< Button to set the date to "None" */
 };
 
 #endif

dbeditor.cpp

@@ -40,7 +40,7 @@ DBEditor::DBEditor(QWidget *parent)
 {
     stack = new QStackedWidget(this);
     vbox->addWidget(stack, 1);
-    QString text("<center>%1<br>%2</center>");
+    QString text("<center>%1<br><br>%2</center>");
     text = text.arg(tr("No columns defined"));
     text = text.arg(tr("Press the \"Add\" button to create one"));
     noColumns = new QLabel(text, stack);

debian/changelog

@@ -1,8 +1,8 @@
-portabase (2.0-1) unstable; urgency=low
+portabase (2.0~beta1-1) unstable; urgency=low
 
   * New upstream version
 
- -- Jeremy Bowman <[email protected]>  Wed, 21 Apr 2010 09:45:33 -0500
+ -- Jeremy Bowman <[email protected]>  Wed, 29 Apr 2010 09:45:33 -0500
 
 portabase (1.9-1) unstable; urgency=low
 

enumeditor.cpp

@@ -61,10 +61,10 @@ EnumEditor::EnumEditor(QWidget *parent)
 
     stack = new QStackedWidget(this);
     vbox->addWidget(stack, 1);
-    QString text("<center>%1<br>%2<br>%3</center>");
+    QString text("<center>%1<br><br>%2</center>");
     text = text.arg(tr("No options defined for this enumeration type"));
-    text = text.arg(tr("Press the \"Add\" button to create one, or press"));
-    text = text.arg(tr("the \"Import\" button to load lines from a text file"));
+    QString extraText = tr("Press the \"Add\" button to create one, or press\nthe \"Import\" button to load lines from a text file");
+    text = text.arg(extraText.replace("\n", "<br>"));
     noOptions = new QLabel(text, stack);
     stack->addWidget(noOptions);
 

enummanager.cpp

@@ -37,7 +37,7 @@ EnumManager::EnumManager(Database *dbase, QWidget *parent)
 {
     stack = new QStackedWidget(this);
     vbox->addWidget(stack, 1);
-    QString text("<center>%1<br>%2</center>");
+    QString text("<center>%1<br><br>%2</center>");
     text = text.arg(tr("No enumerated column types defined"));
     text = text.arg(tr("Press the \"Add\" button to create one"));
     noEnums = new QLabel(text, stack);