Changeset 6367 for trunk/qt-gui

Timestamp:

07/01/08 04:12:56 (5 months ago)

Author:

flynd

Message:

Removed uin functions from qt-gui.

Location:

trunk/qt-gui/src

Files:

• authuserdlg.cpp (modified) (1 diff)
• authuserdlg.h (modified) (2 diffs)
• awaymsgdlg.cpp (modified) (1 diff)
• awaymsgdlg.h (modified) (1 diff)
• ewidgets.cpp (modified) (1 diff)
• ewidgets.h (modified) (2 diffs)
• filedlg.cpp (modified) (1 diff)
• filedlg.h (modified) (3 diffs)
• mainwin.cpp (modified) (1 diff)
• optionsdlg.cpp (modified) (1 diff)
• refusedlg.cpp (modified) (1 diff)
• refusedlg.h (modified) (1 diff)
• showawaymsgdlg.cpp (modified) (1 diff)
• showawaymsgdlg.h (modified) (2 diffs)

trunk/qt-gui/src/authuserdlg.cpp

@@ -115 +115 @@
 }
 
-AuthUserDlg::AuthUserDlg(CICQDaemon *s, unsigned long nUin, bool bGrant,
-   QWidget *parent)
-  : LicqDialog(parent, "AuthUserDialog", false, WDestructiveClose)
-{
-  server = s;
-  m_nUin = nUin;
-  m_bGrant = bGrant;
-  m_nPPID = LICQ_PPID;
-  char szUin[14];
-  sprintf(szUin, "%lu", nUin);
-  m_szId = strdup(szUin);
-  
-
-  if(bGrant)
-    setCaption(tr("Licq - Grant Authorisation"));
-  else
-    setCaption(tr("Licq - Refuse Authorisation"));
-
-  QBoxLayout* toplay = new QVBoxLayout(this, 8, 8);
-
-  lblUin = new QLabel(this);
-  lblUin->setAlignment(AlignCenter);
-  if (m_nUin == 0)
-  {
-    lblUin->setText(tr("Authorize which user (UIN):"));
-    edtUin = new QLineEdit(this);
-    edtUin->setMinimumWidth(90);
-    edtUin->setValidator(new QIntValidator(10000, 2147483647, edtUin));
-    connect (edtUin, SIGNAL(returnPressed()), SLOT(ok()) );
-    QBoxLayout* lay = new QHBoxLayout(toplay);
-    lay->addWidget(lblUin);
-    lay->addWidget(edtUin);
-  }
-  else
-  {
-    edtUin = NULL;
-    toplay->addWidget(lblUin);
-    QString userName;
-    ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
-    if (u != NULL) {
-       //QTextCodec *codec = UserCodec::codecForICQUser(u);
-       userName = QString("%1 (%2)").arg(QString::fromUtf8(u->GetAlias())).arg(m_nUin);
-       gUserManager.DropUser(u);
-    } else {
-       userName = QString::number(m_nUin);
-    }
-
-    if (bGrant)
-      lblUin->setText(tr("Grant authorization to %1").arg(userName));
-    else
-      lblUin->setText(tr("Refuse authorization to %1").arg(userName));
-  }
-
-  toplay->addSpacing(6);
-
-  grpResponse = new QVGroupBox(tr("Response"), this);
-  toplay->addWidget(grpResponse);
-  toplay->setStretchFactor(grpResponse, 2);
-
-  mleResponse = new MLEditWrap(true, grpResponse);
-
-  QBoxLayout* lay = new QHBoxLayout(toplay);
-  lay->addStretch(1);
-  btnOk = new QPushButton(tr("&Ok"), this);
-  btnOk->setMinimumWidth(75);
-  lay->addWidget(btnOk);
-  btnCancel = new QPushButton(tr("&Cancel"), this);
-  btnCancel->setMinimumWidth(75);
-  lay->addWidget(btnCancel);
-  connect (mleResponse, SIGNAL(signal_CtrlEnterPressed()), this, SLOT(ok()));
-  connect (btnOk, SIGNAL(clicked()), SLOT(ok()) );
-  connect (btnCancel, SIGNAL(clicked()), SLOT(close()) );
-
-  if (m_nUin)
-    mleResponse->setFocus();
-  else
-    edtUin->setFocus();
-
-  show();
-}
-
 void AuthUserDlg::ok()
 {
   if (edtUin != NULL)
-  {
     if (edtUin->text().isEmpty()) return;
-    m_nUin = edtUin->text().toULong();
-  }
 
   if (m_szId == 0) m_szId = strdup(edtUin->text().latin1());

trunk/qt-gui/src/authuserdlg.h

@@ -35 +35 @@
    Q_OBJECT
 public:
-   AuthUserDlg (CICQDaemon *s, unsigned long nUin, bool bGrant,
-      QWidget *parent = 0);
    AuthUserDlg (CICQDaemon *s, const char *szId, unsigned long nPPID,
       bool bGrant, QWidget *parent = 0);
@@ -48 +46 @@
    MLEditWrap* mleResponse;
 
-   unsigned long m_nUin;
    char *m_szId;
    unsigned long m_nPPID;

trunk/qt-gui/src/awaymsgdlg.cpp

@@ -338 +338 @@
 }
 
