Changeset 6118

Timestamp:

03/29/08 04:35:22 (8 months ago)

Author:

flynd

Message:

Updated variable and function names to conform better with coding style. Replaced MessageManager? with static function in MessageBox?. Rewrote dialog extension to not use obsolete functions.

Location:

trunk/qt4-gui/src/core

Files:

• messagebox.cpp (modified) (22 diffs)
• messagebox.h (modified) (3 diffs)

trunk/qt4-gui/src/core/messagebox.cpp

@@ -22 +22 @@
 
 #include "config.h"
-
-#include <algorithm>
-#include <ctype.h>
-#include <stdio.h>
 
 #include <QHBoxLayout>
@@ -48 +44 @@
 /*! \brief Dialog with configurable yes/no buttons
  *
- * In it's easiest form, this dialog displays szQuery and the buttons szBtn1 and szBtn2.
- * szBtn1 means true/yes,
- * szBtn2 means false/no.
+ * In it's easiest form, this dialog displays query and the buttons button1 and button2.
+ * button1 means true/yes,
+ * button2 means false/no.
  *
  * When bConfirmYes is true, then a second dialog asks the user to confirm his positive
@@ -58 +54 @@
  * decision, the displayed confirmation message is passed using the QString szConfirmNo.
  */
-bool LicqQtGui::QueryUser(QWidget* q, QString szQuery, QString szBtn1, QString szBtn2,
-    bool bConfirmYes, QString szConfirmYes, bool bConfirmNo, QString szConfirmNo)
+bool LicqQtGui::QueryUser(QWidget* parent, QString query, QString button1, QString button2,
+    bool confirmYes, QString confirmYesText, bool confirmNo, QString confirmNoText)
 {
   bool result;
 
 #ifdef USE_KDE
-  result = (KMessageBox::questionYesNo(q, szQuery, QMessageBox::tr("Licq Question"),
-        KGuiItem(szBtn1), KGuiItem(szBtn2)) == KMessageBox::Yes);
+  result = (KMessageBox::questionYesNo(parent, query, QMessageBox::tr("Licq Question"),
+        KGuiItem(button1), KGuiItem(button2)) == KMessageBox::Yes);
   // The user must confirm his decision!
-  if (result == true && bConfirmYes && !szConfirmYes.isEmpty())
-    result = (KMessageBox::questionYesNo(q, szConfirmYes,
+  if (result == true && confirmYes && !confirmYesText.isEmpty())
+    result = (KMessageBox::questionYesNo(parent, confirmYesText,
           QMessageBox::tr("Licq Question")) == KMessageBox::Yes);
-  else if (result == false && bConfirmNo && !szConfirmNo.isEmpty())
-    result = (KMessageBox::questionYesNo(q, szConfirmNo,
+  else if (result == false && confirmNo && !confirmNoText.isEmpty())
+    result = (KMessageBox::questionYesNo(parent, confirmNoText,
           QMessageBox::tr("Licq Question")) == KMessageBox::Yes);
 #else
-  result = (QMessageBox::question(q, QMessageBox::tr("Licq Question"), szQuery,
-        szBtn1, szBtn2) == 0);
+  result = (QMessageBox::question(parent, QMessageBox::tr("Licq Question"), query,
+        button1, button2) == 0);
   // The user must confirm his decision!
-  if (result == true && bConfirmYes && !szConfirmYes.isEmpty())
-    result = (QMessageBox::question(q, QMessageBox::tr("Licq Question"), szConfirmYes,
+  if (result == true && confirmYes && !confirmYesText.isEmpty())
+    result = (QMessageBox::question(parent, QMessageBox::tr("Licq Question"), confirmYesText,
           QMessageBox::tr("Yes"), QMessageBox::tr("No")) == 0);
-  else if (result == false && bConfirmNo && !szConfirmNo.isEmpty())
-    result = (QMessageBox::question(q, QMessageBox::tr("Licq Question"), szConfirmNo,
+  else if (result == false && confirmNo && !confirmNoText.isEmpty())
+    result = (QMessageBox::question(parent, QMessageBox::tr("Licq Question"), confirmNoText,
           QMessageBox::tr("Yes"), QMessageBox::tr("No")) == 0);
 #endif
@@ -88 +84 @@
 }
 
-int LicqQtGui::QueryUser(QWidget* q, QString szQuery, QString szBtn1, QString szBtn2, QString szBtn3)
-{
-  return ( QMessageBox::question(q, QMessageBox::tr("Licq Question"), szQuery, szBtn1, szBtn2, szBtn3));
+int LicqQtGui::QueryUser(QWidget* parent, QString query, QString button1, QString button2, QString button3)
+{
+  return ( QMessageBox::question(parent, QMessageBox::tr("Licq Question"), query, button1, button2, button3));
 }
 
@@ -98 +94 @@
 }
 
-
-void LicqQtGui::InformUser(QWidget* q, QString sz)
-{
-  MessageManager::Instance()->addMessage(QMessageBox::Information, sz, q);
-}
-
-void LicqQtGui::WarnUser(QWidget* q, QString sz)
-{
-  MessageManager::Instance()->addMessage(QMessageBox::Warning, sz, q);
-}
-
-void LicqQtGui::CriticalUser(QWidget* q, QString sz)
-{
-  MessageManager::Instance()->addMessage(QMessageBox::Critical, sz, q);
+void LicqQtGui::InformUser(QWidget* parent, QString text)
+{
+  MessageBox::addMessage(QMessageBox::Information, text, parent);
+}
+
+void LicqQtGui::WarnUser(QWidget* parent, QString text)
+{
+  MessageBox::addMessage(QMessageBox::Warning, text, parent);
+}
+
+void LicqQtGui::CriticalUser(QWidget* parent, QString text)
+{
+  MessageBox::addMessage(QMessageBox::Critical, text, parent);
 }
 
@@ -117 +112 @@
 
 MessageBox::MessageBox(QWidget* parent)
-  : QDialog(parent, Qt::Dialog), m_nUnreadNum(0)
+  : QDialog(parent, Qt::Dialog), myUnreadCount(0)
 {
   setModal(true);
@@ -127 +122 @@
   QMessageBox::Icon type = QMessageBox::Information;
 
-  QVBoxLayout* topLay = new QVBoxLayout(this);
+  QVBoxLayout* topLayout = new QVBoxLayout(this);
 
   // Make the first horizontal layout for the icon and message
-  QFrame* frmMessage = new QFrame();
-  QHBoxLayout* lay = new QHBoxLayout(frmMessage);
-  m_lblIcon = new QLabel();
+  QHBoxLayout* messageLayout = new QHBoxLayout();
+  myIconLabel = new QLabel();
   QPixmap icon = getMessageIcon(type);
-  m_lblIcon->setPixmap(icon);
-  m_lblMessage = new QLabel(msg);
-
-  lay->addWidget(m_lblIcon, 0, Qt::AlignCenter);
-  lay->addWidget(m_lblMessage);
+  myIconLabel->setPixmap(icon);
+  myMessageLabel = new QLabel(msg);
+
+  messageLayout->addStretch(1);
+  messageLayout->addWidget(myIconLabel);
+  messageLayout->addWidget(myMessageLabel);
+  messageLayout->addStretch(1);
 
   // Make the list box of all the pending messages, starts out hidden
-  m_frmList = new QFrame();
-  QHBoxLayout* layList = new QHBoxLayout(m_frmList);
-  m_lstMsg = new QListWidget();
-  m_lstMsg->setFixedHeight(100); // This seems to be a good height
-  layList->addWidget(m_lstMsg);
-  // Add this listbox as an extension to the dialog, and make it shown at the
-  // bottom part of the dialog.
-  setOrientation(Qt::Vertical);
-  setExtension(m_frmList);
+  myExtension = new QWidget();
+  myExtension->hide();
+  QHBoxLayout* listLayout = new QHBoxLayout(myExtension);
+  listLayout->setMargin(0);
+  myMessageList = new QListWidget();
+  myMessageList->setFixedHeight(100); // This seems to be a good height
+  listLayout->addWidget(myMessageList);
 
   // Make the second horizontal layout for the buttons
-  QFrame* frmButtons = new QFrame();
-  QHBoxLayout* lay2 = new QHBoxLayout(frmButtons);
-  m_btnMore = new QPushButton(tr("&List"));
-  //m_btnMore->setDisabled(true);
-  m_btnNext = new QPushButton(tr("&Next"));
-  m_btnNext->setDisabled(true);
-  m_btnClear = new QPushButton(tr("&Ok"));
-  m_btnClear->setDefault(true);
-
-  lay2->addWidget(m_btnMore);
-  lay2->addWidget(m_btnNext);
-  lay2->addWidget(m_btnClear);
-
-  topLay->addWidget(frmMessage, 0, Qt::AlignCenter);
-  topLay->addWidget(frmButtons, 0, Qt::AlignCenter);
+  QHBoxLayout* buttonsLayout = new QHBoxLayout();
+  myMoreButton = new QPushButton(tr("&List"));
+  myMoreButton->setCheckable(true);
+  //myMoreButton->setDisabled(true);
+  myNextButton = new QPushButton(tr("&Next"));
+  myNextButton->setDisabled(true);
+  myCloseButton = new QPushButton(tr("&Ok"));
+  myCloseButton->setDefault(true);
+
+  buttonsLayout->addStretch(1);
+  buttonsLayout->addWidget(myMoreButton);
+  buttonsLayout->addWidget(myNextButton);
+  buttonsLayout->addWidget(myCloseButton);
+  buttonsLayout->addStretch(1);
+
+  topLayout->addLayout(messageLayout);
+  topLayout->addLayout(buttonsLayout);
+  topLayout->addWidget(myExtension);
 
   // Connect all the signals here
-  connect(m_btnMore, SIGNAL(clicked()), SLOT(slot_toggleMore()));
-  connect(m_btnNext, SIGNAL(clicked()), SLOT(slot_clickNext()));
-  connect(m_btnClear, SIGNAL(clicked()), SLOT(slot_clickClear()));
-  connect(m_lstMsg, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
-      SLOT(slot_listChanged(QListWidgetItem*, QListWidgetItem*)));
+  connect(myMoreButton, SIGNAL(toggled(bool)), myExtension, SLOT(setVisible(bool)));
+  connect(myNextButton, SIGNAL(clicked()), SLOT(showNext()));
+  connect(myCloseButton, SIGNAL(clicked()), SLOT(closeDialog()));
+  connect(myMessageList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)),
+      SLOT(updateCurrentMessage(QListWidgetItem*, QListWidgetItem*)));
 
   show();
+}
+
+MessageBox::~MessageBox()
+{
+  myMessageDialog = NULL;
 }
 
@@ -188 +190 @@
   // If we have only one message in queue, show that one, otherwise update
   // the number of pending messages.
-  if (m_lstMsg->count() == 0)
-  {
-    m_lblIcon->setPixmap(pix);
-    m_lblMessage->setText(msg);
-    m_btnNext->setText(tr("&Next"));
-    m_btnNext->setEnabled(false);
-    m_btnMore->setEnabled(false);
-    m_btnNext->hide();
-    m_btnMore->hide();
-    m_btnClear->setText(tr("&Ok"));
-    showExtension(false); // We are opening the window, so default to not showing this
+  if (myMessageList->count() == 0)
+  {
+    myIconLabel->setPixmap(pix);
+    myMessageLabel->setText(msg);
+    myNextButton->setText(tr("&Next"));
+    myNextButton->setEnabled(false);
+    myMoreButton->setEnabled(false);
+    myNextButton->hide();
+    myMoreButton->hide();
+    myCloseButton->setText(tr("&Ok"));
   }
   else
   {
-    m_nUnreadNum++;
+    myUnreadCount++;
     unread = true; // It is unread
-    m_btnClear->setText(tr("&Clear All"));
-    QString nextStr = QString(tr("&Next (%1)")).arg(m_nUnreadNum);
-    m_btnNext->setText(nextStr);
-    if (!m_btnNext->isEnabled())
+    myCloseButton->setText(tr("&Clear All"));
+    QString nextStr = QString(tr("&Next (%1)")).arg(myUnreadCount);
+    myNextButton->setText(nextStr);
+    if (!myNextButton->isEnabled())
     {
-      m_btnNext->setEnabled(true);
-      m_btnNext->show();
+      myNextButton->setEnabled(true);
+      myNextButton->show();
     }
-    if (!m_btnMore->isEnabled())
+    if (!myMoreButton->isEnabled())
     {
-      m_btnMore->setEnabled(true);
-      m_btnMore->show();
+      myMoreButton->setEnabled(true);
+      myMoreButton->show();
     }
   }
 
-  MessageBoxItem* pEntry = new MessageBoxItem();
+  MessageBoxItem* entry = new MessageBoxItem();
   // Resize the icon
   img = pix.toImage();
@@ -228 +229 @@
   QPixmap scaledPix(QPixmap::fromImage(img));
   // Add the columns now
-  pEntry->setIcon(scaledPix);
-  pEntry->setText(msg.left(qMin(50, msg.indexOf('\n')))); // Put this in setMessage()
+  entry->setIcon(scaledPix);
+  entry->setText(msg.left(qMin(50, msg.indexOf('\n')))); // Put this in setMessage()
   // Set the special data
-  pEntry->setMessage(msg);
-  pEntry->setFullIcon(pix);
-  pEntry->setUnread(unread);
-  pEntry->setType(type);
-
-  m_lstMsg->insertItem(0, pEntry);
+  entry->setMessage(msg);
+  entry->setFullIcon(pix);
+  entry->setUnread(unread);
+  entry->setType(type);
+
+  myMessageList->insertItem(0, entry);
 
   // Set the caption if we set the text and icon here
-  if (m_nUnreadNum == 0)
-    updateCaption(pEntry);
-}
-
-/// ////////////////////////////////////////////////////////
-/// @brief Toggline the detailed list view
-///
-/// When the more button is clicked, toggle showing the list view of
-/// pending messages. When we hide the list view, we need to show the
-/// oldest unread message.
-/// ////////////////////////////////////////////////////////
-void MessageBox::slot_toggleMore()
-{
-  showExtension(m_frmList->isHidden());
+  if (myUnreadCount == 0)
+    updateCaption(entry);
 }
 
@@ -261 +250 @@
 /// unread message. The text and icon will both be updated.
 /// ////////////////////////////////////////////////////////
-void MessageBox::slot_clickNext()
+void MessageBox::showNext()
 {
   // Find the next unread message
-  bool bFound = false;
+  bool found = false;
   MessageBoxItem* item = 0;
-  for (int i = m_lstMsg->currentRow(); i >= 0; --i)
-  {
-    item = dynamic_cast<MessageBoxItem*>(m_lstMsg->item(i));
+  for (int i = myMessageList->currentRow(); i >= 0; --i)
+  {
+    item = dynamic_cast<MessageBoxItem*>(myMessageList->item(i));
     if (item->isUnread())
     {
-      bFound = true;
+      found = true;
       break;
     }
@@ -277 +266 @@
 
   // If no unread item was found, search from the bottom
-  if (!bFound)
-  {
-    for (int i = m_lstMsg->count() - 1; i >= 0; --i)
+  if (!found)
+  {
+    for (int i = myMessageList->count() - 1; i >= 0; --i)
     {
-      item = dynamic_cast<MessageBoxItem*>(m_lstMsg->item(i));
+      item = dynamic_cast<MessageBoxItem*>(myMessageList->item(i));
       if (item->isUnread())
       {
-        bFound = true;
+        found = true;
         break;
       }
@@ -291 +280 @@
 
   // Only change the item if there something to change it to
-  if (bFound)
-    m_lstMsg->setCurrentItem(item);
+  if (found)
+    myMessageList->setCurrentItem(item);
 }
 
@@ -301 +290 @@
 /// remove all messages from the queue.
 /// ////////////////////////////////////////////////////////
-void MessageBox::slot_clickClear()
+void MessageBox::closeDialog()
 {
   // Hide the window first
@@ -307 +296 @@
 
   // Remove all items that have been read
-  m_lstMsg->clear();
-  m_nUnreadNum = 0;
+  myMessageList->clear();
+  myUnreadCount = 0;
 }
 
@@ -320 +309 @@
 /// @param previous The QListWidgetItem* that has been selected prior
 /// ////////////////////////////////////////////////////////
-void MessageBox::slot_listChanged(QListWidgetItem* i, QListWidgetItem* /* previous */)
+void MessageBox::updateCurrentMessage(QListWidgetItem* i, QListWidgetItem* /* previous */)
 {
   // Change the icon, message and caption
@@ -326 +315 @@
   if (item != NULL)
   {
-    m_lblIcon->setPixmap(item->getFullIcon());
-    m_lblMessage->setText(item->getMessage());
+    myIconLabel->setPixmap(item->getFullIcon());
+    myMessageLabel->setText(item->getMessage());
     updateCaption(item);
 
@@ -333 +322 @@
     if (item->isUnread())
     {
-      m_nUnreadNum--;
+      myUnreadCount--;
       item->setUnread(false);
     }
@@ -340 +329 @@
   // Update the next button
   QString nextStr;
-  if (m_nUnreadNum > 0)
-    nextStr = QString(tr("&Next (%1)")).arg(m_nUnreadNum);
+  if (myUnreadCount > 0)
+    nextStr = QString(tr("&Next (%1)")).arg(myUnreadCount);
   else
   {
     // No more unread messages
     nextStr = QString(tr("&Next"));
-    m_btnNext->setEnabled(false);
-    m_nUnreadNum = 0;
-  }
-  m_btnNext->setText(nextStr);
+    myNextButton->setEnabled(false);
+    myUnreadCount = 0;
+  }
+  myNextButton->setText(nextStr);
 }
 
@@ -362 +351 @@
     return;
 
-  QString strCaption;
+  QString caption;
   switch (item->getType())
   {
     case QMessageBox::Information:
-      strCaption = tr("Licq Information");
+      caption = tr("Licq Information");
       break;
 
     case QMessageBox::Warning:
-      strCaption = tr("Licq Warning");
+      caption = tr("Licq Warning");
       break;
 
     case QMessageBox::Critical:
-      strCaption = tr("Licq Critical");
+      caption = tr("Licq Critical");
       break;
 
@@ -380 +369 @@
     case QMessageBox::Question:
     default:
-      strCaption = tr("Licq");
-      break;
-  }
-  setWindowTitle(strCaption);
+      caption = tr("Licq");
+      break;
+  }
+  setWindowTitle(caption);
 }
 
@@ -419 +408 @@
 }
 
-MessageManager* MessageManager::m_pInstance = 0;
-
-MessageManager::MessageManager()
-  : m_pMsgDlg(0)
-{
-}
-
-MessageManager::~MessageManager()
-{
-  if (m_pMsgDlg)
-    delete m_pMsgDlg;
-}
-
-MessageManager* MessageManager::Instance()
-{
-  if (m_pInstance == 0)
-    m_pInstance = new MessageManager;
-
-  return m_pInstance;
-}
-
-void MessageManager::addMessage(QMessageBox::Icon type, const QString& msg,
+MessageBox* MessageBox::myMessageDialog = 0;
+
+void MessageBox::addMessage(QMessageBox::Icon type, const QString& msg,
   QWidget* parent)
 {
   // We should pass parent to it, but it causes a crash after the parent closes
-  // and we try to show another message box. I tried to reparent m_pMsgDlg, but
+  // and we try to show another message box. I tried to reparent myMessageDialog, but
   // that didnt help much.
   // So for now.. we do this:
   parent = 0; // XXX See comment above
-  if (m_pMsgDlg == 0)
-    m_pMsgDlg = new MessageBox(parent);
-
-  m_pMsgDlg->addMessage(type, msg);
-  m_pMsgDlg->show();
+  if (myMessageDialog == 0)
+    myMessageDialog = new MessageBox(parent);
+
+  myMessageDialog->addMessage(type, msg);
+  myMessageDialog->show();
 }
 
@@ -458 +428 @@
   : QListWidgetItem(parent)
 {
-  m_unread = false;
-}
-
-void MessageBoxItem::setUnread(bool b)
-{
-  m_unread = b;
-  if (m_unread)
+  myUnread = false;
+}
+
+void MessageBoxItem::setUnread(bool unread)
+{
+  myUnread = unread;
+  if (myUnread)
     setForeground(Qt::red);
   else

trunk/qt4-gui/src/core/messagebox.h

@@ -34 +34 @@
 namespace LicqQtGui
 {
-bool QueryUser(QWidget*, QString, QString, QString, bool bConfirmYes=false,
-    QString szConfirm=NULL, bool bConfirmNo=false, QString szConfirmNo=NULL);
-int QueryUser(QWidget*, QString, QString, QString, QString);
+bool QueryUser(QWidget* q, QString query, QString button1, QString button2,
+    bool confirmYes = false, QString confirmYesText = NULL,
+    bool confirmNo = false, QString confirmNoText = NULL);
+int QueryUser(QWidget* parent, QString query, QString button1, QString button2,
+    QString button3);
 bool QueryYesNo(QWidget* parent, QString query);
-void InformUser(QWidget* q, QString);
-void WarnUser(QWidget* q, QString szInfo);
-void CriticalUser(QWidget* q, QString szInfo);
+void InformUser(QWidget* parent, QString text);
+void WarnUser(QWidget* parent, QString text);
+void CriticalUser(QWidget* parent, QString text);
+
 
 class MessageBoxItem : public QListWidgetItem
@@ -47 +50 @@
   MessageBoxItem(QListWidget* parent = 0);
 
-  void setMessage(const QString& s) { m_msg = s; }
-  void setFullIcon(const QPixmap& p) { m_fullIcon = p; }
-  void setUnread(bool b);
-  void setType(QMessageBox::Icon t) { m_type = t; }
+  void setMessage(const QString& s) { myMessage = s; }
+  void setFullIcon(const QPixmap& p) { myFullIcon = p; }
+  void setUnread(bool unread);
+  void setType(QMessageBox::Icon t) { myType = t; }
 
-  QString getMessage() const { return m_msg; }
-  QPixmap getFullIcon() const { return m_fullIcon; }
-  bool isUnread() const { return m_unread; }
-  QMessageBox::Icon getType() const { return m_type; }
+  QString getMessage() const { return myMessage; }
+  QPixmap getFullIcon() const { return myFullIcon; }
+  bool isUnread() const { return myUnread; }
+  QMessageBox::Icon getType() const { return myType; }
 
 private:
-  QString m_msg;
-  QPixmap m_fullIcon;
-  bool m_unread;
-  QMessageBox::Icon m_type;
+  QString myMessage;
+  QPixmap myFullIcon;
+  bool myUnread;
+  QMessageBox::Icon myType;
 };
 
@@ -68 +71 @@
   Q_OBJECT
 public:
+  static void addMessage(QMessageBox::Icon type, const QString& msg, QWidget* p);
+
+public slots:
+  void showNext();
+  void closeDialog();
+  void updateCurrentMessage(QListWidgetItem* current, QListWidgetItem* previous);
+
+private:
   MessageBox(QWidget* parent = 0);
+  ~MessageBox();
   void addMessage(QMessageBox::Icon type, const QString& msg);
 
-public slots:
-  void slot_toggleMore();
-  void slot_clickNext();
-  void slot_clickClear();
-  void slot_listChanged(QListWidgetItem* current, QListWidgetItem* previous);
-
-private:
   QPixmap getMessageIcon(QMessageBox::Icon);
   void updateCaption(MessageBoxItem*);
 
-  int m_nUnreadNum;
-  QLabel* m_lblIcon;
-  QLabel* m_lblMessage;
-  QPushButton* m_btnNext;
-  QPushButton* m_btnMore;
-  QPushButton* m_btnClear;
-  QListWidget* m_lstMsg;
-  QFrame* m_frmList;
-};
+  static MessageBox* myMessageDialog;
 
-class MessageManager
-{
-public:
-  ~MessageManager();
-
-  static MessageManager* Instance();
-
-  void addMessage(QMessageBox::Icon type, const QString& msg, QWidget* p);
-
-private:
-  MessageManager();
-  MessageManager(const MessageManager&);
-  MessageManager& operator=(const MessageManager&);
-
-  static MessageManager* m_pInstance;
-  MessageBox* m_pMsgDlg;
+  int myUnreadCount;
+  QLabel* myIconLabel;
+  QLabel* myMessageLabel;
+  QPushButton* myNextButton;
+  QPushButton* myMoreButton;
+  QPushButton* myCloseButton;
+  QListWidget* myMessageList;
+  QWidget* myExtension;
 };