File bibletime-trinity-r1173986-bibletime-sword.diff of Package bibletime

Overview Repositories Revisions Requests Users Attributes Meta

File bibletime-trinity-r1173986-bibletime-sword.diff of Package bibletime (Revision 588f3869eb3aa91be1614a610832af24)

Currently displaying revision 588f3869eb3aa91be1614a610832af24 , Show latest

diff -wruN bibletime-1.6.5.1.orig/bibletime/frontend/btinstallmgr.cpp bibletime-1.6.5.1/bibletime/frontend/btinstallmgr.cpp
--- bibletime-1.6.5.1.orig/bibletime/frontend/btinstallmgr.cpp	2007-10-23 21:37:46.000000000 +0400
+++ bibletime-1.6.5.1/bibletime/frontend/btinstallmgr.cpp	2011-09-08 20:41:09.594462292 +0400
@@ -10,6 +10,7 @@
 //BibleTime includes
 #include "btinstallmgr.h"
 #include "util/cpointers.h"
+#include "cbtconfig.h"
 
 //Qt includes
 #include <qfile.h>
@@ -18,8 +19,11 @@
 //KDE includes
 #include <kapplication.h>
 #include <kglobal.h>
+#include <klocale.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
+#include <kconfig.h>
+#include <kmessagebox.h>
 
 //Sword includes
 #include <filemgr.h>
@@ -272,6 +276,28 @@
 
 	}
 
+#ifdef SWORD_INTERNET_WARNING
+   bool BTInstallMgr::isUserDisclaimerConfirmed() const
+   {
+       KConfig* config = CBTConfig::getConfig();
+       config->setGroup("Remote Resources");
+       if (config->readNumEntry("Allowed", 0) == 1) {
+           return true;
+       }
+       else {
+           if (KMessageBox::questionYesNo(0, i18n("Do you wish to allow BibleTime to access the Internet?\nWARNING: Click DENY if you live in a persecuted country!"), i18n("Confirm Internet Access"), i18n("DENY"), i18n("Allow") ) == KMessageBox::No ) {
+               config->setGroup("Remote Resources");
+               config->writeEntry("Allowed", 1);
+               config->sync();
+               return true;
+           }
+           else {
+               return false;
+           }
+       }
+    }
+#endif
+
 	BTInstallMgr::~BTInstallMgr() {
 		terminate(); //make sure to close the connection
 	}
diff -wruN bibletime-1.6.5.1.orig/bibletime/frontend/btinstallmgr.h bibletime-1.6.5.1/bibletime/frontend/btinstallmgr.h
--- bibletime-1.6.5.1.orig/bibletime/frontend/btinstallmgr.h	2007-10-23 00:33:42.000000000 +0400
+++ bibletime-1.6.5.1/bibletime/frontend/btinstallmgr.h	2011-09-08 20:52:55.357338077 +0400
@@ -15,7 +15,7 @@
 
 //BibleTIme includes
 #include "backend/cswordbackend.h"
-
+#include "config.h"
 
 //sword includes
 #include <installmgr.h>
@@ -26,6 +26,9 @@
 #include <qptrlist.h>
 #include <qstring.h>
 #include <qstringlist.h>
+#ifdef SWORD_MULTIVERSE
+#define SWORD_INTERNET_WARNING 1
+#endif
 
 namespace BookshelfManager {
 
@@ -80,6 +83,12 @@
 		BTInstallMgr();
 		virtual ~BTInstallMgr();
 
+#ifdef SWORD_INTERNET_WARNING
+public:
+       /** Re-implemented from sword::InstallMgr. */
+       virtual bool isUserDisclaimerConfirmed() const;
+#endif
+
 protected:
 		/* Reimplementations of method in StatusReporter */
 		virtual void statusUpdate(double dltotal, double dlnow);
diff -wruN bibletime-1.6.5.1.orig/bibletime/frontend/cswordsetupdialog.cpp bibletime-1.6.5.1/bibletime/frontend/cswordsetupdialog.cpp
--- bibletime-1.6.5.1.orig/bibletime/frontend/cswordsetupdialog.cpp	2007-10-23 21:37:46.000000000 +0400
+++ bibletime-1.6.5.1/bibletime/frontend/cswordsetupdialog.cpp	2011-09-08 20:55:44.956432938 +0400
@@ -502,7 +502,8 @@
 		if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
 			//   int errorCode = 0;
 			if (!m_refreshedRemoteSources) {
-				if (!iMgr.refreshRemoteSource( &is ) ) { //make sure the sources were updates sucessfully
++               bool successful = iMgr.refreshRemoteSource( &is );
++               if (!successful ) { //make sure the sources were updated sucessfully
 					m_refreshedRemoteSources = true;
 					success = true;
 				}

Places

File bibletime-trinity-r1173986-bibletime-sword.diff of Package bibletime (Revision 588f3869eb3aa91be1614a610832af24)

Places