-CustomAwayMsgDlg::CustomAwayMsgDlg(unsigned long nUin, QWidget *parent)
-    : LicqDialog(parent, "CustomAwayMessageDialog", false, WDestructiveClose)
-{
-  m_nUin = nUin;
-
-  QBoxLayout* top_lay = new QVBoxLayout(this, 10);
-
-  mleAwayMsg = new MLEditWrap(true, this);
-  connect(mleAwayMsg, SIGNAL(signal_CtrlEnterPressed()), this, SLOT(slot_ok()));
-  top_lay->addWidget(mleAwayMsg);
-
-  QBoxLayout* l = new QHBoxLayout(top_lay, 10);
-
-  int bw = 75;
-  QPushButton *btnHints = new QPushButton(tr("&Hints"), this);
-  connect(btnHints, SIGNAL(clicked()), SLOT(slot_hints()));
-  QPushButton *btnOk = new QPushButton(tr("&Ok"), this );
-  btnOk->setDefault(true);
-  connect( btnOk, SIGNAL(clicked()), SLOT(slot_ok()) );
-  QPushButton *btnClear = new QPushButton(tr("&Clear"), this );
-  connect( btnClear, SIGNAL(clicked()), SLOT(slot_clear()) );
-  QPushButton *btnCancel = new QPushButton(tr("&Cancel"), this );
-  connect( btnCancel, SIGNAL(clicked()), SLOT(close()) );
-  bw = QMAX(bw, btnOk->sizeHint().width());
-  bw = QMAX(bw, btnClear->sizeHint().width());
-  bw = QMAX(bw, btnCancel->sizeHint().width());
-  bw = QMAX(bw, btnHints->sizeHint().width());
-  btnOk->setFixedWidth(bw);
-  btnClear->setFixedWidth(bw);
-  btnCancel->setFixedWidth(bw);
-  btnHints->setFixedWidth(bw);
-
-  l->addStretch(1);
-  l->addSpacing(30);
-  l->addWidget(btnHints);
-  l->addSpacing(20);
-  l->addWidget(btnOk);
-  l->addWidget(btnClear);
-  l->addWidget(btnCancel);
-
-  ICQUser *u = gUserManager.FetchUser(m_nUin, LOCK_R);
-  setCaption(QString(tr("Set Custom Auto Response for %1"))
-             .arg(QString::fromUtf8(u->GetAlias())));
-  if (*u->CustomAutoResponse())
-    mleAwayMsg->setText(QString::fromLocal8Bit(u->CustomAutoResponse()));
-  else if (u->StatusToUser() != ICQ_STATUS_OFFLINE)
-    mleAwayMsg->setText(tr("I am currently %1.\nYou can leave me a message.")
-                        .arg(Strings::getStatus(u->StatusToUser(), false)));
-
-  gUserManager.DropUser(u);
-
-  mleAwayMsg->setFocus();
-  QTimer::singleShot(0, mleAwayMsg, SLOT(selectAll()));
-
-  show();
-}
-
-
-// -----------------------------------------------------------------------------
 void CustomAwayMsgDlg::slot_hints()
 {

trunk/qt-gui/src/awaymsgdlg.h

@@ -65 +65 @@
   Q_OBJECT
 public:
-  CustomAwayMsgDlg(unsigned long, QWidget *parent = 0);
   CustomAwayMsgDlg(const char *, unsigned long, QWidget *parent = 0);
 
 protected:
   MLEditWrap *mleAwayMsg;
-  unsigned long m_nUin;
   char *m_szId;
   unsigned long m_nPPID;

trunk/qt-gui/src/ewidgets.cpp

@@ -836 +836 @@
     addMsg(newEventList[i]);
 */
-}
-
-CMessageViewWidget::CMessageViewWidget(unsigned long _nUin, CMainWindow *m, QWidget *parent, const char *name, bool historyMode)
-  : MLView(parent,name)
-{
-  setTextFormat(RichText);
-  m_nUin= _nUin;
-  m_szId = NULL; // avoid desalocation error at destructor
-  if (historyMode)
-  {
-    m_useBuffer = true;
-    m_nMsgStyle = m->m_histMsgStyle;
-    m_nDateFormat = m->m_histDateFormat;
-    m_extraSpacing = m->m_histVertSpacing;
-    m_appendLineBreak = false;
-  }
-  else
-  {
-    m_useBuffer = false;
-    m_nMsgStyle = m->m_chatMsgStyle;
-    m_nDateFormat = m->m_chatDateFormat;
-    m_extraSpacing = m->m_chatVertSpacing;
-    m_appendLineBreak = m->m_chatAppendLineBreak;
-  }
-  m_showNotices = m->m_showNotices;
-  m_colorRcv = m->m_colorRcv;
-  m_colorSnt = m->m_colorSnt;
-  m_colorRcvHistory = m->m_colorRcvHistory;
-  m_colorSntHistory = m->m_colorSntHistory;
-  m_colorNotice = m->m_colorNotice;
-  setPaletteBackgroundColor(m->m_colorChatBkg);
-  mainwin = m;
-
-  clear();
-
-/*
-  // add all unread messages.
-  vector<CUserEvent*> newEventList;
-  ICQUser *u = gUserManager.FetchUser(_nUin, LOCK_W);
-  if (u != NULL && u->NewMessages() > 0)
-  {
-    for (unsigned short i = 0; i < u->NewMessages(); i++)
-    {
-      CUserEvent *e = u->EventPeek(i);
-      if (e->Direction() == D_RECEIVER && e->SubCommand() == ICQ_CMDxSUB_MSG)
-    newEventList.push_back(e);
-    }
-  }
-  gUserManager.DropUser(u);
-  for (unsigned short i = 0; i < newEventList.size(); i++)
-    addMsg(newEventList[i]); */
 }
 

