← Back to branch summary

~ubuntu-branches/ubuntu/maverick/kdebase/maverick-updates

« back to all changes in this revision

Viewing changes to apps/konsole/src/ViewManager.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Debian Qt/KDE Maintainers, Martin Alfke, Modestas Vainius
  • Date: 2010-05-01 23:37:50 UTC
  • mfrom: (0.7.4 upstream) (0.4.4 experimental)
  • mto: This revision was merged to the branch mainline in revision 285.
  • Revision ID: james.westby@ubuntu.com-20100501233750-maq4i4sh8ymjbneb
Tags: 4:4.4.3-1
http://bugs.debian.org/555831
http://bugs.debian.org/441298
* New upstream release:
  - Konsole does not crash when closing a broken restored session.
    (Closes: #555831)
  - Konqueror does not crash when closing fast a tab. (Closes: #441298)

[Martin Alfke]
* Update of debian/copyright for kde 4.4

[ Modestas Vainius ]
* Bump kde-sc-dev-latest build dependency to 4.4.3.
* Confirm symbol files for 4.4.2 on hurd-i386 i386 ia64 kfreebsd-amd64
  kfreebsd-i386 mips powerpc s390 sparc.
* Release KDE SC 4.4.3 to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/konsole/src/ViewManager.cpp
233
233
    // keyboard shortcut only actions
234
234
    KShortcut nextViewShortcut = nextViewAction->shortcut();
235
235
    nextViewShortcut.setPrimary( QKeySequence(Qt::SHIFT+Qt::Key_Right) );
236
 
    nextViewShortcut.setAlternate( QKeySequence(Qt::CTRL+Qt::Key_PageUp) );
 
236
    nextViewShortcut.setAlternate( QKeySequence(Qt::CTRL+Qt::Key_PageDown) );
237
237
    nextViewAction->setShortcut(nextViewShortcut); 
238
238
    connect( nextViewAction, SIGNAL(triggered()) , this , SLOT(nextView()) );
239
239
    _viewSplitter->addAction(nextViewAction);
240
240
 
241
241
    KShortcut previousViewShortcut = previousViewAction->shortcut();
242
242
    previousViewShortcut.setPrimary( QKeySequence(Qt::SHIFT+Qt::Key_Left) );
243
 
    previousViewShortcut.setAlternate( QKeySequence(Qt::CTRL+Qt::Key_PageDown) );
 
243
    previousViewShortcut.setAlternate( QKeySequence(Qt::CTRL+Qt::Key_PageUp) );
244
244
    previousViewAction->setShortcut(previousViewShortcut);
245
245
    connect( previousViewAction, SIGNAL(triggered()) , this , SLOT(previousView()) );
246
246
    _viewSplitter->addAction(previousViewAction);
825
825
    bool blinkingText = info->property<bool>(Profile::BlinkingTextEnabled);
826
826
    view->setBlinkingTextEnabled(blinkingText);
827
827
 
 
828
    bool tripleClickMode = info->property<bool>(Profile::TripleClickMode);
 
829
    view->setTripleClickMode(tripleClickMode ? TerminalDisplay::SelectForwardsFromCursor : TerminalDisplay::SelectWholeLine);
 
830
 
828
831
    bool bidiEnabled = info->property<bool>(Profile::BidiRenderingEnabled);
829
832
    view->setBidiEnabled(bidiEnabled);
830
833
 
952
955
        _viewSplitter->activeContainer()->setActiveView(display);
953
956
        display->setFocus(Qt::OtherFocusReason);
954
957
    }
 
958
 
 
959
    if (ids.isEmpty()) // Session file is unusable, start default Profile
 
960
    {
 
961
        Profile::Ptr profile = SessionManager::instance()->defaultProfile();
 
962
        Session* session = SessionManager::instance()->createSession(profile);
 
963
        createView(session);
 
964
        if (!session->isRunning())
 
965
            session->run();
 
966
    }
955
967
}
956
968
 
957
969
uint qHash(QPointer<TerminalDisplay> display)
975
987
 
976
988
int ViewManager::newSession()
977
989
{
978
 
    Profile::Ptr profile = profile = SessionManager::instance()->defaultProfile();
 
990
    Profile::Ptr profile = SessionManager::instance()->defaultProfile();
979
991
    Session* session = SessionManager::instance()->createSession(profile);
980
992
 
981
993
    this->createView(session);