Showing with 10 additions and 8 deletions.
  1. +3 −1 desktop/partui.rc
  2. +7 −7 src/SessionController.cpp
4 changes: 3 additions & 1 deletion desktop/partui.rc
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<!DOCTYPE kpartgui>

<kpartgui name="konsolepart" version="9">
<kpartgui name="konsolepart" version="10">
<Menu name="session-popup-menu">
<Action name="edit_copy"/>
<Action name="edit_paste"/>
<Action name="web-search"/>
<Action name="open-browser"/>
<Separator/>
<Action name="set-encoding"/>
<Separator/>
<Action name="edit_find"/>
<Menu name="history"><text>S&amp;crollback</text>
<Action name="file_save_as" group="session-history-operations"/>
Expand Down
14 changes: 7 additions & 7 deletions src/SessionController.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,13 @@ void SessionController::setupCommonActions()
_findPreviousAction = KStandardAction::findPrev(this, SLOT(findPreviousInHistory()), collection);
_findPreviousAction->setShortcut(QKeySequence());
_findPreviousAction->setEnabled(false);

// Character Encoding
_codecAction = new KCodecAction(i18n("Set &Encoding"), this);
_codecAction->setIcon(KIcon("character-set"));
collection->addAction("set-encoding", _codecAction);
connect(_codecAction->menu(), SIGNAL(aboutToShow()), this, SLOT(updateCodecAction()));
connect(_codecAction, SIGNAL(triggered(QTextCodec*)), this, SLOT(changeCodec(QTextCodec*)));
}

void SessionController::setupExtraActions()
Expand Down Expand Up @@ -683,13 +690,6 @@ void SessionController::setupExtraActions()
action = collection->addAction("monitor-silence", toggleAction);
connect(action, SIGNAL(toggled(bool)), this, SLOT(monitorSilence(bool)));

// Character Encoding
_codecAction = new KCodecAction(i18n("Set &Encoding"), this);
_codecAction->setIcon(KIcon("character-set"));
collection->addAction("set-encoding", _codecAction);
connect(_codecAction->menu(), SIGNAL(aboutToShow()), this, SLOT(updateCodecAction()));
connect(_codecAction, SIGNAL(triggered(QTextCodec*)), this, SLOT(changeCodec(QTextCodec*)));

// Text Size
action = collection->addAction("enlarge-font", this, SLOT(increaseFontSize()));
action->setText(i18n("Enlarge Font"));
Expand Down