trunk/qt-gui/src/ewidgets.h

@@ -222 +222 @@
   char *m_szId;
   unsigned long m_nPPID;
-  unsigned long m_nUin;
   CMainWindow *mainwin;
 public:
@@ -229 +228 @@
   CMessageViewWidget(const char *szId, unsigned long nPPID,
     CMainWindow *m, QWidget *parent = 0, const char *name = 0, bool historyMode = false);
-  CMessageViewWidget(unsigned long _nUin, CMainWindow *m,
-    QWidget* parent = 0, const char *name = 0, bool historyMode = false);
   virtual ~CMessageViewWidget();
 

trunk/qt-gui/src/filedlg.cpp

@@ -143 +143 @@
   #endif
 }
-
-CFileDlg::CFileDlg(unsigned long _nUin, CICQDaemon *daemon, QWidget* parent)
-  : QWidget(parent, "FileDialog", WDestructiveClose)
-{
-  // If we are the server, then we are receiving a file
-  m_nUin = _nUin;
-  licqDaemon = daemon;
-
-  setCaption(tr("Licq - File Transfer (%1)").arg(m_nUin));
-
-  unsigned short CR = 0;
-  QGridLayout* lay = new QGridLayout(this, 8, 3, 8, 8);
-  lay->setColStretch(1, 2);
-
-  lblTransferFileName = new QLabel(tr("Current:"), this);
-  lay->addWidget(lblTransferFileName, CR, 0);
-  nfoTransferFileName = new CInfoField(this, true);
-  nfoTransferFileName->setMinimumWidth(nfoTransferFileName->sizeHint().width()*2);
-  lay->addWidget(nfoTransferFileName, CR, 1);
-  nfoTotalFiles = new CInfoField(this, true);
-  nfoTotalFiles->setMinimumWidth((nfoTotalFiles->sizeHint().width()*3)/2);
-  lay->addWidget(nfoTotalFiles, CR, 2);
-
-  lblLocalFileName = new QLabel(tr("File name:"), this);
-  lay->addWidget(lblLocalFileName, ++CR, 0);
-  nfoLocalFileName = new CInfoField(this, true);
-  lay->addMultiCellWidget(nfoLocalFileName, CR, CR, 1, 2);
-
-  lay->addRowSpacing(++CR, 10);
-
-  // Information stuff about the current file
-  lblTrans = new QLabel(tr("File:"), this);
-  lay->addWidget(lblTrans, ++CR, 0);
-  barTransfer = new QProgressBar(this);
-  lay->addWidget(barTransfer, CR, 1);
-  nfoFileSize = new CInfoField(this, true);
-  lay->addWidget(nfoFileSize, CR, 2);
-
-  // Information about the batch file transfer
-  lblBatch = new QLabel(tr("Batch:"), this);
-  lay->addWidget(lblBatch, ++CR, 0);
-  barBatchTransfer = new QProgressBar(this);
-  lay->addWidget(barBatchTransfer, CR, 1);
-  nfoBatchSize = new CInfoField(this, true);
-  lay->addWidget(nfoBatchSize, CR, 2);
-
-  lblTime = new QLabel(tr("Time:"), this);
-  lay->addWidget(lblTime, ++CR, 0);
-
-  QHBox* hbox = new QHBox(this);
-  hbox->setSpacing(8);
-  lay->addMultiCellWidget(hbox, CR, CR, 0, 1);
-  nfoTime = new CInfoField(hbox, true);
-  nfoBPS = new CInfoField(hbox, true);
-  lblETA = new QLabel(tr("ETA:"), hbox);
-  nfoETA = new CInfoField(this, true);
-  lay->addWidget(nfoETA, CR++, 2);
-  lay->addRowSpacing(++CR, 10);
-
-  mleStatus = new MLEditWrap(true, this);
-  ++CR;
-  lay->addMultiCellWidget(mleStatus, CR, CR, 0, 2);
-  mleStatus->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
-
-  lay->setRowStretch(++CR, 3);
-
-  hbox = new QHBox(this);
-  hbox->setSpacing(8);
-  lay->addMultiCellWidget(hbox, CR, CR, 0, 2);
-  
-  btnCancel = new QPushButton(tr("&Cancel Transfer"), hbox);
-  btnCancel->setMinimumWidth(75);
-  connect(btnCancel, SIGNAL(clicked()), this, SLOT(close()));
-
-  ftman = new CFileTransferManager(licqDaemon, m_nUin);
-  ftman->SetUpdatesEnabled(2);
-  sn = new QSocketNotifier(ftman->Pipe(), QSocketNotifier::Read);
-  connect(sn, SIGNAL(activated(int)), SLOT(slot_ft()));
-
-  #ifdef USE_KDE
-    btnOpen = new QPushButton(tr("&Open"), hbox);
-    btnOpenDir = new QPushButton(tr("O&pen Dir"), hbox);
-    btnOpen->hide();
-    btnOpenDir->hide();
-    connect(btnOpen, SIGNAL(clicked()), SLOT(slot_open()));
-    connect(btnOpenDir, SIGNAL(clicked()), SLOT(slot_opendir()));
-  #else
-    btnOpen = 0;
-    btnOpenDir = 0;
-  #endif
-}
-
 
 //-----Destructor---------------------------------------------------------------

