kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optional popup menu under the toolbar buttons with the command history

Browse source 
for undo and redo - the whole reason for KToolBarPopupAction :)

Does anyone have any objection to those two files being moved to kdelibs ?
At least two apps, was the rule :) graphite and keditbookmarks are just a
beginning :-)

There's a strange space on the left of each menu item though (like the room
for a pixmap, but there is none...). Anyone ?

svn path=/trunk/kdebase/konqueror/keditbookmarks/; revision=72185
This commit is contained in:
David Faure 2000-11-25 20:08:49 +00:00
parent bbe33ab0b2
commit 5b7399229f
2 changed files with 100 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
keditbookmarks/kcommand.cc
View file

@ -23,6 +23,7 @@
#include <kstdaction.h>
#include <kdebug.h>
#include <klocale.h>
#include <qpopupmenu.h>
KMacroCommand::KMacroCommand( const QString & name ) : KCommand(name)
{
@ -52,12 +53,41 @@ void KMacroCommand::unexecute()
////////////
KCommandHistory::KCommandHistory(KActionCollection * actionCollection) :
KCommandHistory::KCommandHistory() :
m_present(0L), m_undoLimit(50), m_redoLimit(30), m_first(false)
{
m_undo = KStdAction::undo( this, SLOT( undo() ), actionCollection );
m_redo = KStdAction::redo( this, SLOT( redo() ), actionCollection );
m_commands.setAutoDelete(true);
clear();
}
KCommandHistory::KCommandHistory(KActionCollection * actionCollection, bool withMenus) :
m_present(0L), m_undoLimit(50), m_redoLimit(30), m_first(false)
{
if (withMenus)
{
KToolBarPopupAction * undo = new KToolBarPopupAction( i18n("Und&o"), "undo",
KStdAccel::key(KStdAccel::Undo), this, SLOT( undo() ),
actionCollection, KStdAction::stdName( KStdAction::Undo ) );
connect( undo->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotUndoAboutToShow() ) );
connect( undo->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotUndoActivated( int ) ) );
m_undo = undo;
m_undoPopup = undo->popupMenu();
KToolBarPopupAction * redo = new KToolBarPopupAction( i18n("Re&do"), "redo",
KStdAccel::key(KStdAccel::Redo), this, SLOT( redo() ),
actionCollection, KStdAction::stdName( KStdAction::Redo ) );
connect( redo->popupMenu(), SIGNAL( aboutToShow() ), this, SLOT( slotRedoAboutToShow() ) );
connect( redo->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotRedoActivated( int ) ) );
m_redo = redo;
m_redoPopup = redo->popupMenu();
}
else
{
m_undo = KStdAction::undo( this, SLOT( undo() ), actionCollection );
m_redo = KStdAction::redo( this, SLOT( redo() ), actionCollection );
m_undoPopup = 0L;
m_redoPopup = 0L;
}
m_commands.setAutoDelete(true);
clear();
}
@ -88,17 +118,9 @@ void KCommandHistory::addCommand(KCommand *command, bool execute) {
m_first=false;
m_undo->setEnabled(true);
m_undo->setText(i18n("Und&o: %1").arg(m_present->name()));
/* can't happen anymore
if(m_commands.next()!=0) {
KCommand *tmp=m_commands.current();
m_redo->setEnabled(true);
m_redo->setText(i18n("Re&do: %1").arg(tmp->name()));
}
else */ {
if(m_redo->isEnabled()) {
m_redo->setEnabled(false);
m_redo->setText(i18n("No Redo Possible"));
}
if(m_redo->isEnabled()) {
m_redo->setEnabled(false);
m_redo->setText(i18n("No Redo Possible"));
}
clipCommands();
}
@ -203,4 +225,47 @@ void KCommandHistory::clipCommands() {
}
}
void KCommandHistory::slotUndoAboutToShow()
{
m_undoPopup->clear();
int i = 0;
if (m_commands.findRef(m_present)!=-1)
while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
{
m_undoPopup->insertItem( i18n("Undo: %1").arg(m_commands.current()->name()), i++ );
m_commands.prev();
}
}
void KCommandHistory::slotUndoActivated( int pos )
{
kdDebug() << "KCommandHistory::slotUndoActivated " << pos << endl;
for ( int i = 0 ; i < pos+1; ++i )
undo();
}
void KCommandHistory::slotRedoAboutToShow()
{
m_redoPopup->clear();
int i = 0;
if (m_first)
{
m_present = m_commands.first();
m_redoPopup->insertItem( i18n("Redo: %1").arg(m_present->name()), i++ );
}
if (m_commands.findRef(m_present)!=-1 && m_commands.next())
while ( m_commands.current() && i<10 ) // TODO make number of items configurable ?
{
m_redoPopup->insertItem( i18n("Redo: %1").arg(m_commands.current()->name()), i++ );
m_commands.next();
}
}
void KCommandHistory::slotRedoActivated( int pos )
{
kdDebug() << "KCommandHistory::slotRedoActivated " << pos << endl;
for ( int i = 0 ; i < pos+1; ++i )
redo();
}
#include "kcommand.moc"

24
keditbookmarks/kcommand.h
View file

@ -27,6 +27,7 @@
class KAction;
class KActionCollection;
class QPopupMenu;
/**
* The abstract base class for all Commands. Commands are used to
@ -100,10 +101,20 @@ class KCommandHistory : public QObject {
Q_OBJECT
public:
/**
* Create a command history. This also creates an
* undo and a redo action, in the @p actionCollection.
* Create a command history, to store commands.
* This constructor doesn't create actions, so you need to call
* @ref undo and @ref redo yourself.
*/
KCommandHistory(KActionCollection *actionCollection);
KCommandHistory();
/**
* Create a command history, to store commands.
* This also creates an undo and a redo action, in the @p actionCollection,
* using the standard names ("edit_undo" and "edit_redo").
* @param withMenus if true, the actions will display a menu when plugged
* into a toolbar.
*/
KCommandHistory(KActionCollection *actionCollection, bool withMenus = true);
virtual ~KCommandHistory();
@ -127,6 +138,12 @@ public slots:
virtual void undo();
virtual void redo();
protected slots:
void slotUndoAboutToShow();
void slotUndoActivated( int );
void slotRedoAboutToShow();
void slotRedoActivated( int );
signals:
/**
* This is called every time a command is executed
@ -141,6 +158,7 @@ private:
QList<KCommand> m_commands;
KCommand *m_present;
KAction *m_undo, *m_redo;
QPopupMenu *m_undoPopup, *m_redoPopup;
int m_undoLimit, m_redoLimit;
bool m_first; // attention: it's the first command in the list!
};