Sorting editor bugfix, updated version number

CHANGES

@@ -1,3 +1,11 @@
+2010-05-17  #################### PortaBase 2.0b2 ####################
+
+2010-05-17  JMB  Sorting editor bugfix, updated version number
+
+    Fixed a bug in the sorting editor where ascending/descending labels were
+    initially reversed.  Also updated the version number in all appropriate
+    places for the next beta release.
+
 2010-05-15  JMB  Assorted bugfixes
 
     Read-only files can now be opened correctly, with a dialog warning the user

README.txt

@@ -1,4 +1,4 @@
-PortaBase 2.0 beta 1 (May 2010)
+PortaBase 2.0 beta 2 (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,
@@ -44,7 +44,7 @@ and/or webOS may be forthcoming as well.
 
 Maemo Installation
 ------------------
-PortaBase is being submitted to the extras-devel repository, you should be
+PortaBase is available from 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.
@@ -75,7 +75,7 @@ structures, and communication with the operating system.  It also uses:
 - CSV import code based on code from KSpread (http://www.koffice.org/kspread/)
 - Blowfish block cipher code based on the BeeCrypt library
   (http://beecrypt.sourceforge.net/)
-- a modified version of the calculator widget from KMyMoney2
+- A modified version of the calculator widget from KMyMoney2
   (http://kmymoney2.sourceforge.net/)
 
 License

debian/changelog

@@ -1,3 +1,9 @@
+portabase (2.0~beta2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Jeremy Bowman <[email protected]>  Wed, 17 May 2010 08:17:59 -0500
+
 portabase (2.0~beta1-1) unstable; urgency=low
 
   * New upstream version

packaging/linux/debian.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=2.0~beta1
+VERSION=2.0~beta2
 DEST=build/debian/portabase-$VERSION
 
 rm -rf build/debian

packaging/mac/Info.plist

@@ -22,7 +22,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PortaBase</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0, (c) Jeremy Bowman, 2002-2010</string>
+	<string>2.0b2, (c) Jeremy Bowman, 2002-2010</string>
 	<key>CFBundleIconFile</key>
 	<string>@ICON@</string>
 	<key>CFBundleIdentifier</key>
@@ -32,11 +32,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.0b2</string>
 	<key>CFBundleSignature</key>
 	<string>PBas</string>
 	<key>CFBundleVersion</key>
-	<string>2.0</string>
+	<string>2.0.0b2</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.4.0</string>
 </dict>

packaging/maemo/debian/changelog

@@ -1,3 +1,9 @@
+portabase (2.0~beta2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Jeremy Bowman <[email protected]>  Wed, 17 May 2010 08:17:59 -0500
+
 portabase (2.0~beta1-2) unstable; urgency=low
 
   * Declare the debug package in the control file

packaging/maemo/diablo.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=2.0~beta1
+VERSION=2.0~beta2
 DEST=build/diablo/portabase-$VERSION
 
 rm -rf build/diablo

packaging/maemo/fremantle.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=2.0~beta1
+VERSION=2.0~beta2
 DEST=build/fremantle/portabase-$VERSION
 
 rm -rf build/fremantle

portabase.cpp

@@ -1917,7 +1917,7 @@ void PortaBase::print(QPrinter *p)
 void PortaBase::aboutPortaBase()
 {
     QString appName = qApp->applicationName();
-    QString text = appName + " 2.0b1\n\n" + tr("Copyright (C)")
+    QString text = appName + " 2.0b2\n\n" + tr("Copyright (C)")
                    + " 2002-2010\nJeremy Bowman\n\n"
                    + tr("Web site at http://portabase.sourceforge.net");
     QMessageBox::about(this, tr("About %1").arg(appName), text);

portabase.iss

@@ -3,13 +3,13 @@
 
 [Setup]
 AppName=PortaBase
-AppVerName=PortaBase 2.0b1
+AppVerName=PortaBase 2.0b2
 AppPublisher=Jeremy Bowman
 AppPublisherURL=http://portabase.sourceforge.net
 AppSupportURL=http://portabase.sourceforge.net
 AppUpdatesURL=http://portabase.sourceforge.net
 AppReadmeFile=README.txt
-AppVersion=2.0b1
+AppVersion=2.0b2
 AppCopyright=Copyright (C) 2002-2010 Jeremy Bowman
 DefaultDirName={pf}\PortaBase
 DefaultGroupName=PortaBase
@@ -19,9 +19,9 @@ ChangesAssociations=yes
 LicenseFile=COPYING
 PrivilegesRequired=admin
 SolidCompression=yes
-OutputBaseFilename=PortaBase_2.0b1
+OutputBaseFilename=PortaBase_2.0b2
 OutputDir=build\windows
-VersionInfoVersion=2.0.0.0
+VersionInfoVersion=2.0.0.1
 ShowLanguageDialog=yes
 
 [Tasks]

portabase.pro

@@ -5,7 +5,7 @@ DESTDIR         = build
 OBJECTS_DIR     = build
 MOC_DIR         = build
 RCC_DIR         = build
-VERSION         = 2.0.0b1
+VERSION         = 2.0.0b2
 TRANSLATIONS    = resources/translations/portabase_cs.ts \
                   resources/translations/portabase_de.ts \
                   resources/translations/portabase_en.ts \

resources/help/html/PortaBase.html

@@ -2,11 +2,11 @@
 <html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>PortaBase 2.0b1</title>
+  <title>PortaBase 2.0b2</title>
 </head>
 <body>
 
-<div align="center"><h3>PortaBase 2.0b1</h3> - A portable database -</div>
+<div align="center"><h3>PortaBase 2.0b2</h3> - A portable database -</div>
 <br>
 <a href="#intro">1)Introduction</a><br>
 <a href="#file">2)File selector</a><br>

sorteditor.cpp

@@ -157,10 +157,10 @@ void SortEditor::updateTable(const QStringList &colNames)
         QString direction = "";
         if (sortCols.contains(name)) {
             if (descCols.contains(name)) {
-                direction = tr("Ascending");
+                direction = tr("Descending");
             }
             else {
-                direction = tr("Descending");
+                direction = tr("Ascending");
             }
             item->setCheckState(0, Qt::Checked);
         }