wilderjds
/
konsole
1
0
Fork 0
Code Issues Pull Requests 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
wilder-portage
Stephan Binner 23 years ago
parent 4de8d40bd2
commit abb60f2ea5
13 changed files with 18 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      konsole/TEWidget.cpp
  2. 1
      konsole/TEWidget.h
  3. 2
      konsole/TEmuVt102.cpp
  4. 2
      konsole/default.keytab.h
  5. 2
      konsole/keytrans.cpp
  6. 2
      konsole/keytrans.h
  7. 4
      konsole/konsole.cpp
  8. 1
      konsole/konsole.h
  9. 2
      other/default.Keytab
  10. 2
      other/linux.keytab
  11. 2
      other/vt100.keytab
  12. 2
      other/vt420pc.keytab
  13. 2
      other/x11r5.keytab

5
konsole/TEWidget.cpp
Unescape View File

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

1
konsole/TEWidget.h
Unescape View File

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

2
konsole/TEmuVt102.cpp
Unescape View File

@ -877,8 +877,6 @@ void TEmuVt102::onKeyPress( QKeyEvent* ev )
{ {
switch(cmd) // ... and execute if found. 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_scrollPageUp : gui->doScroll(-gui->Lines()/2); return;
case CMD_scrollPageDown : gui->doScroll(+gui->Lines()/2); return; case CMD_scrollPageDown : gui->doScroll(+gui->Lines()/2); return;
case CMD_scrollLineUp : gui->doScroll(-1 ); return; case CMD_scrollLineUp : gui->doScroll(-1 ); return;

2
konsole/default.keytab.h
Unescape View File

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

2
konsole/keytrans.cpp
Unescape View File

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

2
konsole/keytrans.h
Unescape View File

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

4
konsole/konsole.cpp
Unescape View File

@ -761,8 +761,10 @@ void Konsole::makeBasicGUI()
m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, te, m_copyClipboard = new KAction(i18n("&Copy"), "editcopy", 0, te,
SLOT(copyClipboard()), m_shortcuts, "copy"); 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"); 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, m_clearTerminal = new KAction(i18n("C&lear Terminal"), 0, this,
SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal");

1
konsole/konsole.h
Unescape View File

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

2
other/default.Keytab
Unescape View File

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

2
other/linux.keytab
Unescape View File

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

2
other/vt100.keytab
Unescape View File

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

2
other/vt420pc.keytab
Unescape View File

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

2
other/x11r5.keytab
Unescape View File

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

Write Preview
Loading…
Cancel
Save