mirror of https://github.com/qTox/qTox.git
Browse Source
That pull request made qTox crash in a number of ways, with no quick fix available. Hopefully there will be a way to fix crash, so that this commit could be reverted, and fix applied.pull/2151/merge
Zetok Zalbavar
10 years ago
14 changed files with 32 additions and 613 deletions
@ -1,155 +0,0 @@ |
|||||||
/*
|
|
||||||
Copyright © 2015 by The qTox Project |
|
||||||
|
|
||||||
This file is part of qTox, a Qt-based graphical interface for Tox. |
|
||||||
|
|
||||||
qTox is libre software: you can redistribute it and/or modify |
|
||||||
it under the terms of the GNU General Public License as published by |
|
||||||
the Free Software Foundation, either version 3 of the License, or |
|
||||||
(at your option) any later version. |
|
||||||
|
|
||||||
qTox is distributed in the hope that it will be useful, |
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||||
GNU General Public License for more details. |
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License |
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/ |
|
||||||
|
|
||||||
#include "groupinviteform.h" |
|
||||||
|
|
||||||
#include <tox/tox.h> |
|
||||||
#include <QSignalMapper> |
|
||||||
#include <QPushButton> |
|
||||||
#include <QBoxLayout> |
|
||||||
#include <QGroupBox> |
|
||||||
#include <QDateTime> |
|
||||||
#include <QLabel> |
|
||||||
#include "ui_mainwindow.h" |
|
||||||
#include "src/widget/tool/croppinglabel.h" |
|
||||||
#include "src/widget/translator.h" |
|
||||||
#include "src/nexus.h" |
|
||||||
#include "src/core/core.h" |
|
||||||
|
|
||||||
GroupInviteForm::GroupInviteForm() |
|
||||||
{ |
|
||||||
QVBoxLayout* layout = new QVBoxLayout(this); |
|
||||||
createButton = new QPushButton(this); |
|
||||||
connect(createButton, &QPushButton::released, [this]() |
|
||||||
{ |
|
||||||
emit groupCreate(TOX_GROUPCHAT_TYPE_AV); |
|
||||||
}); |
|
||||||
|
|
||||||
inviteBox = new QGroupBox(this); |
|
||||||
inviteLayout = new QVBoxLayout(inviteBox); |
|
||||||
inviteLayout->addStretch(1); |
|
||||||
|
|
||||||
layout->addWidget(createButton); |
|
||||||
layout->addWidget(inviteBox); |
|
||||||
|
|
||||||
QFont bold; |
|
||||||
bold.setBold(true); |
|
||||||
|
|
||||||
headLabel = new QLabel(this); |
|
||||||
headLabel->setFont(bold); |
|
||||||
headWidget = new QWidget(this); |
|
||||||
QHBoxLayout* headLayout = new QHBoxLayout(headWidget); |
|
||||||
headLayout->addWidget(headLabel); |
|
||||||
|
|
||||||
retranslateUi(); |
|
||||||
Translator::registerHandler(std::bind(&GroupInviteForm::retranslateUi, this), this); |
|
||||||
} |
|
||||||
|
|
||||||
void GroupInviteForm::show(Ui::MainWindow &ui) |
|
||||||
{ |
|
||||||
ui.mainContent->layout()->addWidget(this); |
|
||||||
ui.mainHead->layout()->addWidget(headWidget); |
|
||||||
QWidget::show(); |
|
||||||
headWidget->show(); |
|
||||||
} |
|
||||||
|
|
||||||
void GroupInviteForm::addGroupInvite(int32_t friendId, uint8_t type, QByteArray invite) |
|
||||||
{ |
|
||||||
QWidget* groupWidget = new QWidget(this); |
|
||||||
QHBoxLayout* groupLayout = new QHBoxLayout(groupWidget); |
|
||||||
|
|
||||||
CroppingLabel* groupLabel = new CroppingLabel(this); |
|
||||||
groupLabel->setText(tr("Invited by <b>%1</b> on %2.").arg(Nexus::getCore()->getFriendUsername(friendId), QDateTime::currentDateTime().toString())); |
|
||||||
groupLayout->addWidget(groupLabel); |
|
||||||
|
|
||||||
QPushButton* acceptButton = new QPushButton(this); |
|
||||||
acceptButtons.insert(acceptButton); |
|
||||||
connect(acceptButton, &QPushButton::released, this, &GroupInviteForm::onGroupInviteAccepted); |
|
||||||
groupLayout->addWidget(acceptButton); |
|
||||||
retranslateAcceptButton(acceptButton); |
|
||||||
|
|
||||||
QPushButton* rejectButton = new QPushButton(this); |
|
||||||
rejectButtons.insert(rejectButton); |
|
||||||
connect(rejectButton, &QPushButton::released, this, &GroupInviteForm::onGroupInviteRejected); |
|
||||||
groupLayout->addWidget(rejectButton); |
|
||||||
retranslateRejectButton(rejectButton); |
|
||||||
|
|
||||||
inviteLayout->insertWidget(0, groupWidget); |
|
||||||
|
|
||||||
GroupInvite group; |
|
||||||
group.friendId = friendId; |
|
||||||
group.type = type; |
|
||||||
group.invite = invite; |
|
||||||
groupInvites.push_front(group); |
|
||||||
|
|
||||||
if (isVisible()) |
|
||||||
emit groupInvitesSeen(); |
|
||||||
} |
|
||||||
|
|
||||||
void GroupInviteForm::showEvent(QShowEvent* event) |
|
||||||
{ |
|
||||||
QWidget::showEvent(event); |
|
||||||
emit groupInvitesSeen(); |
|
||||||
} |
|
||||||
|
|
||||||
void GroupInviteForm::onGroupInviteAccepted() |
|
||||||
{ |
|
||||||
QWidget* groupWidget = static_cast<QWidget*>(sender()); |
|
||||||
int index = inviteLayout->indexOf(groupWidget); |
|
||||||
GroupInvite invite = groupInvites.at(index); |
|
||||||
groupInvites.removeAt(index); |
|
||||||
|
|
||||||
groupWidget->deleteLater(); |
|
||||||
inviteLayout->removeWidget(groupWidget); |
|
||||||
|
|
||||||
emit groupInviteAccepted(invite.friendId, invite.type, invite.invite); |
|
||||||
} |
|
||||||
|
|
||||||
void GroupInviteForm::onGroupInviteRejected() |
|
||||||
{ |
|
||||||
QWidget* groupWidget = static_cast<QWidget*>(sender()); |
|
||||||
int index = inviteLayout->indexOf(groupWidget); |
|
||||||
groupInvites.removeAt(index); |
|
||||||
|
|
||||||
groupWidget->deleteLater(); |
|
||||||
inviteLayout->removeWidget(groupWidget); |
|
||||||
} |
|
||||||
|
|
||||||
void GroupInviteForm::retranslateUi() |
|
||||||
{ |
|
||||||
headLabel->setText(tr("Groups")); |
|
||||||
createButton->setText(tr("Create new group")); |
|
||||||
inviteBox->setTitle(tr("Group invites")); |
|
||||||
|
|
||||||
for (QPushButton* acceptButton : acceptButtons) |
|
||||||
retranslateAcceptButton(acceptButton); |
|
||||||
|
|
||||||
for (QPushButton* rejectButton : rejectButtons) |
|
||||||
retranslateRejectButton(rejectButton); |
|
||||||
} |
|
||||||
|
|
||||||
void GroupInviteForm::retranslateAcceptButton(QPushButton *acceptButton) |
|
||||||
{ |
|
||||||
acceptButton->setText(tr("Join")); |
|
||||||
} |
|
||||||
|
|
||||||
void GroupInviteForm::retranslateRejectButton(QPushButton *rejectButton) |
|
||||||
{ |
|
||||||
rejectButton->setText(tr("Decline")); |
|
||||||
} |
|
||||||
@ -1,78 +0,0 @@ |
|||||||
/*
|
|
||||||
Copyright © 2015 by The qTox Project |
|
||||||
|
|
||||||
This file is part of qTox, a Qt-based graphical interface for Tox. |
|
||||||
|
|
||||||
qTox is libre software: you can redistribute it and/or modify |
|
||||||
it under the terms of the GNU General Public License as published by |
|
||||||
the Free Software Foundation, either version 3 of the License, or |
|
||||||
(at your option) any later version. |
|
||||||
|
|
||||||
qTox is distributed in the hope that it will be useful, |
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||||
GNU General Public License for more details. |
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License |
|
||||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/ |
|
||||||
|
|
||||||
#ifndef GROUPINVITEFORM_H |
|
||||||
#define GROUPINVITEFORM_H |
|
||||||
|
|
||||||
#include <QWidget> |
|
||||||
#include <QSet> |
|
||||||
|
|
||||||
class QLabel; |
|
||||||
class QVBoxLayout; |
|
||||||
class QPushButton; |
|
||||||
class QGroupBox; |
|
||||||
class QSignalMapper; |
|
||||||
|
|
||||||
namespace Ui {class MainWindow;} |
|
||||||
|
|
||||||
class GroupInviteForm : public QWidget |
|
||||||
{ |
|
||||||
Q_OBJECT |
|
||||||
public: |
|
||||||
GroupInviteForm(); |
|
||||||
|
|
||||||
void show(Ui::MainWindow &ui); |
|
||||||
void addGroupInvite(int32_t friendId, uint8_t type, QByteArray invite); |
|
||||||
|
|
||||||
signals: |
|
||||||
void groupCreate(uint8_t type); |
|
||||||
void groupInviteAccepted(int32_t friendId, uint8_t type, QByteArray invite); |
|
||||||
void groupInvitesSeen(); |
|
||||||
|
|
||||||
protected: |
|
||||||
void showEvent(QShowEvent* event) final override; |
|
||||||
|
|
||||||
private slots: |
|
||||||
void onGroupInviteAccepted(); |
|
||||||
void onGroupInviteRejected(); |
|
||||||
|
|
||||||
private: |
|
||||||
void retranslateUi(); |
|
||||||
void retranslateAcceptButton(QPushButton* acceptButton); |
|
||||||
void retranslateRejectButton(QPushButton* rejectButton); |
|
||||||
|
|
||||||
private: |
|
||||||
struct GroupInvite |
|
||||||
{ |
|
||||||
int32_t friendId; |
|
||||||
uint8_t type; |
|
||||||
QByteArray invite; |
|
||||||
}; |
|
||||||
|
|
||||||
QWidget* headWidget; |
|
||||||
QLabel* headLabel; |
|
||||||
QPushButton* createButton; |
|
||||||
QGroupBox* inviteBox; |
|
||||||
QVBoxLayout* inviteLayout; |
|
||||||
QSet<QPushButton*> acceptButtons; |
|
||||||
QSet<QPushButton*> rejectButtons; |
|
||||||
QList<GroupInvite> groupInvites; |
|
||||||
}; |
|
||||||
|
|
||||||
#endif // GROUPINVITEFORM_H
|
|
||||||
Loading…
Reference in new issue