trunk/qt-gui/src/filedlg.h

@@ -39 +39 @@
    Q_OBJECT
 public:
-  CFileDlg(unsigned long _nUin, CICQDaemon *daemon, QWidget* parent = 0);
   CFileDlg(const char *szId, unsigned long nPPID, CICQDaemon *daemon,
     QWidget *parent = 0);
@@ -50 +49 @@
   char *Id()  { return m_szId; }
   unsigned long PPID()  { return m_nPPID; }
-  unsigned long Uin()  { return m_nUin; };
 
 protected:
@@ -69 +67 @@
    CFileTransferManager *ftman;
 
-   unsigned long m_nUin;
    char *m_szId;
    unsigned long m_nPPID;

trunk/qt-gui/src/mainwin.cpp

@@ -4683 +4683 @@
 void CMainWindow::showAuthUserDlg()
 {
-  (void) new AuthUserDlg(licqDaemon, 0, true);
+  (void) new AuthUserDlg(licqDaemon, NULL, 0, true);
 }
 

trunk/qt-gui/src/optionsdlg.cpp

@@ -1697 +1697 @@
   lay->addWidget(tabViewer);
 
-  msgChatViewer = new CMessageViewWidget(0, gMainWindow, tabViewer);
+  msgChatViewer = new CMessageViewWidget(NULL, 0, gMainWindow, tabViewer);
   tabViewer->insertTab(msgChatViewer, "Marge");
 
