[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/kicker
From: Daniel Teske <teske () squorn ! de>
Date: 2006-09-04 20:40:30
Message-ID: 1157402430.112926.1912.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 580946 by teske:
Ported kickers various bookmark classes to the new KBookmarkMenu/Owner API.
M +3 -8 kicker/buttons/bookmarksbutton.cpp
M +0 -1 kicker/buttons/bookmarksbutton.h
M +2 -6 kicker/ui/k_mnu.cpp
M +0 -1 kicker/ui/k_mnu.h
M +1 -1 menuext/konsole/CMakeLists.txt
M +0 -1 menuext/konsole/konsole_mnu.h
M +10 -17 menuext/konsole/konsolebookmarkhandler.cpp
M +4 -11 menuext/konsole/konsolebookmarkhandler.h
D menuext/konsole/konsolebookmarkmenu.cpp
D menuext/konsole/konsolebookmarkmenu.h
--- trunk/KDE/kdebase/workspace/kicker/kicker/buttons/bookmarksbutton.cpp \
#580945:580946 @@ -37,18 +37,14 @@
: PanelPopupButton(parent, "BookmarksButton"),
bookmarkParent(0),
bookmarkMenu(0),
- actionCollection(0),
- bookmarkOwner(0)
+ actionCollection(0)
{
actionCollection = new KActionCollection( this );
bookmarkParent = new KMenu(this);
bookmarkParent->setObjectName("bookmarks");
- bookmarkOwner = new KBookmarkOwner;
- bookmarkMenu = new KBookmarkMenu(KonqBookmarkManager::self(),
- bookmarkOwner,
+ bookmarkMenu = new KBookmarkMenu(KonqBookmarkManager::self(), 0,
bookmarkParent,
- actionCollection,
- true, false);
+ actionCollection );
setPopup(bookmarkParent);
this->setToolTip( i18n("Bookmarks"));
setTitle(i18n("Bookmarks"));
@@ -58,7 +54,6 @@
BookmarksButton::~BookmarksButton()
{
delete bookmarkMenu;
- delete bookmarkOwner;
}
void BookmarksButton::initPopup()
--- trunk/KDE/kdebase/workspace/kicker/kicker/buttons/bookmarksbutton.h \
#580945:580946 @@ -51,7 +51,6 @@
KMenu* bookmarkParent;
KBookmarkMenu* bookmarkMenu;
KActionCollection* actionCollection;
- KBookmarkOwner* bookmarkOwner;
};
#endif
--- trunk/KDE/kdebase/workspace/kicker/kicker/ui/k_mnu.cpp #580945:580946
@@ -70,7 +70,6 @@
PanelKMenu::PanelKMenu()
: PanelServiceMenu(QString(), QString(), 0, "KMenu")
, bookmarkMenu(0)
- , bookmarkOwner(0)
{
// set the first client id to some arbitrarily large value.
client_id = 10000;
@@ -95,7 +94,6 @@
{
clearSubmenus();
delete bookmarkMenu;
- delete bookmarkOwner;
}
#if 0
void PanelKMenu::slotServiceStartedByStorageId(QString starter,
@@ -220,11 +218,9 @@
{
// Need to create a new popup each time, it's deleted by subMenus.clear()
KMenu * bookmarkParent = new KMenu(this);
- bookmarkParent->setObjectName("bookmarks" );
- if(!bookmarkOwner)
- bookmarkOwner = new KBookmarkOwner;
+ bookmarkParent->setObjectName("bookmarks" );
delete bookmarkMenu; // can't reuse old one, the popup has been deleted
- bookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), \
bookmarkOwner, bookmarkParent, actionCollection, true, false ); + bookmarkMenu \
= new KBookmarkMenu( KonqBookmarkManager::self(), 0, bookmarkParent, actionCollection \
);
insertItem(Plasma::menuIconSet("bookmark"),
i18n("Bookmarks"), bookmarkParent);
--- trunk/KDE/kdebase/workspace/kicker/kicker/ui/k_mnu.h #580945:580946
@@ -93,7 +93,6 @@
bool delay_init;
KBookmarkMenu *bookmarkMenu;
KActionCollection *actionCollection;
- KBookmarkOwner *bookmarkOwner;
PopupMenuList dynamicSubMenus;
};
--- trunk/KDE/kdebase/workspace/kicker/menuext/konsole/CMakeLists.txt #580945:580946
@@ -3,7 +3,7 @@
########### next target ###############
-set(kickermenu_konsole_PART_SRCS konsole_mnu.cpp konsolebookmarkhandler.cpp \
konsolebookmarkmenu.cpp ) +set(kickermenu_konsole_PART_SRCS konsole_mnu.cpp \
konsolebookmarkhandler.cpp )
kde4_automoc(${kickermenu_konsole_PART_SRCS})
--- trunk/KDE/kdebase/workspace/kicker/menuext/konsole/konsole_mnu.h #580945:580946
@@ -29,7 +29,6 @@
#include <kpanelmenu.h>
#include <klibloader.h>
-#include "konsolebookmarkmenu.h"
#include "konsolebookmarkhandler.h"
--- trunk/KDE/kdebase/workspace/kicker/menuext/konsole/konsolebookmarkhandler.cpp \
#580945:580946 @@ -12,9 +12,9 @@
#include <kmenu.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
+#include <kbookmarkmenu.h>
#include "konsole_mnu.h"
-#include "konsolebookmarkmenu.h"
#include "konsolebookmarkhandler.h"
KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
@@ -42,15 +42,18 @@
manager->setUpdate( true );
manager->setShowNSBookmarks( false );
- connect( manager, SIGNAL( changed(const QString &, const QString &) ),
- SLOT( slotBookmarksChanged(const QString &, const QString &) ) );
- m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu,
- NULL, false, /*Not toplevel*/
- false /*No 'Add Bookmark'*/ );
+ m_bookmarkMenu = new KBookmarkMenu( manager, this, m_menu, 0 );
+ connect( m_bookmarkMenu, SIGNAL( openBookmark( KBookmark, Qt::MouseButtons, \
Qt::KeyboardModifiers ) ), + this, SLOT( openBookmark( KBookmark, \
Qt::MouseButtons, Qt::KeyboardModifiers )) ); }
-QString KonsoleBookmarkHandler::currentURL() const
+void KonsoleBookmarkHandler::openBookmark(KBookmark bm, Qt::MouseButtons, \
Qt::KeyboardModifiers ) {
+ emit openUrl( bm.url().url(), bm.text() );
+}
+
+QString KonsoleBookmarkHandler::currentUrl() const
+{
return m_konsole->baseURL().url();
}
@@ -98,13 +101,6 @@
*m_importStream << text << "\">\n";
}
-void KonsoleBookmarkHandler::slotBookmarksChanged( const QString &,
- const QString & )
-{
- // This is called when someone changes bookmarks in konsole....
- m_bookmarkMenu->slotBookmarksChanged("");
-}
-
void KonsoleBookmarkHandler::newSeparator()
{
*m_importStream << "<separator/>\n";
@@ -115,7 +111,4 @@
*m_importStream << "</folder>\n";
}
-void KonsoleBookmarkHandler::virtual_hook( int id, void* data )
-{ KBookmarkOwner::virtual_hook( id, data ); }
-
#include "konsolebookmarkhandler.moc"
--- trunk/KDE/kdebase/workspace/kicker/menuext/konsole/konsolebookmarkhandler.h \
#580945:580946 @@ -4,7 +4,6 @@
#define KONSOLEBOOKMARKHANDLER_H
#include <kbookmarkmanager.h>
-#include "konsolebookmarkmenu.h"
//Added by qt3to4:
#include <QTextStream>
#include <QByteArray>
@@ -12,7 +11,7 @@
class QTextStream;
class KMenu;
-class KonsoleBookmarkMenu;
+class KBookmarkMenu;
class KonsoleMenu;
class KonsoleBookmarkHandler : public QObject, public KBookmarkOwner
@@ -21,12 +20,8 @@
public:
KonsoleBookmarkHandler( KonsoleMenu *konsole, bool toplevel );
+ virtual QString currentUrl() const;
- // KBookmarkOwner interface:
- virtual void openBookmarkURL( const QString& url, const QString& title )
- { emit openUrl( url, title ); }
- virtual QString currentURL() const;
-
KMenu *menu() const { return m_menu; }
Q_SIGNALS:
@@ -34,11 +29,11 @@
private Q_SLOTS:
// for importing
+ void openBookmark( KBookmark, Qt::MouseButtons, Qt::KeyboardModifiers );
void slotNewBookmark( const QString& text, const QByteArray& url,
const QString& additionalInfo );
void slotNewFolder( const QString& text, bool open,
const QString& additionalInfo );
- void slotBookmarksChanged( const QString &, const QString & caller );
void newSeparator();
void endFolder();
@@ -47,11 +42,9 @@
KonsoleMenu *m_konsole;
KMenu *m_menu;
- KonsoleBookmarkMenu *m_bookmarkMenu;
+ KBookmarkMenu *m_bookmarkMenu;
QTextStream *m_importStream;
-protected:
- virtual void virtual_hook( int id, void* data );
private:
class KonsoleBookmarkHandlerPrivate;
KonsoleBookmarkHandlerPrivate *d;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic