summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@digia.com>2014-09-04 14:49:55 +0200
committerGatis Paeglis <gatis.paeglis@digia.com>2014-10-07 12:01:58 +0300
commitd80296cc3aecb532e50e5ee262bd446546cb81cf (patch)
tree1b0156c05a6ad036324b949b739a048d419495c7
parenta8cb750ef7c4975dcff4d911b6e0a8ff9d975d91 (diff)
Clean up b2qt launcher
- remove fonts from the projects repository. Font installation is handled when building target image. - remove unused variables. - remove usage of QPalette. It does not have any affect on launchers appearance AFAICT. Change-Id: I83c37e8b07ecd01747ed8419fa8d2f61e5d8f109 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
-rwxr-xr-xopen-sans/OpenSans-Bold.ttfbin224592 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-BoldItalic.ttfbin213292 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-ExtraBold.ttfbin222584 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-ExtraBoldItalic.ttfbin213420 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-Italic.ttfbin212896 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-Light.ttfbin222412 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-LightItalic.ttfbin213128 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-Regular.ttfbin217360 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-Semibold.ttfbin221328 -> 0 bytes
-rwxr-xr-xopen-sans/OpenSans-SemiboldItalic.ttfbin212820 -> 0 bytes
-rw-r--r--open-sans/fonts.pri16
-rw-r--r--src/main.cpp19
-rw-r--r--startup.pro50
13 files changed, 14 insertions, 71 deletions
diff --git a/open-sans/OpenSans-Bold.ttf b/open-sans/OpenSans-Bold.ttf
deleted file mode 100755
index fd79d43..0000000
--- a/open-sans/OpenSans-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-BoldItalic.ttf b/open-sans/OpenSans-BoldItalic.ttf
deleted file mode 100755
index 9bc8009..0000000
--- a/open-sans/OpenSans-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-ExtraBold.ttf b/open-sans/OpenSans-ExtraBold.ttf
deleted file mode 100755
index 21f6f84..0000000
--- a/open-sans/OpenSans-ExtraBold.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-ExtraBoldItalic.ttf b/open-sans/OpenSans-ExtraBoldItalic.ttf
deleted file mode 100755
index 31cb688..0000000
--- a/open-sans/OpenSans-ExtraBoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-Italic.ttf b/open-sans/OpenSans-Italic.ttf
deleted file mode 100755
index c90da48..0000000
--- a/open-sans/OpenSans-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-Light.ttf b/open-sans/OpenSans-Light.ttf
deleted file mode 100755
index 0d38189..0000000
--- a/open-sans/OpenSans-Light.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-LightItalic.ttf b/open-sans/OpenSans-LightItalic.ttf
deleted file mode 100755
index 68299c4..0000000
--- a/open-sans/OpenSans-LightItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-Regular.ttf b/open-sans/OpenSans-Regular.ttf
deleted file mode 100755
index db43334..0000000
--- a/open-sans/OpenSans-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-Semibold.ttf b/open-sans/OpenSans-Semibold.ttf
deleted file mode 100755
index 1a7679e..0000000
--- a/open-sans/OpenSans-Semibold.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/OpenSans-SemiboldItalic.ttf b/open-sans/OpenSans-SemiboldItalic.ttf
deleted file mode 100755
index 59b6d16..0000000
--- a/open-sans/OpenSans-SemiboldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/open-sans/fonts.pri b/open-sans/fonts.pri
deleted file mode 100644
index 1d10517..0000000
--- a/open-sans/fonts.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-FONTFILES += \
- $$PWD/OpenSans-BoldItalic.ttf \
- $$PWD/OpenSans-ExtraBold.ttf \
- $$PWD/OpenSans-ExtraBoldItalic.ttf \
- $$PWD/OpenSans-Italic.ttf \
- $$PWD/OpenSans-Light.ttf \
- $$PWD/OpenSans-LightItalic.ttf \
- $$PWD/OpenSans-Regular.ttf \
- $$PWD/OpenSans-Semibold.ttf \
- $$PWD/OpenSans-SemiboldItalic.ttf
-
-fontfiles.files = $$FONTFILES
-fontfiles.path = $$[QT_INSTALL_LIBS]/fonts
-
-INSTALLS += fontfiles
-
diff --git a/src/main.cpp b/src/main.cpp
index 6e99fa2..d8d29ea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -54,16 +54,6 @@ void displayHelp(const char *appName)
);
}
-/*
- * TODO:
- * - add fps counter
- * - settings screen
- * - Qt logo with glitter and particles
- * - Brightness control (when applicable)
- * - Toggle FPS measurement
- * - power off
- */
-
int main(int argc, char **argv)
{
QApplication app(argc, argv);
@@ -76,13 +66,6 @@ int main(int argc, char **argv)
QWebEngine::initialize();
#endif
- QPalette pal;
- pal.setColor(QPalette::Text, Qt::black);
- pal.setColor(QPalette::WindowText, Qt::black);
- pal.setColor(QPalette::ButtonText, Qt::black);
- pal.setColor(QPalette::Base, Qt::white);
- QGuiApplication::setPalette(pal);
-
QString fontName = QStringLiteral("/system/lib/fonts/DejaVuSans.ttf");
if (QFile::exists(fontName)) {
QFontDatabase::addApplicationFont(fontName);
@@ -102,9 +85,7 @@ int main(int argc, char **argv)
: QStringLiteral("qrc:///qml/Main.qml");
QString appsRoot = QStringLiteral("/data/user/qt");
- QString bgImage = QStringLiteral(":/qml/images/bg_1280x800.jpg");
bool logcat = false;
- QString bgColor;
bool bootAnimation = true;
bool showFps = false;
diff --git a/startup.pro b/startup.pro
index 0c9283a..98da2ae 100644
--- a/startup.pro
+++ b/startup.pro
@@ -1,14 +1,7 @@
-SOURCES += src/main.cpp \
- src/engine.cpp \
- src/applicationsmodel.cpp \
- src/logmanager.cpp \
- src/fpscounter.cpp
-
+# widgets dependency needed for QtChars demo
QT += quick widgets
TARGET = qtlauncher
-QML_FILES += qml
-
qtHaveModule(webengine) {
DEFINES += USE_QTWEBENGINE
QT += webengine
@@ -20,10 +13,20 @@ HEADERS += \
src/logmanager.h \
src/fpscounter.h
-#script.files = qt_run.sh
-#script.path = $$[INSTALL_ROOT]/system/bin
+SOURCES += src/main.cpp \
+ src/engine.cpp \
+ src/applicationsmodel.cpp \
+ src/logmanager.cpp \
+ src/fpscounter.cpp
-#include(open-sans/fonts.pri)
+OTHER_FILES += \
+ qml/LaunchScreen.qml \
+ qml/main_landscape.qml \
+ qml/HighlightShader.qml \
+ qml/Main.qml \
+ qml/ApplicationIcon.qml \
+ qml/GlimmeringQtLogo.qml \
+ qml/BootScreen.qml
android {
target.path = $$[INSTALL_ROOT]/system/bin
@@ -35,28 +38,3 @@ INSTALLS += target
RESOURCES += \
resources.qrc
-
-OTHER_FILES += \
- qml/GridViewWithInertia.qml \
- qml/NoisyGradient.qml \
- qml/Main.qml \
- qml/main_landscape.qml \
- qml/ApplicationIcon.qml \
- qml/LaunchScreen.qml \
- qml/TitleBar.qml \
- qml/BootScreen.qml \
- qml/Background.qml \
- qml/SettingsScreen.qml \
- qml/Section.qml \
- qml/ListViewWithInertia.qml \
- qml/SettingsRow.qml \
- qml/CheckBox.qml \
- qml/DeviceSettings.qml \
- qml/Button.qml \
- qml/Slider.qml \
- open-sans/fonts.pri \
- qml/GlimmeringQtLogo.qml \
- qml/HighlightShader.qml \
- screenshot/Main.qml \
- screenshot/Button.qml
-