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

Reorganize code a bit

Browse source
This commit is contained in:
Luca Beltrame 2015-02-15 19:03:57 +01:00
parent 32dd9bfc1a
commit 8493f036ba
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/mainwindow.cpp
View file

@ -80,9 +80,9 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
loadSettings(); loadSettings();
// TODO Configurable
m_cache = new KImageCache(qApp->applicationName(), DanbooruSettings::self()->cacheSize()); m_cache = new KImageCache(qApp->applicationName(), DanbooruSettings::self()->cacheSize());
m_service->setImageCache(m_cache); m_service->setImageCache(m_cache);
m_tableView->setModel(m_poolModel);
// Set up declarative bindings for the QQuickWidget // Set up declarative bindings for the QQuickWidget
@ -92,7 +92,7 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
declarative.setupBindings(); declarative.setupBindings();
auto qmlViewPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, auto qmlViewPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
qApp->applicationName() + QChar('/') + QLatin1Literal("danbooruimageview.qml")); qApp->applicationName() + QLatin1String("/danbooruimageview.qml"));
QQmlContext *ctxt = m_view->rootContext(); QQmlContext *ctxt = m_view->rootContext();
ctxt->setContextProperty("danbooruModel", m_model); ctxt->setContextProperty("danbooruModel", m_model);
@ -110,10 +110,6 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
// then, setup our actions // then, setup our actions
setupActions(); setupActions();
// add a status bar
statusBar()->show();
setupGUI(KXmlGuiWindow::ToolBar|Keys|Save|Create|StatusBar, "danbooru-clientui.rc"); setupGUI(KXmlGuiWindow::ToolBar|Keys|Save|Create|StatusBar, "danbooru-clientui.rc");
// connections // connections
@ -138,6 +134,7 @@ DanbooruMainWindow::DanbooruMainWindow(QWidget *parent)
m_service->getPostList(); m_service->getPostList();
} }
m_connectWidget->hide(); m_connectWidget->hide();
statusBar()->hide();
}); });
@ -275,11 +272,12 @@ void DanbooruMainWindow::setupActions()
void DanbooruMainWindow::setupDockWidgets() { void DanbooruMainWindow::setupDockWidgets() {
// Set up PoolWidget // Set up PoolWidget
m_tableView->setModel(m_poolModel);
QDockWidget* poolDockWidget = new QDockWidget(i18n("Pools"), this); QDockWidget* poolDockWidget = new QDockWidget(i18n("Pools"), this);
poolDockWidget->setAllowedAreas(Qt::BottomDockWidgetArea); poolDockWidget->setAllowedAreas(Qt::BottomDockWidgetArea);
poolDockWidget->setWidget(m_tableView); poolDockWidget->setWidget(m_tableView);
poolDockWidget->setObjectName("PoolView"); poolDockWidget->setObjectName("PoolView");
// Prevent the use of winId() when detached, leads to QQuickWidget bugs // Prevent the use of winId() when detached, leads to QQuickWidget bugs
poolDockWidget->setFeatures(QDockWidget::DockWidgetClosable); poolDockWidget->setFeatures(QDockWidget::DockWidgetClosable);
addDockWidget(Qt::BottomDockWidgetArea, poolDockWidget); addDockWidget(Qt::BottomDockWidgetArea, poolDockWidget);
@ -291,12 +289,15 @@ void DanbooruMainWindow::setupDockWidgets() {
searchDockWidget->setAllowedAreas(Qt::TopDockWidgetArea); searchDockWidget->setAllowedAreas(Qt::TopDockWidgetArea);
searchDockWidget->setWidget(m_searchWidget); searchDockWidget->setWidget(m_searchWidget);
searchDockWidget->setObjectName("SearchView"); searchDockWidget->setObjectName("SearchView");
// FIXME: Get rid of the close button in the widget
searchDockWidget->setFeatures(QDockWidget::NoDockWidgetFeatures); searchDockWidget->setFeatures(QDockWidget::NoDockWidgetFeatures);
addDockWidget(Qt::TopDockWidgetArea, searchDockWidget); addDockWidget(Qt::TopDockWidgetArea, searchDockWidget);
// No title wanted
searchDockWidget->setTitleBarWidget(new QWidget(this));
searchDockWidget->hide(); searchDockWidget->hide();
m_searchWidget->hide(); m_searchWidget->hide();
searchDockWidget->setTitleBarWidget(new QWidget(this));
// Connections // Connections