pidgin/quail/quail-redux

Improve the dialogs to have ok cancel buttons, add chat names to the buddy list

2013-08-30, Phil Hannent
b57337fa2d7b
Parents 298217b3f296
Children f1c155873c69777509d81ef21ef97abc822a
Improve the dialogs to have ok cancel buttons, add chat names to the buddy list
6 files changed, 80 insertions(+), 19 deletions(-)
  • +2 -2
    src/QuailBListWindow.cpp
  • +4 -1
    src/QuailBlistItem.cpp
  • +1 -1
    src/QuailConvWindow.cpp
  • +47 -4
    src/QuailDialogs.cpp
  • +25 -10
    src/QuailDialogs.h
  • +1 -1
    src/QuailNotify.cpp
    • --- a/src/QuailBListWindow.cpp Fri Aug 30 09:04:26 2013 +0100
    +++ b/src/QuailBListWindow.cpp Fri Aug 30 09:43:23 2013 +0100
    @@ -420,7 +420,7 @@
    if (group != NULL)
    dialog->setGroup(group->name);
    - dialog->showMaximized();
    + dialog->show();
    }
    void
    @@ -461,8 +461,8 @@
    if (group != NULL)
    dialog->setGroup(group->name);
    + dialog->show();
    - dialog->showMaximized();
    }
    void
    QQuailBListWindow::showAddChat()
    --- a/src/QuailBlistItem.cpp Fri Aug 30 09:04:26 2013 +0100
    +++ b/src/QuailBlistItem.cpp Fri Aug 30 09:43:23 2013 +0100
    @@ -175,9 +175,12 @@
    {
    qDebug() << "QQuailBListItem::updateInfo.Chat";
    PurpleChat *chat = (PurpleChat *)node;
    + QString chatName = chat->alias;
    + if (chatName.isEmpty())
    + chatName = QString::fromStdString(purple_chat_get_name(chat));
    setIcon(1, QIcon(QQuailProtocolUtils::getProtocolIcon(chat->account)));
    - setText(1, chat->alias);
    + setText(1, chatName);
    }
    else if (PURPLE_BLIST_NODE_IS_GROUP(node))
    {
    --- a/src/QuailConvWindow.cpp Fri Aug 30 09:04:26 2013 +0100
    +++ b/src/QuailConvWindow.cpp Fri Aug 30 09:43:23 2013 +0100
    @@ -1012,7 +1012,7 @@
    // dialog->setScreenName(purple_conversation_get_name(conv));
    // dialog->setAccount(purple_conversation_get_account(conv));
    -// dialog->showMaximized();
    +// dialog->show();
    // }
    // else
    // {
    --- a/src/QuailDialogs.cpp Fri Aug 30 09:04:26 2013 +0100
    +++ b/src/QuailDialogs.cpp Fri Aug 30 09:43:23 2013 +0100
    @@ -47,11 +47,16 @@
    return text;
    }
    +QuailDialog::QuailDialog(QWidget *parent) :
    + QDialog(parent)
    +{
    +}
    +
    /**************************************************************************
    * QQuailAddBuddyDialog
    **************************************************************************/
    QQuailAddBuddyDialog::QQuailAddBuddyDialog(QWidget *parent)
    - : QDialog(parent)
    + : QuailDialog(parent)
    {
    buildInterface();
    }
    @@ -133,6 +138,19 @@
    spacer = new QLabel("");
    vbox->addWidget(spacer);
    vbox->setStretchFactor(spacer, 1);
    +
    + QHBoxLayout *hbox = new QHBoxLayout(this);
    + okButton = new QPushButton(this);
    + okButton->setText(tr("Join"));
    + connect(okButton, SIGNAL(released()), this, SLOT(accept()));
    + hbox->addWidget(okButton);
    +
    + cancelButton = new QPushButton(this);
    + cancelButton->setText(tr("Cancel"));
    + connect(cancelButton, SIGNAL(released()), this, SLOT(close()));
    + hbox->addWidget(cancelButton);
    + vbox->addLayout(hbox);
    +
    }
    void
    @@ -206,7 +224,7 @@
    * QQuailAddChatDialog
    **************************************************************************/
    QQuailAddChatDialog::QQuailAddChatDialog(QWidget *parent)
    - : QDialog(parent)
    + : QuailDialog(parent)
    {
    buildInterface();
    }
    @@ -283,6 +301,18 @@
    vbox->addWidget(spacer);
    vbox->setStretchFactor(spacer, 1);
    + QHBoxLayout *hbox = new QHBoxLayout(this);
    + okButton = new QPushButton(this);
    + okButton->setText(tr("Join"));
    + connect(okButton, SIGNAL(released()), this, SLOT(accept()));
    + hbox->addWidget(okButton);
    +
    + cancelButton = new QPushButton(this);
    + cancelButton->setText(tr("Cancel"));
    + connect(cancelButton, SIGNAL(released()), this, SLOT(close()));
    + hbox->addWidget(cancelButton);
    + vbox->addLayout(hbox);
    +
    rebuildWidgetsFrame();
    }
    @@ -445,7 +475,7 @@
    * QQuailNewImDialog
    **************************************************************************/
    QQuailNewImDialog::QQuailNewImDialog(QWidget *parent)
    - : QDialog(parent)
    + : QuailDialog(parent)
    {
    buildInterface();
    }
    @@ -500,6 +530,19 @@
    spacer = new QLabel();
    vbox->addWidget(spacer);
    vbox->setStretchFactor(spacer, 1);
    +
    + QHBoxLayout *hbox = new QHBoxLayout(this);
    + okButton = new QPushButton(this);
    + okButton->setText(tr("Join"));
    + connect(okButton, SIGNAL(released()), this, SLOT(accept()));
    + hbox->addWidget(okButton);
    +
    + cancelButton = new QPushButton(this);
    + cancelButton->setText(tr("Cancel"));
    + connect(cancelButton, SIGNAL(released()), this, SLOT(close()));
    + hbox->addWidget(cancelButton);
    + vbox->addLayout(hbox);
    +
    }
    void
    @@ -538,7 +581,7 @@
    * QQuailJoinChatDialog
    **************************************************************************/
    QQuailJoinChatDialog::QQuailJoinChatDialog(QWidget *parent)
    - : QDialog(parent)
    + : QuailDialog(parent)
    {
    buildInterface();
    --- a/src/QuailDialogs.h Fri Aug 30 09:04:26 2013 +0100
    +++ b/src/QuailDialogs.h Fri Aug 30 09:43:23 2013 +0100
    @@ -34,12 +34,29 @@
    class QLabel;
    class QLineEdit;
    -class QQuailAddBuddyDialog : public QDialog
    +class QuailDialog : public QDialog
    +{
    + Q_OBJECT
    +
    +public:
    + QuailDialog(QWidget *parent = 0);
    +
    +protected:
    + virtual void buildInterface() = 0;
    +
    + QPushButton *okButton;
    + QPushButton *cancelButton;
    +protected slots:
    + virtual void accept() = 0;
    +
    +};
    +
    +class QQuailAddBuddyDialog : public QuailDialog
    {
    Q_OBJECT
    public:
    - QQuailAddBuddyDialog(QWidget *parent = NULL);
    + QQuailAddBuddyDialog(QWidget *parent = 0);
    void setScreenName(const QString &screenName);
    void setAlias(const QString &alias);
    @@ -60,12 +77,12 @@
    QQuailAccountBox *accountCombo;
    };
    -class QQuailAddChatDialog : public QDialog
    +class QQuailAddChatDialog : public QuailDialog
    {
    Q_OBJECT
    public:
    - QQuailAddChatDialog(QWidget *parent = NULL);
    + QQuailAddChatDialog(QWidget *parent = 0);
    void setAlias(const QString &alias);
    void setGroup(const QString &group);
    @@ -92,12 +109,12 @@
    QList<QWidget*> widgets;
    };
    -class QQuailNewImDialog : public QDialog
    +class QQuailNewImDialog : public QuailDialog
    {
    Q_OBJECT
    public:
    - QQuailNewImDialog(QWidget *parent = NULL);
    + QQuailNewImDialog(QWidget *parent = 0);
    void setScreenName(const QString &screenName);
    void setAccount(PurpleAccount *account);
    @@ -113,12 +130,12 @@
    QQuailAccountBox *accountCombo;
    };
    -class QQuailJoinChatDialog : public QDialog
    +class QQuailJoinChatDialog : public QuailDialog
    {
    Q_OBJECT
    public:
    - QQuailJoinChatDialog(QWidget *parent = NULL);
    + QQuailJoinChatDialog(QWidget *parent = 0);
    void setAccount(PurpleAccount *account);
    @@ -136,8 +153,6 @@
    QFrame *widgetsFrame;
    QList<QWidget*> labels;
    QList<QWidget*> widgets;
    - QPushButton *okButton;
    - QPushButton *cancelButton;
    };
    #endif /* _QUAIL_DIALOGS_H_ */
    --- a/src/QuailNotify.cpp Fri Aug 30 09:04:26 2013 +0100
    +++ b/src/QuailNotify.cpp Fri Aug 30 09:43:23 2013 +0100
    @@ -189,7 +189,7 @@
    layout->addWidget(textview);
    textview->setText(text);
    - dialog->showMaximized();
    + dialog->show();
    return NULL;
    }