Differential D8174 Diff 20431 src/context/ToolbarView.cpp

Changeset View

Standalone View

View Options

src/context/ToolbarView.cpp

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s)49{
52 setFixedHeight( m_height ); 52​ setFixedHeight( m_height );
53 setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ); 53​ setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed );
54 setAutoFillBackground( true ); 54​ setAutoFillBackground( true );
55 setContentsMargins( 0, 0, 0, 0 ); 55​ setContentsMargins( 0, 0, 0, 0 );
56 56​
57 setFrameStyle( QFrame::NoFrame ); 57​ setFrameStyle( QFrame::NoFrame );
58 applyStyleSheet(); 58​ applyStyleSheet();
59 59​
60 connect( The::paletteHandler(), SIGNAL(newPalette(QPalette)), SLOT(applyStyleSheet()) ); 60​ connect( The::paletteHandler(), &PaletteHandler::newPalette, this, &Context::ToolbarView::applyStyleSheet );
61 61​
62 //Padding required to prevent view scrolling, probably caused by the 1px ridge 62​ //Padding required to prevent view scrolling, probably caused by the 1px ridge
63 setSceneRect( TOOLBAR_X_OFFSET, 0, size().width()-TOOLBAR_SCENE_PADDING, 63​ setSceneRect( TOOLBAR_X_OFFSET, 0, size().width()-TOOLBAR_SCENE_PADDING,
64 size().height()-TOOLBAR_SCENE_PADDING ); 64​ size().height()-TOOLBAR_SCENE_PADDING );
65 65​
66 setInteractive( true ); 66​ setInteractive( true );
67 setAcceptDrops( true ); 67​ setAcceptDrops( true );
68 setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); 68​ setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
69 setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); 69​ setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
70 70​
71 // now we create the toolbar 71​ // now we create the toolbar
72 m_toolbar = new AppletToolbar(0); 72​ m_toolbar = new AppletToolbar(0);
73 scene->addItem(m_toolbar.data()); 73​ scene->addItem(m_toolbar.data());
74 m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) ); 74​ m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
75 m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 ); 75​ m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
76 m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 ); 76​ m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
77 77​
78 connect( m_toolbar.data(), SIGNAL(configModeToggled()), SLOT(toggleConfigMode()) ); 78​ connect( m_toolbar.data(), &Context::AppletToolbar::configModeToggled, this, &Context::ToolbarView::toggleConfigMode );
79 connect( m_toolbar.data(), SIGNAL(hideAppletExplorer()), SIGNAL(hideAppletExplorer()) ); 79​ connect( m_toolbar.data(), &Context::AppletToolbar::hideAppletExplorer, this, &Context::ToolbarView::hideAppletExplorer );
80 connect( m_toolbar.data(), SIGNAL(showAppletExplorer()), SIGNAL(showAppletExplorer()) ); 80​ connect( m_toolbar.data(), &Context::AppletToolbar::showAppletExplorer, this, &Context::ToolbarView::showAppletExplorer );
81 81​
82 Context::Containment* cont = dynamic_cast< Context::Containment* >( containment ); 82​ Context::Containment* cont = dynamic_cast< Context::Containment* >( containment );
83 if( cont ) 83​ if( cont )
84 { 84​ {
85 connect( cont, SIGNAL(appletAdded(Plasma::Applet*,int)), m_toolbar.data(), SLOT(appletAdded(Plasma::Applet*,int)) ); 85​ connect( cont, &Context::Containment::appletAdded, m_toolbar.data(), &Context::AppletToolbar::appletAdded );
86 connect( m_toolbar.data(), SIGNAL(appletAddedToToolbar(Plasma::Applet*,int)), this, SLOT(appletAdded(Plasma::Applet*,int)) ); 86​ connect( m_toolbar.data(), &Context::AppletToolbar::appletAddedToToolbar, this, &Context::ToolbarView::appletAdded );
87 connect( cont, SIGNAL(appletRemoved(Plasma::Applet*)), this, SLOT(appletRemoved(Plasma::Applet*)) ); 87​ connect( cont, &Context::Containment::appletRemoved, this, &Context::ToolbarView::appletRemoved );
88 connect( m_toolbar.data(), SIGNAL(showApplet(Plasma::Applet*)), cont, SLOT(showApplet(Plasma::Applet*)) ); 88​ connect( m_toolbar.data(), &Context::AppletToolbar::showApplet, cont, &Context::Containment::showApplet );
89 connect( m_toolbar.data(), SIGNAL(moveApplet(Plasma::Applet*,int,int)), cont, SLOT(moveApplet(Plasma::Applet*,int,int)) ); 89​ connect( m_toolbar.data(), &Context::AppletToolbar::moveApplet, cont, &Context::Containment::moveApplet );
90 } 90​ }
91 91​
92} 92​}
93 93​
94Context::ToolbarView::~ToolbarView() 94​Context::ToolbarView::~ToolbarView()
95{ 95​{
96 delete m_toolbar.data(); 96​ delete m_toolbar.data();
97} 97​}
▲ Show 20 Lines • Show All 66 Lines • ▼ Show 20 Line(s)157 /* for( int i = 0; i < m_toolbar->appletLayout()->count(); i++ )
164 164​
165 for( int i = 0; i < m_toolbar.data()->appletLayout()->count(); i++ ) 165​ for( int i = 0; i < m_toolbar.data()->appletLayout()->count(); i++ )
166 { 166​ {
167 debug() << "creating a move overlay"; 167​ debug() << "creating a move overlay";
168 Context::AppletToolbarAppletItem* item = dynamic_cast< Context::AppletToolbarAppletItem* >( m_toolbar.data()->appletLayout()->itemAt( i ) ); 168​ Context::AppletToolbarAppletItem* item = dynamic_cast< Context::AppletToolbarAppletItem* >( m_toolbar.data()->appletLayout()->itemAt( i ) );
169 if( item ) 169​ if( item )
170 { 170​ {
171 Context::AppletItemOverlay *moveOverlay = new Context::AppletItemOverlay( item, m_toolbar.data()->appletLayout(), this ); 171​ Context::AppletItemOverlay *moveOverlay = new Context::AppletItemOverlay( item, m_toolbar.data()->appletLayout(), this );
172 connect( moveOverlay, SIGNAL(moveApplet(Plasma::Applet*,int,int)), m_cont, SLOT(moveApplet(Plasma::Applet*,int,int)) ); 172​ connect( moveOverlay, &Context::AppletItemOverlay::moveApplet, m_cont, &Context::Containment::moveApplet );
173 connect( moveOverlay, SIGNAL(moveApplet(Plasma::Applet*,int,int)), this, SLOT(refreshOverlays()) ); 173​ connect( moveOverlay, &Context::AppletItemOverlay::moveApplet, this, &Context::ToolbarView::refreshOverlays );
174 connect( moveOverlay, SIGNAL(deleteApplet(Plasma::Applet*)), this, SLOT(appletRemoved(Plasma::Applet*)) ); 174​ connect( moveOverlay, &Context::AppletItemOverlay::deleteApplet, this, &Context::ToolbarView::appletRemoved );
175 moveOverlay->setPalette( p ); 175​ moveOverlay->setPalette( p );
176 moveOverlay->show(); 176​ moveOverlay->show();
177 moveOverlay->raise(); 177​ moveOverlay->raise();
178 m_moveOverlays << moveOverlay; 178​ m_moveOverlays << moveOverlay;
179 debug() << moveOverlay << moveOverlay->geometry(); 179​ debug() << moveOverlay << moveOverlay->geometry();
180 } 180​ }
181 181​
182 } 182​ }
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Line(s)228{
238 p.setBrush( QPalette::Window, overlayBrush ); 238​ p.setBrush( QPalette::Window, overlayBrush );
239 for( int i = 0; i < m_toolbar.data()->appletLayout()->count(); i++ ) 239​ for( int i = 0; i < m_toolbar.data()->appletLayout()->count(); i++ )
240 { 240​ {
241 debug() << "creating a move overlay"; 241​ debug() << "creating a move overlay";
242 Context::AppletToolbarAppletItem* item = dynamic_cast< Context::AppletToolbarAppletItem* >( m_toolbar.data()->appletLayout()->itemAt( i ) ); 242​ Context::AppletToolbarAppletItem* item = dynamic_cast< Context::AppletToolbarAppletItem* >( m_toolbar.data()->appletLayout()->itemAt( i ) );
243 if( item ) 243​ if( item )
244 { 244​ {
245 Context::AppletItemOverlay *moveOverlay = new Context::AppletItemOverlay( item, m_toolbar.data()->appletLayout(), this ); 245​ Context::AppletItemOverlay *moveOverlay = new Context::AppletItemOverlay( item, m_toolbar.data()->appletLayout(), this );
246 connect( moveOverlay, SIGNAL(moveApplet(Plasma::Applet*,int,int)), m_cont, SLOT(moveApplet(Plasma::Applet*,int,int)) ); 246​ connect( moveOverlay, &Context::AppletItemOverlay::moveApplet, m_cont, &Context::Containment::moveApplet );
247 connect( moveOverlay, SIGNAL(moveApplet(Plasma::Applet*,int,int)), this, SLOT(refreshOverlays()) ); 247​ connect( moveOverlay, &Context::AppletItemOverlay::moveApplet, this, &Context::ToolbarView::refreshOverlays );
248 connect( moveOverlay, SIGNAL(deleteApplet(Plasma::Applet*)), this, SLOT(appletRemoved(Plasma::Applet*)) ); 248​ connect( moveOverlay, &Context::AppletItemOverlay::deleteApplet, this, &Context::ToolbarView::appletRemoved );
249 moveOverlay->setPalette( p ); 249​ moveOverlay->setPalette( p );
250 moveOverlay->show(); 250​ moveOverlay->show();
251 moveOverlay->raise(); 251​ moveOverlay->raise();
252 m_moveOverlays << moveOverlay; 252​ m_moveOverlays << moveOverlay;
253 debug() << moveOverlay << moveOverlay->geometry(); 253​ debug() << moveOverlay << moveOverlay->geometry();
254 } 254​ }
255 255​
256 } 256​ }
Show All 11 Lines