diff --git a/phoenixresources.qrc b/phoenixresources.qrc index 63acc3ded..b70dc7127 100644 --- a/phoenixresources.qrc +++ b/phoenixresources.qrc @@ -278,8 +278,6 @@ resources/fonts/DroidSans.ttf resources/fonts/DroidSansMono.ttf resources/fonts/DroidSans-Bold.ttf - resources/fonts/ocr-a-tribute-bold-latin-1_0.ttf - resources/fonts/ocr-a-tribute-light-latin-1_0.ttf resources/fonts/NOTICE resources/fonts/OCRA.ttf resources/bins/my_parts.fzb diff --git a/resources/fonts/ocr-a-tribute-bold-latin-1_0.ttf b/resources/fonts/ocr-a-tribute-bold-latin-1_0.ttf deleted file mode 100644 index 8209389c2..000000000 Binary files a/resources/fonts/ocr-a-tribute-bold-latin-1_0.ttf and /dev/null differ diff --git a/resources/fonts/ocr-a-tribute-light-latin-1_0.ttf b/resources/fonts/ocr-a-tribute-light-latin-1_0.ttf deleted file mode 100644 index d9726b95c..000000000 Binary files a/resources/fonts/ocr-a-tribute-light-latin-1_0.ttf and /dev/null differ diff --git a/resources/styles/fritzing.qss b/resources/styles/fritzing.qss index 62eb9cbca..8a08fb4eb 100644 --- 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 index c3b59b24b..0f8a5481e 100644 --- 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"