baseUrl come Q_PROPERTY (accesso proprietà, niente Q_INVOKABLE) + log data di build in avvio
This commit is contained in:
@@ -120,7 +120,7 @@ Page {
|
|||||||
function resolveUrl(u) {
|
function resolveUrl(u) {
|
||||||
if (u.indexOf("http://") === 0 || u.indexOf("https://") === 0)
|
if (u.indexOf("http://") === 0 || u.indexOf("https://") === 0)
|
||||||
return u
|
return u
|
||||||
var base = appSettings.baseUrl()
|
var base = appSettings.baseUrl
|
||||||
return base + (u.charAt(0) === "/" ? u : "/" + u)
|
return base + (u.charAt(0) === "/" ? u : "/" + u)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ Page {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function loadIndex() {
|
function loadIndex() {
|
||||||
var base = appSettings.baseUrl()
|
var base = appSettings.baseUrl
|
||||||
if (base.length === 0) {
|
if (base.length === 0) {
|
||||||
page.errorMessage = "Server non configurato"
|
page.errorMessage = "Server non configurato"
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ Page {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function search() {
|
function search() {
|
||||||
var base = appSettings.baseUrl()
|
var base = appSettings.baseUrl
|
||||||
var query = searchField.text.trim()
|
var query = searchField.text.trim()
|
||||||
if (base.length === 0 || query.length === 0)
|
if (base.length === 0 || query.length === 0)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include <QDebug>
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
#include <QQuickView>
|
#include <QQuickView>
|
||||||
#include <QQmlContext>
|
#include <QQmlContext>
|
||||||
@@ -12,6 +13,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
|
|||||||
QGuiApplication *app = SailfishApp::application(argc, argv);
|
QGuiApplication *app = SailfishApp::application(argc, argv);
|
||||||
QQuickView *view = SailfishApp::createView();
|
QQuickView *view = SailfishApp::createView();
|
||||||
|
|
||||||
|
qDebug() << "harbour-calibreweb v0.1.0 build" << __DATE__ << __TIME__;
|
||||||
|
|
||||||
Settings settings;
|
Settings settings;
|
||||||
ApiClient apiClient(&settings);
|
ApiClient apiClient(&settings);
|
||||||
Downloader downloader(&settings);
|
Downloader downloader(&settings);
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ void Settings::setServerUrl(const QString &value)
|
|||||||
return;
|
return;
|
||||||
m_settings.setValue(QStringLiteral("serverUrl"), value);
|
m_settings.setValue(QStringLiteral("serverUrl"), value);
|
||||||
emit serverUrlChanged();
|
emit serverUrlChanged();
|
||||||
|
emit baseUrlChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Settings::username() const
|
QString Settings::username() const
|
||||||
|
|||||||
+5
-2
@@ -13,6 +13,8 @@ class Settings : public QObject
|
|||||||
Q_PROPERTY(QString password READ password WRITE setPassword NOTIFY passwordChanged)
|
Q_PROPERTY(QString password READ password WRITE setPassword NOTIFY passwordChanged)
|
||||||
Q_PROPERTY(bool ignoreSslErrors READ ignoreSslErrors WRITE setIgnoreSslErrors NOTIFY ignoreSslErrorsChanged)
|
Q_PROPERTY(bool ignoreSslErrors READ ignoreSslErrors WRITE setIgnoreSslErrors NOTIFY ignoreSslErrorsChanged)
|
||||||
Q_PROPERTY(QString downloadDir READ downloadDir CONSTANT)
|
Q_PROPERTY(QString downloadDir READ downloadDir CONSTANT)
|
||||||
|
// derivata da serverUrl (senza slash finale): accesso QML come appSettings.baseUrl
|
||||||
|
Q_PROPERTY(QString baseUrl READ baseUrl NOTIFY baseUrlChanged)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit Settings(QObject *parent = 0);
|
explicit Settings(QObject *parent = 0);
|
||||||
@@ -34,14 +36,15 @@ public:
|
|||||||
// Header "Authorization: Basic ..." pronto da usare, vuoto se utente non impostato
|
// Header "Authorization: Basic ..." pronto da usare, vuoto se utente non impostato
|
||||||
QString authHeader() const;
|
QString authHeader() const;
|
||||||
|
|
||||||
// URL del server senza slash finale (usabile da QML come appSettings.baseUrl())
|
// URL del server senza slash finale
|
||||||
Q_INVOKABLE QString baseUrl() const;
|
QString baseUrl() const;
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void serverUrlChanged();
|
void serverUrlChanged();
|
||||||
void usernameChanged();
|
void usernameChanged();
|
||||||
void passwordChanged();
|
void passwordChanged();
|
||||||
void ignoreSslErrorsChanged();
|
void ignoreSslErrorsChanged();
|
||||||
|
void baseUrlChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QSettings m_settings;
|
QSettings m_settings;
|
||||||
|
|||||||
Reference in New Issue
Block a user