alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add the ability to install packages from files. needs a UI review by another pair of usability sensitive hands. there are still issues, such as lack of double click interactions and feeble feedback on error and success. but it works, now we can pollish.

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=780460
This commit is contained in:
Aaron J. Seigo 2008-02-29 08:10:14 +00:00
parent b3eae6af7b
commit 331d163253
4 changed files with 231 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -21,11 +21,12 @@ set(plasma_LIB_SRCS
animator.cpp
applet.cpp
appletbrowser.cpp
appletbrowser/customdragtreeview.cpp
appletbrowser/kcategorizeditemsview.cpp
appletbrowser/kcategorizeditemsviewdelegate.cpp
appletbrowser/kcategorizeditemsviewmodels.cpp
appletbrowser/openwidgetassistant.cpp
appletbrowser/plasmaappletitemmodel.cpp
appletbrowser/customdragtreeview.cpp
applethandle.cpp
configxml.cpp
containment.cpp
@ -89,7 +90,7 @@ endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
kde4_add_library(plasma SHARED ${plasma_LIB_SRCS})
target_link_libraries(plasma ${KDE4_KIO_LIBS} ${QT_QTUITOOLS_LIBRARY})
target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${QT_QTUITOOLS_LIBRARY})
if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
target_link_libraries(plasma ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})

36
appletbrowser.cpp
View File

