Mercurial Repositories > eric / changeset
changeset
Changed the logic of the site info dialog to be able to cope with Qt installations without SSL support.
Fri, 11 May 2012 18:48:10 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 11 May 2012 18:48:10 +0200
- changeset 1857
- baf039cc2d9a
- parent 1856
- 76cb601aec88
- child 1858
- 04e1f90786cd
Changed the logic of the site info dialog to be able to cope with Qt installations without SSL support.
--- a/Helpviewer/SiteInfo/SiteInfoDialog.py Wed May 09 20:19:04 2012 +0200 +++ b/Helpviewer/SiteInfo/SiteInfoDialog.py Fri May 11 18:48:10 2012 +0200 @@ -16,7 +16,12 @@ from E5Gui import E5MessageBox, E5FileDialog -from .Ui_SiteInfoDialog import Ui_SiteInfoDialog +try: + from .Ui_SiteInfoDialog import Ui_SiteInfoDialog # __IGNORE_WARNING__ + SSL = True +except ImportError: + from .Ui_SiteInfoNoSslDialog import Ui_SiteInfoDialog # __IGNORE_WARNING__ + SSL = False from ..Download.DownloadUtilities import dataString @@ -46,7 +51,8 @@ self.tabWidget.setTabIcon(0, UI.PixmapCache.getIcon("siteinfo-general.png")) self.tabWidget.setTabIcon(1, UI.PixmapCache.getIcon("siteinfo-media.png")) self.tabWidget.setTabIcon(2, UI.PixmapCache.getIcon("siteinfo-databases.png")) - self.tabWidget.setTabIcon(3, UI.PixmapCache.getIcon("siteinfo-security.png")) + if SSL: + self.tabWidget.setTabIcon(3, UI.PixmapCache.getIcon("siteinfo-security.png")) self.__mainFrame = browser.page().mainFrame() title = browser.title() @@ -85,8 +91,11 @@ if sslInfo is not None and sslInfo.isValid(): self.securityLabel.setStyleSheet(SiteInfoDialog.okStyle) self.securityLabel.setText('<b>Connection is encrypted.</b>') - self.sslWidget.showCertificate(sslInfo) - self.securityDetailsButton.setEnabled(True) + if SSL: + self.sslWidget.showCertificate(sslInfo) + self.securityDetailsButton.setEnabled(True) + else: + self.securityDetailsButton.setEnabled(False) else: self.securityLabel.setStyleSheet(SiteInfoDialog.nokStyle) self.securityLabel.setText('<b>Connection is not encrypted.</b>')
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Helpviewer/SiteInfo/SiteInfoNoSslDialog.ui Fri May 11 18:48:10 2012 +0200 @@ -0,0 +1,404 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>SiteInfoDialog</class> + <widget class="QDialog" name="SiteInfoDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>700</width> + <height>550</height> + </rect> + </property> + <property name="windowTitle"> + <string>Site Information</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="heading"> + <property name="text"> + <string notr="true"/> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="generalTab"> + <attribute name="title"> + <string>General</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Site Address:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="siteAddressLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Encoding:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="encodingLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Size:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="sizeLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Meta tags of site:</string> + </property> + </widget> + </item> + <item> + <widget class="QTreeWidget" name="tagsTree"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <column> + <property name="text"> + <string>Tag</string> + </property> + </column> + <column> + <property name="text"> + <string>Value</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0" colspan="4"> + <widget class="QLabel" name="label_4"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><b>Security information</b></string> + </property> + </widget> + </item> + <item row="1" column="0"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="securityLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="1" column="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="3"> + <widget class="QPushButton" name="securityDetailsButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Details</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="mediaTab"> + <attribute name="title"> + <string>Media</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="QTreeWidget" name="imagesTree"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <column> + <property name="text"> + <string>Image</string> + </property> + </column> + <column> + <property name="text"> + <string>Image Address</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string><b>Preview</b></string> + </property> + </widget> + </item> + <item> + <widget class="QGraphicsView" name="imagePreview"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="databasesTab"> + <attribute name="title"> + <string>Databases</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="QListWidget" name="databasesList"> + <property name="toolTip"> + <string>Shows a list of databases used by the site</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_10"> + <property name="text"> + <string><b>Database details</b></string> + </property> + </widget> + </item> + <item> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="databaseName"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><database not selected></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Path:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="databasePath"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><database not selected></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Size:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="databaseSize"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><database not selected></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>161</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>tabWidget</tabstop> + <tabstop>tagsTree</tabstop> + <tabstop>securityDetailsButton</tabstop> + <tabstop>imagesTree</tabstop> + <tabstop>imagePreview</tabstop> + <tabstop>databasesList</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>SiteInfoDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>SiteInfoDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/eric5.e4p Wed May 09 20:19:04 2012 +0200 +++ b/eric5.e4p Fri May 11 18:48:10 2012 +0200 @@ -1300,6 +1300,7 @@ <Form>Helpviewer/Bookmarks/BookmarkPropertiesDialog.ui</Form> <Form>Snapshot/SnapWidget.ui</Form> <Form>UI/SearchWidget.ui</Form> + <Form>Helpviewer/SiteInfo/SiteInfoNoSslDialog.ui</Form> </Forms> <Translations> <Translation>i18n/eric5_cs.qm</Translation>
