Slightly increased font size in browser and deck sub header.

kokernutz · Nov 6, 2018 · bd501f7 · bd501f7
1 parent 83b01a3
commit bd501f7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/qml/CSI/S5/Channel.qml b/qml/CSI/S5/Channel.qml
@@ -19,8 +19,8 @@ Module
   Wire { from: surface_prefix + "eq.mid";     to: DirectPropertyAdapter { path: app_prefix + "eq.mid"    } }
   Wire { from: surface_prefix + "eq.low";     to: DirectPropertyAdapter { path: app_prefix + "eq.low"    } }
   Wire { from: surface_prefix + "filter";     to: DirectPropertyAdapter { path: app_prefix + "fx.adjust" } }
-  Wire { enabled: !shift; from: surface_prefix + "filter_on"; to: TogglePropertyAdapter { path: app_prefix + "fx.on" } }
-  Wire { enabled: shift;  from: surface_prefix + "filter_on"; to: ButtonScriptAdapter { onRelease: { mixerFX.value = (mixerFX.value + 1) % 5; } } }
+  Wire { enabled: !shift; from: surface_prefix + "filter_on"; to: TogglePropertyAdapter { path: app_prefix + "fx.on"; } }
+  Wire { enabled: shift;  from: surface_prefix + "filter_on"; to: ButtonScriptAdapter { onPress: { mixerFX.value = (mixerFX.value + 1) % 5; } } }
 
   Wire { from: surface_prefix + "cue";        to: TogglePropertyAdapter { path: app_prefix + "cue"       } }
 

diff --git a/qml/Screens/Defines/Prefs.qml b/qml/Screens/Defines/Prefs.qml
@@ -15,7 +15,7 @@ QtObject {
 	readonly property bool displayHotCueBar:		true
 	readonly property bool displayPhaseMeter:		true
 	readonly property bool spectrumWaveformColors:	true
- 	readonly property variant mixerFXNames:         ["FLTR", "MFX 1", "MFX 2", "MFX 3", "MFX 4"] // do not change FILTER
+ 	readonly property variant mixerFXNames:         ["FLTR", "MFX 1", "MFX 2", "MFX 3", "MFX 4"] // do not change FLTR
 
 	// deck header text (use -1 to turn off)
 

diff --git a/qml/Screens/S8/Views/Browser/ListDelegate.qml b/qml/Screens/S8/Views/Browser/ListDelegate.qml
@@ -28,7 +28,7 @@ Item {
 
   property color          keyMatchColor :         textColor
   property color          tempoMatchColor :       textColor
-  property int            browserFontSize:        prefs.displayMoreItems ? fonts.scale(14) : fonts.scale(15) 
+  property int            browserFontSize:        prefs.displayMoreItems ? fonts.scale(15) : fonts.scale(16)
 
   AppProperty { id: masterClockBpm;   path: "app.traktor.masterclock.tempo"; onValueChanged: { updateMatchInfo(); } }
   AppProperty { id: masterKeyDisplay; path: "app.traktor.decks." + (masterDeckId.value + 1) + ".track.key.key_for_display" ; onValueChanged: { updateMatchInfo(); }}
@@ -139,7 +139,7 @@ Item {
       anchors.topMargin: contactDelegate.textTopMargin
       horizontalAlignment: Text.AlignRight
       verticalAlignment: Text.AlignVCenter
-      width: 27
+      width: 29
       color: masterDeckId.value >= 0 ? tempoMatchColor : textColor
       clip: true
       text: (model.dataType == BrowserDataType.Track) ? model.bpm.toFixed(0) : ""
@@ -192,7 +192,7 @@ Item {
       verticalAlignment: Text.AlignVCenter
 
       color: (model.dataType == BrowserDataType.Track) ? (((model.key == "none") || (model.key == "None")) ? textColor : parent.colorForKey(model.keyIndex)) : textColor
-      width: 26
+      width: 28
       clip: true
       text: (model.dataType == BrowserDataType.Track) ? (((model.key == "none") || (model.key == "None")) ? "-" : (prefs.camelotKey ? keyText[model.keyIndex] : model.key)) : ""
       font.pixelSize: browserFontSize

diff --git a/qml/Screens/S8/Views/Deck/DeckHeader.qml b/qml/Screens/S8/Views/Deck/DeckHeader.qml
@@ -418,7 +418,7 @@ Item {
         text: "SYNC"
         color: isInSync ? (deckRunning.value ? colors.colorGrey24 : colors.colorDeckBlueBright) : colors.colorGrey128
         font.family: "Pragmatica MediumTT"
-        font.pixelSize: fonts.smallFontSize - 1
+        font.pixelSize: fonts.smallFontSize + 1
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
       }
@@ -438,7 +438,7 @@ Item {
         text: "MASTER"
         color: isMaster ? (deckRunning.value ? colors.colorGrey24 : colors.colorDeckBlueBright) : colors.colorGrey128
         font.family: "Pragmatica MediumTT"
-        font.pixelSize: fonts.smallFontSize
+        font.pixelSize: fonts.smallFontSize + 1
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
       }
@@ -458,7 +458,7 @@ Item {
         text: prefs.mixerFXNames[mixerFX.value]
         color: mixerFXOn.value ? colors.colorGrey40 : colors.mixerFXColors[mixerFX.value]
         font.family: "Pragmatica MediumTT"
-        font.pixelSize: fonts.smallFontSize
+        font.pixelSize: fonts.smallFontSize + 1
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
       }
@@ -477,7 +477,7 @@ Item {
         text: "LOOP "  + loopText[loopSizePos]
         color: colors.colorGrey200 // isMaster ? (deckRunning.value ? colors.colorGrey24 : colors.colorDeckBlueBright) : colors.colorGrey200
         font.family: "Pragmatica" //MediumTT"
-        font.pixelSize: fonts.smallFontSize
+        font.pixelSize: fonts.smallFontSize + 1
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
       }