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

List:       kde-commits
Subject:    extragear/utils/yakuake
From:       Eike Hein <hein () kde ! org>
Date:       2009-03-27 19:13:15
Message-ID: 1238181195.518497.31721.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 945595 by hein:

* Update the toggle action states when tab switches occur again.
* Make sure that updating the toggle action states doesn't fire
  the actions.


 M  +0 -3      ChangeLog  
 M  +15 -3     app/tabbar.cpp  


--- trunk/extragear/utils/yakuake/ChangeLog #945594:945595
@@ -27,9 +27,6 @@
 * Added a feature to prevent a session from being closed (toggled via a user-
   configured shortcut or the context menu) by way of Yakuake's own shortcuts
   and actions, including D-Bus calls to get/set this state bit.
-* Started fix for Disable Keyboard Input and Prevent Session Closing context
-  menus states being carried over to all sessions even if other sessions are
-  not really affected (still needs some more fixing though).
 
 
 Changes in 2.9.4:
--- trunk/extragear/utils/yakuake/app/tabbar.cpp #945594:945595
@@ -159,8 +159,17 @@
 
     KActionCollection* actionCollection = m_mainWindow->actionCollection();
 
-    actionCollection->action("toggle-keyboard-input")->setChecked(!m_mainWindow->sessionStack()->isKeyboardInputEnabled(sessionId));
                
-    actionCollection->action("toggle-prevent-closing")->setChecked(!m_mainWindow->sessionStack()->isSessionClosable(sessionId));
 +    QAction* toggleKeyboardInput = \
actionCollection->action("toggle-keyboard-input"); +    QAction* togglePreventClosing \
= actionCollection->action("toggle-prevent-closing"); +
+    toggleKeyboardInput->blockSignals(true);
+    togglePreventClosing->blockSignals(true);
+
+    toggleKeyboardInput->setChecked(!m_mainWindow->sessionStack()->isKeyboardInputEnabled(sessionId));
 +    togglePreventClosing->setChecked(!m_mainWindow->sessionStack()->isSessionClosable(sessionId));
 +
+    toggleKeyboardInput->blockSignals(false);
+    togglePreventClosing->blockSignals(false);
 }
 
 void TabBar::contextMenuEvent(QContextMenuEvent* event)
@@ -575,8 +584,11 @@
 
     m_selectedSessionId = sessionId;
 
-    updateMoveActions(m_tabs.indexOf(sessionId));
+    int index = m_tabs.indexOf(sessionId);
 
+    updateMoveActions(index);
+    updateToggleActions(index);
+
     repaint();
 }
 


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