Skip to content

Commit a2896d3

Browse files
author
Jeremy Bowman
committed
Sorting editor bugfix, updated version number
1 parent 15bdc9e commit a2896d3

File tree

13 files changed

+39
-19
lines changed

13 files changed

+39
-19
lines changed

‎CHANGES

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2010-05-17 #################### PortaBase 2.0b2 ####################
2+
3+
2010-05-17 JMB Sorting editor bugfix, updated version number
4+
5+
Fixed a bug in the sorting editor where ascending/descending labels were
6+
initially reversed. Also updated the version number in all appropriate
7+
places for the next beta release.
8+
19
2010-05-15 JMB Assorted bugfixes
210

311
Read-only files can now be opened correctly, with a dialog warning the user

‎README.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PortaBase 2.0 beta 1 (May 2010)
1+
PortaBase 2.0 beta 2 (May 2010)
22
-------------------------------
33
PortaBase (portable database) is a program for conveniently managing one-table
44
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.
4444

4545
Maemo Installation
4646
------------------
47-
PortaBase is being submitted to the extras-devel repository, you should be
47+
PortaBase is available from the extras-devel repository, you should be
4848
able to download and install it from there. In time, it should make its way
4949
to the extras-testing and extras repositories as well, for users who are a
5050
little less adventurous.
@@ -75,7 +75,7 @@ structures, and communication with the operating system. It also uses:
7575
- CSV import code based on code from KSpread (http://www.koffice.org/kspread/)
7676
- Blowfish block cipher code based on the BeeCrypt library
7777
(http://beecrypt.sourceforge.net/)
78-
- a modified version of the calculator widget from KMyMoney2
78+
- A modified version of the calculator widget from KMyMoney2
7979
(http://kmymoney2.sourceforge.net/)
8080

8181
License

‎debian/changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
portabase (2.0~beta2-1) unstable; urgency=low
2+
3+
* New upstream version
4+
5+
-- Jeremy Bowman <[email protected]> Wed, 17 May 2010 08:17:59 -0500
6+
17
portabase (2.0~beta1-1) unstable; urgency=low
28

39
* New upstream version

‎packaging/linux/debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VERSION=2.0~beta1
3+
VERSION=2.0~beta2
44
DEST=build/debian/portabase-$VERSION
55

66
rm -rf build/debian

‎packaging/mac/Info.plist

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<key>CFBundleExecutable</key>
2323
<string>PortaBase</string>
2424
<key>CFBundleGetInfoString</key>
25-
<string>2.0, (c) Jeremy Bowman, 2002-2010</string>
25+
<string>2.0b2, (c) Jeremy Bowman, 2002-2010</string>
2626
<key>CFBundleIconFile</key>
2727
<string>@ICON@</string>
2828
<key>CFBundleIdentifier</key>
@@ -32,11 +32,11 @@
3232
<key>CFBundlePackageType</key>
3333
<string>APPL</string>
3434
<key>CFBundleShortVersionString</key>
35-
<string>2.0</string>
35+
<string>2.0b2</string>
3636
<key>CFBundleSignature</key>
3737
<string>PBas</string>
3838
<key>CFBundleVersion</key>
39-
<string>2.0</string>
39+
<string>2.0.0b2</string>
4040
<key>LSMinimumSystemVersion</key>
4141
<string>10.4.0</string>
4242
</dict>

‎packaging/maemo/debian/changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
portabase (2.0~beta2-1) unstable; urgency=low
2+
3+
* New upstream version
4+
5+
-- Jeremy Bowman <[email protected]> Wed, 17 May 2010 08:17:59 -0500
6+
17
portabase (2.0~beta1-2) unstable; urgency=low
28

39
* Declare the debug package in the control file

‎packaging/maemo/diablo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VERSION=2.0~beta1
3+
VERSION=2.0~beta2
44
DEST=build/diablo/portabase-$VERSION
55

66
rm -rf build/diablo

‎packaging/maemo/fremantle.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VERSION=2.0~beta1
3+
VERSION=2.0~beta2
44
DEST=build/fremantle/portabase-$VERSION
55

66
rm -rf build/fremantle

‎portabase.cpp

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

‎portabase.iss

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
[Setup]
55
AppName=PortaBase
6-
AppVerName=PortaBase 2.0b1
6+
AppVerName=PortaBase 2.0b2
77
AppPublisher=Jeremy Bowman
88
AppPublisherURL=http://portabase.sourceforge.net
99
AppSupportURL=http://portabase.sourceforge.net
1010
AppUpdatesURL=http://portabase.sourceforge.net
1111
AppReadmeFile=README.txt
12-
AppVersion=2.0b1
12+
AppVersion=2.0b2
1313
AppCopyright=Copyright (C) 2002-2010 Jeremy Bowman
1414
DefaultDirName={pf}\PortaBase
1515
DefaultGroupName=PortaBase
@@ -19,9 +19,9 @@ ChangesAssociations=yes
1919
LicenseFile=COPYING
2020
PrivilegesRequired=admin
2121
SolidCompression=yes
22-
OutputBaseFilename=PortaBase_2.0b1
22+
OutputBaseFilename=PortaBase_2.0b2
2323
OutputDir=build\windows
24-
VersionInfoVersion=2.0.0.0
24+
VersionInfoVersion=2.0.0.1
2525
ShowLanguageDialog=yes
2626

2727
[Tasks]

‎portabase.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DESTDIR = build
55
OBJECTS_DIR = build
66
MOC_DIR = build
77
RCC_DIR = build
8-
VERSION = 2.0.0b1
8+
VERSION = 2.0.0b2
99
TRANSLATIONS = resources/translations/portabase_cs.ts \
1010
resources/translations/portabase_de.ts \
1111
resources/translations/portabase_en.ts \

‎resources/help/html/PortaBase.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<html>
33
<head>
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5-
<title>PortaBase 2.0b1</title>
5+
<title>PortaBase 2.0b2</title>
66
</head>
77
<body>
88

9-
<div align="center"><h3>PortaBase 2.0b1</h3> - A portable database -</div>
9+
<div align="center"><h3>PortaBase 2.0b2</h3> - A portable database -</div>
1010
<br>
1111
<a href="#intro">1)Introduction</a><br>
1212
<a href="#file">2)File selector</a><br>

‎sorteditor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ void SortEditor::updateTable(const QStringList &colNames)
157157
QString direction = "";
158158
if (sortCols.contains(name)) {
159159
if (descCols.contains(name)) {
160-
direction = tr("Ascending");
160+
direction = tr("Descending");
161161
}
162162
else {
163-
direction = tr("Descending");
163+
direction = tr("Ascending");
164164
}
165165
item->setCheckState(0, Qt::Checked);
166166
}

0 commit comments

Comments
 (0)