Changeset 4452

Timestamp:

06/27/06 00:49:31 (2 years ago)

Author:

erijo

Message:

This makes the Send button (instead of the Close button) be the Cancel
button when sending messages. Implements ticket #641, except the last item.
I'm closing it, so if anyone wants the last item on zloba_org's list, please
open a new ticket.

Location:

trunk/qt-gui/src

Files:

• usereventdlg.cpp (modified) (8 diffs)
• usereventdlg.h (modified) (2 diffs)

trunk/qt-gui/src/usereventdlg.cpp

@@ -1510 +1510 @@
 
   QAccel *a = new QAccel( this );
-  a->connectItem(a->insertItem(Key_Escape), this, SLOT(cancelSend()));
+  a->connectItem(a->insertItem(Key_Escape), this, SLOT(slot_cancelSend()));
 #if QT_VERSION >= 300
   if (mainwin->userEventTabDlg &&
@@ -1593 +1593 @@
   connect( btnSend, SIGNAL( clicked() ), this, SLOT( trySecure() ) );
 
-  btnCancel = new QPushButton(tr("&Close"), this);
-  w = QMAX(btnCancel->sizeHint().width(), w);
+  btnClose = new QPushButton(tr("&Close"), this);
+  w = QMAX(btnClose->sizeHint().width(), w);
   btnSend->setFixedWidth(w);
-  btnCancel->setFixedWidth(w);
+  btnClose->setFixedWidth(w);
   h_lay->addWidget(btnSend);
-  h_lay->addWidget(btnCancel);
-  connect(btnCancel, SIGNAL(clicked()), this, SLOT(cancelSend()));
+  h_lay->addWidget(btnClose);
+  connect(btnClose, SIGNAL(clicked()), this, SLOT(slot_close()));
   splView = new QSplitter(Vertical, mainWidget);
   //splView->setOpaqueResize();
@@ -1786 +1786 @@
   setFocusProxy(mleSend);
   setTabOrder(mleSend, btnSend);
-  setTabOrder(btnSend, btnCancel);
+  setTabOrder(btnSend, btnClose);
   icqColor.SetToDefault();
   mleSend->setBackground(QColor(icqColor.BackRed(), icqColor.BackGreen(), icqColor.BackBlue()));
@@ -2232 +2232 @@
     setCaption(title);
     setCursor(waitCursor);
-    btnSend->setEnabled(false);
-    btnCancel->setText(tr("&Cancel"));
+    btnSend->setText(tr("&Cancel"));
+    btnClose->setEnabled(false);
+    disconnect(btnSend, SIGNAL(clicked()), this, SLOT(sendButton()));
+    connect(btnSend, SIGNAL(clicked()), this, SLOT(slot_cancelSend()));
+
     connect (sigman, SIGNAL(signal_doneUserFcn(ICQEvent *)), this, SLOT(sendDone_common(ICQEvent *)));
   }
@@ -2312 +2315 @@
 
   setCursor(arrowCursor);
-  btnSend->setEnabled(true);
-  btnCancel->setText(tr("&Close"));
+  btnSend->setText(tr("&Send"));
+  btnClose->setEnabled(true);
+  disconnect(btnSend, SIGNAL(clicked()), this, SLOT(slot_cancelSend()));
+  connect(btnSend, SIGNAL(clicked()), this, SLOT(sendButton()));
+
   // If cancelled automatically check "Send through Server"
   if (mainwin->m_bAutoSendThroughServer && e->Result() == EVENT_CANCELLED)
@@ -2546 +2552 @@
 
 
-//-----UserSendCommon::cancelSend--------------------------------------------
-void UserSendCommon::cancelSend()
+//-----UserSendCommon::slot_close--------------------------------------------
+void UserSendCommon::slot_close()
+{
+  if (mainwin->m_bMsgChatView)
+  {
+    // the window is at the front, if the timer has not expired and we close
+    // the window, then the new events will stay there
+    slot_ClearNewEvents();
+  }
+#if QT_VERSION >= 300
+  if (mainwin->userEventTabDlg &&
+      mainwin->userEventTabDlg->tabExists(this))
+    mainwin->userEventTabDlg->removeTab(this);
+  else
+#endif
+    close();
+}
+
+//-----UserSendCommon::slot_cancelSend--------------------------------------------
+void UserSendCommon::slot_cancelSend()
 {
   unsigned long icqEventTag = 0;
@@ -2554 +2578 @@
 
   if (!icqEventTag)
-  {
-    if (mainwin->m_bMsgChatView)
-    {
-      // the window is at the front, if the timer has not expired and we close
-      // the window, then the new events will stay there
-      slot_ClearNewEvents();
-    }
-#if QT_VERSION >= 300
-    if (mainwin->userEventTabDlg &&
-        mainwin->userEventTabDlg->tabExists(this))
-      mainwin->userEventTabDlg->removeTab(this);
-    else
-#endif
-      close();
     return;
-  }
 
 #if QT_VERSION >= 300
@@ -2576 +2585 @@
     mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
 #endif
-  setCaption(m_sBaseTitle);
   server->CancelEvent(icqEventTag);
-  icqEventTag = 0;
-  btnSend->setEnabled(true);
-  btnCancel->setText(tr("&Close"));
-  setCursor(arrowCursor);
 }
 

trunk/qt-gui/src/usereventdlg.h

@@ -277 +277 @@
   QSplitter * splView;
   QCheckBox *chkSendServer, *chkUrgent, *chkMass;
-  QPushButton *btnSend, *btnCancel;
+  QPushButton *btnSend, *btnClose;
   QGroupBox *grpMR;
   QButtonGroup *grpCmd;
@@ -299 +299 @@
   virtual void sendDone_common(ICQEvent *);
 
-  void cancelSend();
+  void slot_close();
+  void slot_cancelSend();
   void massMessageToggled(bool);
   void slot_resettitle();