Skip to content

Commit 4184adb

Browse files
author
Jeremy Bowman
committed
Japanese update, accelerator clash fix, dropped file fix
1 parent 500aef0 commit 4184adb

29 files changed

+555
-866
lines changed

‎README.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PortaBase 2.0 beta 2 (May 2010)
2-
-------------------------------
1+
PortaBase 2.0 release candidate 1 (May 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).

‎debian/changelog

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

39
* New upstream version

‎menuactions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ MenuActions::MenuActions(QObject *parent)
119119
textMap.insert(EditColumns, tr("Edit Col&umns") + ellipsis);
120120
toolTipMap.insert(EditColumns, tr("Edit the database format"));
121121

122-
textMap.insert(EditEnums, tr("Edit &Enums") + ellipsis);
122+
textMap.insert(EditEnums, tr("Edit E&nums") + ellipsis);
123123
toolTipMap.insert(EditEnums, tr("Edit the enumerated data types"));
124124

125125
textMap.insert(Views, tr("Views") + ellipsis);

‎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~beta2
3+
VERSION=2.0~rc1
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.0b2, (c) Jeremy Bowman, 2002-2010</string>
25+
<string>2.0rc1, (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.0b2</string>
35+
<string>2.0rc1</string>
3636
<key>CFBundleSignature</key>
3737
<string>PBas</string>
3838
<key>CFBundleVersion</key>
39-
<string>2.0.0b2</string>
39+
<string>2.0.0d1</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.0b2
6+
VERSION=2.0rc1
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~rc1-1) unstable; urgency=low
2+
3+
* New upstream version
4+
5+
-- Jeremy Bowman <[email protected]> Wed, 27 May 2010 09:49:17 -0500
6+
17
portabase (2.0~beta2-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~beta2
3+
VERSION=2.0~rc1
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~beta2
3+
VERSION=2.0~rc1
44
DEST=build/fremantle/portabase-$VERSION
55

66
rm -rf build/fremantle

‎portabase.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,7 @@ void PortaBase::dropEvent(QDropEvent *event)
16331633
else if (file.length() < 5) {
16341634
valid = false;
16351635
}
1636-
else if (file.right(4) != ".pob") {
1636+
else if (file.right(4).toLower() != ".pob") {
16371637
valid = false;
16381638
}
16391639
if (!valid) {
@@ -1920,7 +1920,7 @@ void PortaBase::print(QPrinter *p)
19201920
void PortaBase::aboutPortaBase()
19211921
{
19221922
QString appName = qApp->applicationName();
1923-
QString text = appName + " 2.0b2\n\n" + tr("Copyright (C)")
1923+
QString text = appName + " 2.0rc1\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

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

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

2727
[Tasks]
@@ -65,3 +65,4 @@ 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.0b2
8+
VERSION = 2.0.0rc1
99
TRANSLATIONS = resources/translations/portabase_cs.ts \
1010
resources/translations/portabase_de.ts \
1111
resources/translations/portabase_en.ts \

‎qqutil/qqmenuhelper.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ QQMenuHelper::QQMenuHelper(QMainWindow *window, QToolBar *toolbar,
104104
fileSaveAction->setShortcut(QKeySequence::Save);
105105
connect(fileSaveAction, SIGNAL(triggered()), this, SIGNAL(saveFile()));
106106

107-
recent = new QMenu(menuText(tr("Open &Recent")), window);
108107
for (int i = 0; i < MAX_RECENT_FILES; i++) {
109108
// we'll set the actual paths later; just need actions that stick
110109
// around after a file is opened

‎resources/diablo.qrc

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<file alias="i18n/Qt.qm">translations/qt_en.qm</file>
3636
</qresource>
3737
<qresource lang="cs">
38+
<file alias="help/html/PortaBase.html">help/cs/html/PortaBase.html</file>
3839
<file alias="i18n/PortaBase.qm">translations/portabase_cs.qm</file>
3940
<file alias="i18n/Qt.qm">translations/qt_cs.qm</file>
4041
</qresource>

‎resources/fremantle.qrc

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
<file alias="i18n/Qt.qm">translations/qt_en.qm</file>
3535
</qresource>
3636
<qresource lang="cs">
37+
<file alias="help/html/PortaBase.html">help/cs/html/PortaBase.html</file>
3738
<file alias="i18n/PortaBase.qm">translations/portabase_cs.qm</file>
3839
<file alias="i18n/Qt.qm">translations/qt_cs.qm</file>
3940
</qresource>

0 commit comments

Comments
 (0)