From 72d6fbf2130dc005cb66f4f314080c504e06cef9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 20 Dec 2010 19:51:20 -0700
Subject: [PATCH] Comments editor completed

---
 resources/images/format-text-heading.png | Bin 0 -> 965 bytes
 resources/images/insert-link.png         | Bin 0 -> 3696 bytes
 src/calibre/gui2/comments_editor.py      |  87 ++++++++++++++++++++++-
 3 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 resources/images/format-text-heading.png
 create mode 100644 resources/images/insert-link.png

diff --git a/resources/images/format-text-heading.png b/resources/images/format-text-heading.png
new file mode 100644
index 0000000000000000000000000000000000000000..970acb7d604b8ce0ea7c852c8a5c7d31f4c27ca3
GIT binary patch
literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#XGugsRCwC#SIchGKoq?*b`m>*G|i&j
z6}sZ_D{PREy6p!*c5Q)D350}DNy;x&ZGi=_V8b_5`~ek}K&Xh84QlhS<0LlsUV9wd
zsT+ditQcu(*JozVnfscF004bwXXk?u;+E^W;CUWo*^mdMl*IFKd3pIZeY?E7yX#H6
z5hro$_{X4~Q~UbuJ1Wf706+#_yt)7Zr$GXQGP{(5O(Zf>K|G2pcnUr4AIT!J^uO!I
zV=OK}X1Dtx2c!#-B6|S|{)7b*0tBW@RE{_Foj*2-1;HE)@Ns<doRsuVwScB+kk92n
z$1Z|J`n?`F*r}yqDx-8==T5DM-v@(%AB2Bn0qQxNyt1|iCnvvnp?<#)^Ye4isMmSy
z%IfL}R^Qx&9=?-!7s=K)HsJ8fA-sS07Hr!N#ihC=6hOwqXYF1MDwPUUt5ukpsX*;+
zEli~m4F6~0XccOWMgy8>Ets9HvdHM>(k-9`<k(!#g@r2%U>F8>O3~{#uR*KT0veLU
zZXnj_SaAIF7+$@81E;5FD69;YW%=19hihNpf_TuGrUChU9tzm~{PnnwQ!5rtC=?0-
z<}yyZ+u#4h!B{L7Rn1QXxVSh7qwXL=!$cz5CHgg|=Wxd^FG4Y5A_)off_X%?v~-94
z{i43b?(hQ2p?k*!Vf<aN022k!Vh`3gz;PTu3y`=}D*2Hf5kLW1E|-1Fp@kR|=_P)|
z1@W@1fsH<-Z8%OBHlIJkC?7DM(>1vN@DUOfaK{#p9nKf*dlE#}P}q4jF4YC}uAvW`
z%_i@P7UZ1nb^`%L475{>6O%C-tL7)?h1hrth(t;PG%@O_h$sQkLK4ON^@S>e=VD?K
z0V>+9cAL&?OtDT_AyrwO1dC?G*g_=HUld$NM?d_UKotzXAACLtOYFa3ejJDk1ZY9Q
zz^BwCJbv<&gQ$(Wu`L_wTQB*$!~mQa(-G7BwUcdbdwZMjX&u}4I+n$~>p17$<?z7a
zJ}E})@!H5ijW~%r76TfcY~lIp@+k&EA@L&DDs{q5g3)?%>{*Zi!~0vx{cbW$#4_ct
z1Y~tD{4XHA6iW%yZZfQ3Q*Me=S)jGIw|9wZ_Y}!nDpf1k7qQQdTvsyuiHQ9-{TwAi
nx<!`gjxl8~(9Nd(M}PqUkbjK|=HJ=G00000NkvXXu0mjf`q{pl

literal 0
HcmV?d00001

diff --git a/resources/images/insert-link.png b/resources/images/insert-link.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9e335d320408f26bec0e37da2fd9f7c28c3cb0e
GIT binary patch
literal 3696
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
O0000<MNUMnLSTYh&Ie=w

literal 0
HcmV?d00001

diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py
index c644d696de..a21390bcd0 100644
--- a/src/calibre/gui2/comments_editor.py
+++ b/src/calibre/gui2/comments_editor.py
@@ -5,18 +5,19 @@ __license__   = 'GPL v3'
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
+import re, os
 
 from lxml import html
 from lxml.html import soupparser
 
 from PyQt4.Qt import QApplication, QFontInfo, QSize, QWidget, QPlainTextEdit, \
-    QToolBar, QVBoxLayout, QAction, QIcon, QWebPage, Qt, QTabWidget, \
-    QSyntaxHighlighter, QColor, QChar, QColorDialog
+    QToolBar, QVBoxLayout, QAction, QIcon, QWebPage, Qt, QTabWidget, QUrl, \
+    QSyntaxHighlighter, QColor, QChar, QColorDialog, QMenu, QInputDialog
 from PyQt4.QtWebKit import QWebView
 
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre import xml_replace_entities
-
+from calibre.gui2 import open_url
 
 class PageAction(QAction): # {{{
 
@@ -44,6 +45,18 @@ class PageAction(QAction): # {{{
 
 # }}}
 
+class BlockStyleAction(QAction): # {{{
+
+    def __init__(self, text, name, view):
+        QAction.__init__(self, text, view)
+        self._name = name
+        self.triggered.connect(self.apply_style)
+
+    def apply_style(self, *args):
+        self.parent().exec_command('formatBlock', self._name)
+
+# }}}
+
 class EditorWidget(QWebView): # {{{
 
     def __init__(self, parent=None):
@@ -98,6 +111,38 @@ class EditorWidget(QWebView): # {{{
                 _('Background color'), self)
         self.action_background.triggered.connect(self.background_color)
 
+        self.action_block_style = QAction(QIcon(I('format-text-heading')),
+                _('Style text block'), self)
+        self.action_block_style.setToolTip(
+                _('Style the selected text block'))
+        self.block_style_menu = QMenu(self)
+        self.action_block_style.setMenu(self.block_style_menu)
+        self.block_style_actions = []
+        for text, name in [
+                (_('Normal'), 'p'),
+                (_('Heading') +' 1', 'h1'),
+                (_('Heading') +' 2', 'h2'),
+                (_('Heading') +' 3', 'h3'),
+                (_('Heading') +' 4', 'h4'),
+                (_('Heading') +' 5', 'h5'),
+                (_('Heading') +' 6', 'h6'),
+                (_('Pre-formatted'), 'pre'),
+                (_('Address'), 'address'),
+                ]:
+            ac = BlockStyleAction(text, name, self)
+            self.block_style_menu.addAction(ac)
+            self.block_style_actions.append(ac)
+
+        self.action_insert_link = QAction(QIcon(I('insert-link.png')),
+                _('Insert link'), self)
+        self.action_insert_link.triggered.connect(self.insert_link)
+
+        self.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
+        self.page().linkClicked.connect(self.link_clicked)
+
+    def link_clicked(self, url):
+        open_url(url)
+
     def foreground_color(self):
         col = QColorDialog.getColor(Qt.black, self,
                 _('Choose foreground color'), QColorDialog.ShowAlphaChannel)
@@ -110,6 +155,37 @@ class EditorWidget(QWebView): # {{{
         if col.isValid():
             self.exec_command('hiliteColor', unicode(col.name()))
 
+    def insert_link(self, *args):
+        link, ok = QInputDialog.getText(self, _('Create link'),
+            _('Enter URL'))
+        if not ok:
+            return
+        url = self.parse_link(unicode(link))
+        if url.isValid():
+            url = unicode(url.toString())
+            self.exec_command('createLink', url)
+
+    def parse_link(self, link):
+        link = link.strip()
+        has_schema = re.match(r'^[a-zA-Z]+:', link)
+        if has_schema is not None:
+            url = QUrl(link, QUrl.TolerantMode)
+            if url.isValid():
+                return url
+        if os.path.exists(link):
+            return QUrl.fromLocalFile(link)
+
+        if has_schema is None:
+            first, _, rest = link.partition('.')
+            prefix = 'http'
+            if first == 'ftp':
+                prefix = 'ftp'
+            url = QUrl(prefix +'://'+link, QUrl.TolerantMode)
+            if url.isValid():
+                return url
+
+        return QUrl(link, QUrl.TolerantMode)
+
     def sizeHint(self):
         return QSize(150, 150)
 
@@ -436,6 +512,11 @@ class Editor(QWidget):
         self.toolbar1.addAction(self.editor.action_background)
         self.toolbar1.addSeparator()
 
+        self.toolbar1.addAction(self.editor.action_block_style)
+        w = self.toolbar1.widgetForAction(self.editor.action_block_style)
+        w.setPopupMode(w.InstantPopup)
+        self.toolbar1.addAction(self.editor.action_insert_link)
+
         self.code_edit.textChanged.connect(self.code_dirtied)
         self.editor.page().contentsChanged.connect(self.wyswyg_dirtied)