@ -19,20 +19,24 @@
#include "plasma/appletbrowser.h"
#include <QVBoxLayout>
#include <QLabel>
#include <KAction>
#include <KConfig>
#include <KConfigGroup>
#include <KFileDialog>
#include <KMenu>
#include <KPageWidgetItem>
#include <KPushButton>
#include <KServiceTypeTrader>
#include <KStandardAction>
#include "plasma/applet.h"
#include "plasma/corona.h"
#include "plasma/containment.h"
#include "plasma/applet.h"
#include "plasma/appletbrowser/plasmaappletitemmodel_p.h"
#include "plasma/appletbrowser/kcategorizeditemsview_p.h"
#include "plasma/appletbrowser/plasmaappletitemmodel_p.h"
#include "plasma/appletbrowser/openwidgetassistant_p.h"
namespace Plasma
{
@ -295,28 +299,10 @@ void AppletBrowserWidget::downloadWidgets()
void AppletBrowserWidget::openWidgetFile()
{
KService::List offers = KServiceTypeTrader::self()->query("Plasma/PackageStructure");
QStringList filters;
filters << i18nc("File dialog filter", "%1|PlasmaWidget", "*.plasma");
QStringList mimetypes;
foreach (const KService::Ptr &offer, offers) {
//filters << offer->property("X-Plasma-PackageMimeFilter").toStringList();
QString glob = offer->property("X-Plasma-PackageFileFilter").toString();
if (!glob.isEmpty()) {
glob = QString("%1|%2").arg(glob).arg(offer->name());
filters << glob;
}
}
kDebug() << "filters are" << filters;
KFileDialog fd(KUrl(), QString(), this);
fd.setOperationMode(KFileDialog::Opening);
fd.setMode(KFile::Files | KFile::ExistingOnly);
fd.setFilter(filters.join("\n"));// + mimetypes.join("\n"));
fd.exec();
kDebug() << "selected file" << fd.selectedUrl() << "of type" << fd.currentFilter();
// TODO: if we already have one of these showing and the user clicks to add it again, show the same window?
OpenWidgetAssistant *assistant = new OpenWidgetAssistant(topLevelWidget());
assistant->setAttribute(Qt::WA_DeleteOnClose, true);
assistant->show();
}
class AppletBrowser::Private

161
appletbrowser/openwidgetassistant.cpp Normal file
View File

@ -0,0 +1,161 @@
/*
* Copyright (C) 2008 Aaron Seigo <aseigo@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library/Lesser General Public License
* version 2, or (at your option) any later version, as published by the
* Free Software Foundation
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU Library/Lesser General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "plasma/appletbrowser/openwidgetassistant_p.h"
#include <QLabel>
#include <QVBoxLayout>
#include <KDebug>
#include <kfilewidget.h>
#include <KListWidget>
#include <KService>
#include <KServiceTypeTrader>
#include <KStandardDirs>
#include "plasma/packagestructure.h"
namespace Plasma
{
OpenWidgetAssistant::OpenWidgetAssistant(QWidget *parent)
: KAssistantDialog(parent),
m_fileDialog(0),
m_filePageWidget(0)
{
QWidget *selectWidget = new QWidget(this);
QVBoxLayout *selectLayout = new QVBoxLayout(selectWidget);
QLabel *selectLabel = new QLabel(selectWidget);
selectLabel->setText(i18n("Select what sort of widget to install from the list below."));
m_widgetTypeList = new KListWidget(selectWidget);
m_widgetTypeList->setSelectionMode(QAbstractItemView::SingleSelection);
//m_widgetTypeList->setSelectionBehavior(QAbstractItemView::SelectItems);
QString constraint("'Applet' in [X-Plasma-ComponentTypes] and exist [X-Plasma-PackageFormat]");
KService::List offers = KServiceTypeTrader::self()->query("Plasma/ScriptEngine", constraint);
QListWidgetItem * item = new QListWidgetItem(KIcon("plasma"), i18n("Plasmoid: Native plasma widget"), m_widgetTypeList);
item->setSelected(true);
m_widgetTypeList->setCurrentItem(item);
foreach (const KService::Ptr &offer, offers) {
QString text(offer->name());
if (!offer->comment().isEmpty()) {
text.append(": ").append(offer->comment());
}
item = new QListWidgetItem(text, m_widgetTypeList);
item->setData(PackageStructureRole, offer->property("X-KDE-PluginInfo-Name"));
if (!offer->icon().isEmpty()) {
item->setIcon(KIcon(offer->icon()));
}
}
selectLayout->addWidget(selectLabel);
selectLayout->addWidget(m_widgetTypeList);
m_typePage = new KPageWidgetItem(selectWidget, i18n("Install New Widget From File"));
m_typePage->setIcon(KIcon("plasma"));
addPage(m_typePage);
m_filePageWidget = new QWidget(this);
m_filePage = new KPageWidgetItem(m_filePageWidget, i18n("Select File"));
addPage(m_filePage);
connect(this, SIGNAL(currentPageChanged(KPageWidgetItem*,KPageWidgetItem*)), SLOT(prepPage(KPageWidgetItem*,KPageWidgetItem*)));
connect(this, SIGNAL(user1Clicked()), this, SLOT(finished()));
}
void OpenWidgetAssistant::prepPage(KPageWidgetItem *current, KPageWidgetItem *before)
{
Q_UNUSED(before)
if (current != m_filePage) {
return;
}
if (!m_fileDialog) {
QVBoxLayout *layout = new QVBoxLayout(m_filePageWidget);
m_fileDialog = new KFileWidget(KUrl(), m_filePageWidget);
m_fileDialog->setOperationMode(KFileWidget::Opening);
m_fileDialog->setMode(KFile::File | KFile::ExistingOnly);
//m_fileDialog->setWindowFlags(Qt::Widget);
layout->addWidget(m_fileDialog);
}
QListWidgetItem *item = m_widgetTypeList->selectedItems().first();
Q_ASSERT(item);
QString type = item->data(PackageStructureRole).toString();
m_fileDialog->setFilter(QString());
if (!type.isEmpty()) {
QString constraint = QString("'%1' == [X-KDE-PluginInfo-Name]").arg(type);
KService::List offers = KServiceTypeTrader::self()->query("Plasma/PackageStructure", constraint);
kDebug() << "looking for a Plasma/PackageStructure with" << constraint << type;
Q_ASSERT(offers.count() > 0);
m_packageStructureService = offers.first();
QStringList mimes = m_packageStructureService->property("X-Plasma-PackageFileMimetypes").toStringList();
if (mimes.count() > 0) {
m_fileDialog->setMimeFilter(mimes);
} else {
QString filter = m_packageStructureService->property("X-Plasma-PackageFileFilter").toString();
if (!filter.isEmpty()) {
m_fileDialog->setFilter( + "|" + m_packageStructureService->name());
}
}
} else {
m_fileDialog->setFilter("*.plasmoid|Plasma Widget");
}
}
void OpenWidgetAssistant::finished()
{
m_fileDialog->slotOk();
m_fileDialog->accept(); // how interesting .. accept() must be called before the state is set
if (m_fileDialog->selectedFile().isEmpty()) {
//TODO: user visible error handling
return;
}
//kDebug() << "selected uri is" << m_fileDialog->selectedFile() << "of type" << m_fileDialog->currentFilter();
QString error;
PackageStructure *installer = m_packageStructureService->createInstance<Plasma::PackageStructure>(0, QVariantList(), &error);
if (!installer) {
kDebug() << "Could not load requested PackageStructure installer "
<< m_packageStructureService << ". Error given: " << error;
return;
}
QString root = KStandardDirs::locateLocal("data", "plasma/plasmoids/");
//kDebug() << "installing to root dir of" << root;
bool success = installer->installPackage(m_fileDialog->selectedFile(), root);
kDebug() << "install returned. were we successful?" << success;
//TODO: user visible feedback
}
} // Plasma namespace
#include "openwidgetassistant_p.moc"

56
appletbrowser/openwidgetassistant_p.h Normal file
View File

@ -0,0 +1,56 @@
/*
* Copyright (C) 2008 Aaron Seigo <aseigo@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library/Lesser General Public License
* version 2, or (at your option) any later version, as published by the
* Free Software Foundation
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU Library/Lesser General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef PLASMA_OPENWIDGETASSISTANT_P_H
#define PLASMA_OPENWIDGETASSISTANT_P_H
#include <KAssistantDialog>
#include <KService>
class KFileWidget;
class KListWidget;
namespace Plasma
{
class OpenWidgetAssistant : public KAssistantDialog
{
Q_OBJECT
public:
enum { PackageStructureRole = Qt::UserRole + 1 };
OpenWidgetAssistant(QWidget *parent);
protected Q_SLOTS:
void prepPage(KPageWidgetItem *current, KPageWidgetItem *before);
void finished();
private:
KPageWidgetItem *m_typePage;
KPageWidgetItem *m_filePage;
KFileWidget *m_fileDialog;
QWidget *m_filePageWidget;
KListWidget *m_widgetTypeList;
KService::Ptr m_packageStructureService;
};
} // Plasma namespace
#endif