Skip to content

Commit fe948da

Browse files
author
Jeremy Bowman
committed
Fremantle condition editor fix, updated version number
1 parent a0f7484 commit fe948da

17 files changed

+50
-26
lines changed

‎CHANGES

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2010-06-02 #################### PortaBase 2.0 ####################
2+
3+
2010-06-02 JMB Fremantle condition editor fix, updated version number
4+
5+
Fixed a bug on Fremantle where launching the date picker dialog from the
6+
condition editor would confuse the back/close button logic in the app
7+
thereafter. Updated version numbers for the next release.
8+
19
2010-05-29 JMB Recent files update fix
210

311
Fixed a bug where an invalid entry was added to the recently opened files

‎README.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PortaBase 2.0 release candidate 1 (May 2010)
2-
--------------------------------------------
1+
PortaBase 2.0 (June 2010)
2+
-------------------------
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,
55
Windows, and Maemo (Diablo and Fremantle).

‎conditioneditor.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@
3737
* @param parent The dialog's parent widget, if any
3838
*/
3939
ConditionEditor::ConditionEditor(Database *dbase, QWidget *parent)
40-
: PBDialog(tr("Condition Editor"), parent, true), dataType(STRING)
40+
: PBDialog(tr("Condition Editor"), parent), db(dbase), dataType(STRING)
4141
{
42-
db = dbase;
42+
#if defined(Q_WS_HILDON) || defined(Q_WS_MAEMO_5)
43+
vbox->addStretch(1);
44+
#endif
4345
columnList= new QComboBox(this);
4446
vbox->addWidget(columnList);
4547
columnList->addItem(tr("Any text column"));
@@ -106,6 +108,9 @@ ConditionEditor::ConditionEditor(Database *dbase, QWidget *parent)
106108
constantStack->addWidget(constantCombo);
107109
constantStack->setCurrentWidget(constantLine);
108110

111+
#if defined(Q_WS_HILDON) || defined(Q_WS_MAEMO_5)
112+
vbox->addStretch(1);
113+
#endif
109114
finishLayout();
110115
}
111116

‎debian/changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
portabase (2.0-1) unstable; urgency=low
2+
3+
* New upstream version
4+
5+
-- Jeremy Bowman <[email protected]> Wed, 02 Jun 2010 16:23:17 -0500
6+
17
portabase (2.0~rc1-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~rc1
3+
VERSION=2.0
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.0rc1, (c) Jeremy Bowman, 2002-2010</string>
25+
<string>2.0, (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.0rc1</string>
35+
<string>2.0</string>
3636
<key>CFBundleSignature</key>
3737
<string>PBas</string>
3838
<key>CFBundleVersion</key>
39-
<string>2.0.0d1</string>
39+
<string>2.0.0f1</string>
4040
<key>LSMinimumSystemVersion</key>
4141
<string>10.4.0</string>
4242
</dict>

‎packaging/mac/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Script for packaging the Mac version of PortaBase for distribution
44
# Assumes that we are in the PortaBase source code root directory
55

6-
VERSION=2.0rc1
6+
VERSION=2.0
77
DIRNAME=PortaBase_$VERSION
88

99
rm -rf build/*.app

‎packaging/maemo/debian/changelog

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

39
* New upstream version

‎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~rc1
3+
VERSION=2.0
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~rc1
3+
VERSION=2.0
44
DEST=build/fremantle/portabase-$VERSION
55

66
rm -rf build/fremantle

‎portabase.cpp

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

‎portabase.iss

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

44
[Setup]
55
AppName=PortaBase
6-
AppVerName=PortaBase 2.0rc1
6+
AppVerName=PortaBase 2.0
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.0rc1
12+
AppVersion=2.0
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.0rc1
22+
OutputBaseFilename=PortaBase_2.0
2323
OutputDir=build\windows
24-
VersionInfoVersion=2.0.0.2
24+
VersionInfoVersion=2.0.0.3
2525
ShowLanguageDialog=yes
2626

2727
[Tasks]
@@ -65,4 +65,3 @@ Name: "{userdesktop}\PortaBase"; Filename: "{app}\portabase.exe"; Tasks: desktop
6565
[Run]
6666
Filename: "{app}\PortaBase.exe"; Description: "{cm:LaunchProgram,PortaBase}"; Flags: nowait postinstall skipifsilent
6767

68-

‎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.0rc1
8+
VERSION = 2.0.0
99
TRANSLATIONS = resources/translations/portabase_cs.ts \
1010
resources/translations/portabase_de.ts \
1111
resources/translations/portabase_en.ts \

‎resources/help/cs/html/PortaBase.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
22
<html>
33
<head>
4-
<title>PortaBase 2.0rc1</title>
4+
<title>PortaBase 2.0</title>
55
<meta http-equiv="content-type" content="text/html; charset=utf-8">
66
</head>
77
<body>
88

9-
<div align="center"><h3>PortaBase 2.0rc1</h3>
9+
<div align="center"><h3>PortaBase 2.0</h3>
1010
- Přenosná databáze -</div>
1111
<br>
1212
<a href="#intro">1) Úvodem</a><br>

‎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.0rc1</title>
5+
<title>PortaBase 2.0</title>
66
</head>
77
<body>
88

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

‎resources/help/ja/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.0rc1</title>
5+
<title>PortaBase 2.0</title>
66
</head>
77
<body>
88

9-
<div align="center"><h3>PortaBase 2.0rc1</h3> - A portable database -</div>
9+
<div align="center"><h3>PortaBase 2.0</h3> - A portable database -</div>
1010
<br>
1111
<a href="#intro">1)イントロダクション</a><br>
1212
<a href="#file">2)ファイル選択画面</a><br>

‎resources/help/tw/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.0rc1</title>
5+
<title>PortaBase 2.0</title>
66
</head>
77
<body>
88

9-
<div align="center"><h3>PortaBase 2.0rc1</h3> - 一個可攜式的資料庫 -</div>
9+
<div align="center"><h3>PortaBase 2.0</h3> - 一個可攜式的資料庫 -</div>
1010
<br>
1111
<a href="#intro">1)簡介</a><br>
1212
<a href="#file">2)檔案選取器</a><br>

0 commit comments

Comments
 (0)