mirror of
https://github.com/KDE/konsole.git
synced 2026-05-04 12:44:23 -04:00
Re-implement 'Send Input to All' (now Edit -> Copy Input To...)
Improvements in the KDE 4 version: - Input can be copied to all other sessions or only a subset of sessions, selection is via a filter-able list which appears when 'Copy Input To...' is clicked. - Input can be sent from a tab in one window to a tab in another window (all sessions in all windows are displayed in the filter window) BUG: 152072 BUG: 77682 Squashed commit of the following: commit 3184e1958d3aa7e7574081df32814dbe44591c9e Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 19:24:22 2008 +0100 Remove debugging messages. commit 31afd9b2a3a327ca3e43deff47415de41a1ad74e Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 19:16:33 2008 +0100 Copy input dialog. Hide 'Number' column and header. Show the check box in the title column. Focus the search filter before showing the dialog. commit 8c74e736d322e74d7af812a14500d748e748a224 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 19:03:59 2008 +0100 Remove sessions from the internal checked/fixed sets when they are removed. Fix crashes if sessions exited while SessionController was showing a dialog for that session. Add QPointer<T> guards around the dialog exec() methods. commit e4085069c2ff8cedb987639f50b73a3c679319f6 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 18:44:40 2008 +0100 Remove sessions from the SessionGroup and SessionListModel when they terminate. commit 29db3a3dd84f392ee333918e261bd6bcd75fd062 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 18:39:24 2008 +0100 Use an extended rather than single selection in CopyInputDialog commit 3f93507405053c84e09337225fa6e2a582776264 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 17:54:22 2008 +0100 Copy Input Dialog: Show tab text in the Title column. Show clear button in filter line edit. commit 0619f7ad72a1a346118a0174e5aee01ce94ddc52 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 17:40:07 2008 +0100 Copy Input Dialog: Add buttons to select and deselect all visible sessions. commit 126afb3d394894a0325c5772fb32a25380932c44 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 17:23:07 2008 +0100 Show the master session as checked and disabled. commit c559bd5f5bcc59adecc3f29ee5b16200adb37b09 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 17:20:40 2008 +0100 Create a SessionGroup in the SessionController when copyInputToAll() is called and use the CopyInputDialog to allow the user to choose which sessions the current one copies to. commit 64c12e58a582a17b5cdeddcc8f9df7a89885f9e5 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 17:19:47 2008 +0100 Display session list with check boxes and filter to select sessions to copy input to. Show master session as a disabled, checked item. commit 43eb5ccdfc768b42c5e650b6e56d1e1120ab5c5b Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 17:19:06 2008 +0100 Add header data and Session* pointer to items in SessionListModel. commit a8236a6658e1540a924aa6467dc90aeed346a0be Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 17:18:28 2008 +0100 Remove connection to removed slot. commit 03990fa244159b50152cc721a0fe4e403551d47c Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 17:17:54 2008 +0100 Make SessionGroup take a QObject* parent argument in the constructor. commit e2f91001c09a8422fb44ad58cf95f8dcba22c063 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 15:25:26 2008 +0100 Add CopyInputDialog to build. commit 3b33e1d6abdde56bbafd2bbd64c89c008a41d096 Author: Robert Knight <robertknight@gmail.com> Date: Sun Apr 13 14:32:36 2008 +0100 Add header and implementation files for 'Copy Input To' dialog. commit 9ebc36e3f09865f29702768cbb17279054e8cb4c Author: Robert Knight <robertknight@gmail.com> Date: Thu Apr 10 07:04:48 2008 +0100 Add a dialog for selecting sessions to copy input to. svn path=/trunk/KDE/kdebase/apps/konsole/; revision=796545
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
|
||||
// KDE
|
||||
#include <klocale.h>
|
||||
#include <kicon.h>
|
||||
#include <krun.h>
|
||||
#include <kshell.h>
|
||||
#include <kconfig.h>
|
||||
@@ -693,12 +694,106 @@ QKeySequence SessionManager::shortcut(Profile::Ptr info) const
|
||||
return QKeySequence();
|
||||
}
|
||||
|
||||
|
||||
K_GLOBAL_STATIC( SessionManager , theSessionManager )
|
||||
SessionManager* SessionManager::instance()
|
||||
{
|
||||
return theSessionManager;
|
||||
}
|
||||
|
||||
SessionListModel::SessionListModel(QObject* parent)
|
||||
: QAbstractListModel(parent)
|
||||
{
|
||||
}
|
||||
|
||||
void SessionListModel::setSessions(const QList<Session*>& sessions)
|
||||
{
|
||||
_sessions = sessions;
|
||||
|
||||
foreach(Session* session, sessions)
|
||||
connect(session,SIGNAL(finished()),this,SLOT(sessionFinished()));
|
||||
|
||||
reset();
|
||||
}
|
||||
QVariant SessionListModel::data(const QModelIndex& index, int role) const
|
||||
{
|
||||
Q_ASSERT(index.isValid());
|
||||
|
||||
int row = index.row();
|
||||
int column = index.column();
|
||||
|
||||
Q_ASSERT( row >= 0 && row < _sessions.count() );
|
||||
Q_ASSERT( column >= 0 && column < 2 );
|
||||
|
||||
switch (role)
|
||||
{
|
||||
case Qt::DisplayRole:
|
||||
if (column == 1)
|
||||
return _sessions[row]->title(Session::DisplayedTitleRole);
|
||||
else if (column == 0)
|
||||
return _sessions[row]->sessionId();
|
||||
break;
|
||||
case Qt::DecorationRole:
|
||||
if (column == 1)
|
||||
return KIcon(_sessions[row]->iconName());
|
||||
else
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
return QVariant();
|
||||
}
|
||||
QVariant SessionListModel::headerData(int section, Qt::Orientation orientation,
|
||||
int role) const
|
||||
{
|
||||
if (role != Qt::DisplayRole)
|
||||
return QVariant();
|
||||
|
||||
if (orientation == Qt::Vertical)
|
||||
return QVariant();
|
||||
else
|
||||
{
|
||||
switch (section)
|
||||
{
|
||||
case 0:
|
||||
return i18n("Number");
|
||||
case 1:
|
||||
return i18n("Title");
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int SessionListModel::columnCount(const QModelIndex& parent) const
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
int SessionListModel::rowCount(const QModelIndex& parent) const
|
||||
{
|
||||
return _sessions.count();
|
||||
}
|
||||
QModelIndex SessionListModel::parent(const QModelIndex& index) const
|
||||
{
|
||||
return QModelIndex();
|
||||
}
|
||||
void SessionListModel::sessionFinished()
|
||||
{
|
||||
Session* session = qobject_cast<Session*>(sender());
|
||||
int row = _sessions.indexOf(session);
|
||||
|
||||
if (row != -1)
|
||||
{
|
||||
beginRemoveRows(QModelIndex(),row,row);
|
||||
sessionRemoved(session);
|
||||
_sessions.removeAt(row);
|
||||
endRemoveRows();
|
||||
}
|
||||
}
|
||||
QModelIndex SessionListModel::index(int row, int column, const QModelIndex& parent) const
|
||||
{
|
||||
if (hasIndex(row,column,parent))
|
||||
return createIndex(row,column,_sessions[row]);
|
||||
else
|
||||
return QModelIndex();
|
||||
}
|
||||
|
||||
#include "SessionManager.moc"
|
||||
|
||||
Reference in New Issue
Block a user