← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdesdk/vivid

« back to all changes in this revision

Viewing changes to okteta/libs/kasten/controllers/shellwindow/viewareasplit/viewareasplitcontroller.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-06 11:49:54 UTC
  • mfrom: (0.4.21)
  • Revision ID: package-import@ubuntu.com-20120606114954-rdls73fzlpzxglbx
Tags: 4:4.8.80-0ubuntu1
* New uptream beta release
* Update dont_export_private_classes.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
okteta/libs/kasten/controllers/shellwindow/viewareasplit/viewareasplitcontroller.cpp
34
34
#include <KLocale>
35
35
 
36
36
 
37
 
namespace Kasten1
 
37
namespace Kasten2
38
38
{
39
39
 
40
40
ViewAreaSplitController::ViewAreaSplitController( ViewManager* viewManager, AbstractGroupedViews* groupedViews, KXMLGUIClient* guiClient )
46
46
    mViewAreaSplitable = mGroupedViews ? qobject_cast<If::ViewAreaSplitable*>( mGroupedViews ) : 0;
47
47
    if( mViewAreaSplitable )
48
48
    {
49
 
        connect( mGroupedViews, SIGNAL(viewAreaFocusChanged(Kasten1::AbstractViewArea*)),
50
 
                 SLOT(onViewAreaFocusChanged(Kasten1::AbstractViewArea*)) );
51
 
        connect( mGroupedViews, SIGNAL(viewAreasAdded(QList<Kasten1::AbstractViewArea*>)),
 
49
        connect( mGroupedViews, SIGNAL(viewAreaFocusChanged(Kasten2::AbstractViewArea*)),
 
50
                 SLOT(onViewAreaFocusChanged(Kasten2::AbstractViewArea*)) );
 
51
        connect( mGroupedViews, SIGNAL(viewAreasAdded(QList<Kasten2::AbstractViewArea*>)),
52
52
                 SLOT(onViewAreasChanged()) );
53
 
        connect( mGroupedViews, SIGNAL(viewAreasRemoved(QList<Kasten1::AbstractViewArea*>)),
 
53
        connect( mGroupedViews, SIGNAL(viewAreasRemoved(QList<Kasten2::AbstractViewArea*>)),
54
54
                 SLOT(onViewAreasChanged()) );
55
55
    }
56
56
 
57
57
    KActionCollection* actionCollection = guiClient->actionCollection();
58
58
 
59
 
    mSplitVerticallyAction = actionCollection->addAction( QLatin1String("view_area_split_vertically") );
 
59
    mSplitVerticallyAction = actionCollection->addAction( QLatin1String("view_area_split_vertically"),
 
60
                                                          this, SLOT(splitVertically()) );
60
61
    mSplitVerticallyAction->setText( i18nc("@title:menu","Split Vertically") );
61
62
    mSplitVerticallyAction->setIcon( KIcon( QLatin1String("view-split-left-right") ) );
62
63
    mSplitVerticallyAction->setShortcut( Qt::CTRL + Qt::SHIFT + Qt::Key_L );
63
64
    mSplitVerticallyAction->setEnabled( mViewAreaSplitable != 0 );
64
 
    connect( mSplitVerticallyAction, SIGNAL(triggered()), SLOT(splitVertically()) );
65
65
 
66
 
    mSplitHorizontallyAction = actionCollection->addAction( QLatin1String("view_area_split_horizontally") );
 
66
    mSplitHorizontallyAction = actionCollection->addAction( QLatin1String("view_area_split_horizontally"),
 
67
                                                            this, SLOT(splitHorizontally()) );
67
68
    mSplitHorizontallyAction->setText( i18nc("@title:menu","Split Horizontal") );
68
69
    mSplitHorizontallyAction->setIcon( KIcon( QLatin1String("view-split-top-bottom") ) );
69
70
    mSplitHorizontallyAction->setShortcut( Qt::CTRL + Qt::SHIFT + Qt::Key_T );
70
71
    mSplitHorizontallyAction->setEnabled( mViewAreaSplitable != 0 );
71
 
    connect( mSplitHorizontallyAction, SIGNAL(triggered()), SLOT(splitHorizontally()) );
72
72
 
73
 
    mCloseAction = actionCollection->addAction( QLatin1String("view_area_close") );
 
73
    mCloseAction = actionCollection->addAction( QLatin1String("view_area_close"),
 
74
                                                this, SLOT(close()) );
74
75
    mCloseAction->setText( i18nc("@title:menu","Close View Area") );
75
76
    mCloseAction->setIcon( KIcon( QLatin1String("view-close") ) );
76
77
    mCloseAction->setShortcut( Qt::CTRL + Qt::SHIFT + Qt::Key_R );
77
 
    connect( mCloseAction, SIGNAL(triggered()), SLOT(close()) );
78
78
 
79
79
    onViewAreaFocusChanged( mViewAreaSplitable ? mViewAreaSplitable->viewAreaFocus() : 0 );
80
80
    onViewAreasChanged();
122
122
 
123
123
    if( mCurrentViewArea )
124
124
    {
125
 
        connect( mCurrentViewArea, SIGNAL(added(QList<Kasten1::AbstractView*>)),
 
125
        connect( mCurrentViewArea, SIGNAL(added(QList<Kasten2::AbstractView*>)),
126
126
                 SLOT(onViewsChanged()) );
127
 
        connect( mCurrentViewArea, SIGNAL(removing(QList<Kasten1::AbstractView*>)),
 
127
        connect( mCurrentViewArea, SIGNAL(removing(QList<Kasten2::AbstractView*>)),
128
128
                 SLOT(onViewsChanged()) );
129
129
    }
130
130
    onViewsChanged();