From e2fbeced17427c203c5e00ed6b3b49e3c135a613 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 1 Apr 2014 15:55:10 +0100 Subject: [PATCH] PatchCanvas: Use pixel size instead of point size --- source/carla_skin.py | 4 ++-- source/patchcanvas.py | 12 ++++++------ source/patchcanvas_theme.py | 22 +++++++++------------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/source/carla_skin.py b/source/carla_skin.py index 993c08aba..623485ffd 100644 --- a/source/carla_skin.py +++ b/source/carla_skin.py @@ -819,7 +819,7 @@ class PluginSlot_BasicFX(AbstractPluginSlot): self.ui.dial_drywet.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_WET) self.ui.dial_drywet.setMinimum(0.0) self.ui.dial_drywet.setMaximum(1.0) - #self.ui.dial_drywet.forceWhiteLabelGradientText() + self.ui.dial_drywet.forceWhiteLabelGradientText() self.ui.dial_vol.setIndex(PARAMETER_VOLUME) self.ui.dial_vol.setPixmap(3) @@ -827,7 +827,7 @@ class PluginSlot_BasicFX(AbstractPluginSlot): self.ui.dial_vol.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_VOL) self.ui.dial_vol.setMinimum(0.0) self.ui.dial_vol.setMaximum(1.27) - #self.ui.dial_vol.forceWhiteLabelGradientText() + self.ui.dial_vol.forceWhiteLabelGradientText() self.fParameterList.append([PARAMETER_DRYWET, self.ui.dial_drywet]) self.fParameterList.append([PARAMETER_VOLUME, self.ui.dial_vol]) diff --git a/source/patchcanvas.py b/source/patchcanvas.py index 5674db579..3ca32f2a0 100644 --- a/source/patchcanvas.py +++ b/source/patchcanvas.py @@ -1782,9 +1782,9 @@ class CanvasPort(QGraphicsItem): # Base Variables self.m_port_width = 15 self.m_port_height = canvas.theme.port_height - self.m_port_font = QFont() # FIXME + self.m_port_font = QFont() self.m_port_font.setFamily(canvas.theme.port_font_name) - self.m_port_font.setPointSize(canvas.theme.port_font_size) + self.m_port_font.setPixelSize(canvas.theme.port_font_size) self.m_port_font.setWeight(canvas.theme.port_font_state) self.m_port_value = 1.0 @@ -2176,14 +2176,14 @@ class CanvasBox(QGraphicsItem): self.m_connection_lines = [] # Set Font - self.m_font_name = QFont() # FIXME + self.m_font_name = QFont() self.m_font_name.setFamily(canvas.theme.box_font_name) - self.m_font_name.setPointSize(canvas.theme.box_font_size) + self.m_font_name.setPixelSize(canvas.theme.box_font_size) self.m_font_name.setWeight(canvas.theme.box_font_state) - self.m_font_port = QFont() # FIXME + self.m_font_port = QFont() self.m_font_port.setFamily(canvas.theme.port_font_name) - self.m_font_port.setPointSize(canvas.theme.port_font_size) + self.m_font_port.setPixelSize(canvas.theme.port_font_size) self.m_font_port.setWeight(canvas.theme.port_font_state) # Icon diff --git a/source/patchcanvas_theme.py b/source/patchcanvas_theme.py index 9ffba080b..a59ed78f3 100644 --- a/source/patchcanvas_theme.py +++ b/source/patchcanvas_theme.py @@ -76,7 +76,7 @@ class Theme(object): self.box_text_sel = self.box_text self.box_text_ypos = 16 self.box_font_name = "Deja Vu Sans" - self.box_font_size = 8 + self.box_font_size = 11 self.box_font_state = QFont.Bold self.box_bg_type = self.THEME_BG_GRADIENT @@ -87,7 +87,7 @@ class Theme(object): self.port_text_ypos = 12 self.port_bg_pixmap = None self.port_font_name = "Deja Vu Sans" - self.port_font_size = 8 + self.port_font_size = 11 self.port_font_state = QFont.Normal self.port_mode = self.THEME_PORT_POLYGON @@ -158,7 +158,7 @@ class Theme(object): self.box_text_sel = self.box_text self.box_text_ypos = 10 self.box_font_name = "Deja Vu Sans" - self.box_font_size = 7 + self.box_font_size = 10 self.box_font_state = QFont.Bold self.box_bg_type = self.THEME_BG_GRADIENT @@ -169,7 +169,7 @@ class Theme(object): self.port_text_ypos = 9 self.port_bg_pixmap = None self.port_font_name = "Deja Vu Sans" - self.port_font_size = 6 + self.port_font_size = 9 self.port_font_state = QFont.Normal self.port_mode = self.THEME_PORT_POLYGON @@ -251,7 +251,7 @@ class Theme(object): self.port_text_ypos = 12 self.port_bg_pixmap = None self.port_font_name = "Ubuntu" - self.port_font_size = 10 + self.port_font_size = 11 self.port_font_state = QFont.Bold self.port_mode = self.THEME_PORT_POLYGON @@ -322,7 +322,7 @@ class Theme(object): self.box_text_sel = self.box_text self.box_text_ypos = 12 self.box_font_name = "Sans" - self.box_font_size = 9 + self.box_font_size = 12 self.box_font_state = QFont.Normal self.box_bg_type = self.THEME_BG_GRADIENT @@ -333,7 +333,7 @@ class Theme(object): self.port_text_ypos = 11 self.port_bg_pixmap = None self.port_font_name = "Sans" - self.port_font_size = 8 + self.port_font_size = 11 self.port_font_state = QFont.Normal self.port_mode = self.THEME_PORT_SQUARE @@ -404,7 +404,7 @@ class Theme(object): self.box_text_sel = QPen(QColor(189, 122, 214), 0) self.box_text_ypos = 16 self.box_font_name = "Deja Vu Sans" - self.box_font_size = 8 + self.box_font_size = 11 self.box_font_state = QFont.Bold self.box_bg_type = self.THEME_BG_SOLID @@ -418,7 +418,7 @@ class Theme(object): self.port_text_ypos = 14 self.port_bg_pixmap = QPixmap(":/bitmaps/canvas/frame_port_bg.png") self.port_font_name = "Deja Vu Sans" - self.port_font_size = 8 + self.port_font_size = 11 self.port_font_state = QFont.Normal self.port_mode = self.THEME_PORT_SQUARE @@ -472,10 +472,6 @@ class Theme(object): self.rubberband_pen = QPen(QColor(1, 230, 238), 2, Qt.SolidLine) self.rubberband_brush = QColor(90, 90, 90, 100) -# if platform == "darwin": -# self.box_font_size += 3 -# self.port_font_size += 3 - def getDefaultTheme(): return Theme.THEME_MODERN_DARK