Changeset 49 for psi

Timestamp:

09/14/06 23:31:42 (2 years ago)

Author:

dmik

Message:

Psi: Improved: Pressing ESC in a chat or a group chat window minimizes it.

Location:

psi/trunk/src

Files:

• chatdlg.cpp (modified) (1 diff)
• groupchatdlg.cpp (modified) (1 diff)
• mainwin.cpp (modified) (1 diff)
• tabdlg.cpp (modified) (1 diff)

psi/trunk/src/chatdlg.cpp

@@ -359 +359 @@
 void ChatDlg::keyPressEvent(QKeyEvent *e)
 {
-        if(e->key() == Key_Escape && !option.useTabs)
-                close();
-//#ifdef Q_WS_MAC //this is a standard on other platforms too
+        if(e->key() == Key_Escape && e->state() == 0 && !option.useTabs)
+                showMinimized();
         else if(e->key() == Key_W && e->state() & ControlButton && !option.useTabs)
                 close();
-//#endif
         else if(e->key() == Key_Return || e->key() == Key_Enter || (e->key() == Key_S && (e->state() & AltButton)))
                 doSend();

psi/trunk/src/groupchatdlg.cpp

@@ -832 +832 @@
         if(e->key() == Key_Return || e->key() == Key_Enter || (e->key() == Key_S && (e->state() & AltButton)))
                 mle_returnPressed();
+        else if(e->key() == Key_Escape && e->state() == 0)
+                showMinimized();
         else if(e->key() == Key_PageUp && (e->state() & ShiftButton))
                 d->te_log->setContentsPos(d->te_log->contentsX(), d->te_log->contentsY() - d->te_log->visibleHeight()/2);

psi/trunk/src/mainwin.cpp

@@ -868 +868 @@
 
         bool closekey = false;
-        if(e->key() == Key_Escape)
+        if(e->key() == Key_Escape && e->state() == 0)
                 closekey = true;
 #ifdef Q_WS_MAC

psi/trunk/src/tabdlg.cpp

@@ -405 +405 @@
 void TabDlg::keyPressEvent(QKeyEvent *e)
 {
-        if (e->key() == Key_Escape)
-        {
-                closeChat();
+        if (e->key() == Key_Escape && e->state() == 0)
+        {
+                showMinimized();
         }
         else if ( e->key() == Key_W && (e->state() & ControlButton) )