Shade: Switch Fonts to Open Sans

AndreiRO · Apr 12, 2015 · 2e47005 · 2e47005
1 parent 0c63c3c
commit 2e47005
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 31 deletions.
diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml
@@ -264,7 +264,8 @@
 						<TrackProperty>
 							<TooltipId>track_title</TooltipId>
 							<Style>QLabel { 
-								font: bold 14px/12px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+								font: bold 14px/12px sans-serif;
+								font-family: "Open Sans";
 								background-color: transparent; 
 								color: #191F24; 
 								text-align: left; 
@@ -285,8 +286,12 @@
 						-->
 						<TrackProperty>
 							<TooltipId>track_artist</TooltipId>
-							<Style>QLabel { font: bold 14px/12px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-							background-color: transparent; color: #191F24; text-align: left; padding-left: 1px; }
+							<Style>QLabel { font: bold 14px/12px sans-serif;
+									font-family: "Open Sans";
+									background-color: transparent; 
+									color: #191F24; 
+									text-align: left; 
+									padding-left: 1px; }
 							</Style>
 							<Property>artist</Property>
 							<Channel><Variable name="channum"/></Channel>
@@ -302,8 +307,12 @@
 						-->
 						<NumberPos>
 							<TooltipId>track_time</TooltipId>
-							<Style>QLabel { font: bold 14px/12px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-							background-color: transparent; color: #191F24; text-align: left;padding-left: 1px; }
+							<Style>QLabel { font: bold 14px/12px sans-serif;
+                                                                        font-family: Open Sans;
+							                background-color: transparent; 
+                                                                        color: #191F24;  
+                                                                        text-align: left; 
+                                                                        padding-left: 1px; }
 							</Style>
 							<Channel><Variable name="channum"/></Channel>
 							<Pos>249,24</Pos>
@@ -324,7 +333,8 @@
 							<TooltipId>visual_bpm</TooltipId>
 							<Style>
 								QLabel { 
-									font: bold 10px/12px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+									font: bold 10px/12px sans-serif;
+									font-family: "Open Sans";
 									background-color: transparent; 
 									color: #191F24; 
 									padding-right: 1px; 
@@ -350,7 +360,8 @@
 							<TooltipId>visual_key</TooltipId>
 							<Style>
 								QLabel { 
-									font: bold 10px/12px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+									font: bold 10px/12px ans-serif;
+									font-family: "Open Sans";
 									background-color: transparent; 
 									color: #191F24; 
 									padding-right: 1px; 

diff --git a/res/skins/Shade/effect_parameter_button.xml b/res/skins/Shade/effect_parameter_button.xml
@@ -19,7 +19,8 @@
 			<EffectButtonParameterName>
 			<Style>
 				WEffectButtonParameter { 
-					font: 10px/8px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+					font: 10px/8px sans-serif;
+					font-family: "Open Sans";
 					background-color: transparent; 
 					color: #191F24; 
 					padding-left: 1px; 

diff --git a/res/skins/Shade/effect_parameter_knob.xml b/res/skins/Shade/effect_parameter_knob.xml
@@ -19,7 +19,8 @@
 			<EffectParameterName>
 				<Style>
 					WEffectParameter { 
-						font: 10px/8px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+						font: 10px/8px sans-serif;
+						font-family: "Open Sans";
 						background-color: transparent; 
 						color: #191F24; 
 						padding-left: 1px; 

diff --git a/res/skins/Shade/effect_parameters.xml b/res/skins/Shade/effect_parameters.xml
@@ -12,7 +12,8 @@
   	<Size>e,45</Size>
     <Layout>horizontal</Layout>
     <Style> WEffect, WPushButton { 
-		font: bold 12px/10px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+		font: bold 12px/10px sans-serif;
+		font-family: "Open Sans";
 		background-color: transparent; 
 		color: #191F24; 
 		padding-left: 1px; 

diff --git a/res/skins/Shade/effect_selector_button.xml b/res/skins/Shade/effect_selector_button.xml
@@ -11,7 +11,8 @@
 	<WidgetGroup>
 	    <Layout>horizontal</Layout>
 	    <Style> WEffect, WPushButton { 
-			font: bold 12px/10px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+			font: bold 12px/10px sans-serif;
+			font-family: "Open Sans";
 			background-color: transparent; 
 			color: #191F24; 
 			padding-left: 1px; 

diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml
@@ -568,8 +568,11 @@
 							<TooltipId>time</TooltipId>
 							<Style>
 								QLabel {
-									font: bold 10px/12px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-									background-color: transparent; color: #191F24; text-align:center;
+									font: bold 10px/12px sans-serif;
+									font-family: "Open Sans";
+									background-color: transparent; 
+									color: #191F24; 
+									text-align:center;
 								}
 							</Style>
 							<Pos>113,15</Pos>

diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml
@@ -24,8 +24,12 @@
 								-->
 								<Text>
 									<TooltipId>text</TooltipId>
-									<Style>QLabel { font: bold 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-									background-color: transparent; color: #191F24; text-align: left; padding-left: 1px; }
+									<Style>QLabel { font: bold 12px/14px sans-serif;
+											font-family: "Open Sans";
+											background-color: transparent;
+											color: #191F24; 
+											text-align: left; 
+											padding-left: 1px; }
 									</Style>
 									<Group>[Sampler<Variable name="samplernum"/>]</Group>
 									<Pos>2,3</Pos>
@@ -35,8 +39,12 @@
 								<!-- Alternative "TITLE ONLY" display
 								<TrackProperty>
 									<TooltipId>track_title</TooltipId>
-									<Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-									background-color: transparent; color: #191F24; text-align: left; padding-left: 1px; }
+									<Style>QLabel { font: bold 14px/16px sans-serif;
+											font-family: "Open Sans";
+											background-color: transparent;
+											color: #191F24; 
+											text-align: left; 
+											padding-left: 1px; }
 									</Style>
 									<Property>title</Property>
 									<Group>[Sampler<Variable name="samplernum"/>]</Group>
@@ -53,8 +61,12 @@
 								-->
 								<NumberBpm>
 									<TooltipId>visual_bpm</TooltipId>
-									<Style>QLabel { font: bold 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-									background-color: transparent; color: #191F24; text-align: left;padding-left: 1px; }
+									<Style>QLabel { font: bold 12px/14px sans-serif;
+											font-family: "Open Sans";
+											background-color: transparent;
+											color: #191F24; 
+											text-align: left;
+											padding-left: 1px; }
 									</Style>
 									<Group>[Sampler<Variable name="samplernum"/>]</Group>
 									<Pos>164,3</Pos>

diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
@@ -318,10 +318,13 @@
 					<Style>
 					QGroupBox { border: 0px solid #565E6B; margin: 0px 0px 0px 0px;}
 
-					QTableView, QTextBrowser, QTreeView { border: 1px solid #656565; font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-					background: transparent; color: #ACACAC;
-					<!--we use  "background: transparent" as workaround, else "alternate-background-color" wont work, QT 4.7.x bug?-->
-					alternate-background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(43, 43, 43, 255), stop:0.049 rgba(43, 43, 43, 255), stop:0.050 rgba(43, 43, 43, 100), stop:0.949 rgba(43, 43, 43, 100), stop:0.95 rgba(43, 43, 43, 255), stop:1 rgba(43, 43, 43, 255));}
+					QTableView, QTextBrowser, QTreeView { 
+						border: 1px solid #656565; 
+						font: 12px/14px sans-serif;
+						font-family: "Open Sans";
+						background: transparent; color: #ACACAC;
+						<!--we use  "background: transparent" as workaround, else "alternate-background-color" wont work, QT 4.7.x bug?-->
+						alternate-background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(43, 43, 43, 255), stop:0.049 rgba(43, 43, 43, 255), stop:0.050 rgba(43, 43, 43, 100), stop:0.949 rgba(43, 43, 43, 100), stop:0.95 rgba(43, 43, 43, 255), stop:1 rgba(43, 43, 43, 255));}
 					<!--checkbox in library "Played" column -->
 					QTableView::indicator { width: 12px; height: 12px;}
 					QTableView::indicator:checked { background: url(skin:/style/style_checkbox_checked.png);}
@@ -340,31 +343,44 @@
 					QPushButton#LibraryBPMButton::checked {image: url(:/images/library/ic_library_checked.png);}
 					QPushButton#LibraryBPMButton::!checked {image: url(:/images/library/ic_library_unchecked.png);}
 
-					QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
+					QHeaderView { font: 11px/13px sans-serif; 
+						      font-family: "Open Sans";}
 
 					<!--Styling a QSpinbox is complex and it took ages to figure out how to remove the surrounding frame and make the background transparent without affecting the subcontrols (up/down-buttons).
 					You could easily style a subcontrol like in the QT-Docs, but if you want to have the OS-native subcontrols, this is the only way i found ( there are probably others ).
 					In our case make sure that the "frame"-property in the corresponding dlgautodj.ui file is set to "false"
 					The general rule when it comes to stylesheets is always to remember that if you style part of a widget, then you usually have to style all of it.
 					-->
 					<!--transition time in Auto DJ tab-->
-					QSpinBox:editable { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #ACACAC; }
+					QSpinBox:editable { 
+							font: 12px/14px sans-serif; 
+							font-family: "Open Sans";
+							background: transparent; 
+							color: #ACACAC; }
 					QSpinBox { min-height: 20px; max-height: 20px;min-width: 40px; max-width: 40px;}
 
 					<!--library search bar-->
 					WSearchLineEdit { 
 						margin: 0px 0px 5px 5px; 
 						padding: 2px; 
 						border: 1px solid #656565; 
-						font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; 
+						font: 12px/14px sans-serif;
+						font-family: "Open Sans"; 
 						background: transparent; 
 						color: #ACACAC; 
 					}
-					WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: rgba(255, 102, 0,50); color: #D6D6D6;}
+					WSearchLineEdit:focus {
+						padding: 2px; 
+						border: 2px solid #FF6600; 
+						font: 12px/14px sans-serif; 
+						font-family: "Open Sans"; 
+						background: rgba(255, 102, 0,50); 
+						color: #D6D6D6;}
 
 					<!--Cover Art-->
 					WCoverArt { 
-						font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; 
+						font: 13px/15px sans-serif;
+						font-family: "Open Sans"; 
 						background: transparent; 	
 						color: #ACACAC; 
 					}
@@ -375,9 +391,14 @@
 					QSplitter::handle:horizontal { width: 6px; }
 					QSplitter::handle:vertical { height: 6px;}
 
-					QPushButton { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
+					QPushButton { font: 12px/14px sans-serif; 
+						      font-family: "Open Sans";}
 					<!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
-					QLabel, QRadioButton { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #C1C1C1;}
+					QLabel, QRadioButton { 
+						font: 12px/14px sans-serif; 
+						font-family: "Open Sans";
+						background: transparent; 
+						color: #C1C1C1;}
 
 					<!--Spacing between treeview and searchbar-->
 					QTreeView { margin: 0px 0px 0px 5px; }
@@ -442,7 +463,8 @@
 														<Text>
 															<TooltipId>text</TooltipId>
 															<Style> QLabel {
-																font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+																font: 11px/13px sans-serif;
+																font-family: "Open Sans";
 																background-color: transparent;
 																color: #ACACAC;
 																text-align: left;