From 43ac1dfd0dfb89fcdc2b410b9cbab2966ed75b15 Mon Sep 17 00:00:00 2001 From: dubslow Date: Fri, 17 Oct 2014 22:59:59 -0500 Subject: [PATCH] add ui for auto accept; fixes #182 and #280 --- src/misc/settings.cpp | 7 +++++-- src/widget/friendwidget.cpp | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/misc/settings.cpp b/src/misc/settings.cpp index 1d201ff96..de84e7a3c 100644 --- a/src/misc/settings.cpp +++ b/src/misc/settings.cpp @@ -496,9 +496,12 @@ QString Settings::getAutoAcceptDir(const QString& id) const return autoAccept.value(id.left(TOX_ID_PUBLIC_KEY_LENGTH)); } -void Settings::setAutoAcceptDir(const QString&id, const QString& dir) +void Settings::setAutoAcceptDir(const QString& id, const QString& dir) { - autoAccept[id.left(TOX_ID_PUBLIC_KEY_LENGTH)] = dir; + if (dir.isEmpty()) + autoAccept.remove(id.left(TOX_ID_PUBLIC_KEY_LENGTH)); + else + autoAccept[id.left(TOX_ID_PUBLIC_KEY_LENGTH)] = dir; } void Settings::setWidgetData(const QString& uniqueName, const QByteArray& data) diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp index 9c320c767..3a584c6f3 100644 --- a/src/widget/friendwidget.cpp +++ b/src/widget/friendwidget.cpp @@ -25,12 +25,15 @@ #include "maskablepixmapwidget.h" #include "croppinglabel.h" #include "src/misc/style.h" +#include "src/misc/settings.h" #include #include #include #include #include #include +#include +#include FriendWidget::FriendWidget(int FriendId, QString id) : friendId(FriendId) @@ -44,6 +47,8 @@ FriendWidget::FriendWidget(int FriendId, QString id) void FriendWidget::contextMenuEvent(QContextMenuEvent * event) { QPoint pos = event->globalPos(); + QString id = Core::getInstance()->getFriendAddress(friendId); + QString dir = Settings::getInstance().getAutoAcceptDir(id); QMenu menu; QAction* copyId = menu.addAction(tr("Copy friend ID","Menu to copy the Tox ID of that friend")); QMenu* inviteMenu = menu.addMenu(tr("Invite in group","Menu to invite a friend in a groupchat")); @@ -55,6 +60,10 @@ void FriendWidget::contextMenuEvent(QContextMenuEvent * event) } if (groupActions.isEmpty()) inviteMenu->setEnabled(false); + QAction* autoAccept = menu.addAction(tr("Auto accept files from this friend", "context menu entry")); + QAction* disableAutoAccept = menu.addAction(tr("Diasble auto accepting files", "context menu entry")); + if (dir.isEmpty()) + disableAutoAccept->setEnabled(false); menu.addSeparator(); QAction* removeFriendAction = menu.addAction(tr("Remove friend", "Menu to remove the friend from our friendlist")); @@ -74,6 +83,21 @@ void FriendWidget::contextMenuEvent(QContextMenuEvent * event) emit removeFriend(friendId); return; } + else if (selectedItem == autoAccept) + { + if (dir.isEmpty()) + dir = QDir::homePath(); + dir = QFileDialog::getExistingDirectory(0, tr("Choose an auto accept directory","popup title"), dir); + if (!dir.isEmpty()) + { + qDebug() << "FriendWidget: setting auto accept dir for" << friendId << "to" << dir; + Settings::getInstance().setAutoAcceptDir(id, dir); + } + } + else if (selectedItem == disableAutoAccept) + { + Settings::getInstance().setAutoAcceptDir(id, ""); + } else if (groupActions.contains(selectedItem)) { Group* group = groupActions[selectedItem];