Thu, 19 May 2022 14:38:25 +0200
Merged with branch 'eric7'.
eric7.epj | file | annotate | diff | comparison | revisions |
--- a/eric7.epj Thu May 19 14:37:01 2022 +0200 +++ b/eric7.epj Thu May 19 14:38:25 2022 +0200 @@ -278,6 +278,7 @@ "eric7/DataViews/CodeMetricsDialog.ui", "eric7/DataViews/PyCoverageDialog.ui", "eric7/DataViews/PyCoverageHtmlReportDialog.ui", + "eric7/DataViews/PyCoverageJsonReportDialog.ui", "eric7/DataViews/PyProfileDialog.ui", "eric7/Debugger/CallTraceViewer.ui", "eric7/Debugger/EditBreakpointDialog.ui", @@ -990,6 +991,7 @@ "eric7/DataViews/CodeMetricsDialog.py", "eric7/DataViews/PyCoverageDialog.py", "eric7/DataViews/PyCoverageHtmlReportDialog.py", + "eric7/DataViews/PyCoverageJsonReportDialog.py", "eric7/DataViews/PyProfileDialog.py", "eric7/DataViews/__init__.py", "eric7/DebugClients/Python/AsyncFile.py",
--- a/eric7/Debugger/StartDialog.py Thu May 19 14:37:01 2022 +0200 +++ b/eric7/Debugger/StartDialog.py Thu May 19 14:38:25 2022 +0200 @@ -403,7 +403,7 @@ None ) return ( - self.ui.scriptnamePicker.getPathNames(), + self.ui.scriptnamePicker.getPathItems(), [self.ui.cmdlineCombo.itemText(index) for index in range( self.ui.cmdlineCombo.count())], self.ui.workdirPicker.getPathItems(),
--- a/eric7/Plugins/WizardPlugins/EricMessageBoxWizard/EricMessageBoxWizardDialog.ui Thu May 19 14:37:01 2022 +0200 +++ b/eric7/Plugins/WizardPlugins/EricMessageBoxWizard/EricMessageBoxWizardDialog.ui Thu May 19 14:38:25 2022 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>535</width> - <height>681</height> + <width>600</width> + <height>851</height> </rect> </property> <property name="windowTitle">
--- a/eric7/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui Thu May 19 14:37:01 2022 +0200 +++ b/eric7/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui Thu May 19 14:38:25 2022 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>535</width> - <height>522</height> + <width>600</width> + <height>650</height> </rect> </property> <property name="windowTitle">
--- a/eric7/WebBrowser/WebBrowserPage.py Thu May 19 14:37:01 2022 +0200 +++ b/eric7/WebBrowser/WebBrowserPage.py Thu May 19 14:38:25 2022 +0200 @@ -392,8 +392,8 @@ @return viewport position @rtype QPoint """ - return QPoint(pos.x() // self.zoomFactor(), - pos.y() // self.zoomFactor()) + return QPoint(int(pos.x() // self.zoomFactor()), + int(pos.y() // self.zoomFactor())) def hitTestContent(self, pos): """