Commit dcdf9e76 authored by Robert Knight's avatar Robert Knight
Browse files

Rename History to Scrollback in the UI, to avoid confusion with shell's...

Rename History to Scrollback in the UI, to avoid confusion with shell's command history.  Fixes to color scheme previewing in Edit Profile Dialog.  Add a few icons here and there.  Add full screen menu item.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=665834
parent 983271c5
......@@ -16,7 +16,7 @@
<Menu name="edit"><text>Edit</text>
<DefineGroup name="session-edit-operations" />
</Menu>
<Menu name="history"><text>History</text>
<Menu name="history"><text>Scrollback</text>
<DefineGroup name="session-history-operations"/>
</Menu>
<Menu name="view"><text>View</text>
......@@ -35,6 +35,7 @@
<Action name="merge-windows"/>
<Separator/>
<Action name="hide-menubar"/>
<Action name="view-full-screen"/>
</Menu>
<Action name="bookmark"/>
<Menu name="settings"><text>Settings</text>
......
......@@ -131,6 +131,7 @@ void EditProfileDialog::setupGeneralPage(const Profile* info)
_ui->initialDirEdit->setText( info->defaultWorkingDirectory() );
_ui->initialDirEdit->setCompletionObject( new KUrlCompletion(KUrlCompletion::DirCompletion) );
_ui->initialDirEdit->setClearButtonShown(true);
_ui->dirSelectButton->setIcon( KIcon("folder-open") );
_ui->iconSelectButton->setIcon( KIcon(info->icon()) );
// tab title format
......@@ -363,7 +364,10 @@ bool EditProfileDialog::eventFilter( QObject* watched , QEvent* event )
{
if ( watched == _ui->colorSchemeList && event->type() == QEvent::Leave )
{
unpreview(Profile::ColorScheme);
if ( _tempProfile->isPropertySet(Profile::ColorScheme) )
preview(Profile::ColorScheme,_tempProfile->colorScheme());
else
unpreview(Profile::ColorScheme);
}
return KDialog::eventFilter(watched,event);
......@@ -464,7 +468,8 @@ void EditProfileDialog::showColorSchemeEditor(bool isNewScheme)
updateColorSchemeList();
const QString& currentScheme = SessionManager::instance()->profile(_profileKey)->colorScheme();
Profile* profile = SessionManager::instance()->profile(_profileKey);
const QString& currentScheme = profile->colorScheme();
// the next couple of lines may seem slightly odd,
// but they force any open views based on the current profile
......@@ -472,6 +477,7 @@ void EditProfileDialog::showColorSchemeEditor(bool isNewScheme)
if ( newScheme->name() == currentScheme )
{
_tempProfile->setProperty(Profile::ColorScheme,newScheme->name());
preview(Profile::ColorScheme,newScheme->name());
}
}
}
......
......@@ -46,7 +46,7 @@ HistorySizeDialog::HistorySizeDialog( QWidget* parent )
, _defaultLineCount(1000)
{
// basic dialog properties
setPlainCaption( i18n("History Options") );
setPlainCaption( i18n("Scrollback Options") );
setButtons( Default | Ok | Cancel );
setDefaultButton(Ok);
setModal( false );
......@@ -59,9 +59,9 @@ HistorySizeDialog::HistorySizeDialog( QWidget* parent )
QButtonGroup* modeGroup = new QButtonGroup(this);
_noHistoryButton = new QRadioButton( i18n("No history") );
_fixedHistoryButton = new QRadioButton( i18n("Fixed size history:") );
_unlimitedHistoryButton = new QRadioButton( i18n("Unlimited history") );
_noHistoryButton = new QRadioButton( i18n("No scrollback") );
_fixedHistoryButton = new QRadioButton( i18n("Fixed size scrollback: ") );
_unlimitedHistoryButton = new QRadioButton( i18n("Unlimited scrollback") );
modeGroup->addButton(_noHistoryButton);
modeGroup->addButton(_fixedHistoryButton);
......
......@@ -33,6 +33,7 @@
#include <KMenu>
#include <KMenuBar>
#include <KService>
#include <KToggleFullScreenAction>
#include <KToolInvocation>
#include <kstandardaction.h>
#include <KXMLGUIFactory>
......@@ -178,6 +179,10 @@ void MainWindow::setupActions()
hideMenuBarAction->setText( i18n("Hide MenuBar") );
connect( hideMenuBarAction , SIGNAL(triggered()) , menuBar() , SLOT(hide()) );
KToggleFullScreenAction* fullScreenAction = new KToggleFullScreenAction(this);
fullScreenAction->setWindow(this);
collection->addAction("view-full-screen",fullScreenAction);
connect( fullScreenAction , SIGNAL(toggled(bool)) , this , SLOT(viewFullScreen(bool)) );
//TODO - Implmement this correctly
//
//QAction* mergeAction = collection->addAction("merge-windows");
......@@ -190,10 +195,18 @@ void MainWindow::setupActions()
QAction* manageProfilesAction = collection->addAction("manage-profiles");
manageProfilesAction->setText( i18n("Manage Profiles...") );
manageProfilesAction->setIcon( KIcon("configure") );
connect( manageProfilesAction , SIGNAL(triggered()) , this , SLOT(showManageProfilesDialog()) );
}
void MainWindow::viewFullScreen(bool fullScreen)
{
if ( fullScreen )
showFullScreen();
else
showNormal();
}
BookmarkHandler* MainWindow::bookmarkHandler() const
{
return _bookmarkHandler;
......
......@@ -99,6 +99,8 @@ class MainWindow : public KXmlGuiWindow
void activeViewTitleChanged(ViewProperties*);
void sessionListChanged(const QList<QAction*>& actions);
void viewFullScreen(bool fullScreen);
private:
void setupActions();
void setupWidgets();
......
......@@ -64,7 +64,7 @@ Q_OBJECT
public:
Q_PROPERTY(QString name READ nameTitle)
Q_PROPERTY(int processId READ processId)
Q_PROPERTY(QString keytab READ keyBindings WRITE setKeyBindings)
Q_PROPERTY(QString keyBindings READ keyBindings WRITE setKeyBindings)
Q_PROPERTY(QSize size READ size WRITE setSize)
/**
......
......@@ -417,7 +417,7 @@ void SessionController::setupActions()
connect( action , SIGNAL(triggered()) , this , SLOT(decreaseTextSize()) );
// History
_searchToggleAction = new KAction(i18n("Search History..."),this);
_searchToggleAction = new KAction(i18n("Search Output..."),this);
_searchToggleAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_F) );
_searchToggleAction->setIcon( KIcon("edit-find") );
action = collection->addAction("search-history" , _searchToggleAction);
......@@ -438,20 +438,21 @@ void SessionController::setupActions()
connect( _findPreviousAction , SIGNAL(triggered()) , this , SLOT(findPreviousInHistory()) );
action = collection->addAction("save-history");
action->setText( i18n("Save History...") );
action->setText( i18n("Save Output...") );
action->setIcon( KIcon("document-save-as") );
connect( action , SIGNAL(triggered()) , this , SLOT(saveHistory()) );
action = collection->addAction("history-options");
action->setText( i18n("History Options") );
action->setText( i18n("Scrollback Options") );
action->setIcon( KIcon("configure") );
connect( action , SIGNAL(triggered()) , this , SLOT(showHistoryOptions()) );
action = collection->addAction("clear-history");
action->setText( i18n("Clear History") );
action->setText( i18n("Clear Scrollback") );
connect( action , SIGNAL(triggered()) , this , SLOT(clearHistory()) );
action = collection->addAction("clear-history-and-reset");
action->setText( i18n("Clear History && Reset") );
action->setText( i18n("Clear Scrollback && Reset") );
action->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_X) );
connect( action , SIGNAL(triggered()) , this , SLOT(clearHistoryAndReset()) );
......
......@@ -121,6 +121,7 @@ void ViewManager::setupActions()
connect( splitTopBottomAction , SIGNAL(triggered()) , this , SLOT(splitTopBottom()));
KAction* closeActiveAction = new KAction( i18n("Close Active") , this );
closeActiveAction->setIcon(KIcon("view-remove"));
closeActiveAction->setShortcut( QKeySequence(Qt::CTRL+Qt::SHIFT+Qt::Key_S) );
closeActiveAction->setEnabled(false);
collection->addAction("close-active-view",closeActiveAction);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment