mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-23 18:32:49 +00:00
kio: disable copying of KBookmarkMenu
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
8d6cbd657c
commit
c8119cf861
9 changed files with 52 additions and 67 deletions
|
@ -21,17 +21,18 @@
|
|||
*/
|
||||
|
||||
#include "kbookmark.h"
|
||||
|
||||
#include <QStack>
|
||||
#include <QDateTime>
|
||||
|
||||
#include <kdebug.h>
|
||||
#include <kmimetype.h>
|
||||
#include <kstringhandler.h>
|
||||
#include <kglobal.h>
|
||||
#include <klocale.h>
|
||||
#include <assert.h>
|
||||
#include <kbookmarkmanager.h>
|
||||
|
||||
#include <qdatetime.h>
|
||||
#include <qmimedata.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define METADATA_KDE_OWNER "http://www.kde.org"
|
||||
#define METADATA_FREEDESKTOP_OWNER "http://freedesktop.org"
|
||||
|
|
|
@ -21,13 +21,14 @@
|
|||
#define KBOOKMARK_H
|
||||
|
||||
#include <kio/kio_export.h>
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QMetaType>
|
||||
#include <QtXml/qdom.h>
|
||||
#include <kurl.h>
|
||||
|
||||
#include <QString>
|
||||
#include <QList>
|
||||
#include <QMimeData>
|
||||
#include <QMetaType>
|
||||
#include <QDomDocument>
|
||||
|
||||
class KBookmarkManager;
|
||||
class KBookmarkGroup;
|
||||
|
||||
|
|
|
@ -22,10 +22,12 @@
|
|||
#include "kbookmarkmanager.h"
|
||||
#include "kbookmarkmenu.h"
|
||||
#include "kbookmarkmenu_p.h"
|
||||
|
||||
#include <QFormLayout>
|
||||
#include <QLabel>
|
||||
#include <QTreeWidget>
|
||||
#include <QHeaderView>
|
||||
|
||||
#include <klineedit.h>
|
||||
#include <klocale.h>
|
||||
#include <kiconloader.h>
|
||||
|
|
|
@ -21,14 +21,12 @@
|
|||
#define KBOOKMARKDIALOG_H
|
||||
|
||||
#include "kbookmark.h"
|
||||
|
||||
#include <kdialog.h>
|
||||
#include <kurl.h>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QLabel>
|
||||
#include <QTreeWidget>
|
||||
#include <QTreeWidgetItem>
|
||||
#include <QGridLayout>
|
||||
|
||||
class KBookmarkManager;
|
||||
class KBookmarkDialogPrivate;
|
||||
|
|
|
@ -21,17 +21,21 @@
|
|||
*/
|
||||
|
||||
#include "kbookmarkmanager.h"
|
||||
#include "kbookmarkmenu.h"
|
||||
#include "kbookmarkmenu_p.h"
|
||||
#include "kbookmarkdialog.h"
|
||||
#include "kbookmarkmanageradaptor_p.h"
|
||||
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QProcess>
|
||||
#include <QtCore/QRegExp>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QTextCodec>
|
||||
#include <QtCore/QThread>
|
||||
#include <QtDBus/QtDBus>
|
||||
#include <QtGui/QApplication>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include <QProcess>
|
||||
#include <QRegExp>
|
||||
#include <QTextStream>
|
||||
#include <QMutex>
|
||||
#include <QTextCodec>
|
||||
#include <QThread>
|
||||
#include <QApplication>
|
||||
#include <QDBusConnection>
|
||||
|
||||
#include <kconfiggroup.h>
|
||||
#include <kdebug.h>
|
||||
|
@ -42,11 +46,6 @@
|
|||
#include <kstandarddirs.h>
|
||||
#include <kmimetype.h>
|
||||
|
||||
#include "kbookmarkmenu.h"
|
||||
#include "kbookmarkmenu_p.h"
|
||||
#include "kbookmarkdialog.h"
|
||||
#include "kbookmarkmanageradaptor_p.h"
|
||||
|
||||
#define BOOKMARK_CHANGE_NOTIFY_INTERFACE "org.kde.KIO.KBookmarkManager"
|
||||
|
||||
class KBookmarkManagerList : public QList<KBookmarkManager*>
|
||||
|
|
|
@ -20,17 +20,12 @@
|
|||
#ifndef KBOOKMARKMANAGER_H
|
||||
#define KBOOKMARKMANAGER_H
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPair>
|
||||
#include <QtGui/QTreeWidgetItem>
|
||||
#include <QtGui/QLabel>
|
||||
#include <QtGui/QTreeWidget>
|
||||
#include <QtXml/QDomDocument>
|
||||
#include <QtDBus/QDBusMessage>
|
||||
#include <QString>
|
||||
#include <QObject>
|
||||
#include <QPair>
|
||||
#include <QDomDocument>
|
||||
#include <QDBusMessage>
|
||||
|
||||
#include <kurl.h>
|
||||
#include "kbookmark.h"
|
||||
|
||||
class KBookmarkGroup;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#ifndef KBOOKMARKMANAGERADAPTOR_H
|
||||
#define KBOOKMARKMANAGERADAPTOR_H
|
||||
|
||||
#include <QtDBus/QDBusAbstractAdaptor>
|
||||
#include <QDBusAbstractAdaptor>
|
||||
|
||||
class KBookmarkManager;
|
||||
|
||||
|
|
|
@ -21,6 +21,13 @@
|
|||
#include "kbookmarkmenu.h"
|
||||
#include "kbookmarkmenu_p.h"
|
||||
#include "kbookmarkdialog.h"
|
||||
|
||||
#include <QMimeData>
|
||||
#include <QStack>
|
||||
#include <QClipboard>
|
||||
#include <QHeaderView>
|
||||
#include <QApplication>
|
||||
|
||||
#include <kdebug.h>
|
||||
#include <kiconloader.h>
|
||||
#include <klocale.h>
|
||||
|
@ -28,16 +35,9 @@
|
|||
#include <kmenu.h>
|
||||
#include <kstandardshortcut.h>
|
||||
#include <kstandardaction.h>
|
||||
#include <kstringhandler.h>
|
||||
#include <krun.h>
|
||||
#include <kactioncollection.h>
|
||||
|
||||
#include <qclipboard.h>
|
||||
#include <qmimedata.h>
|
||||
#include <QtCore/QStack>
|
||||
#include <QtGui/QHeaderView>
|
||||
#include <QtGui/QApplication>
|
||||
|
||||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
|
@ -231,7 +231,6 @@ KMenu* KBookmarkMenu::parentMenu() const
|
|||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
|
||||
KBookmarkActionInterface::KBookmarkActionInterface(const KBookmark &bk)
|
||||
: bm(bk)
|
||||
{
|
||||
|
@ -249,8 +248,6 @@ const KBookmark KBookmarkActionInterface::bookmark() const
|
|||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
|
||||
|
||||
KBookmarkContextMenu::KBookmarkContextMenu(const KBookmark &bk, KBookmarkManager *manager, KBookmarkOwner *owner, QWidget *parent)
|
||||
: KMenu(parent), bm(bk), m_pManager(manager), m_pOwner(owner)
|
||||
{
|
||||
|
@ -289,7 +286,6 @@ void KBookmarkContextMenu::addFolderActions()
|
|||
addAction(KIcon("edit-delete"), i18n("Delete Folder"), this, SLOT(slotRemove()));
|
||||
}
|
||||
|
||||
|
||||
void KBookmarkContextMenu::addProperties()
|
||||
{
|
||||
addAction(i18n("Properties"), this, SLOT(slotProperties()));
|
||||
|
@ -319,7 +315,6 @@ void KBookmarkContextMenu::slotEditAt()
|
|||
void KBookmarkContextMenu::slotProperties()
|
||||
{
|
||||
// kDebug(7043) << m_highlightedAddress;
|
||||
|
||||
KBookmarkDialog* dlg = m_pOwner->bookmarkDialog(m_pManager, QApplication::activeWindow());
|
||||
dlg->editBookmark(bm);
|
||||
delete dlg;
|
||||
|
@ -414,7 +409,6 @@ KBookmark KBookmarkContextMenu::bookmark() const
|
|||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
|
||||
void KBookmarkMenu::slotBookmarksChanged(const QString &groupAddress)
|
||||
{
|
||||
kDebug(7043) << "slotBookmarksChanged" << groupAddress;
|
||||
|
@ -623,8 +617,6 @@ void KBookmarkMenu::slotNewFolder()
|
|||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
/********************************************************************/
|
||||
|
||||
|
||||
KBookmarkAction::KBookmarkAction(const KBookmark &bk, KBookmarkOwner *owner, QObject *parent)
|
||||
: KAction(bk.text().replace('&', "&&"), parent),
|
||||
KBookmarkActionInterface(bk),
|
||||
|
|
|
@ -23,21 +23,17 @@
|
|||
#ifndef KBOOKMARKMENU_H
|
||||
#define KBOOKMARKMENU_H
|
||||
|
||||
#include <sys/types.h>
|
||||
#include "kbookmark.h"
|
||||
#include "kbookmarkmanager.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QStack>
|
||||
#include <QString>
|
||||
#include <QMenu>
|
||||
#include <QAction>
|
||||
|
||||
#include <kaction.h>
|
||||
#include <kactionmenu.h>
|
||||
#include <kmenu.h>
|
||||
|
||||
#include "kbookmark.h"
|
||||
#include "kbookmarkmanager.h"
|
||||
|
||||
class KActionCollection;
|
||||
class KMenu;
|
||||
class KBookmarkMenuPrivate;
|
||||
|
@ -145,7 +141,8 @@ private Q_SLOTS:
|
|||
void slotCustomContextMenu(const QPoint &pos);
|
||||
|
||||
private:
|
||||
KBookmarkMenuPrivate* d;
|
||||
KBookmarkMenuPrivate* const d;
|
||||
Q_DISABLE_COPY(KBookmarkMenu);
|
||||
};
|
||||
|
||||
class KIO_EXPORT KBookmarkContextMenu : public KMenu
|
||||
|
|
Loading…
Add table
Reference in a new issue