← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to apps/dolphin/src/kcm/kcmdolphinservices.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Roderick B. Greening
  • Date: 2009-05-13 12:21:39 UTC
  • mfrom: (1.1.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20090513122139-24avbekpgnur3yew
Tags: 4:4.2.85-0ubuntu1
* New upstream release
* Remove merged/unnecessary patches
  - kubuntu_09_trash_kcm_in_dolphin.diff
  - kubuntu_11_svn954343_dolphin_prefix.diff
* Add the following patches
  - kubuntu_13_fix_phonon_include.diff - fix FTBFS in phononwidget.cpp
* Updated build dep to include kdebase-workspace-dev req by folderview
* Updated various install files
  - Removed from:
    kdebase-data.install
      usr/share/kde4/services/filetypes.desktop
      usr/share/kde4/services/useragentstrings/firefox15oncurrent.desktop
      usr/share/kde4/services/useragentstrings/mozoncurrent.desktop
      usr/share/kde4/services/useragentstrings/mozoncurrent12.desktop
      usr/share/kde4/services/useragentstrings/mozonwinxp.desktop
      usr/share/kde4/services/useragentstrings/safari12.desktop
    dolphin.install
      usr/lib/kde4/kcm_dolphin.so
      usr/lib/libdolphinprivate.so.4.2.0
      usr/share/icons/hicolor/128x128/actions/preview.png
      usr/share/icons/hicolor/16x16/actions/preview.png
      usr/share/icons/hicolor/22x22/actions/preview.png
      usr/share/icons/hicolor/32x32/actions/preview.png
      usr/share/icons/hicolor/48x48/actions/preview.png
      usr/share/icons/hicolor/64x64/actions/preview.png
      usr/share/kde4/services/kcmdolphin.desktop
    konqueror.install
      usr/lib/libkonquerorprivate.so.4.2.0
      usr/lib/kde4/konq_remoteencoding.so
      usr/share/kde4/apps/dolphinpart/kpartplugins/kremoteencodingplugin.desktop
      usr/share/kde4/apps/dolphinpart/kpartplugins/kremoteencodingplugin.rc
    libkonqsidebarplugin4.install
      usr/lib/libkonqsidebarplugin.so.4.2.0
    libkonq5.install
      usr/lib/libkonq.so.5.2.0
    kdebase-bin.install
      usr/bin/keditfiletype
      usr/lib/kde4/kcm_filetypes.so
  - Added to:
    kdebase-data.install
      usr/share/kde4/services/useragentstrings/android10.desktop
      usr/share/kde4/services/useragentstrings/chrome10onwinnt51.desktop
      usr/share/kde4/services/useragentstrings/firefox30oncurrent.desktop
      usr/share/kde4/services/useragentstrings/ie70onwinnt51.desktop
      usr/share/kde4/services/useragentstrings/op962oncurrent.desktop
      usr/share/kde4/services/useragentstrings/safari30oniphone.desktop
      usr/share/kde4/services/useragentstrings/safari32.desktop
    dolphin.install
      usr/lib/kde4/kcm_dolphingeneral.so
      usr/lib/kde4/kcm_dolphinnavigation.so
      usr/lib/kde4/kcm_dolphinservices.so
      usr/lib/kde4/kcm_dolphinviewmodes.so
      usr/lib/libdolphinprivate.so.4.3.0
      usr/share/kde4/services/kcmdolphingeneral.desktop
      usr/share/kde4/services/kcmdolphinnavigation.desktop
      usr/share/kde4/services/kcmdolphinservices.desktop
      usr/share/kde4/services/kcmdolphinviewmodes.desktop
    konqueror.install
      usr/lib/libkonquerorprivate.so.4.3.0
    libkonqsidebarplugin4.install
      usr/lib/libkonqsidebarplugin.so.4.3.0
    libkonq5.install
      usr/lib/libkonq.so.5.3.0
      usr/share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
* Updated not-installed file
  - Added
    ./usr/lib/libkonsoleprivate.so

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/dolphin/src/kcm/kcmdolphinservices.cpp
 
1
/***************************************************************************
 
2
 *   Copyright (C) 2009 by Peter Penz <peter.penz@gmx.at>                  *
 
3
 *                                                                         *
 
4
 *   This program is free software; you can redistribute it and/or modify  *
 
5
 *   it under the terms of the GNU General Public License as published by  *
 
6
 *   the Free Software Foundation; either version 2 of the License, or     *
 
7
 *   (at your option) any later version.                                   *
 
8
 *                                                                         *
 
9
 *   This program is distributed in the hope that it will be useful,       *
 
10
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 
11
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 
12
 *   GNU General Public License for more details.                          *
 
13
 *                                                                         *
 
14
 *   You should have received a copy of the GNU General Public License     *
 
15
 *   along with this program; if not, write to the                         *
 
16
 *   Free Software Foundation, Inc.,                                       *
 
17
 *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
 
18
 ***************************************************************************/
 
19
 
 
20
#include "kcmdolphinservices.h"
 
21
 
 
22
#include "settings/servicessettingspage.h"
 
23
 
 
24
#include <ktabwidget.h>
 
25
#include <kdialog.h>
 
26
#include <klocale.h>
 
27
#include <kpluginfactory.h>
 
28
#include <kpluginloader.h>
 
29
 
 
30
#include <QVBoxLayout>
 
31
 
 
32
K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>("dolphinservices");)
 
33
K_EXPORT_PLUGIN(KCMDolphinServicesConfigFactory("kcmdolphinservices"))
 
34
 
 
35
DolphinServicesConfigModule::DolphinServicesConfigModule(QWidget* parent, const QVariantList& args) :
 
36
    KCModule(KCMDolphinServicesConfigFactory::componentData(), parent),
 
37
    m_services(0)
 
38
{
 
39
    Q_UNUSED(args);
 
40
 
 
41
    KGlobal::locale()->insertCatalog("dolphinservices");
 
42
 
 
43
    setButtons(KCModule::Default | KCModule::Help);
 
44
 
 
45
    QVBoxLayout* topLayout = new QVBoxLayout(this);
 
46
    topLayout->setMargin(0);
 
47
    topLayout->setSpacing(KDialog::spacingHint());
 
48
 
 
49
    m_services = new ServicesSettingsPage(this);
 
50
    connect(m_services, SIGNAL(changed()), this, SLOT(changed()));
 
51
    topLayout->addWidget(m_services, 0, 0);
 
52
}
 
53
 
 
54
DolphinServicesConfigModule::~DolphinServicesConfigModule()
 
55
{
 
56
}
 
57
 
 
58
void DolphinServicesConfigModule::save()
 
59
{
 
60
    m_services->applySettings();
 
61
}
 
62
 
 
63
void DolphinServicesConfigModule::defaults()
 
64
{
 
65
    m_services->restoreDefaults();
 
66
}
 
67
 
 
68
#include "kcmdolphinservices.moc"