blumia/pineapple-comic-reader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(misc): a bunch of crude UI/UX tweaks

Browse Source 
- display add time for later use
- basic keyboard navigation support
- remember last-used server address
- show connection error when attempt to connect to server
This commit is contained in:
Gary Wang 2024-11-15 20:58:03 +08:00
parent 1f7adc2a3a
commit edb3338bc4
No known key found for this signature in database
GPG Key ID: 5D30A4F15EA78760
8 changed files with 59 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ComicOverviewPage.qml
View File

@ -11,12 +11,14 @@ Control {
property var curComicIndex: AppController.currentComicModelIndex()
property bool startReading: AppController.selectedComicOpened
readonly property int comicPageCount: dataByRole(ComicItem.PageCountRole)
function dataByRole(role) {
return AppController.comicsModel.data(curComicIndex, role)
}
contentItem: ColumnLayout {
enabled: !root.startReading
Image {
Layout.fillWidth: true
Layout.maximumHeight: Math.min(root.width / 2, root.height / 2)
@ -32,7 +34,12 @@ Control {
}
Label {
Layout.preferredWidth: root.width - 10
text: `${dataByRole(ComicItem.PageCountRole)} pages`
text: "Added: " + new Date(Number(`${dataByRole(ComicItem.AddedTimeRole)}000`)).toLocaleString(Qt.locale())
wrapMode: Text.Wrap
}
Label {
Layout.preferredWidth: root.width - 10
text: `${comicPageCount} pages`
wrapMode: Text.Wrap
}
Label {
@ -43,6 +50,7 @@ Control {
Button {
Layout.fillWidth: true
text: "Read"
enabled: root.comicPageCount > 0
onClicked: function() {
AppController.openComic()
}
@ -60,7 +68,7 @@ Control {
}
ComicViewer {
z: 2
parent: Overlay.overlay
visible: root.startReading
pageCount: dataByRole(ComicItem.PageCountRole)
}

14
ComicViewer.qml
View File

@ -15,6 +15,12 @@ Pane {
id: view
anchors.fill: parent
onVisibleChanged: function() {
if (visible) {
forceActiveFocus()
}
}
Repeater {
model: root.pageCount
Loader {
@ -46,11 +52,12 @@ Pane {
Pane {
visible: root.osdVisible
anchors.fill: parent
opacity: 0.6
opacity: 0.65
}
ColumnLayout {
visible: root.osdVisible
enabled: root.osdVisible
anchors.fill: parent
Item {
Layout.fillWidth: true
@ -65,6 +72,7 @@ Pane {
text: "Close Comic"
Layout.fillWidth: true
onClicked: function() {
root.osdVisible = false
AppController.closeComic()
}
}
@ -86,4 +94,8 @@ Pane {
}
}
}
Keys.onEscapePressed: function(event) {
root.osdVisible = !root.osdVisible
}
}

19
ConnectServerPage.qml
View File

@ -1,3 +1,4 @@
import QtCore
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
@ -21,17 +22,19 @@ Control {
TextField {
id: baseUrlEdit
Layout.fillWidth: true
placeholderText: "e.g. http://192.168.123.123:8080"
inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhUrlCharactersOnly
enabled: AppController.connectionState === AppController.NotConnected
}
Item {
Layout.fillHeight: true
Layout.verticalStretchFactor: 1
Label {
text: AppController.lastErrorMessage
}
Button {
Layout.fillWidth: true
text: AppController.connectionState === AppController.NotConnected ? "Connect" : "Connecting"
enabled: baseUrlEdit.enabled
onClicked: function() {
settings.setValue("server_url", baseUrlEdit.text)
AppController.connectServer(baseUrlEdit.text)
}
}
@ -40,4 +43,14 @@ Control {
Layout.verticalStretchFactor: 3
}
}
Settings {
id: settings
Component.onCompleted: function() {
let srvUrl = settings.value("server_url", "")
if (srvUrl !== "") {
baseUrlEdit.text = srvUrl
}
}
}
}

13
appcontroller.cpp
View File

@ -4,6 +4,8 @@
#include "dataitems/comicitem.h"
#include "dataitems/folderitem.h"
#include <chrono>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
@ -12,6 +14,8 @@
#include <QRestReply>
#include <QSettings>
using namespace std::chrono_literals;
AppController::AppController(QObject *parent)
: QObject(parent)
, m_networkAccessManager(new QNetworkAccessManager(this))
@ -30,17 +34,22 @@ void AppController::connectServer(QUrl serverBaseUrl)
setProperty("connectionState", Connecting);
serverBaseUrl.setPath("/v2/");
QNetworkRequestFactory api(serverBaseUrl);
m_restAccessManager->get(api.createRequest("version"), this, [=](QRestReply &reply){
QNetworkRequest req(api.createRequest("version"));
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::ManualRedirectPolicy);
req.setTransferTimeout(5s);
m_restAccessManager->get(req, this, [=](QRestReply &reply){
qDebug() << reply.httpStatus() << reply << reply.isHttpStatusSuccess();
if (reply.isSuccess()) {
qDebug() << reply.readText();
m_requestFactory.setBaseUrl(serverBaseUrl);
m_requestFactory.clearCommonHeaders();
QHttpHeaders commonHeaders;
commonHeaders.append("X-Request-Id", "114514");
m_requestFactory.setCommonHeaders(commonHeaders);
setProperty("connectionState", Connected);
setProperty("lastErrorMessage", "");
} else {
setProperty("connectionState", NotConnected);
setProperty("lastErrorMessage", QStringLiteral("%1: %2").arg(reply.httpStatus()).arg(reply.errorString()));
}
});
}

3
appcontroller.h
View File

@ -22,6 +22,7 @@ public:
Q_PROPERTY(int selectedLibraryId MEMBER m_currentLibraryId NOTIFY currentLibraryIdChanged FINAL)
Q_PROPERTY(QString selectedComicId MEMBER m_currentComicId NOTIFY currentComicIdChanged FINAL)
Q_PROPERTY(bool selectedComicOpened MEMBER m_currentComicOpened NOTIFY currentComicOpenedChanged FINAL)
Q_PROPERTY(QString lastErrorMessage MEMBER m_lastErrorMessage NOTIFY lastErrorMessageChanged FINAL)
Q_PROPERTY(QStandardItemModel * librariesModel MEMBER m_librariesModel CONSTANT FINAL)
Q_PROPERTY(QStandardItemModel * comicsModel MEMBER m_comicsModel CONSTANT FINAL)
Q_PROPERTY(QStandardItemModel * foldersModel MEMBER m_foldersModel CONSTANT FINAL)
@ -42,6 +43,7 @@ signals:
void currentLibraryIdChanged(int newLibraryId);
void currentComicIdChanged(QString newComicId);
void currentComicOpenedChanged(bool opened);
void lastErrorMessageChanged(QString errorMessage);
private:
QNetworkRequestFactory apiFactory() const;
@ -50,6 +52,7 @@ private:
int m_currentLibraryId = -1;
QString m_currentComicId;
bool m_currentComicOpened = false;
QString m_lastErrorMessage;
QNetworkRequestFactory m_requestFactory;
QNetworkAccessManager * m_networkAccessManager;
QRestAccessManager * m_restAccessManager;

2
dataitems/comicitem.cpp
View File

@ -8,6 +8,7 @@ ComicItem::ComicItem(QJsonObject jsonObj, const QString &name)
setData(jsonObj["num_pages"].toInt(), PageCountRole);
setData(jsonObj["current_page"].toInt(), CurrentPageRole);
setData(jsonObj["type"].toInt(), TypeRole);
setData(jsonObj["added"].toInteger(), AddedTimeRole);
}
QHash<int, QByteArray> ComicItem::roleNames()
@ -19,5 +20,6 @@ QHash<int, QByteArray> ComicItem::roleNames()
{ComicItem::PageCountRole, "pageCount"},
{ComicItem::CurrentPageRole, "currentPage"},
{ComicItem::TypeRole, "type"},
{ComicItem::AddedTimeRole, "addedTime"},
};
}

1
dataitems/comicitem.h
View File

@ -14,6 +14,7 @@ public:
PageCountRole,
CurrentPageRole,
TypeRole,
AddedTimeRole,
};
Q_ENUM(Roles)

3
main.cpp
View File

@ -33,7 +33,10 @@ public:
int main(int argc, char *argv[])
{
QCoreApplication::setApplicationName("Pineapple Comic Reader");
QGuiApplication app(argc, argv);
app.setOrganizationName("Chestnut Software");
app.setOrganizationDomain("blumia.net");
qputenv("QT_QUICK_CONTROLS_STYLE", QByteArray("FluentWinUI3"));