Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:redwil:15.4
horus
0003-Update-wxPython-syntax.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0003-Update-wxPython-syntax.patch of Package horus
From 5ae5b1583ec557bf2966e4a18726efb98b6b269c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> Date: Sun, 20 Feb 2022 06:05:02 +0100 Subject: [PATCH 3/4] Update wxPython syntax --- src/horus/gui/splash.py | 5 ++-- src/horus/gui/util/custom_panels.py | 24 +++++++++---------- src/horus/gui/util/machine_settings.py | 12 +++++----- src/horus/gui/util/opengl_helpers.py | 2 +- src/horus/gui/util/preferences.py | 4 ++-- src/horus/gui/wizard/scanning_page.py | 6 ++--- src/horus/gui/wizard/wizard_page.py | 9 +++---- .../gui/workbench/calibration/pages/page.py | 6 ++--- src/horus/gui/workbench/control/panels.py | 8 +++---- src/horus/gui/workbench/workbench.py | 2 +- 10 files changed, 37 insertions(+), 41 deletions(-) diff --git a/src/horus/gui/splash.py b/src/horus/gui/splash.py index 6f80e25..89dcf7b 100644 --- a/src/horus/gui/splash.py +++ b/src/horus/gui/splash.py @@ -8,17 +8,18 @@ __license__ = 'GNU General Public License v2 http://www.gnu.org/licenses/gpl2.ht import time import wx._core +import wx.adv from horus.util.resources import get_path_for_image -class SplashScreen(wx.SplashScreen): +class SplashScreen(wx.adv.SplashScreen): def __init__(self, callback): self.callback = callback bitmap = wx.Image(get_path_for_image("splash.png"), wx.BITMAP_TYPE_PNG).ConvertToBitmap() - super(SplashScreen, self).__init__(bitmap, wx.SPLASH_CENTRE_ON_SCREEN, 0, None) + super(SplashScreen, self).__init__(bitmap, wx.adv.SPLASH_CENTER_ON_SCREEN, 0, None) # TODO: fix in wx.SplashScreen class time.sleep(0.03) wx.CallAfter(self.do_callback) diff --git a/src/horus/gui/util/custom_panels.py b/src/horus/gui/util/custom_panels.py index 2c32deb..4d08e3c 100644 --- a/src/horus/gui/util/custom_panels.py +++ b/src/horus/gui/util/custom_panels.py @@ -100,10 +100,10 @@ class ExpandablePanel(wx.Panel): self.hbox.Add(self.title_text, 1, wx.ALIGN_CENTER_VERTICAL) if self.has_undo: self.hbox.Add( - self.undo_button, 0, wx.RIGHT | wx.BOTTOM | wx.ALIGN_RIGHT, 5) + self.undo_button, 0, wx.RIGHT | wx.BOTTOM, 5) if self.has_restore: self.hbox.Add( - self.restore_button, 0, wx.RIGHT | wx.BOTTOM | wx.ALIGN_RIGHT, 5) + self.restore_button, 0, wx.RIGHT | wx.BOTTOM, 5) self.vbox.Add(self.hbox, 0, wx.TOP | wx.BOTTOM | wx.EXPAND, 5) self.vbox.Add(self.content, 1, wx.ALL ^ wx.TOP ^ wx.BOTTOM | wx.EXPAND, 15) self.SetSizer(self.vbox) @@ -384,11 +384,11 @@ class Slider(ControlPanel): if sys.is_wx30(): hbox.Add(self.label, 0, wx.BOTTOM | wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 0) hbox.AddStretchSpacer() - hbox.Add(self.control, 0, wx.BOTTOM | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) + hbox.Add(self.control, 0, wx.BOTTOM | wx.ALIGN_CENTER_VERTICAL, 5) else: hbox.Add(self.label, 0, wx.TOP | wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) hbox.AddStretchSpacer() - hbox.Add(self.control, 0, wx.TOP | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 0) + hbox.Add(self.control, 0, wx.TOP | wx.ALIGN_CENTER_VERTICAL, 0) self.SetSizer(hbox) self.Layout() @@ -442,7 +442,7 @@ class ComboBox(ControlPanel): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(label, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) hbox.AddStretchSpacer() - hbox.Add(self.control, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.control, 0, wx.ALIGN_CENTER_VERTICAL) self.SetSizer(hbox) self.Layout() @@ -473,7 +473,7 @@ class CheckBox(ControlPanel): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(label, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) hbox.AddStretchSpacer() - hbox.Add(self.control, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.control, 0, wx.ALIGN_CENTER_VERTICAL) self.SetSizer(hbox) self.Layout() @@ -528,7 +528,7 @@ class TextBox(ControlPanel): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(label, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) hbox.AddStretchSpacer() - hbox.Add(self.control, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.control, 0, wx.ALIGN_CENTER_VERTICAL) self.SetSizer(hbox) self.Layout() @@ -601,7 +601,7 @@ class IntTextBox(ControlPanel): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(label, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) hbox.AddStretchSpacer() - hbox.Add(self.control, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.control, 0, wx.ALIGN_CENTER_VERTICAL) self.SetSizer(hbox) self.Layout() @@ -659,7 +659,7 @@ class FloatTextBox(ControlPanel): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(label, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) hbox.AddStretchSpacer() - hbox.Add(self.control, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.control, 0, wx.ALIGN_CENTER_VERTICAL) self.SetSizer(hbox) self.Layout() @@ -836,7 +836,7 @@ class Button(ControlPanel): # Layout hbox = wx.BoxSizer(wx.HORIZONTAL) - hbox.Add(self.control, 1, wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.EXPAND, 2) + hbox.Add(self.control, 1, wx.TOP | wx.EXPAND, 2) self.SetSizer(hbox) self.Layout() @@ -858,7 +858,7 @@ class CallbackButton(ControlPanel): # Layout hbox = wx.BoxSizer(wx.HORIZONTAL) - hbox.Add(self.control, 1, wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.EXPAND, 2) + hbox.Add(self.control, 1, wx.TOP | wx.EXPAND, 2) self.SetSizer(hbox) self.Layout() @@ -886,7 +886,7 @@ class ToggleButton(ControlPanel): # Layout hbox = wx.BoxSizer(wx.HORIZONTAL) - hbox.Add(self.control, 1, wx.ALIGN_CENTER_VERTICAL | wx.TOP | wx.EXPAND, 2) + hbox.Add(self.control, 1, wx.TOP | wx.EXPAND, 2) self.SetSizer(hbox) self.Layout() diff --git a/src/horus/gui/util/machine_settings.py b/src/horus/gui/util/machine_settings.py index c7c8ca0..a2a7045 100644 --- a/src/horus/gui/util/machine_settings.py +++ b/src/horus/gui/util/machine_settings.py @@ -61,7 +61,7 @@ class MachineSettingsDialog(wx.Dialog): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.machineShapeLabel, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 10) hbox.AddStretchSpacer() - hbox.Add(self.machineShapeCombo, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.machineShapeCombo, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.ALL | wx.EXPAND, 10) vbox.Add(wx.StaticLine(self), 0, wx.EXPAND | wx.ALL, 5) @@ -70,25 +70,25 @@ class MachineSettingsDialog(wx.Dialog): self.diam_hbox = wx.BoxSizer(wx.HORIZONTAL) self.diam_hbox.Add(self.diameterLabel, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 10) self.diam_hbox.AddStretchSpacer() - self.diam_hbox.Add(self.diameterField, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + self.diam_hbox.Add(self.diameterField, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(self.diam_hbox, 0, wx.ALL | wx.EXPAND, 10) # Width self.width_hbox = wx.BoxSizer(wx.HORIZONTAL) self.width_hbox.Add(self.widthLabel, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 10) self.width_hbox.AddStretchSpacer() - self.width_hbox.Add(self.widthField, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + self.width_hbox.Add(self.widthField, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(self.width_hbox, 0, wx.ALL | wx.EXPAND, 10) # Height hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.heightLabel, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 10) hbox.AddStretchSpacer() - hbox.Add(self.heightField, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.heightField, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.BOTTOM | wx.LEFT | wx.RIGHT | wx.EXPAND, 10) # Depth self.depth_hbox = wx.BoxSizer(wx.HORIZONTAL) self.depth_hbox.Add(self.depthLabel, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 10) self.depth_hbox.AddStretchSpacer() - self.depth_hbox.Add(self.depthField, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + self.depth_hbox.Add(self.depthField, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(self.depth_hbox, 0, wx.BOTTOM | wx.LEFT | wx.RIGHT | wx.EXPAND, 10) vbox.Add(wx.StaticLine(self), 0, wx.EXPAND | wx.ALL, 5) @@ -97,7 +97,7 @@ class MachineSettingsDialog(wx.Dialog): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.machineModelButton, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 10) hbox.AddStretchSpacer() - hbox.Add(self.machineModelField, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.machineModelField, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.ALL | wx.EXPAND, 10) vbox.Add(wx.StaticLine(self), 0, wx.EXPAND | wx.ALL, 5) diff --git a/src/horus/gui/util/opengl_helpers.py b/src/horus/gui/util/opengl_helpers.py index 3bca826..43ed020 100755 --- a/src/horus/gui/util/opengl_helpers.py +++ b/src/horus/gui/util/opengl_helpers.py @@ -323,7 +323,7 @@ def load_gl_texture(filename): glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR) img = wx.ImageFromBitmap(wx.Bitmap(get_path_for_image(filename))) rgb_data = img.GetData() - alpha_data = img.GetAlphaData() + alpha_data = img.GetAlpha() if alpha_data is not None: data = b'' for i in range(0, len(alpha_data)): diff --git a/src/horus/gui/util/preferences.py b/src/horus/gui/util/preferences.py index f9a33b4..3f4b69f 100644 --- a/src/horus/gui/util/preferences.py +++ b/src/horus/gui/util/preferences.py @@ -132,7 +132,7 @@ class PreferencesDialog(wx.Dialog): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.upload_firmware_button, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 10) hbox.AddStretchSpacer() - hbox.Add(self.clear_check_box, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.clear_check_box, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.ALL | wx.EXPAND, 10) vbox.Add(self.gauge, 0, wx.EXPAND | wx.ALL ^ wx.TOP, 10) @@ -166,7 +166,7 @@ class PreferencesDialog(wx.Dialog): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(label, 0, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 10) hbox.AddStretchSpacer() - hbox.Add(combo, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(combo, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.ALL | wx.EXPAND, 10) def on_hex_combo_changed(self, event): diff --git a/src/horus/gui/wizard/scanning_page.py b/src/horus/gui/wizard/scanning_page.py index fde45a8..284fbb8 100644 --- a/src/horus/gui/wizard/scanning_page.py +++ b/src/horus/gui/wizard/scanning_page.py @@ -61,15 +61,15 @@ class ScanningPage(WizardPage): vbox = wx.BoxSizer(wx.VERTICAL) hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.resolution_label, 1, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) - hbox.Add(self.resolution_combo_box, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.resolution_combo_box, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.ALL | wx.EXPAND, 15) hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.laser_label, 1, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) - hbox.Add(self.laser_combo_box, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.laser_combo_box, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.ALL | wx.EXPAND, 15) hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.capture_texture_label, 1, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) - hbox.Add(self.capture_texture_checkbox, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.capture_texture_checkbox, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.ALL | wx.EXPAND, 15) self.panel.SetSizer(vbox) self.Layout() diff --git a/src/horus/gui/wizard/wizard_page.py b/src/horus/gui/wizard/wizard_page.py index 2bd5c2b..67fe840 100644 --- a/src/horus/gui/wizard/wizard_page.py +++ b/src/horus/gui/wizard/wizard_page.py @@ -42,13 +42,10 @@ class WizardPage(wx.Panel): hbox.Add(self.video_view, 0, wx.ALL, 0) vbox.Add(hbox, 1, wx.ALL | wx.EXPAND, 20) hbox = wx.BoxSizer(wx.HORIZONTAL) - hbox.Add(self.prev_button, 0, wx.ALL | wx.EXPAND | - wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_LEFT, 2) + hbox.Add(self.prev_button, 0, wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, 2) hbox.Add((0, 0), 1, wx.EXPAND) - hbox.Add(self.skip_button, 0, wx.ALL | wx.EXPAND | - wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 2) - hbox.Add(self.next_button, 0, wx.ALL | wx.EXPAND | - wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 2) + hbox.Add(self.skip_button, 0, wx.ALL | wx.EXPAND, 2) + hbox.Add(self.next_button, 0, wx.ALL | wx.EXPAND, 2) vbox.Add(hbox, 0, wx.ALL | wx.EXPAND, 10) self.SetSizer(vbox) diff --git a/src/horus/gui/workbench/calibration/pages/page.py b/src/horus/gui/workbench/calibration/pages/page.py index b9f69e8..2f00156 100644 --- a/src/horus/gui/workbench/calibration/pages/page.py +++ b/src/horus/gui/workbench/calibration/pages/page.py @@ -43,11 +43,9 @@ class Page(wx.Panel): vbox.Add(self.gauge, 0, wx.ALL | wx.EXPAND, 10) self.panel.SetSizer(self.panel_box) vbox.Add(button_panel, 0, wx.ALL | wx.EXPAND, 1) - hbox.Add(self.left_button, 0, wx.ALL | wx.EXPAND | - wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_LEFT, 8) + hbox.Add(self.left_button, 0, wx.ALL | wx.EXPAND | wx.ALIGN_LEFT, 8) hbox.Add((0, 0), 1, wx.EXPAND) - hbox.Add(self.right_button, 0, wx.ALL | wx.EXPAND | - wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_RIGHT, 8) + hbox.Add(self.right_button, 0, wx.ALL | wx.EXPAND, 8) button_panel.SetSizer(hbox) self.SetSizer(vbox) self.Layout() diff --git a/src/horus/gui/workbench/control/panels.py b/src/horus/gui/workbench/control/panels.py index 6a3913c..d5dee9c 100644 --- a/src/horus/gui/workbench/control/panels.py +++ b/src/horus/gui/workbench/control/panels.py @@ -123,12 +123,12 @@ class LDRSection(ControlPanel): hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.ldr_buttons[0], 0, wx.ALIGN_CENTER_VERTICAL) hbox.AddStretchSpacer() - hbox.Add(self.ldr_labels[0], 1, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.ldr_labels[0], 1, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.TOP | wx.BOTTOM | wx.EXPAND, 5) hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.ldr_buttons[1], 0, wx.ALIGN_CENTER_VERTICAL) hbox.AddStretchSpacer() - hbox.Add(self.ldr_labels[1], 1, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.ldr_labels[1], 1, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.TOP | wx.BOTTOM | wx.EXPAND, 5) self.SetSizer(vbox) self.Layout() @@ -217,14 +217,14 @@ class GcodeSection(ControlPanel): vbox = wx.BoxSizer(wx.VERTICAL) hbox = wx.BoxSizer(wx.HORIZONTAL) hbox.Add(self.request, 1, wx.RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) - hbox.Add(self.control, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL) + hbox.Add(self.control, 0, wx.ALIGN_CENTER_VERTICAL) vbox.Add(hbox, 0, wx.EXPAND) vbox.Add(self.response, 1, wx.TOP | wx.BOTTOM | wx.EXPAND, 8) self.SetSizer(vbox) self.Layout() # Events - self.request.Bind(wx.wx.EVT_KEY_DOWN, self.on_key_pressed) + self.request.Bind(wx.EVT_KEY_DOWN, self.on_key_pressed) self.control.Bind(wx.EVT_BUTTON, self.on_button_clicked) def on_key_pressed(self, event): diff --git a/src/horus/gui/workbench/workbench.py b/src/horus/gui/workbench/workbench.py index 30dac26..e8ab1a2 100644 --- a/src/horus/gui/workbench/workbench.py +++ b/src/horus/gui/workbench/workbench.py @@ -38,7 +38,7 @@ class Workbench(wx.Panel): vsbox.Add(self.panels_collection, 1, wx.ALL | wx.EXPAND, 0) self.scroll_panel.SetSizer(vsbox) vsbox.Fit(self.scroll_panel) - panel_size = self.scroll_panel.GetSize()[0] + wx.SystemSettings_GetMetric(wx.SYS_VSCROLL_X) + panel_size = self.scroll_panel.GetSize()[0] + wx.SystemSettings.GetMetric(wx.SYS_VSCROLL_X) self.scroll_panel.SetMinSize((panel_size, -1)) self.scroll_panel.Disable() -- 2.35.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
