Browse Source

PatchCanvas: Use pixel size instead of point size

tags/1.9.4
falkTX 11 years ago
parent
commit
e2fbeced17
3 changed files with 17 additions and 21 deletions
  1. +2
    -2
      source/carla_skin.py
  2. +6
    -6
      source/patchcanvas.py
  3. +9
    -13
      source/patchcanvas_theme.py

+ 2
- 2
source/carla_skin.py View File

@@ -819,7 +819,7 @@ class PluginSlot_BasicFX(AbstractPluginSlot):
self.ui.dial_drywet.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_WET) self.ui.dial_drywet.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_WET)
self.ui.dial_drywet.setMinimum(0.0) self.ui.dial_drywet.setMinimum(0.0)
self.ui.dial_drywet.setMaximum(1.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.setIndex(PARAMETER_VOLUME)
self.ui.dial_vol.setPixmap(3) 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.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_VOL)
self.ui.dial_vol.setMinimum(0.0) self.ui.dial_vol.setMinimum(0.0)
self.ui.dial_vol.setMaximum(1.27) 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_DRYWET, self.ui.dial_drywet])
self.fParameterList.append([PARAMETER_VOLUME, self.ui.dial_vol]) self.fParameterList.append([PARAMETER_VOLUME, self.ui.dial_vol])


+ 6
- 6
source/patchcanvas.py View File

@@ -1782,9 +1782,9 @@ class CanvasPort(QGraphicsItem):
# Base Variables # Base Variables
self.m_port_width = 15 self.m_port_width = 15
self.m_port_height = canvas.theme.port_height 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.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_font.setWeight(canvas.theme.port_font_state)


self.m_port_value = 1.0 self.m_port_value = 1.0
@@ -2176,14 +2176,14 @@ class CanvasBox(QGraphicsItem):
self.m_connection_lines = [] self.m_connection_lines = []


# Set Font # 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.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_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.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) self.m_font_port.setWeight(canvas.theme.port_font_state)


# Icon # Icon


+ 9
- 13
source/patchcanvas_theme.py View File

@@ -76,7 +76,7 @@ class Theme(object):
self.box_text_sel = self.box_text self.box_text_sel = self.box_text
self.box_text_ypos = 16 self.box_text_ypos = 16
self.box_font_name = "Deja Vu Sans" 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_font_state = QFont.Bold


self.box_bg_type = self.THEME_BG_GRADIENT self.box_bg_type = self.THEME_BG_GRADIENT
@@ -87,7 +87,7 @@ class Theme(object):
self.port_text_ypos = 12 self.port_text_ypos = 12
self.port_bg_pixmap = None self.port_bg_pixmap = None
self.port_font_name = "Deja Vu Sans" 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_font_state = QFont.Normal
self.port_mode = self.THEME_PORT_POLYGON self.port_mode = self.THEME_PORT_POLYGON


@@ -158,7 +158,7 @@ class Theme(object):
self.box_text_sel = self.box_text self.box_text_sel = self.box_text
self.box_text_ypos = 10 self.box_text_ypos = 10
self.box_font_name = "Deja Vu Sans" 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_font_state = QFont.Bold


self.box_bg_type = self.THEME_BG_GRADIENT self.box_bg_type = self.THEME_BG_GRADIENT
@@ -169,7 +169,7 @@ class Theme(object):
self.port_text_ypos = 9 self.port_text_ypos = 9
self.port_bg_pixmap = None self.port_bg_pixmap = None
self.port_font_name = "Deja Vu Sans" 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_font_state = QFont.Normal
self.port_mode = self.THEME_PORT_POLYGON self.port_mode = self.THEME_PORT_POLYGON


@@ -251,7 +251,7 @@ class Theme(object):
self.port_text_ypos = 12 self.port_text_ypos = 12
self.port_bg_pixmap = None self.port_bg_pixmap = None
self.port_font_name = "Ubuntu" self.port_font_name = "Ubuntu"
self.port_font_size = 10
self.port_font_size = 11
self.port_font_state = QFont.Bold self.port_font_state = QFont.Bold
self.port_mode = self.THEME_PORT_POLYGON self.port_mode = self.THEME_PORT_POLYGON


@@ -322,7 +322,7 @@ class Theme(object):
self.box_text_sel = self.box_text self.box_text_sel = self.box_text
self.box_text_ypos = 12 self.box_text_ypos = 12
self.box_font_name = "Sans" self.box_font_name = "Sans"
self.box_font_size = 9
self.box_font_size = 12
self.box_font_state = QFont.Normal self.box_font_state = QFont.Normal


self.box_bg_type = self.THEME_BG_GRADIENT self.box_bg_type = self.THEME_BG_GRADIENT
@@ -333,7 +333,7 @@ class Theme(object):
self.port_text_ypos = 11 self.port_text_ypos = 11
self.port_bg_pixmap = None self.port_bg_pixmap = None
self.port_font_name = "Sans" self.port_font_name = "Sans"
self.port_font_size = 8
self.port_font_size = 11
self.port_font_state = QFont.Normal self.port_font_state = QFont.Normal
self.port_mode = self.THEME_PORT_SQUARE 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_sel = QPen(QColor(189, 122, 214), 0)
self.box_text_ypos = 16 self.box_text_ypos = 16
self.box_font_name = "Deja Vu Sans" 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_font_state = QFont.Bold


self.box_bg_type = self.THEME_BG_SOLID self.box_bg_type = self.THEME_BG_SOLID
@@ -418,7 +418,7 @@ class Theme(object):
self.port_text_ypos = 14 self.port_text_ypos = 14
self.port_bg_pixmap = QPixmap(":/bitmaps/canvas/frame_port_bg.png") self.port_bg_pixmap = QPixmap(":/bitmaps/canvas/frame_port_bg.png")
self.port_font_name = "Deja Vu Sans" 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_font_state = QFont.Normal
self.port_mode = self.THEME_PORT_SQUARE 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_pen = QPen(QColor(1, 230, 238), 2, Qt.SolidLine)
self.rubberband_brush = QColor(90, 90, 90, 100) self.rubberband_brush = QColor(90, 90, 90, 100)


# if platform == "darwin":
# self.box_font_size += 3
# self.port_font_size += 3

def getDefaultTheme(): def getDefaultTheme():
return Theme.THEME_MODERN_DARK return Theme.THEME_MODERN_DARK




Loading…
Cancel
Save