Japanese update, accelerator clash fix, dropped file fix

jmbowman · May 28, 2010 · 4184adb · 4184adb
1 parent 500aef0
commit 4184adb
Show file tree

Hide file tree

Showing 29 changed files with 555 additions and 866 deletions.
diff --git a/README.txt b/README.txt
@@ -1,5 +1,5 @@
-PortaBase 2.0 beta 2 (May 2010)
--------------------------------
+PortaBase 2.0 release candidate 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).

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+portabase (2.0~rc1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Jeremy Bowman <[email protected]>  Wed, 27 May 2010 09:49:17 -0500
+
 portabase (2.0~beta2-1) unstable; urgency=low
 
   * New upstream version

diff --git a/menuactions.cpp b/menuactions.cpp
@@ -119,7 +119,7 @@ MenuActions::MenuActions(QObject *parent)
     textMap.insert(EditColumns, tr("Edit Col&umns") + ellipsis);
     toolTipMap.insert(EditColumns, tr("Edit the database format"));
 
-    textMap.insert(EditEnums, tr("Edit &Enums") + ellipsis);
+    textMap.insert(EditEnums, tr("Edit E&nums") + ellipsis);
     toolTipMap.insert(EditEnums, tr("Edit the enumerated data types"));
 
     textMap.insert(Views, tr("Views") + ellipsis);

diff --git a/packaging/linux/debian.sh b/packaging/linux/debian.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=2.0~beta2
+VERSION=2.0~rc1
 DEST=build/debian/portabase-$VERSION
 
 rm -rf build/debian

diff --git a/packaging/mac/Info.plist b/packaging/mac/Info.plist
@@ -22,7 +22,7 @@
 	<key>CFBundleExecutable</key>
 	<string>PortaBase</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0b2, (c) Jeremy Bowman, 2002-2010</string>
+	<string>2.0rc1, (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.0b2</string>
+	<string>2.0rc1</string>
 	<key>CFBundleSignature</key>
 	<string>PBas</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0b2</string>
+	<string>2.0.0d1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.4.0</string>
 </dict>

diff --git a/packaging/mac/build.sh b/packaging/mac/build.sh
@@ -3,7 +3,7 @@
 # Script for packaging the Mac version of PortaBase for distribution
 # Assumes that we are in the PortaBase source code root directory
 
-VERSION=2.0b2
+VERSION=2.0rc1
 DIRNAME=PortaBase_$VERSION
 
 rm -rf build/*.app

diff --git a/packaging/maemo/debian/changelog b/packaging/maemo/debian/changelog
@@ -1,3 +1,9 @@
+portabase (2.0~rc1-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Jeremy Bowman <[email protected]>  Wed, 27 May 2010 09:49:17 -0500
+
 portabase (2.0~beta2-1) unstable; urgency=low
 
   * New upstream version

diff --git a/packaging/maemo/diablo.sh b/packaging/maemo/diablo.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=2.0~beta2
+VERSION=2.0~rc1
 DEST=build/diablo/portabase-$VERSION
 
 rm -rf build/diablo

diff --git a/packaging/maemo/fremantle.sh b/packaging/maemo/fremantle.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=2.0~beta2
+VERSION=2.0~rc1
 DEST=build/fremantle/portabase-$VERSION
 
 rm -rf build/fremantle

diff --git a/portabase.cpp b/portabase.cpp
@@ -1633,7 +1633,7 @@ void PortaBase::dropEvent(QDropEvent *event)
         else if (file.length() < 5) {
             valid = false;
         }
-        else if (file.right(4) != ".pob") {
+        else if (file.right(4).toLower() != ".pob") {
             valid = false;
         }
         if (!valid) {
@@ -1920,7 +1920,7 @@ void PortaBase::print(QPrinter *p)
 void PortaBase::aboutPortaBase()
 {
     QString appName = qApp->applicationName();
-    QString text = appName + " 2.0b2\n\n" + tr("Copyright (C)")
+    QString text = appName + " 2.0rc1\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);

diff --git a/portabase.iss b/portabase.iss
@@ -3,13 +3,13 @@
 
 [Setup]
 AppName=PortaBase
-AppVerName=PortaBase 2.0b2
+AppVerName=PortaBase 2.0rc1
 AppPublisher=Jeremy Bowman
 AppPublisherURL=http://portabase.sourceforge.net
 AppSupportURL=http://portabase.sourceforge.net
 AppUpdatesURL=http://portabase.sourceforge.net
 AppReadmeFile=README.txt
-AppVersion=2.0b2
+AppVersion=2.0rc1
 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.0b2
+OutputBaseFilename=PortaBase_2.0rc1
 OutputDir=build\windows
-VersionInfoVersion=2.0.0.1
+VersionInfoVersion=2.0.0.2
 ShowLanguageDialog=yes
 
 [Tasks]
@@ -65,3 +65,4 @@ Name: "{userdesktop}\PortaBase"; Filename: "{app}\portabase.exe"; Tasks: desktop
 [Run]
 Filename: "{app}\PortaBase.exe"; Description: "{cm:LaunchProgram,PortaBase}"; Flags: nowait postinstall skipifsilent
 
+
diff --git a/portabase.pro b/portabase.pro
@@ -5,7 +5,7 @@ DESTDIR         = build
 OBJECTS_DIR     = build
 MOC_DIR         = build
 RCC_DIR         = build
-VERSION         = 2.0.0b2
+VERSION         = 2.0.0rc1
 TRANSLATIONS    = resources/translations/portabase_cs.ts \
                   resources/translations/portabase_de.ts \
                   resources/translations/portabase_en.ts \

diff --git a/qqutil/qqmenuhelper.cpp b/qqutil/qqmenuhelper.cpp
@@ -104,7 +104,6 @@ QQMenuHelper::QQMenuHelper(QMainWindow *window, QToolBar *toolbar,
     fileSaveAction->setShortcut(QKeySequence::Save);
     connect(fileSaveAction, SIGNAL(triggered()), this, SIGNAL(saveFile()));
 
-    recent = new QMenu(menuText(tr("Open &Recent")), window);
     for (int i = 0; i < MAX_RECENT_FILES; i++) {
         // we'll set the actual paths later; just need actions that stick
         // around after a file is opened

diff --git a/resources/diablo.qrc b/resources/diablo.qrc
@@ -35,6 +35,7 @@
      <file alias="i18n/Qt.qm">translations/qt_en.qm</file>
  </qresource>
  <qresource lang="cs">
+     <file alias="help/html/PortaBase.html">help/cs/html/PortaBase.html</file>
      <file alias="i18n/PortaBase.qm">translations/portabase_cs.qm</file>
      <file alias="i18n/Qt.qm">translations/qt_cs.qm</file>
  </qresource>

diff --git a/resources/fremantle.qrc b/resources/fremantle.qrc
@@ -34,6 +34,7 @@
      <file alias="i18n/Qt.qm">translations/qt_en.qm</file>
  </qresource>
  <qresource lang="cs">
+     <file alias="help/html/PortaBase.html">help/cs/html/PortaBase.html</file>
      <file alias="i18n/PortaBase.qm">translations/portabase_cs.qm</file>
      <file alias="i18n/Qt.qm">translations/qt_cs.qm</file>
  </qresource>