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

List:       kde-commits
Subject:    kdenetwork/kget
From:       Rainer Wirtz <rainer.wirtz () gmx ! de>
Date:       2005-02-22 22:46:03
Message-ID: 20050222224603.03029ED8A () office ! kde ! org
[Download RAW message or body]

CVS commit by ratz: 

slotQuit() was hardwired to systray->menu->idAt(4). This broke the systray-quit-confirmation dialog


  M +1 -6      docking.cpp   1.26
  M +2 -3      docking.h   1.14
  M +5 -1      kmainwidget.cpp   1.113
  M +3 -1      kmainwidget.h   1.30


--- kdenetwork/kget/docking.cpp  #1.25:1.26
@@ -94,9 +94,4 @@ void DockWidget::mousePressEvent(QMouseE
 
 
-void DockWidget::contextMenuAboutToShow ( KPopupMenu* menu )
-{
-    menu->connectItem( menu->idAt(4), kmain, SLOT(slotQuit()));
-}
-
 void DockWidget::updateToolTip( const QString& _status )
 {

--- kdenetwork/kget/docking.h  #1.13:1.14
@@ -60,5 +60,4 @@ Q_OBJECT public:
     ~DockWidget();
     /** No descriptions */
-    virtual void contextMenuAboutToShow ( KPopupMenu* menu );
     void updateToolTip( const QString& );
 

--- kdenetwork/kget/kmainwidget.cpp  #1.112:1.113
@@ -111,5 +111,5 @@ int ddp_sock = -1;              /* Apple
 KMainWidget::KMainWidget(bool bStartDocked)
     : KGetIface( "KGet-Interface" ),
-      KMainWindow(0, "kget mainwindow"),
+      KMainWindow(0, "kget mainwindow",0),
       prefDlg( 0 ), kdock( 0 )
 {
@@ -673,4 +673,8 @@ void KMainWidget::writeLog()
 }
 
+void KMainWidget::close()
+{
+    slotQuit();
+}
 
 void KMainWidget::slotQuit()

--- kdenetwork/kget/kmainwidget.h  #1.29:1.30
@@ -103,4 +103,6 @@ public slots:
     void slotToggleSound();
     void slotUpdateActions();
+    void close();
+
 protected slots:
     void slotQuit();


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