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 026e16e0ff2da1d24f792054cfe8dc8d)

Currently displaying revision 026e16e0ff2da1d24f792054cfe8dc8d , Show latest

Index: applications/bibletime/bibletime/frontend/btinstallmgr.cpp
===================================================================
--- applications/bibletime/bibletime/frontend/btinstallmgr.cpp	(revision 1173985)
+++ applications/bibletime/bibletime/frontend/btinstallmgr.cpp	(revision 1173986)
@@ -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>
@@ -269,8 +273,29 @@
 
 	BTInstallMgr::BTInstallMgr() : InstallMgr(Tool::RemoteConfig::configPath().latin1(), this) { //use this class also as status reporter
 		this->setFTPPassive(true);
+	}
 
+#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
Index: applications/bibletime/bibletime/frontend/cswordsetupdialog.cpp
===================================================================
--- applications/bibletime/bibletime/frontend/cswordsetupdialog.cpp	(revision 1173985)
+++ applications/bibletime/bibletime/frontend/cswordsetupdialog.cpp	(revision 1173986)
@@ -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 updated sucessfully
+				bool successful = iMgr.refreshRemoteSource( &is );
+				if (!successful ) { //make sure the sources were updated sucessfully
 					m_refreshedRemoteSources = true;
 					success = true;
 				}
Index: applications/bibletime/bibletime/frontend/btinstallmgr.h
===================================================================
--- applications/bibletime/bibletime/frontend/btinstallmgr.h	(revision 1173985)
+++ applications/bibletime/bibletime/frontend/btinstallmgr.h	(revision 1173986)
@@ -15,8 +15,8 @@
 
 //BibleTIme includes
 #include "backend/cswordbackend.h"
+#include "config.h"
 
-
 //sword includes
 #include <installmgr.h>
 #include <ftptrans.h>
@@ -27,6 +27,10 @@
 #include <qstring.h>
 #include <qstringlist.h>
 
+#ifdef SWORD_MULTIVERSE
+#define SWORD_INTERNET_WARNING 1
+#endif
+
 namespace BookshelfManager {
 
 	typedef qPtrList<sword::InstallSource> InstallSourceList;
@@ -80,6 +84,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);

Places

File bibletime-trinity-r1173986-bibletime-sword.diff of Package bibletime (Revision 026e16e0ff2da1d24f792054cfe8dc8d)

Places