From 9d465361a0247cfe93638845283a52139dc1ee01 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 30 Nov 2010 08:47:14 -0700 Subject: [PATCH 1/4] ... --- resources/images/news/novaya_gazeta.png | Bin 0 -> 610 bytes resources/images/news/vedomosti.png | Bin 0 -> 693 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/images/news/novaya_gazeta.png create mode 100644 resources/images/news/vedomosti.png diff --git a/resources/images/news/novaya_gazeta.png b/resources/images/news/novaya_gazeta.png new file mode 100644 index 0000000000000000000000000000000000000000..41886a64b9d1e72d5d91d260871719d982b0dbf6 GIT binary patch literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#O=fT^vI!PT!sA>pdk=q;37@De@~=l9aTX zoN|@84)!}t>=9yNoj6T5+T$Msvm#eZ)NTPL@m-uEAp$LeET&3{ThT=#3A;oX^W!Ed4! z-tT>~cayE2^-bFkTl)8>zlv>IcOv-IHuINVJjUM*Pxhu8-h0Qwp)68RZ+EW!h@Itc z#;+G6c@{r<&8GL%Q`7anlZ?;9hLbnS4-~%*y;Za1SO&|(ioIVayG-C>Z#ZmF#Lus= zI`H5Y3eKT!%89Z2aTBfYu6&*2Yo=3q(3wxP@&AT`n#Ch+sRJJNK9`VYRK2*HW zqThSzat1k*(4u3OXKaLJzcaXhDdJAa`@dxCt0%nw|8#!8bm_Uu_T|?YGUDbvON~{( zC#gKw^v)_vcBbcZS{e2nkf_}3{6EPi)@(=hSDXGQEr!D?Iy?%VGfx~|D0xkMI)j9) z^nsqo*Js___+Cfx)k@u`r{f}zeF$G)zx=+R(>#NpVl}6Maim(}8c~v5l$uzQs+$5N z7>o=I4Rj3+b&ZTejEt;|4Xg|;wGE7|3=CLP)KXy@a`RI%(<%vQh`JgO2-Lvf>FVdQ I&MBb@0Ocj^tpET3 literal 0 HcmV?d00001 diff --git a/resources/images/news/vedomosti.png b/resources/images/news/vedomosti.png new file mode 100644 index 0000000000000000000000000000000000000000..3187308f4e9ff62fc547475a1a69523dd39b0e88 GIT binary patch literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#Qz)x;TbdoSr(#H(NMRq;0;nv6fztc%4db zx7(ubIt3OhDG}2h0a||rMO`Lz#qKD08DF5yvGzigW3R|AO)+QgjXNf2?a=TQX*F5# zK&hv#%&54(yKvb|KkljrhisqU`@HY`UK!W$H6hPh>pPM*Mg+0<>!|XDX?<3jdtd3^ zvX1v`-oFoiGIQOcFMn^}w56?^a<>T*^?rc}CR;H_2 zqPMqsbDenhyGZ(B>(i&KVd3^hhK1q`zkANUxhxrwR`4&2Z>=dqTjBzSU7D|6zrR^z z&BJ$dV)oz9RU3Y4f7%>*yfijztCU+)bhXTl{rXU+nn6?8EzL@m4>slxky<^L*|*AOCsub92#^E4rJW%SVLmx%0Bb zp*rEn>v_*rIbF);YYTF^I8C~cv%Nbzduv2)$(JmZHM=~b){0#_7bs^@t9NVpWp~N_ zrOkgjV|w&N3T4<|U%sw?{BYav@9%PYV&$D#nY%J)%Dj4c(16Ezopr093dcqyPW_ literal 0 HcmV?d00001 From 243fcf5b3825d757c32db3f63c1db0704c052a66 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 30 Nov 2010 10:15:53 -0700 Subject: [PATCH 2/4] Search box: Only trigger as you type timer if text content has changed --- src/calibre/gui2/search_box.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py index c82489d218..547dc32c53 100644 --- a/src/calibre/gui2/search_box.py +++ b/src/calibre/gui2/search_box.py @@ -140,7 +140,7 @@ class SearchBox2(QComboBox): if event.key() in (Qt.Key_Return, Qt.Key_Enter): self.do_search() self.focus_to_library.emit() - if self.as_you_type: + elif self.as_you_type and unicode(event.text()): self.timer.start(1500) def timer_event(self): From ae9fcef78828834081ae54c825fd1969a964a3f3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 30 Nov 2010 10:17:23 -0700 Subject: [PATCH 3/4] ... --- src/calibre/gui2/search_box.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py index 547dc32c53..f8d5d4777e 100644 --- a/src/calibre/gui2/search_box.py +++ b/src/calibre/gui2/search_box.py @@ -76,7 +76,6 @@ class SearchBox2(QComboBox): self.activated.connect(self.history_selected) self.setEditable(True) self.as_you_type = True - self.prev_search = '' self.timer = QTimer() self.timer.setSingleShot(True) self.timer.timeout.connect(self.timer_event, type=Qt.QueuedConnection) @@ -154,7 +153,6 @@ class SearchBox2(QComboBox): text = unicode(self.currentText()).strip() if not text: return self.clear() - self.prev_search = text self.search.emit(text) idx = self.findText(text, Qt.MatchFixedString) From 1063a52c121b5ee76e62f1d4773d14d8b4ad73e0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 30 Nov 2010 10:22:01 -0700 Subject: [PATCH 4/4] ... --- src/calibre/gui2/search_box.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py index f8d5d4777e..6624acf35f 100644 --- a/src/calibre/gui2/search_box.py +++ b/src/calibre/gui2/search_box.py @@ -106,10 +106,11 @@ class SearchBox2(QComboBox): def text(self): return self.currentText() - def clear(self, emit_search=False): + def clear(self, emit_search=True): self.normalize_state() self.setEditText('') - self.search.emit('') + if emit_search: + self.search.emit('') self._in_a_search = False self.cleared.emit()