back to OCRA

cjmayo · Dec 10, 2013 · 8b7f73d · 8b7f73d
1 parent e841799
commit 8b7f73d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/phoenixresources.qrc b/phoenixresources.qrc
@@ -278,8 +278,6 @@
         <file>resources/fonts/DroidSans.ttf</file>
         <file>resources/fonts/DroidSansMono.ttf</file>
         <file>resources/fonts/DroidSans-Bold.ttf</file>
-        <file>resources/fonts/ocr-a-tribute-bold-latin-1_0.ttf</file>
-        <file>resources/fonts/ocr-a-tribute-light-latin-1_0.ttf</file>
         <file>resources/fonts/NOTICE</file>
         <file>resources/fonts/OCRA.ttf</file>
         <file>resources/bins/my_parts.fzb</file>

diff --git a/resources/fonts/ocr-a-tribute-bold-latin-1_0.ttf b/resources/fonts/ocr-a-tribute-bold-latin-1_0.ttf
diff --git a/resources/fonts/ocr-a-tribute-light-latin-1_0.ttf b/resources/fonts/ocr-a-tribute-light-latin-1_0.ttf
diff --git a/resources/styles/fritzing.qss b/resources/styles/fritzing.qss
@@ -257,7 +257,7 @@ QMenu::item:disabled:selected {
 }
 
 #sketch_tabs::pane, 
-#pe_tabs:pane
+#pe_tabs::pane
 { /*the tab-window*/
 
  	padding: 0px 0px 0px 0px;
@@ -711,13 +711,10 @@ background:transparent;
      } 
 
 
-
-
 #tip  {
 	background: #D5E1E9;
 	border: none;
-	font: "OCR A Tribute W01 Regular";
-	font-family: "OCR A Tribute W01 Regular";
+	font-family: "OCRA";
 	color:#2e94af;
 	font-size:16px;
 	qproperty-wordWrap: true;

diff --git a/src/fapplication.cpp b/src/fapplication.cpp
@@ -665,12 +665,8 @@ void FApplication::registerFonts() {
 	registerFont(":/resources/fonts/DroidSans.ttf", true);
 	registerFont(":/resources/fonts/DroidSans-Bold.ttf", false);
 	registerFont(":/resources/fonts/DroidSansMono.ttf", false);
-	registerFont(":/resources/fonts/ocr-a-tribute-bold-latin-1_0.ttf", true);
-	registerFont(":/resources/fonts/ocr-a-tribute-light-latin-1_0.ttf", true);
+	registerFont(":/resources/fonts/OCRA.ttf", false);
 
-	// "OCR A Tribute W01 Bold" 
-	// "OCR A Tribute W01 Light" 
-	// "OCR A Tribute W01 Regular" 
     // "Droid Sans" 
     // "Droid Sans Mono"