From: <ck...@us...> - 2008-04-27 07:14:39
|
Revision: 2773 http://krusader.svn.sourceforge.net/krusader/?rev=2773&view=rev Author: ckarai Date: 2008-04-27 00:14:44 -0700 (Sun, 27 Apr 2008) Log Message: ----------- Popup changes Modified Paths: -------------- trunk/krusader_kde4/krusader/BookMan/krbookmarkbutton.cpp trunk/krusader_kde4/krusader/BookMan/krbookmarkbutton.h trunk/krusader_kde4/krusader/GUI/dirhistorybutton.cpp trunk/krusader_kde4/krusader/GUI/dirhistorybutton.h trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.cpp trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.h trunk/krusader_kde4/krusader/GUI/mediabutton.cpp trunk/krusader_kde4/krusader/GUI/mediabutton.h trunk/krusader_kde4/krusader/krslots.h Modified: trunk/krusader_kde4/krusader/BookMan/krbookmarkbutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/BookMan/krbookmarkbutton.cpp 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/BookMan/krbookmarkbutton.cpp 2008-04-27 07:14:44 UTC (rev 2773) @@ -22,18 +22,18 @@ acmBookmarks->menu()->setKeyboardShortcutsEnabled(true); acmBookmarks->menu()->setKeyboardShortcutsExecute(true); - setPopup(acmBookmarks->menu()); + setMenu(acmBookmarks->menu()); connect(this, SIGNAL(pressed()), this, SLOT(populate())); populate(); } void KrBookmarkButton::populate() { - krBookMan->populate(static_cast<KMenu*>(popup())); + krBookMan->populate(static_cast<KMenu*>(menu())); } -void KrBookmarkButton::openPopup() { +void KrBookmarkButton::showMenu() { populate(); - popup()->exec(mapToGlobal(QPoint(0, height()))); + menu()->exec(mapToGlobal(QPoint(0, height()))); } #include "krbookmarkbutton.moc" Modified: trunk/krusader_kde4/krusader/BookMan/krbookmarkbutton.h =================================================================== --- trunk/krusader_kde4/krusader/BookMan/krbookmarkbutton.h 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/BookMan/krbookmarkbutton.h 2008-04-27 07:14:44 UTC (rev 2773) @@ -9,7 +9,7 @@ Q_OBJECT public: KrBookmarkButton(QWidget *parent); - void openPopup(); + void showMenu(); signals: void openUrl(const KUrl &url); Modified: trunk/krusader_kde4/krusader/GUI/dirhistorybutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/dirhistorybutton.cpp 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/GUI/dirhistorybutton.cpp 2008-04-27 07:14:44 UTC (rev 2773) @@ -41,7 +41,7 @@ popupMenu = new QMenu( this ); Q_CHECK_PTR( popupMenu ); - setPopup( popupMenu ); + setMenu( popupMenu ); popupMenu->setCheckable( true ); historyQueue = hQ; @@ -52,10 +52,10 @@ DirHistoryButton::~DirHistoryButton() {} -void DirHistoryButton::openPopup() { - QMenu * pP = popup(); +void DirHistoryButton::showMenu() { + QMenu * pP = menu(); if ( pP ) { - popup() ->exec( mapToGlobal( QPoint( 0, height() ) ) ); + menu() ->exec( mapToGlobal( QPoint( 0, height() ) ) ); } } /** No descriptions */ Modified: trunk/krusader_kde4/krusader/GUI/dirhistorybutton.h =================================================================== --- trunk/krusader_kde4/krusader/GUI/dirhistorybutton.h 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/GUI/dirhistorybutton.h 2008-04-27 07:14:44 UTC (rev 2773) @@ -36,7 +36,7 @@ DirHistoryButton(DirHistoryQueue* hQ, QWidget *parent=0); ~DirHistoryButton(); - void openPopup(); + void showMenu(); private: QMenu* popupMenu; Modified: trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.cpp 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.cpp 2008-04-27 07:14:44 UTC (rev 2773) @@ -53,7 +53,7 @@ } QMenu *pP = action->menu(); Q_CHECK_PTR( pP ); - setPopup( pP ); + setMenu( pP ); setPopupMode( QToolButton::InstantPopup ); setAcceptDrops( false ); } @@ -63,10 +63,10 @@ } /** called when clicked to the button */ -void KCMDModeButton::openPopup() { - QMenu * pP = popup(); +void KCMDModeButton::showMenu() { + QMenu * pP = menu(); if ( pP ) { - popup() ->exec( mapToGlobal( QPoint( 0, 0 ) ) ); + menu() ->exec( mapToGlobal( QPoint( 0, 0 ) ) ); } } Modified: trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.h =================================================================== --- trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.h 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/GUI/kcmdmodebutton.h 2008-04-27 07:14:44 UTC (rev 2773) @@ -42,7 +42,7 @@ ~KCMDModeButton(); /** Shows the popup menu. Called when clicked to the button */ - void openPopup(); + void showMenu(); private: /** The menu containing the actions for switching the mode */ Modified: trunk/krusader_kde4/krusader/GUI/mediabutton.cpp =================================================================== --- trunk/krusader_kde4/krusader/GUI/mediabutton.cpp 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/GUI/mediabutton.cpp 2008-04-27 07:14:44 UTC (rev 2773) @@ -404,10 +404,10 @@ } } -void MediaButton::openPopup() { - QMenu * pP = popup(); +void MediaButton::showMenu() { + QMenu * pP = menu(); if ( pP ) { - popup() ->exec( mapToGlobal( QPoint( 0, height() ) ) ); + menu() ->exec( mapToGlobal( QPoint( 0, height() ) ) ); } } Modified: trunk/krusader_kde4/krusader/GUI/mediabutton.h =================================================================== --- trunk/krusader_kde4/krusader/GUI/mediabutton.h 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/GUI/mediabutton.h 2008-04-27 07:14:44 UTC (rev 2773) @@ -63,7 +63,7 @@ void slotTimeout(); void slotPopupActivated( QAction * ); void gettingSpaceData(const QString &mountPoint, quint64 kBSize, quint64 kBUsed, quint64 kBAvail); - void openPopup(); + void showMenu(); void slotEntries( KIO::Job*, const KIO::UDSEntryList& ); void slotListResult( KJob* ); Modified: trunk/krusader_kde4/krusader/krslots.h =================================================================== --- trunk/krusader_kde4/krusader/krslots.h 2008-04-27 06:29:18 UTC (rev 2772) +++ trunk/krusader_kde4/krusader/krslots.h 2008-04-27 07:14:44 UTC (rev 2773) @@ -145,16 +145,16 @@ void toggleCmdline(); void changeTrashIcon(); void multiRename(); - void openRightBookmarks() { RIGHT_PANEL->slotFocusOnMe(); RIGHT_PANEL->bookmarksButton->openPopup(); } - void openLeftBookmarks() { LEFT_PANEL->slotFocusOnMe(); LEFT_PANEL->bookmarksButton->openPopup(); } - void openBookmarks() { ACTIVE_PANEL->bookmarksButton->openPopup(); } + void openRightBookmarks() { RIGHT_PANEL->slotFocusOnMe(); RIGHT_PANEL->bookmarksButton->showMenu(); } + void openLeftBookmarks() { LEFT_PANEL->slotFocusOnMe(); LEFT_PANEL->bookmarksButton->showMenu(); } + void openBookmarks() { ACTIVE_PANEL->bookmarksButton->showMenu(); } void bookmarkCurrent(); - void openHistory() { ACTIVE_PANEL->historyButton->openPopup(); } - void openLeftHistory() { LEFT_PANEL->historyButton->openPopup(); } - void openRightHistory() { RIGHT_PANEL->historyButton->openPopup(); } - void openMedia() { ACTIVE_PANEL->mediaButton->openPopup(); } - void openLeftMedia() { LEFT_PANEL->mediaButton->openPopup(); } - void openRightMedia() { RIGHT_PANEL->mediaButton->openPopup(); } + void openHistory() { ACTIVE_PANEL->historyButton->showMenu(); } + void openLeftHistory() { LEFT_PANEL->historyButton->showMenu(); } + void openRightHistory() { RIGHT_PANEL->historyButton->showMenu(); } + void openMedia() { ACTIVE_PANEL->mediaButton->showMenu(); } + void openLeftMedia() { LEFT_PANEL->mediaButton->showMenu(); } + void openRightMedia() { RIGHT_PANEL->mediaButton->showMenu(); } void syncPanels() { ListPanel *t = ACTIVE_PANEL; OTHER_FUNC->openUrl(ACTIVE_PANEL->virtualPath()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |