KDE/danbooru-client
1
0
Fork 0
Code Issues Pull requests Releases Activity

Temporarily patch up things to allow building

Browse source
This commit is contained in:
Luca Beltrame 2020-08-19 17:00:44 +02:00
parent deac8ebe76
commit c09bf559f6
Signed by: einar
GPG key ID: 4707F46E9EC72DEC
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/mainwindow.cpp
View file

@ -54,7 +54,9 @@
// Own // Own
#include "libdanbooru/danbooruservice.h" #include "libdanbooru/servicebase.h"
#include "libdanbooru/moebooru.h"
#include "libdanbooru/danbooru_donmai.h"
#include "libdanbooru/danboorupost.h" #include "libdanbooru/danboorupost.h"
#include "libdanbooru/danboorupool.h" #include "libdanbooru/danboorupool.h"
#include "model/danboorupostmodel.h" #include "model/danboorupostmodel.h"
@ -103,9 +105,6 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
loadSettings(); loadSettings();
m_cache = new KImageCache(qApp->applicationName(), DanbooruSettings::self()->cacheSize());
m_service->setImageCache(m_cache);
m_proxyModel->setSortRole(DanbooruTagModel::TagCountRole); m_proxyModel->setSortRole(DanbooruTagModel::TagCountRole);
m_proxyModel->setSourceModel(m_tagModel); m_proxyModel->setSourceModel(m_tagModel);
m_proxyModel->setDynamicSortFilter(true); m_proxyModel->setDynamicSortFilter(true);
@ -118,12 +117,12 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
m_view->setResizeMode(QQuickWidget::SizeRootObjectToView); m_view->setResizeMode(QQuickWidget::SizeRootObjectToView);
KDeclarative::KDeclarative declarative; KDeclarative::KDeclarative declarative;
declarative.setDeclarativeEngine(m_view->engine()); declarative.setDeclarativeEngine(m_view->engine());
declarative.setupBindings(); declarative.setupContext();
declarative.setupEngine(m_view->engine());
m_view->setFocusPolicy(Qt::StrongFocus); m_view->setFocusPolicy(Qt::StrongFocus);
m_view->setFocus(); m_view->setFocus();
auto qmlViewPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, auto qmlViewPath = QString("qrc:/danbooru-client/qml/danbooruimageview.qml");
qApp->applicationName() + QStringLiteral("/danbooruimageview.qml"));
QQmlContext *ctxt = m_view->rootContext(); QQmlContext *ctxt = m_view->rootContext();
ctxt->setContextProperty(QStringLiteral("danbooruModel"), m_model); ctxt->setContextProperty(QStringLiteral("danbooruModel"), m_model);
@ -595,13 +594,13 @@ void DanbooruMainWindow::handlePostDownload(const QStringList &tags, bool relate
m_view->rootObject()->setProperty("poolMode", QVariant(false)); m_view->rootObject()->setProperty("poolMode", QVariant(false));
m_service->setPostTags(tags); m_service->setPostTags(tags);
if (minimumWidth > 0) { // if (minimumWidth > 0) {
m_service->setMinimumWidth(minimumWidth); // m_service->setMinimumWidth(minimumWidth);
} // }
//
if (minimumHeight > 0) { // if (minimumHeight > 0) {
m_service->setMinimumHeight(minimumHeight); // m_service->setMinimumHeight(minimumHeight);
} // }
if (relatedTags) { if (relatedTags) {
m_service->getRelatedTags(tags); m_service->getRelatedTags(tags);

4
src/mainwindow.h
View file

@ -39,7 +39,7 @@ namespace Danbooru
{ {
class DanbooruClientView; class DanbooruClientView;
class DanbooruService; class DanbooruServiceBase;
class DanbooruPostModel; class DanbooruPostModel;
class DanbooruPoolModel; class DanbooruPoolModel;
class DanbooruTagModel; class DanbooruTagModel;
@ -64,7 +64,7 @@ private:
DanbooruPostModel *m_model; DanbooruPostModel *m_model;
DanbooruPoolModel *m_poolModel; DanbooruPoolModel *m_poolModel;
DanbooruTagModel *m_tagModel; DanbooruTagModel *m_tagModel;
DanbooruService *m_service; DanbooruServiceBase *m_service;
DanbooruConnectWidget *m_connectWidget; DanbooruConnectWidget *m_connectWidget;
DanbooruSearchWidget *m_searchWidget; DanbooruSearchWidget *m_searchWidget;
DanbooruTagWidget *m_tagWidget; DanbooruTagWidget *m_tagWidget;