[Pkg-crosswire-devel] [Branch ~pkgcrosswire/bibletime/main] Rev 23: New upstream release

noreply at launchpad.net noreply at launchpad.net
Sun Jun 7 06:08:07 BST 2009


------------------------------------------------------------
revno: 23
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Sat 2009-06-06 22:01:50 -0700
message:
  New upstream release
modified:
  CMakeLists.txt
  ChangeLog
  debian/changelog
  src/backend/rendering/cdisplayrendering.cpp
  src/bibletime.cpp
  src/frontend/display/bthtmlreaddisplay.cpp
  src/util/cresmgr.cpp
  src/util/cresmgr.h

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2009-05-28 23:32:39 +0000
+++ CMakeLists.txt	2009-06-07 05:01:50 +0000
@@ -2,7 +2,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
 
 #Version
-ADD_DEFINITIONS(-DBT_VERSION=\\\"2.0\\\")
+ADD_DEFINITIONS(-DBT_VERSION=\\\"2.0.1\\\")
 
 #Non-English locales to be processed and installed for UI, handbook and howto
 LIST(APPEND MESSAGE_LOCALE_LANGS af bg cs da de en_GB es et fi fr hu it ko nl nn_NO no pl pt_br ro ru sk sv ua vi zh_CN zh_TW)
@@ -307,7 +307,7 @@
 SET(CPACK_PACKAGE_VENDOR "http://www.bibletime.info")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "BibleTime")
 
 ######################################################

=== modified file 'ChangeLog'
--- ChangeLog	2009-05-28 23:32:39 +0000
+++ ChangeLog	2009-06-07 05:01:50 +0000
@@ -1,3 +1,13 @@
+2009-06-06 Martin Gruner <mgruner at crosswire.org>
+	* Release 2.0.1
+
+2009-06-02 Martin Gruner <mgruner at crosswire.org>
+	* Fix bug #2799800: Display broken when verse numbers are turned off
+
+2009-05-30 Gary Holmlund
+	* Fix defect, the main window icon was missing - defect # 2798758
+	* Removed debug code writing a out.txt file in the current directory without warning
+
 2009-05-28 Martin Gruner <mgruner at crosswire.org>
 	* release 2.0
 

=== modified file 'debian/changelog'
--- debian/changelog	2009-06-03 06:41:07 +0000
+++ debian/changelog	2009-06-07 05:01:50 +0000
@@ -1,3 +1,9 @@
+bibletime (2.0.1-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Jonathan Marsden <jmarsden at fastmail.fm>  Sat, 06 Jun 2009 21:58:36 -0700
+
 bibletime (2.0-1) unstable; urgency=low
 
   * New upstream version.

=== modified file 'src/backend/rendering/cdisplayrendering.cpp'
--- src/backend/rendering/cdisplayrendering.cpp	2009-04-05 07:01:43 +0000
+++ src/backend/rendering/cdisplayrendering.cpp	2009-06-07 05:01:50 +0000
@@ -19,6 +19,7 @@
 //Qt
 #include <QString>
 #include <QRegExp>
+#include <QDebug>
 
 namespace Rendering {
 
@@ -80,8 +81,9 @@
 			}
 		}
 
+
 		if (linkText.isEmpty()) {
-			return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\" />");
+			return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\"></a>");
 		}
 		else {
 			return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\" ")
@@ -147,7 +149,7 @@
 		CDisplayTemplateMgr::Settings settings;
 		settings.modules = modules;
 		settings.langAbbrev = ((modules.count() == 1) && lang->isValid()) ? lang->abbrev() : QString::null;
-		
+
 		if (modules.count() == 1)
 			settings.pageDirection = (modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr"  : "rtl";
 		else

=== modified file 'src/bibletime.cpp'
--- src/bibletime.cpp	2009-04-29 17:39:29 +0000
+++ src/bibletime.cpp	2009-06-07 05:01:50 +0000
@@ -20,6 +20,7 @@
 
 #include "util/ctoolclass.h"
 #include "util/cpointers.h"
+#include "util/cresmgr.h"
 #include "util/directoryutil.h"
 
 #include "backend/drivers/cswordmoduleinfo.h"
@@ -75,6 +76,7 @@
    initConnections();
    readSettings();
    setPlainCaption(QString());
+	setWindowIcon( util::filesystem::DirectoryUtil::getIcon(CResMgr::mainWindow::icon) );
 }
 
 BibleTime::~BibleTime() 

=== modified file 'src/frontend/display/bthtmlreaddisplay.cpp'
--- src/frontend/display/bthtmlreaddisplay.cpp	2009-05-27 20:11:46 +0000
+++ src/frontend/display/bthtmlreaddisplay.cpp	2009-06-07 05:01:50 +0000
@@ -213,19 +213,11 @@
 	return QString();
 }
 
-#include <QTextStream>
 // Puts html text and javascript into QWebView
 void BtHtmlReadDisplay::setText( const QString& newText ) 
 {
 	QString jsText = newText;
 
-     QFile file("out.txt");
-     if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
-         return;
-
-     QTextStream out(&file);
-     out <<  newText << "\n";
-
 	jsText.replace(body,jsBegin+javascript+jsEnd+body);
 
 	// Disconnect any previous connect and connect to slot that loads the javascript object
@@ -379,4 +371,4 @@
     if ( e->type() == QEvent::Leave )
         m_display->m_jsObject->clearPrevAttribute();
     return QWidget::event(e);
-}
\ No newline at end of file
+}

=== modified file 'src/util/cresmgr.cpp'
--- src/util/cresmgr.cpp	2009-04-05 07:01:43 +0000
+++ src/util/cresmgr.cpp	2009-06-07 05:01:50 +0000
@@ -13,6 +13,9 @@
 
 
 namespace CResMgr {
+	namespace mainWindow {
+		const QString icon = "bibletime.svg";
+	} // mainWindow
 	namespace modules {
 		namespace bible {
 			const QString icon_unlocked  = "bible.svg";

=== modified file 'src/util/cresmgr.h'
--- src/util/cresmgr.h	2009-04-05 07:01:43 +0000
+++ src/util/cresmgr.h	2009-06-07 05:01:50 +0000
@@ -20,6 +20,9 @@
 namespace CResMgr {
 	void init_tr();
 
+	namespace mainWindow {
+		extern const QString icon;
+	}
 	namespace modules {
 		namespace bible {
 			extern const QString icon_unlocked;



--
lp:~pkgcrosswire/bibletime/main
https://code.launchpad.net/~pkgcrosswire/bibletime/main

Your team Crosswire Packaging Team is subscribed to branch lp:~pkgcrosswire/bibletime/main.
To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/bibletime/main/+edit-subscription.




More information about the Pkg-crosswire-devel mailing list