[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [muon/frameworks] updater: Fix warnings in muon-updater
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2014-10-01 0:44:28
Message-ID: E1XZ81s-0005Eh-W2 () scm ! kde ! org
[Download RAW message or body]

Git commit 4e92bb4e5c21674ce5f4066323f7e0238b283240 by Aleix Pol.
Committed on 30/09/2014 at 23:30.
Pushed by apol into branch 'frameworks'.

Fix warnings in muon-updater

M  +1    -1    updater/CMakeLists.txt
M  +2    -1    updater/ChangelogWidget.cpp
M  +6    -1    updater/UpdaterWidget.cpp

http://commits.kde.org/muon/4e92bb4e5c21674ce5f4066323f7e0238b283240

diff --git a/updater/CMakeLists.txt b/updater/CMakeLists.txt
index 1e5b6af..2368722 100644
--- a/updater/CMakeLists.txt
+++ b/updater/CMakeLists.txt
@@ -36,6 +36,6 @@ install(TARGETS muon-updater ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### install files ###############
 
-install( FILES muon-updaterui.rc  DESTINATION  ${DATA_INSTALL_DIR}/muonupdater )
+install( FILES muon-updaterui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/muon-updater )
 install( PROGRAMS muon-updater.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
diff --git a/updater/ChangelogWidget.cpp b/updater/ChangelogWidget.cpp
index 85fafee..c354068 100644
--- a/updater/ChangelogWidget.cpp
+++ b/updater/ChangelogWidget.cpp
@@ -36,6 +36,7 @@
 #include <KLocalizedString>
 #include <KPixmapSequence>
 #include <KPixmapSequenceOverlayPainter>
+#include <KIconLoader>
 #include <QTextBrowser>
 
 ChangelogWidget::ChangelogWidget(QWidget *parent)
@@ -71,7 +72,7 @@ ChangelogWidget::ChangelogWidget(QWidget *parent)
     viewport->setPalette(palette);
 
     m_busyWidget = new KPixmapSequenceOverlayPainter(this);
-    m_busyWidget->setSequence(KPixmapSequence("process-working", \
QFontMetrics(qApp->font()).xHeight()*4)); +    \
m_busyWidget->setSequence(KIconLoader::global()->loadPixmapSequence("process-working", \
KIconLoader::SizeSmallMedium));  m_busyWidget->setAlignment(Qt::AlignHCenter | \
Qt::AlignVCenter);  m_busyWidget->setWidget(this);
 
diff --git a/updater/UpdaterWidget.cpp b/updater/UpdaterWidget.cpp
index df44bb8..23d7ad6 100644
--- a/updater/UpdaterWidget.cpp
+++ b/updater/UpdaterWidget.cpp
@@ -31,6 +31,7 @@
 #include <QtWidgets/QVBoxLayout>
 #include <QAction>
 #include <QPushButton>
+#include <QDebug>
 
 // KDE includes
 #include <KLocalizedString>
@@ -38,6 +39,7 @@
 #include <KPixmapSequence>
 #include <KPixmapSequenceOverlayPainter>
 #include <KMessageWidget>
+#include <kiconloader.h>
 
 // Libmuon includes
 #include <resources/AbstractResourcesBackend.h>
@@ -102,7 +104,9 @@ UpdaterWidget::UpdaterWidget(ResourcesUpdatesModel* updates, \
QWidget *parent) :  page1Layout->addWidget(m_changelogWidget);
 
     m_busyWidget = new KPixmapSequenceOverlayPainter(page1);
-    m_busyWidget->setSequence(KPixmapSequence("process-working", \
QFontMetrics(qApp->font()).xHeight()*4)); //TODO: make sure it's an appropriate size \
+    KPixmapSequence seq = \
KIconLoader::global()->loadPixmapSequence("process-working", \
KIconLoader::SizeSmallMedium); +    qDebug() << "fuuuuuuuuuuu" << seq.isValid();
+    m_busyWidget->setSequence(seq);
     m_busyWidget->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
     m_busyWidget->setWidget(m_updateView->viewport());
 
@@ -150,6 +154,7 @@ void UpdaterWidget::activityChanged()
 
 void UpdaterWidget::populateUpdateModel()
 {
+    qDebug() << "..... populating";
     m_busyWidget->stop();
     QApplication::restoreOverrideCursor();
     setEnabled(true);


[prev in list] [next in list] [prev in thread] [next in thread]