summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qml/GlobalIndicator.qml2
-rw-r--r--src/engine.cpp29
-rw-r--r--src/engine.h19
3 files changed, 4 insertions, 46 deletions
diff --git a/qml/GlobalIndicator.qml b/qml/GlobalIndicator.qml
index f68cbbd..271aae4 100644
--- a/qml/GlobalIndicator.qml
+++ b/qml/GlobalIndicator.qml
@@ -50,6 +50,6 @@ Item {
Text {
id: globalIndicatorLabel;
color: "white"
- font.pixelSize: engine.sensibleButtonSize() * 0.2
+ font.pointSize: 18
}
}
diff --git a/src/engine.cpp b/src/engine.cpp
index 3341d80..d51a034 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -56,7 +56,6 @@ Engine::Engine(QQuickItem *parent)
, m_intro_done(false)
, m_apps_ready(false)
, m_fps_enabled(false)
- , m_glAvailable(checkForGlAvailability())
{
m_state = ENGINE_STATE_RUNNING;
@@ -70,8 +69,6 @@ Engine::Engine(QQuickItem *parent)
float high = 20;
float screenSizeCM = qMax<float>(qMin(m_screenSize.width(), m_screenSize.height()) / m_dpcm, low);
m_dpcm *= (screenSizeCM - low) / (high - low) * 0.5 + 0.5;
- m_screenWidth = m_screenSize.width();
- m_screenHeight = m_screenSize.height();
connect(this, SIGNAL(windowChanged(QQuickWindow*)), this, SLOT(windowChanged(QQuickWindow*)));
}
@@ -115,11 +112,6 @@ void Engine::setState(const QString &state)
emit stateChanged(m_state);
}
-int Engine::titleBarSize() const
-{
- return int(QGuiApplication::primaryScreen()->physicalDotsPerInch() / 2.54f);
-}
-
void Engine::setFps(qreal fps)
{
fps = qRound(fps);
@@ -147,21 +139,6 @@ void Engine::setFpsEnabled(bool enabled)
emit fpsEnabledChanged(m_fps_enabled);
}
-
-int Engine::sensibleButtonSize() const
-{
- // 3cm buttons, nice and big...
- int buttonSize = int(m_dpcm * 3);
-
- int baseSize = qMin(m_screenSize.width(), m_screenSize.height());
-
- // Clamp buttonSize to screen..
- if (buttonSize > baseSize)
- buttonSize = baseSize;
-
- return buttonSize;
-}
-
bool Engine::fileExists(const QUrl &fileName)
{
QFile file(fileName.toLocalFile());
@@ -174,11 +151,10 @@ void Engine::launchApplication(const QUrl &path, const QString &mainFile, const
if (m_state != QStringLiteral("running"))
return;
- m_applicationMain = m_applicationUrl = path;
+ m_applicationMain = path;
m_applicationMain.setPath(path.path() + "/" + mainFile);
m_applicationName = name;
m_applicationDescription = desc;
- emit applicationUrlChanged(m_applicationUrl);
emit applicationMainChanged(m_applicationMain);
emit applicationNameChanged(m_applicationName);
emit applicationDescriptionChanged(m_applicationName);
@@ -189,10 +165,9 @@ void Engine::closeApplication()
{
emit activeIconChanged(nullptr);
- m_applicationMain = m_applicationUrl = QUrl();
+ m_applicationMain = QUrl();
m_applicationName = QString();
m_applicationDescription = QString();
- emit applicationUrlChanged(m_applicationUrl);
emit applicationMainChanged(m_applicationMain);
emit applicationNameChanged(m_applicationName);
emit applicationDescriptionChanged(m_applicationName);
diff --git a/src/engine.h b/src/engine.h
index c65f431..3ef185c 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -46,7 +46,6 @@ class Engine : public QQuickItem
Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged)
Q_PROPERTY(QUrl applicationMain READ applicationMain NOTIFY applicationMainChanged)
- Q_PROPERTY(QUrl applicationUrl READ applicationUrl NOTIFY applicationUrlChanged)
Q_PROPERTY(QString applicationName READ applicationName NOTIFY applicationNameChanged)
Q_PROPERTY(QString applicationDescription READ applicationDescription NOTIFY applicationDescriptionChanged)
@@ -55,10 +54,8 @@ class Engine : public QQuickItem
Q_PROPERTY(const QString qtVersion READ qtVersion CONSTANT)
- Q_PROPERTY(bool glAvailable READ glAvailable NOTIFY glAvailableChanged)
-
public:
- explicit Engine(QQuickItem *parent = 0);
+ explicit Engine(QQuickItem *parent = nullptr);
QString state() const { return m_state; }
void setState(const QString &state);
@@ -70,37 +67,26 @@ public:
QString qtVersion() const { return QT_VERSION_STR; }
- QUrl applicationUrl() const { return m_applicationUrl; }
QUrl applicationMain() const { return m_applicationMain; }
QString applicationName() const { return m_applicationName; }
QString applicationDescription() const { return m_applicationDescription; }
static bool checkForGlAvailability();
- Q_INVOKABLE QUrl fromUserInput(const QString& userInput) { return QUrl::fromUserInput(userInput); }
- Q_INVOKABLE int sensibleButtonSize() const;
- Q_INVOKABLE int titleBarSize() const;
- Q_INVOKABLE int smallFontSize() const { return qMax<int>(m_dpcm * 0.4, 10); }
- Q_INVOKABLE int fontSize() const { return qMax<int>(m_dpcm * 0.6, 14); }
Q_INVOKABLE int titleFontSize() const { return qMax<int>(m_dpcm * 0.9, 20); }
Q_INVOKABLE int centimeter(int val = 1) const { return (m_dpcm * val); }
Q_INVOKABLE int mm(int val) const { return (int)(m_dpcm * val * 0.1); }
- Q_INVOKABLE int screenWidth() const { return m_screenWidth; }
- Q_INVOKABLE int screenHeight() const { return m_screenHeight; }
- Q_INVOKABLE bool glAvailable() const { return m_glAvailable; }
protected:
signals:
void stateChanged(const QString &state);
void activeIconChanged(QQuickItem *item);
- void applicationUrlChanged(const QUrl &applicationUrl);
void applicationMainChanged(const QUrl &applicationMain);
void applicationNameChanged(const QString &applicationName);
void applicationDescriptionChanged(const QString &applicationName);
void fpsChanged(qreal fps);
void fpsEnabledChanged(bool enabled);
- void glAvailableChanged(bool available);
public slots:
void markApplicationsModelReady() { m_apps_ready = true; updateReadyness(); }
@@ -122,14 +108,12 @@ private:
QString m_state;
- QUrl m_applicationUrl;
QUrl m_applicationMain;
QString m_applicationName;
QString m_applicationDescription;
QSize m_screenSize;
qreal m_dpcm;
- int m_screenWidth, m_screenHeight;
FpsCounter *m_fpsCounter;
qreal m_fps;
@@ -137,7 +121,6 @@ private:
uint m_intro_done : 1;
uint m_apps_ready : 1;
uint m_fps_enabled : 1;
- bool m_glAvailable;
};
#endif // ENGINE_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 13:38:45 +0000