Sat, 18 Feb 2012 16:10:22 +0100
Added the capability to configure the web browser behavior, when multiple tabs are about to be closed.
--- a/Helpviewer/HelpTabWidget.py Sat Feb 18 12:21:39 2012 +0100 +++ b/Helpviewer/HelpTabWidget.py Sat Feb 18 16:10:22 2012 +0100 @@ -646,7 +646,7 @@ @return flag indicating a shut down (boolean) """ - if self.count() > 1: + if self.count() > 1 and Preferences.getHelp("WarnOnMultipleClose"): mb = E5MessageBox.E5MessageBox(E5MessageBox.Information, self.trUtf8("Are you sure you want to close the window?"), self.trUtf8("""Are you sure you want to close the window?\n"""
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Feb 18 12:21:39 2012 +0100 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Sat Feb 18 16:10:22 2012 +0100 @@ -60,6 +60,8 @@ self.styleSheetEdit.setText(Preferences.getHelp("UserStyleSheet")) self.tabsCloseButtonCheckBox.setChecked(Preferences.getUI("SingleCloseButton")) + self.warnOnMultipleCloseCheckBox.setChecked( + Preferences.getHelp("WarnOnMultipleClose")) def setMode(self, displayMode): """ @@ -99,6 +101,9 @@ if self.__displayMode == ConfigurationWidget.HelpBrowserMode: Preferences.setUI("SingleCloseButton", self.tabsCloseButtonCheckBox.isChecked()) + + Preferences.setHelp("WarnOnMultipleClose", + self.warnOnMultipleCloseCheckBox.isChecked()) @pyqtSlot() def on_standardFontButton_clicked(self):
--- a/Preferences/ConfigurationPages/HelpAppearancePage.ui Sat Feb 18 12:21:39 2012 +0100 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.ui Sat Feb 18 16:10:22 2012 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>497</width> - <height>458</height> + <height>547</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -222,6 +222,16 @@ </property> </widget> </item> + <item> + <widget class="QCheckBox" name="warnOnMultipleCloseCheckBox"> + <property name="toolTip"> + <string>Select to issue a warning, if multiple tabs are about to be closed</string> + </property> + <property name="text"> + <string>Warn, if multiple tabs are about to be closed</string> + </property> + </widget> + </item> </layout> </widget> </item>
--- a/Preferences/__init__.py Sat Feb 18 12:21:39 2012 +0100 +++ b/Preferences/__init__.py Sat Feb 18 16:10:22 2012 +0100 @@ -662,6 +662,7 @@ "SyncFtpPassword": "", "SyncFtpPath": "", "SyncFtpPort": 21, + "WarnOnMultipleClose": True, } websettings = QWebSettings.globalSettings() @@ -2041,6 +2042,7 @@ "LocalContentCanAccessRemoteUrls", "LocalContentCanAccessFileUrls", "XSSAuditingEnabled", "SiteSpecificQuirksEnabled", "SyncEnabled", "SyncBookmarks", "SyncHistory", "SyncPasswords", "SyncUserAgents", + "WarnOnMultipleClose" ]: return toBool(prefClass.settings.value("Help/" + key, prefClass.helpDefaults[key]))
--- a/i18n/eric5_cs.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_cs.ts Sat Feb 18 16:10:22 2012 +0100 @@ -13115,7 +13115,7 @@ <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation>Vybrat sadu stylů</translation> </message> @@ -13149,6 +13149,16 @@ <source>Show only one close button instead of one for each tab</source> <translation type="unfinished">Zobrazit pouze jedno tlačítko Zavřít místo jednoho v každém tabu</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -28534,27 +28544,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_de.ts Sat Feb 18 16:10:22 2012 +0100 @@ -12890,7 +12890,7 @@ <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation>Wähle Style Sheet</translation> </message> @@ -12924,6 +12924,16 @@ <source>Show only one close button instead of one for each tab</source> <translation>Nur einen Schließen-Knopf anzeigen anstelle von einem pro Tab</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation>Warnen, wenn mehrere Tabs geschlossen werden</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation>Auswählen, um eine Warnung auszugeben, wenn mehrere Tabs geschlossen werden</translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -27736,27 +27746,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation>Wähle den Python2 Interpreter</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation>Wähle den zu verwendenden Python2 Interpreter aus:</translation> </message>
--- a/i18n/eric5_en.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_en.ts Sat Feb 18 16:10:22 2012 +0100 @@ -12821,7 +12821,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation type="unfinished"></translation> </message> @@ -12840,6 +12840,16 @@ <source>Show only one close button instead of one for each tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -27580,27 +27590,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_es.ts Sat Feb 18 16:10:22 2012 +0100 @@ -13011,7 +13011,7 @@ <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation>Seleccionar Hoja de Estilos</translation> </message> @@ -13045,6 +13045,16 @@ <source>Show only one close button instead of one for each tab</source> <translation>Mostrar solamente un boton de cerrar en lugar de uno por cada pestaña</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -28237,27 +28247,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation>Seleccionar Intérprete de Python2</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation>Seleccionar el intérprete de Python2 a utilizar:</translation> </message>
--- a/i18n/eric5_fr.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_fr.ts Sat Feb 18 16:10:22 2012 +0100 @@ -14025,7 +14025,7 @@ <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation>Sélection d'une feuille de styles</translation> </message> @@ -14059,6 +14059,16 @@ <source>Show only one close button instead of one for each tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -30134,27 +30144,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_it.ts Sat Feb 18 16:10:22 2012 +0100 @@ -12950,7 +12950,7 @@ <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation>Seleziona foglio di stile</translation> </message> @@ -12984,6 +12984,16 @@ <source>Show only one close button instead of one for each tab</source> <translation type="unfinished">Mostra solo un pulsante di chiusura invece di uno per ogni linguetta</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -28133,27 +28143,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_ru.ts Sat Feb 18 16:10:22 2012 +0100 @@ -13048,7 +13048,7 @@ <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation>Выберите стиль CSS</translation> </message> @@ -13082,6 +13082,16 @@ <source>Show only one close button instead of one for each tab</source> <translation type="unfinished">Показывать только одну общую закрывающую кнопку</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -28268,27 +28278,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_tr.ts Sat Feb 18 16:10:22 2012 +0100 @@ -13142,7 +13142,7 @@ <translation>...</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation>Sayfa Stilini seç</translation> </message> @@ -13161,6 +13161,16 @@ <source>Show only one close button instead of one for each tab</source> <translation type="unfinished">Her bir sekmede bir tane yerine tek bir kapatma düğmesi göster</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -28433,27 +28443,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Feb 18 12:21:39 2012 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Feb 18 16:10:22 2012 +0100 @@ -13987,7 +13987,7 @@ <translation>……</translation> </message> <message> - <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="133"/> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.py" line="138"/> <source>Select Style Sheet</source> <translation>选择样式表</translation> </message> @@ -14006,6 +14006,16 @@ <source>Show only one close button instead of one for each tab</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="231"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/HelpAppearancePage.ui" line="228"/> + <source>Select to issue a warning, if multiple tabs are about to be closed</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HelpBrowser</name> @@ -30095,27 +30105,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="987"/> + <location filename="Preferences/__init__.py" line="988"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1014"/> + <location filename="Preferences/__init__.py" line="1015"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1107"/> + <location filename="Preferences/__init__.py" line="1108"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message>