-  msgHistViewer = new CMessageViewWidget(0, gMainWindow, tabViewer, 0, true);
+  msgHistViewer = new CMessageViewWidget(NULL, 0, gMainWindow, tabViewer, 0, true);
   tabViewer->insertTab(msgHistViewer, tr("History"));
 

trunk/qt-gui/src/refusedlg.cpp

@@ -64 +64 @@
 }
 
-CRefuseDlg::CRefuseDlg(unsigned long _nUin, QString t, QWidget* parent)
-   : LicqDialog(parent, "RefuseDialog", true)
-{
-  ICQUser *u = gUserManager.FetchUser(_nUin, LOCK_R);
-  QLabel *lbl = new QLabel(tr("Refusal message for %1 with ").arg(t) + QString::fromUtf8(u->GetAlias()) + ":", this);
-  gUserManager.DropUser(u);
-
-  mleRefuseMsg = new MLEditWrap(true, this);
-
-  QPushButton *btnRefuse = new QPushButton(tr("Refuse"), this );
-  connect( btnRefuse, SIGNAL(clicked()), SLOT(accept()) );
-  QPushButton *btnCancel = new QPushButton(tr("Cancel"), this );
-  connect( btnCancel, SIGNAL(clicked()), SLOT(reject()) );
-  int bw = 75;
-  bw = QMAX(bw, btnRefuse->sizeHint().width());
-  bw = QMAX(bw, btnCancel->sizeHint().width());
-  btnRefuse->setFixedWidth(bw);
-  btnCancel->setFixedWidth(bw);
-
-  QGridLayout *lay = new QGridLayout(this, 3, 5, 15, 10);
-  lay->addMultiCellWidget(lbl, 0, 0, 0, 4);
-  lay->addMultiCellWidget(mleRefuseMsg, 1, 1, 0, 4);
-  lay->addWidget(btnRefuse, 2, 1);
-  lay->addWidget(btnCancel, 2, 3);
-  lay->setColStretch(0, 2);
-  lay->setColStretch(4, 2);
-  lay->addColSpacing(2, 10);
-
-  setCaption(tr("Licq %1 Refusal").arg(t));
-}
-
-
 QString CRefuseDlg::RefuseMessage()
 {

trunk/qt-gui/src/refusedlg.h

@@ -30 +30 @@
 
 public:
-  CRefuseDlg(unsigned long _nUin, QString t, QWidget *parent = 0);
   CRefuseDlg(const char *, unsigned long, QString, QWidget * = 0);
   QString RefuseMessage();

trunk/qt-gui/src/showawaymsgdlg.cpp

@@ -102 +102 @@
 }
 
-ShowAwayMsgDlg::ShowAwayMsgDlg(CICQDaemon *_server, CSignalManager* _sigman, unsigned long _nUin, QWidget *parent)
-{
-  char szUin[13];
-  snprintf(szUin, 12, "%lu", _nUin);
-  szUin[12] = 0;
-  
-  ShowAwayMsgDlg(_server, _sigman, szUin, LICQ_PPID, parent);
-}
-
-
-// -----------------------------------------------------------------------------
-
 ShowAwayMsgDlg::~ShowAwayMsgDlg()
 {

trunk/qt-gui/src/showawaymsgdlg.h

@@ -38 +38 @@
   Q_OBJECT
 public:
-  ShowAwayMsgDlg(CICQDaemon *_server, CSignalManager* _sigman,
-                 unsigned long _nUin, QWidget *parent = 0);
   ShowAwayMsgDlg(CICQDaemon *_server, CSignalManager *_sigman,
                  const char *szId, unsigned long nPPID,
@@ -46 +44 @@
 
 protected:
-  unsigned long m_nUin;
   char *m_szId;
   unsigned long m_nPPID;