Mercurial Repositories > eric / file comparison
comparison: Helpviewer/HelpBrowserWV.py
Helpviewer/HelpBrowserWV.py
- changeset 4612
- c9982bcd00f8
- parent 4357
- 815d1f3116ff
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4610:93732395fc1d | 4612:c9982bcd00f8 |
|---|---|
| 684 data = self.history().currentItem().userData() | 684 data = self.history().currentItem().userData() |
| 685 if data is None: | 685 if data is None: |
| 686 return | 686 return |
| 687 | 687 |
| 688 if 'zoom' in data: | 688 if 'zoom' in data: |
| 689 frame.page().view().setZoomValue(int(data['zoom'] * 100)) | 689 frame.page().view().setZoomValue(int(data['zoom'] * 100), |
| 690 saveValue=False) | |
| 690 | 691 |
| 691 if 'scrollPos' in data and frame.scrollPosition() == QPoint(0, 0): | 692 if 'scrollPos' in data and frame.scrollPosition() == QPoint(0, 0): |
| 692 frame.setScrollPosition(data['scrollPos']) | 693 frame.setScrollPosition(data['scrollPos']) |
| 693 | 694 |
| 694 ############################################################################### | 695 ############################################################################### |
| 1054 """ | 1055 """ |
| 1055 Private slot to apply the current zoom factor. | 1056 Private slot to apply the current zoom factor. |
| 1056 """ | 1057 """ |
| 1057 self.setZoomValue(self.__currentZoom) | 1058 self.setZoomValue(self.__currentZoom) |
| 1058 | 1059 |
| 1059 def setZoomValue(self, value): | 1060 def setZoomValue(self, value, saveValue=True): |
| 1060 """ | 1061 """ |
| 1061 Public method to set the zoom value. | 1062 Public method to set the zoom value. |
| 1062 | 1063 |
| 1063 @param value zoom value (integer) | 1064 @param value zoom value (integer) |
| 1065 @keyparam saveValue flag indicating to save the zoom value with the | |
| 1066 zoom manager | |
| 1067 @type bool | |
| 1064 """ | 1068 """ |
| 1065 if value != self.zoomValue(): | 1069 if value != self.zoomValue(): |
| 1066 try: | 1070 try: |
| 1067 self.setZoomFactor(value / 100.0) | 1071 self.setZoomFactor(value / 100.0) |
| 1068 except AttributeError: | 1072 except AttributeError: |
| 1069 self.setTextSizeMultiplier(value / 100.0) | 1073 self.setTextSizeMultiplier(value / 100.0) |
| 1074 self.__currentZoom = value | |
| 1075 if saveValue: | |
| 1076 Helpviewer.HelpWindow.HelpWindow.zoomManager().setZoomValue( | |
| 1077 self.url(), value) | |
| 1070 self.zoomValueChanged.emit(value) | 1078 self.zoomValueChanged.emit(value) |
| 1071 | 1079 |
| 1072 def zoomValue(self): | 1080 def zoomValue(self): |
| 1073 """ | 1081 """ |
| 1074 Public method to get the current zoom value. | 1082 Public method to get the current zoom value. |
| 1996 if Preferences.getHelp("ClickToFlashEnabled"): | 2004 if Preferences.getHelp("ClickToFlashEnabled"): |
| 1997 # this is a hack to make the ClickToFlash button appear | 2005 # this is a hack to make the ClickToFlash button appear |
| 1998 self.zoomIn() | 2006 self.zoomIn() |
| 1999 self.zoomOut() | 2007 self.zoomOut() |
| 2000 | 2008 |
| 2009 zoomValue = Helpviewer.HelpWindow.HelpWindow.zoomManager()\ | |
| 2010 .zoomValue(self.url()) | |
| 2011 self.setZoomValue(zoomValue) | |
| 2012 | |
| 2001 if ok: | 2013 if ok: |
| 2002 self.mw.adBlockManager().page().hideBlockedPageEntries(self.page()) | 2014 self.mw.adBlockManager().page().hideBlockedPageEntries(self.page()) |
| 2003 self.mw.passwordManager().fill(self.page()) | 2015 self.mw.passwordManager().fill(self.page()) |
| 2004 | 2016 |
| 2005 def isLoading(self): | 2017 def isLoading(self): |
