From e0c4c9e8961ee46aff14308c66668dbefb475759 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 3 Apr 2011 22:30:15 +0900 Subject: [PATCH] added foreground setting / remove formatting and some icons foreground setting is not sticky due to webkit issues --- aqt/editor.py | 85 +++++++++++++++------------------ designer/icons.qrc | 3 ++ designer/icons/rating.png | Bin 1487 -> 4256 bytes designer/icons/text_remove.png | Bin 0 -> 2752 bytes designer/icons/text_sub.png | Bin 0 -> 1487 bytes designer/icons/text_super.png | Bin 0 -> 1513 bytes 6 files changed, 41 insertions(+), 47 deletions(-) create mode 100644 designer/icons/text_remove.png create mode 100644 designer/icons/text_sub.png create mode 100644 designer/icons/text_super.png diff --git a/aqt/editor.py b/aqt/editor.py index cd9357562..a18165b71 100644 --- a/aqt/editor.py +++ b/aqt/editor.py @@ -34,8 +34,8 @@ String.prototype.format = function() { var currentField = null; var changeTimer = null; -function keyUp() { - // esc clears focus +function onKey() { + // esc clears focus, allowing dialog to close if (window.event.which == 27) { currentField.blur(); return; @@ -103,7 +103,7 @@ function setFields(fields) { var n = fields[i][0]; var f = fields[i][1]; txt += "{0}".format(n); - txt += "
lame -to enable recording.'''), parent=self.parent) +to enable recording.'''), parent=self.widget) return raise if file: @@ -942,7 +933,7 @@ class FactEdit(QTextEdit): if source.hasHtml() and "qrichtext" in unicode(source.html()): self.insertHtml(source.html()) return True - if source.hasText() and (aqt.mw.config['stripHTML'] or + if source.hasText() and (self.mw.config['stripHTML'] or not source.hasHtml()): txt = unicode(source.text()) l = txt.lower() @@ -1022,7 +1013,7 @@ class FactEdit(QTextEdit): def simplifyHTML(self, html): "Remove all style information and P tags." # fixme - if not aqt.mw.config['stripHTML']: + if not self.mw.config['stripHTML']: return html html = re.sub("\n", " ", html) html = re.sub("
", "\n", html) @@ -1038,7 +1029,7 @@ class FactEdit(QTextEdit): self.parent.lastFocusedEdit = self self.parent.resetFormatButtons() self.parent.disableButtons() - if aqt.mw.config['preserveKeyboard'] and sys.platform.startswith("win32"): + if self.mw.config['preserveKeyboard'] and sys.platform.startswith("win32"): self._ownLayout = GetKeyboardLayout(0) ActivateKeyboardLayout(self._programLayout, 0) self.emit(SIGNAL("lostFocus")) @@ -1058,7 +1049,7 @@ class FactEdit(QTextEdit): QTextEdit.focusInEvent(self, evt) self.parent.formatChanged(None) self.parent.enableButtons() - if aqt.mw.config['preserveKeyboard'] and sys.platform.startswith("win32"): + if self.mw.config['preserveKeyboard'] and sys.platform.startswith("win32"): self._programLayout = GetKeyboardLayout(0) if self._ownLayout == None: self._ownLayout = self._programLayout diff --git a/designer/icons.qrc b/designer/icons.qrc index 230974765..7e4827c84 100644 --- a/designer/icons.qrc +++ b/designer/icons.qrc @@ -94,5 +94,8 @@ icons/text_under.png icons/view-pim-news.png icons/view_text.png + icons/text_sub.png + icons/text_super.png + icons/text_remove.png diff --git a/designer/icons/rating.png b/designer/icons/rating.png index 48d79e9ec197c9b723be1e5cc5fa3cef9e8f2e42..9373e3d3347dc2fc879dae916fea38a36b3688f8 100644 GIT binary patch literal 4256 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 literal 0 HcmV?d00001 diff --git a/designer/icons/text_super.png b/designer/icons/text_super.png new file mode 100644 index 0000000000000000000000000000000000000000..8b4548d7550aa2f47003aa4d6fd3cb27d2ff5062 GIT binary patch literal 1513 zcmVjzE*LA_#g+Z{vT7%J`2GwALVr&FfURGgq zTJx5g8CYtX=Dcf~*OVzF@0?g}f%k3YEh}gamP+P@sk3C2@4Vpso|p9f?)&_}AHMmT z^WEJ3_;7x|b9=t$Ip=xKc>%zGf=@2ikhRa&FRRfLSFnP3kX!CqnDEE~_}xv?$jW6G z;E)0Dh$7&Z2Y|K@=okcAx`60XfNj>xD!@vERbObJy{82-D*%^Fz&0K5%?G@40JhsK zs{r$4ykeCKowgtFqf!31ktE_qe8}2m--1sQP=2KfXd3`-{SKU`>&?E#6zkK->O}>l zq@=t>T#}QM<5*s0*-W}gJt-yMvi>swD-4bQ@I1DW-)z1CH03~j8}LUDaO^vP^^OY) z$j!}Nm6(|5%gM(|OG{BvQGv$BMzprJqO-FTj~_oqb8|ClYHE;`m4&3Fqz4x+TyS`H zo~>cJ(3a80tEe}{3ja{up&A-`tF@OcT|H5866lH zP#7E>6co>JOQtw}m&~=n2iteX0Cj&tIRlOD!2K@Z`%2(#e@wD{<2(To5fKiTE?v?y zC}mw;9kR2tk(!zcjYfl#k`mO`)}p<=9YaGyDpD628F_hjzL!oRhIDWG3i#k0@Tw<9 z`Cmdz4Q9fyu&~00h6cSA78Dd9JUqOTSOy0NZ(+GDG&J-C%gZ#@FK1z7WJIB@txfti z%}cj#c!O*qYo42mgMxxuIEm_3Ie4tQ=i%Y;qM^eY5D@Um#fuj)Iy#E6u`#8jxEVJ$ zH`UN$s2^0mIxsMBnl4xOwy>}e{{H?a78=YkE7^`GPoAiRgoJ?g>y|7)@b&dAB@=V_ z+1uOu^#xYH;mnyc?hHXpOiZY75k?4D1b27$^`}pt{@BaQ>l6j0^Shoa)#c~sqo=0_ zlarGwXV0Gf=K^TpHBV1ZUy{rHf51s~X=!P=dGn^63kgxh*woaN9#5Y>g`b}voSdAD z7r@mz(s0l9>(}w{;X^qKdd6sE9@Ep)D)f-?0$g2PotX8Ai%U644aW6#S29H;ahA0JoF3&k2I;K-39y-XxBnF?JDYisNE3k_!54u&R%hlj;mN&=&o zj1ypGWz{Jm*4^DLcY#bOs}}(V6OpB*BG7%uj zMIu4+Iu0E=lt2-yW?jyH?~-#iHa6pVd3g}8$sHgfM6?JH(MuMvfB*h)zJNr4`W9$u zX#vwQ4jecz$oBhWT=qC2AwlkcNxic7auKNlqN1X}eof@6g@wg?e_Md5sp*?E)LT_m zB?8ndStjl1=#aSA%Ycj&5i16zT@@f>Dl01y6B7e-bMvSrC89lh_Ixg