[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/netbook/shell
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-03-30 22:03:44
Message-ID: 20100330220344.EE136AC88B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1109264 by mart:

prevent closing with alt+f4
BUG:232753


 M  +11 -0     netview.cpp  
 M  +1 -0      netview.h  
 M  +1 -1      plasmaapp.cpp  


--- trunk/KDE/kdebase/workspace/plasma/netbook/shell/netview.cpp #1109263:1109264
@@ -157,6 +157,17 @@
     emit geometryChanged();
 }
 
+bool NetView::event(QEvent *e)
+{
+    if (e->type() == QEvent::Close) {
+        //prevent ALT+F4 from killing the shell
+        e->ignore();
+        return true;
+    } else {
+        return Plasma::View::event(e);
+    }
+}
+
 void NetView::screenOwnerChanged(int wasScreen, int isScreen, Plasma::Containment* containment)
 {
     kDebug() << "was, is, containment:" << wasScreen << isScreen << (QObject*)containment;
--- trunk/KDE/kdebase/workspace/plasma/netbook/shell/netview.h #1109263:1109264
@@ -77,6 +77,7 @@
 protected:
     void drawBackground(QPainter *painter, const QRectF &rect);
     void resizeEvent(QResizeEvent *event);
+    bool event(QEvent *e);
 
 private:
     NetPanelController *m_panelController;
--- trunk/KDE/kdebase/workspace/plasma/netbook/shell/plasmaapp.cpp #1109263:1109264
@@ -850,7 +850,7 @@
         }
     } else if (watched == m_widgetExplorerView && event->type() == QEvent::Resize) {
          m_widgetExplorer->resize(m_widgetExplorerView->contentsRect().size());
-    } else if (watched == m_mainView && event->type() == QEvent::Close) {
+    } else if (!m_isDesktop && watched == m_mainView && event->type() == QEvent::Close) {
         exit();
     }
     return false;
[prev in list] [next in list] [prev in thread] [next in thread]