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

List:       kde-commits
Subject:    KDE/kdebase/apps/konsole/konsole
From:       Yann Bodson <yann.bodson () online ! fr>
Date:       2006-05-01 4:04:27
Message-ID: 1146456267.398935.4135.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 536040 by ybodson:

deprecated--

* QMenu::insertItem() -> QMenu::addAction()



 M  +22 -13    konsole.cpp  
 M  +10 -1     konsole.h  


--- trunk/KDE/kdebase/apps/konsole/konsole/konsole.cpp #536039:536040
@@ -493,18 +493,26 @@
    KActionCollection* actions = actionCollection();
 
    // Send Signal Menu
-   if (KAuthorized::authorizeKAction("send_signal"))
+   if ( KAuthorized::authorizeKAction( "send_signal" ) )
    {
-      m_signals = new KMenu( i18n("&Send Signal"), this );
-      m_signals->insertItem( i18n( "&Suspend Task" )   + " (STOP)", SIGSTOP);
-      m_signals->insertItem( i18n( "&Continue Task" )  + " (CONT)", SIGCONT);
-      m_signals->insertItem( i18n( "&Hangup" )         + " (HUP)", SIGHUP);
-      m_signals->insertItem( i18n( "&Interrupt Task" ) + " (INT)", SIGINT);
-      m_signals->insertItem( i18n( "&Terminate Task" ) + " (TERM)", SIGTERM);
-      m_signals->insertItem( i18n( "&Kill Task" )      + " (KILL)", SIGKILL);
-      m_signals->insertItem( i18n( "User Signal &1")   + " (USR1)", SIGUSR1);
-      m_signals->insertItem( i18n( "User Signal &2")   + " (USR2)", SIGUSR2);
-      connect(m_signals, SIGNAL(activated(int)), SLOT(sendSignal(int)));
+      m_signals = new KMenu( i18n( "&Send Signal" ), this );
+      m_sigStop = m_signals->addAction( i18n( "&Suspend Task" ) + " (STOP)" );
+      m_sigCont = m_signals->addAction( i18n( "&Continue Task" ) + " (CONT)" );
+      m_sigHup = m_signals->addAction( i18n( "&Hangup" ) + " (HUP)" );
+      m_sigInt = m_signals->addAction( i18n( "&Interrupt Task" ) + " (INT)" );
+      m_sigTerm = m_signals->addAction( i18n( "&Terminate Task" ) + " (TERM)" );
+      m_sigKill = m_signals->addAction( i18n( "&Kill Task" ) + " (KILL)" );
+      m_sigUsr1 = m_signals->addAction( i18n( "User Signal &1" ) + " (USR1)" );
+      m_sigUsr2 = m_signals->addAction( i18n( "User Signal &2" ) + " (USR2)" );
+      m_sigStop->setData( QVariant( SIGSTOP ) );
+      m_sigCont->setData( QVariant( SIGCONT ) );
+      m_sigHup->setData( QVariant( SIGHUP ) );
+      m_sigInt->setData( QVariant( SIGINT ) );
+      m_sigTerm->setData( QVariant( SIGTERM ) );
+      m_sigKill->setData( QVariant( SIGKILL ) );
+      m_sigUsr1->setData( QVariant( SIGUSR1 ) );
+      m_sigUsr2->setData( QVariant( SIGUSR2 ) );
+      connect( m_signals, SIGNAL(triggered(QAction*)), SLOT(sendSignal(QAction*)));
       KAcceleratorManager::manage( m_signals );
    }
 
@@ -2315,9 +2323,10 @@
   }
 }
 
-void Konsole::sendSignal(int sn)
+void Konsole::sendSignal( QAction* action )
 {
-  if (se) se->sendSignal(sn);
+    if ( se )
+      se->sendSignal( action->data().toInt() );
 }
 
 void Konsole::runSession(TESession* s)
--- trunk/KDE/kdebase/apps/konsole/konsole/konsole.h #536039:536040
@@ -178,7 +178,7 @@
   void moveSessionRight();
   void allowPrevNext();
   void setSchema(int n, TEWidget* tewidget=0);   // no slot necessary?
-  void sendSignal(int n);
+  void sendSignal(QAction*);
   void slotClearTerminal();
   void slotResetClearTerminal();
   void slotSelectTabbar();
@@ -362,6 +362,15 @@
   KAction       *m_quit;
   KAction       *m_tabDetachSession;
 
+  QAction       *m_sigStop;
+  QAction       *m_sigCont;
+  QAction       *m_sigHup;
+  QAction       *m_sigInt;
+  QAction       *m_sigTerm;
+  QAction       *m_sigKill;
+  QAction       *m_sigUsr1;
+  QAction       *m_sigUsr2;
+
   KActionCollection *m_shortcuts;
 
   QActionGroup  *m_sessionGroup;
[prev in list] [next in list] [prev in thread] [next in thread]