LP-174 Move textbubbleslider to libs/utils, centralize fonts

ground/gcs/src/libs/utils/textbubbleslider.cpp

@@ -39,7 +39,7 @@
 TextBubbleSlider::TextBubbleSlider(QWidget *parent) :
     QSlider(parent)
 {
-    QFontDatabase::addApplicationFont(":/configgadget/fonts/PTS75F.ttf");
+    QFontDatabase::addApplicationFont(":/utils/fonts/PTS75F.ttf");
 
     construct();
 }

ground/gcs/src/libs/utils/utils.pro

@@ -57,7 +57,8 @@ SOURCES += \
     hostosinfo.cpp \
     logfile.cpp \
     crc.cpp \
-    mustache.cpp
+    mustache.cpp \
+    textbubbleslider.cpp
 
 SOURCES += xmlconfig.cpp
 
@@ -120,7 +121,8 @@ HEADERS += \
     hostosinfo.h \
     logfile.h \
     crc.h \
-    mustache.h
+    mustache.h \
+    textbubbleslider.h
 
 HEADERS += xmlconfig.h
 

ground/gcs/src/libs/utils/utils.qrc

@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/utils" >
         <file>images/removesubmitfield.png</file>
+        <file>fonts/PTS75F.ttf</file>
     </qresource>
 </RCC>

ground/gcs/src/plugins/config/config.pro

@@ -58,8 +58,7 @@ HEADERS += \
     calibration/gyrobiascalibrationmodel.h \
     calibration/calibrationuiutils.h \
     configoplinkwidget.h \
-    configrevonanohwwidget.h \
-    textbubbleslider.h
+    configrevonanohwwidget.h
 
 SOURCES += \
     configplugin.cpp \
@@ -100,8 +99,7 @@ SOURCES += \
     calibration/levelcalibrationmodel.cpp \
     calibration/gyrobiascalibrationmodel.cpp \
     configoplinkwidget.cpp \
-    configrevonanohwwidget.cpp \
-    textbubbleslider.cpp
+    configrevonanohwwidget.cpp
 
 FORMS += \
     airframe.ui \

ground/gcs/src/plugins/config/configgadget.qrc

@@ -57,6 +57,5 @@
         <file>images/error.svg</file>
         <file>images/nano_top.png</file>
         <file>images/cc3d_top.png</file>
-        <file>fonts/PTS75F.ttf</file>
     </qresource>
 </RCC>

ground/gcs/src/plugins/config/inputchannelform.ui

@@ -848,7 +848,7 @@ margin:1px;</string>
   <customwidget>
    <class>TextBubbleSlider</class>
    <extends>QSlider</extends>
-   <header>textbubbleslider.h</header>
+   <header>utils/textbubbleslider.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

ground/gcs/src/plugins/pfdqml/PfdResources.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/pfdqml">
-        <file>fonts/PTS75F.ttf</file>
-    </qresource>
-</RCC>

ground/gcs/src/plugins/pfdqml/fonts/Paratype PT Sans Free Font License.txt

@@ -1,26 +0,0 @@
-Copyright © 2009 ParaType Ltd.
-with Reserved Names "PT Sans" and "ParaType".
-
-FONT LICENSE
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining a copy of the font software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the font software, subject to the following conditions:
-
-1) Neither the font software nor any of its individual components, in original or modified versions, may be sold by itself.
-
-2) Original or modified versions of the font software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
-
-3) No modified version of the font software may use the Reserved Name(s) or combinations of Reserved Names with other words unless explicit written permission is granted by the ParaType. This restriction only applies to the primary font name as presented to the users.
-
-4) The name of ParaType or the author(s) of the font software shall not be used to promote, endorse or advertise any modified version, except to acknowledge the contribution(s) of ParaType and the author(s) or with explicit written permission of ParaType.
-
-5) The font software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
-
-TERMINATION & TERRITORY
-This license has no limits on time and territory, but it becomes null and void if any of the above conditions are not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL PARATYPE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
-ParaType Ltd
-http://www.paratype.ru

ground/gcs/src/plugins/pfdqml/pfdqml.pro

@@ -39,7 +39,3 @@ contains(DEFINES,USE_OSG) {
 OTHER_FILES += PfdQml.pluginspec
 
 FORMS += pfdqmlgadgetoptionspage.ui
-
-RESOURCES += \
-    PfdResources.qrc
-

ground/gcs/src/share/pfd/default/Pfd.qml

@@ -26,7 +26,7 @@ Rectangle {
 
             FontLoader {
                 id: pt_bold
-                source: "qrc:/pfdqml/fonts/PTS75F.ttf"
+                source: "qrc:/utils/fonts/PTS75F.ttf"
             }
 
             width: Math.floor((parent.paintedHeight * 1.32) - (parent.paintedHeight * 0.013))