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

List:       kde-commits
Subject:    kdebase/kwin
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2005-02-07 15:17:27
Message-ID: 20050207151727.573851BA98 () office ! kde ! org
[Download RAW message or body]

CVS commit by lunakl: 

Something I forgot for #44268 - show the shortcut in the titlebar.


  M +8 -2      client.cpp   1.450
  M +1 -0      client.h   1.177
  M +1 -0      useractions.cpp   2.35


--- kdebase/kwin/client.cpp  #1.449:1.450
@@ -1279,5 +1279,6 @@ void Client::setCaption( const QString& 
         if( wmClientMachine( false ) != "localhost" && !isLocalMachine( \
wmClientMachine( false )))  machine_suffix = " <@" + wmClientMachine( true ) + ">";
-        cap_suffix = machine_suffix;
+        QString shortcut_suffix = !shortcut().isNull() ? ( " {" + \
shortcut().toString() + "}" ) : ""; +        cap_suffix = machine_suffix + \
                shortcut_suffix;
         if ( ( !isSpecialWindow() || isToolbar()) && workspace()->findClient( \
FetchNameInternalPredicate( this )))   {
@@ -1285,5 +1286,5 @@ void Client::setCaption( const QString& 
             do 
                 {
-                cap_suffix = machine_suffix + " <" + QString::number(i) + ">";
+                cap_suffix = machine_suffix + " <" + QString::number(i) + ">" + \
shortcut_suffix;  i++;
                 } while ( workspace()->findClient( FetchNameInternalPredicate( this \
))); @@ -1305,4 +1306,9 @@ void Client::setCaption( const QString& 
     }
 
+void Client::updateCaption()
+    {
+    setCaption( cap_normal, true );
+    }
+
 void Client::fetchIconicName()
     {

--- kdebase/kwin/client.h  #1.176:1.177
@@ -236,4 +236,5 @@ class Client : public QObject, public KD
 
         QString caption( bool full = true ) const;
+        void updateCaption();
 
         void keyPressEvent( uint key_code ); // FRAME ??

--- kdebase/kwin/useractions.cpp  #2.34:2.35
@@ -1016,4 +1016,5 @@ void Client::setShortcutInternal( const 
         return;
     _shortcut = cut;
+    updateCaption();
     workspace()->clientShortcutUpdated( this );
     }


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