mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-06 05:36:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved emitClipboard/emitSelection configuration from keytables to

Browse Source 
"Configure Shortcuts..." aka use KAction. Fix for report #53490.

svn path=/trunk/kdebase/konsole/; revision=207363
This commit is contained in:
Stephan Binner
2003-02-16 23:27:46 +00:00
parent 4de8d40bd2
commit abb60f2ea5
13 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
konsole/TEWidget.cpp
View File

@@ -1302,6 +1302,11 @@ void TEWidget::pasteClipboard()
emitSelection(false,false);
}
void TEWidget::pasteSelection()
{
emitSelection(true,false);
}
void TEWidget::onClearSelection()
{
emit clearSelectionSignal();

1
konsole/TEWidget.h
View File

@@ -109,6 +109,7 @@ public slots:
void copyClipboard();
void pasteClipboard();
void pasteSelection();
void onClearSelection();
signals:

2
konsole/TEmuVt102.cpp
View File

@@ -877,8 +877,6 @@ void TEmuVt102::onKeyPress( QKeyEvent* ev )
{
switch(cmd) // ... and execute if found.
{
case CMD_emitClipboard : gui->emitSelection(false,false); return;
case CMD_emitSelection : gui->emitSelection(true,false); return;
case CMD_scrollPageUp : gui->doScroll(-gui->Lines()/2); return;
case CMD_scrollPageDown : gui->doScroll(+gui->Lines()/2); return;
case CMD_scrollLineUp : gui->doScroll(-1 ); return;

2
konsole/default.keytab.h
View File

@@ -125,8 +125,6 @@
"key Prior +Shift : scrollPageUp\n"
"key Down +Shift : scrollLineDown\n"
"key Next +Shift : scrollPageDown\n"
"key Insert+Shift -Control : emitClipboard\n"
"key Insert+Shift +Control : emitSelection\n"
"\n"
"key ScrollLock : scrollLock\n"
"\n"

2
konsole/keytrans.cpp
View File

@@ -469,9 +469,7 @@ void KeyTransSymbols::defOprSyms()
defOprSym("scrollLineDown",CMD_scrollLineDown);
defOprSym("scrollPageUp", CMD_scrollPageUp );
defOprSym("scrollPageDown",CMD_scrollPageDown);
defOprSym("emitSelection", CMD_emitSelection );
defOprSym("scrollLock", CMD_scrollLock);
defOprSym("emitClipboard", CMD_emitClipboard);
}
void KeyTransSymbols::defModSyms()

2
konsole/keytrans.h
View File

@@ -28,13 +28,11 @@
#define CMD_none -1
#define CMD_send 0
#define CMD_emitSelection 1
#define CMD_scrollPageUp 2
#define CMD_scrollPageDown 3
#define CMD_scrollLineUp 4
#define CMD_scrollLineDown 5
#define CMD_scrollLock 6
#define CMD_emitClipboard 7
#define BITS(x,v) ((((v)!=0)<<(x)))

4
konsole/konsole.cpp
View File

@@ -761,8 +761,10 @@ void Konsole::makeBasicGUI()
m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, te,
SLOT(copyClipboard()), m_shortcuts, "copy");
m_pasteClipboard = new KAction(i18n("&Paste"), "editpaste", 0, te,
m_pasteClipboard = new KAction(i18n("&Paste"), "editpaste", Qt::SHIFT+Qt::Key_Insert, te,
SLOT(pasteClipboard()), m_shortcuts, "paste");
m_pasteSelection = new KAction(i18n("Paste Selection"), Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, te,
SLOT(pasteSelection()), m_shortcuts, "pasteselection");
m_clearTerminal = new KAction(i18n("C&lear Terminal"), 0, this,
SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");

1
konsole/konsole.h
View File

@@ -291,6 +291,7 @@ private:
KAction *m_copyClipboard;
KAction *m_pasteClipboard;
KAction *m_pasteSelection;
KAction *m_clearTerminal;
KAction *m_resetClearTerminal;
KAction *m_clearAllSessionHistories;

18
other/default.Keytab
View File

@@ -99,18 +99,18 @@ key F10 -Shift : "\E[21~"
key F11 -Shift : "\E[23~"
key F12 -Shift : "\E[24~"
key F1 +Shift : "\EO2P"
key F1 +Shift : "\EO2P"
key F2 +Shift : "\EO2Q"
key F3 +Shift : "\EO2R"
key F4 +Shift : "\EO2S"
key F5 +Shift : "\E[15;2~"
key F6 +Shift : "\E[17;2~"
key F7 +Shift : "\E[18;2~"
key F8 +Shift : "\E[19;2~"
key F9 +Shift : "\E[20;2~"
key F10+Shift : "\E[21;2~"
key F11+Shift : "\E[23;2~"
key F12+Shift : "\E[24;2~"
key F6 +Shift : "\E[17;2~"
key F7 +Shift : "\E[18;2~"
key F8 +Shift : "\E[19;2~"
key F9 +Shift : "\E[20;2~"
key F10+Shift : "\E[21;2~"
key F11+Shift : "\E[23;2~"
key F12+Shift : "\E[24;2~"
# Work around dead keys
@@ -123,8 +123,6 @@ key Up +Shift : scrollLineUp
key Prior +Shift : scrollPageUp
key Down +Shift : scrollLineDown
key Next +Shift : scrollPageDown
key Insert+Shift -Control : emitClipboard
key Insert+Shift +Control : emitSelection
key ScrollLock : scrollLock

2
other/linux.keytab
View File

@@ -120,8 +120,6 @@ key Up +Shift : scrollLineUp
key Prior +Shift : scrollPageUp
key Down +Shift : scrollLineDown
key Next +Shift : scrollPageDown
key Insert+Shift -Control : emitClipboard
key Insert+Shift +Control : emitSelection
key ScrollLock : scrollLock

2
other/vt100.keytab
View File

@@ -119,8 +119,6 @@ key Up +Shift : scrollLineUp
key Prior +Shift : scrollPageUp
key Down +Shift : scrollLineDown
key Next +Shift : scrollPageDown
key Insert+Shift -Control : emitClipboard
key Insert+Shift +Control : emitSelection
key ScrollLock : scrollLock

2
other/vt420pc.keytab
View File

@@ -153,8 +153,6 @@ key Up +Shift : scrollLineUp
key Prior +Shift : scrollPageUp
key Down +Shift : scrollLineDown
key Next +Shift : scrollPageDown
key Insert+Shift -Control : emitClipboard
key Insert+Shift +Control : emitSelection
key ScrollLock : scrollLock

2
other/x11r5.keytab
View File

@@ -65,8 +65,6 @@ key Up +Shift : scrollLineUp
key Prior +Shift : scrollPageUp
key Down +Shift : scrollLineDown
key Next +Shift : scrollPageDown
key Insert+Shift -Control : emitClipboard
key Insert+Shift +Control : emitSelection
key ScrollLock : scrollLock