From 82cc57b3f06fb198af501a4831c30bb3a6da4c35 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Thu, 6 Sep 2012 11:33:56 +0200
Subject: [PATCH 1/3] Add link to CC in the open wireless device dialog.
---
src/calibre/gui2/dialogs/smartdevice.ui | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/calibre/gui2/dialogs/smartdevice.ui b/src/calibre/gui2/dialogs/smartdevice.ui
index 5a6e1e59e5..383bbe08e8 100644
--- a/src/calibre/gui2/dialogs/smartdevice.ui
+++ b/src/calibre/gui2/dialogs/smartdevice.ui
@@ -30,12 +30,17 @@
QLabel { margin-bottom: 1ex; }
- <p>Start wireless device connections.
- <p>You may see some messages from your computer's firewall or anti-virus manager asking you if it is OK for calibre to connect to the network. <b>Please answer yes</b>. If you do not, wireless connections will not work.
+ <p>Start wireless device connections. Currently used only
+ by <a href="https://play.google.com/store/apps/details?id=com.multipie.calibreandroid">Calibre Companion</a>
+ <p>You may see some messages from your computer's firewall or anti-virus manager asking you if it is OK for calibre to connect to the network. <b>Please answer yes</b>. If you do not, wireless connections will not work.
true
+
+ true
+
+
-
From 573f906a11a7130de4efcdb1edaebaba0cc176c7 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Thu, 6 Sep 2012 11:48:43 +0200
Subject: [PATCH 2/3] Make the CC link in the wireless driver go to MultiPie,
not Google Play.
---
src/calibre/gui2/dialogs/smartdevice.ui | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/calibre/gui2/dialogs/smartdevice.ui b/src/calibre/gui2/dialogs/smartdevice.ui
index 383bbe08e8..3fadb02fa8 100644
--- a/src/calibre/gui2/dialogs/smartdevice.ui
+++ b/src/calibre/gui2/dialogs/smartdevice.ui
@@ -31,8 +31,8 @@
<p>Start wireless device connections. Currently used only
- by <a href="https://play.google.com/store/apps/details?id=com.multipie.calibreandroid">Calibre Companion</a>
- <p>You may see some messages from your computer's firewall or anti-virus manager asking you if it is OK for calibre to connect to the network. <b>Please answer yes</b>. If you do not, wireless connections will not work.
+ by <a href="http://www.multipie.co.uk/calibre-companion/">Calibre Companion</a>
+ <p>You may see some messages from your computer's firewall or anti-virus manager asking you if it is OK for calibre to connect to the network. <b>Please answer yes</b>. If you do not, wireless connections will not work.
true
From bfb32356167ce8f46f30da8a9b8f9a4615a0529f Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Thu, 6 Sep 2012 12:04:54 +0200
Subject: [PATCH 3/3] ...
---
src/calibre/gui2/dialogs/smartdevice.ui | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/calibre/gui2/dialogs/smartdevice.ui b/src/calibre/gui2/dialogs/smartdevice.ui
index 3fadb02fa8..cd4eb650a0 100644
--- a/src/calibre/gui2/dialogs/smartdevice.ui
+++ b/src/calibre/gui2/dialogs/smartdevice.ui
@@ -31,7 +31,7 @@
<p>Start wireless device connections. Currently used only
- by <a href="http://www.multipie.co.uk/calibre-companion/">Calibre Companion</a>
+ by <a href="http://www.multipie.co.uk/calibre-companion/">Calibre Companion</a>.
<p>You may see some messages from your computer's firewall or anti-virus manager asking you if it is OK for calibre to connect to the network. <b>Please answer yes</b>. If you do not, wireless connections will not work.