StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6182

Browse Source 
bodwok (2):
      refactor: connection to parent method in toxuri.cpp
      refactor: connection to parent method in toxuri.cpp
This commit is contained in:
Anthony Bilinski 2020-07-04 16:52:36 -07:00
commit ede0418b4f
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
4 changed files with 2 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -460,8 +460,6 @@ set(${PROJECT_NAME}_SOURCES
src/widget/tool/croppinglabel.h src/widget/tool/croppinglabel.h
src/widget/tool/flyoutoverlaywidget.cpp src/widget/tool/flyoutoverlaywidget.cpp
src/widget/tool/flyoutoverlaywidget.h src/widget/tool/flyoutoverlaywidget.h
src/widget/tool/friendrequestdialog.cpp
src/widget/tool/friendrequestdialog.h
src/widget/tool/identicon.cpp src/widget/tool/identicon.cpp
src/widget/tool/identicon.h src/widget/tool/identicon.h
src/widget/tool/movablewidget.cpp src/widget/tool/movablewidget.cpp

5
src/net/toxuri.cpp
View File

@ -20,7 +20,6 @@
#include "src/net/toxuri.h" #include "src/net/toxuri.h"
#include "src/core/core.h" #include "src/core/core.h"
#include "src/widget/gui.h" #include "src/widget/gui.h"
#include "src/widget/tool/friendrequestdialog.h"
#include <QByteArray> #include <QByteArray>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@ -100,8 +99,8 @@ ToxURIDialog::ToxURIDialog(QWidget* parent, Core& _core)
buttonBox->addButton(tr("Send", "Send a friend request"), QDialogButtonBox::AcceptRole); buttonBox->addButton(tr("Send", "Send a friend request"), QDialogButtonBox::AcceptRole);
buttonBox->addButton(tr("Cancel", "Don't send a friend request"), QDialogButtonBox::RejectRole); buttonBox->addButton(tr("Cancel", "Don't send a friend request"), QDialogButtonBox::RejectRole);
connect(buttonBox, &QDialogButtonBox::accepted, this, &FriendRequestDialog::accept); connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &FriendRequestDialog::reject); connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
QVBoxLayout* layout = new QVBoxLayout(this); QVBoxLayout* layout = new QVBoxLayout(this);

66
src/widget/tool/friendrequestdialog.cpp
View File

@ -1,66 +0,0 @@
/*
Copyright © 2013 by Maxim Biro <nurupo.contributions@gmail.com>
Copyright © 2014-2019 by The qTox Project Contributors
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 "friendrequestdialog.h"
#include <QDialogButtonBox>
#include <QLabel>
#include <QLineEdit>
#include <QPlainTextEdit>
#include <QPushButton>
#include <QVBoxLayout>
FriendRequestDialog::FriendRequestDialog(QWidget* parent, const QString& userId, const QString& message)
: QDialog(parent)
{
setAttribute(Qt::WA_QuitOnClose, false);
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowTitle(tr("Friend request", "Title of the window to aceept/deny a friend request"));
QLabel* friendsLabel = new QLabel(tr("Someone wants to add you as a friend"), this);
QLabel* userIdLabel = new QLabel(tr("User ID:"), this);
QLineEdit* userIdEdit = new QLineEdit(userId, this);
userIdEdit->setCursorPosition(0);
userIdEdit->setReadOnly(true);
QLabel* messageLabel = new QLabel(tr("Friend request message:"), this);
QPlainTextEdit* messageEdit = new QPlainTextEdit(message, this);
messageEdit->setReadOnly(true);
QDialogButtonBox* buttonBox = new QDialogButtonBox(Qt::Horizontal, this);
buttonBox->addButton(tr("Accept", "Accept a friend request"), QDialogButtonBox::AcceptRole);
buttonBox->addButton(tr("Reject", "Reject a friend request"), QDialogButtonBox::RejectRole);
connect(buttonBox, &QDialogButtonBox::accepted, this, &FriendRequestDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &FriendRequestDialog::reject);
QVBoxLayout* layout = new QVBoxLayout(this);
layout->addWidget(friendsLabel);
layout->addSpacing(12);
layout->addWidget(userIdLabel);
layout->addWidget(userIdEdit);
layout->addWidget(messageLabel);
layout->addWidget(messageEdit);
layout->addWidget(buttonBox);
resize(300, 200);
}

30
src/widget/tool/friendrequestdialog.h
View File

@ -1,30 +0,0 @@
/*
Copyright © 2013 by Maxim Biro <nurupo.contributions@gmail.com>
Copyright © 2019 by The qTox Project Contributors
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/>.
*/
#pragma once
#include <QDialog>
class FriendRequestDialog : public QDialog
{
Q_OBJECT
public:
explicit FriendRequestDialog(QWidget* parent, const QString& userId, const QString& message);
};