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

Circle context menus

Browse Source
This commit is contained in:
Daniel Hrabovcak 2015-05-29 09:26:43 -04:00 committed by tux3
parent ff37812a53
commit 8f02d6c14c
5 changed files with 84 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/widget/circlewidget.cpp
View File

@ -67,8 +67,6 @@ CircleWidget::CircleWidget(FriendListWidget *parent)
QFrame *lineFrame = new QFrame(container);
lineFrame->setObjectName("line");
lineFrame->setFrameShape(QFrame::HLine);
//topLayout->addSpacing(5);
//topLayout->addWidget(lineFrame, 1);
midLayout->addLayout(topLayout);
midLayout->addWidget(lineFrame);
@ -77,38 +75,11 @@ CircleWidget::CircleWidget(FriendListWidget *parent)
QHBoxLayout *statusLayout = new QHBoxLayout();
//QLabel *onlineIconLabel = new QLabel(container);
//onlineIconLabel->setAlignment(Qt::AlignCenter);
//onlineIconLabel->setPixmap(QPixmap(":img/status/dot_online.svg"));
onlineLabel = new QLabel("0", container);
onlineLabel->setObjectName("status");
/*QLabel *awayIconLabel = new QLabel(container);
awayIconLabel->setAlignment(Qt::AlignCenter);
awayIconLabel->setPixmap(QPixmap(":img/status/dot_away.svg"));
QLabel *awayLabel = new QLabel("0", container);
awayLabel->setObjectName("status");*/
//QLabel *offlineIconLabel = new QLabel(container);
//offlineIconLabel->setAlignment(Qt::AlignCenter);
//offlineIconLabel->setPixmap(QPixmap(":img/status/dot_offline.svg"));
//offlineLabel = new QLabel("0", container);
//offlineLabel->setObjectName("status");
//statusLayout->addWidget(onlineIconLabel);
//statusLayout->addSpacing(2);
statusLayout->addWidget(onlineLabel);
//statusLayout->addSpacing(10);
//statusLayout->addWidget(awayIconLabel);
//statusLayout->addSpacing(5);
//statusLayout->addWidget(awayLabel);
//statusLayout->addSpacing(10);
//statusLayout->addWidget(offlineIconLabel);
//statusLayout->addSpacing(2);
//statusLayout->addWidget(offlineLabel);
//statusLayout->addStretch();
//midLayout->addLayout(statusLayout);
topLayout->addStretch();
topLayout->addLayout(statusLayout);
@ -133,6 +104,13 @@ void CircleWidget::addFriendWidget(FriendWidget *w, Status s)
updateOnline();
}
void CircleWidget::expand()
{
if (expanded)
return;
toggle();
}
void CircleWidget::toggle()
{
expanded = !expanded;
@ -153,6 +131,11 @@ void CircleWidget::searchChatrooms(const QString &searchString, bool hideOnline,
listLayout->searchChatrooms(searchString, hideOnline, hideOffline, hideGroups);
}
QString CircleWidget::getName() const
{
return nameLabel->text();
}
void CircleWidget::renameCircle()
{
qDebug() << nameLabel->parentWidget()->layout();
@ -173,6 +156,11 @@ void CircleWidget::renameCircle()
});
}
void CircleWidget::onCompactChanged(bool compact)
{
}
void CircleWidget::contextMenuEvent(QContextMenuEvent *event)
{
QMenu menu;
@ -188,21 +176,17 @@ void CircleWidget::contextMenuEvent(QContextMenuEvent *event)
while (listLayout->friendLayouts[Online]->count() != 0)
{
QWidget *getWidget = listLayout->friendLayouts[Online]->takeAt(0)->widget();
qDebug() << getWidget;
assert(getWidget != nullptr);
FriendWidget *friendWidget = dynamic_cast<FriendWidget*>(getWidget);
qDebug() << friendWidget;
friendList->moveWidget(friendWidget, FriendList::findFriend(friendWidget->friendId)->getStatus(), true);
}
while (listLayout->friendLayouts[Offline]->count() != 0)
{
QWidget *getWidget = listLayout->friendLayouts[Offline]->takeAt(0)->widget();
qDebug() << getWidget;
assert(getWidget != nullptr);
assert(getWidget != nullptr);
FriendWidget *friendWidget = dynamic_cast<FriendWidget*>(getWidget);
qDebug() << friendWidget;
friendList->moveWidget(friendWidget, FriendList::findFriend(friendWidget->friendId)->getStatus(), true);
}

6
src/widget/circlewidget.h
View File

@ -36,13 +36,18 @@ public:
void searchChatrooms(const QString &searchString, bool hideOnline = false, bool hideOffline = false, bool hideGroups = false);
void expand();
void toggle();
void updateOnline();
void updateOffline();
QString getName() const;
void renameCircle();
public slots:
void onCompactChanged(bool compact);
protected:
void contextMenuEvent(QContextMenuEvent *event);
@ -64,7 +69,6 @@ private:
QVBoxLayout *mainLayout;
QLabel *arrowLabel;
QLabel *onlineLabel;
QLabel *offlineLabel;
QWidget *container;
QLabel *nameLabel;
};

20
src/widget/friendlistwidget.cpp
View File

@ -51,10 +51,15 @@ void FriendListWidget::addGroupWidget(GroupWidget *widget)
listLayout->groupLayout->addWidget(widget);
}
void FriendListWidget::addCircleWidget()
void FriendListWidget::addCircleWidget(FriendWidget *friendWidget)
{
CircleWidget *circleWidget = new CircleWidget(this);
circleLayout->addWidget(circleWidget);
if (friendWidget != nullptr)
{
circleWidget->addFriendWidget(friendWidget, FriendList::findFriend(friendWidget->friendId)->getStatus());
circleWidget->toggle();
}
circleWidget->show(); // Avoid flickering.
}
@ -62,7 +67,7 @@ void FriendListWidget::removeCircleWidget(CircleWidget *widget)
{
//setUpdatesEnabled(false);
//widget->setVisible(false);
//circleLayout->removeWidget(widget);
circleLayout->removeWidget(widget);
widget->deleteLater();
//setUpdatesEnabled(true);
//widget->deleteLater();
@ -127,6 +132,17 @@ QList<GenericChatroomWidget*> FriendListWidget::getAllFriends()
return friends;
}
QVector<CircleWidget*> FriendListWidget::getAllCircles()
{
QVector<CircleWidget*> vec;
vec.reserve(circleLayout->count());
for (int i = 0; i < circleLayout->count(); ++i)
{
vec.push_back(dynamic_cast<CircleWidget*>(circleLayout->itemAt(i)->widget()));
}
return vec;
}
void FriendListWidget::dragEnterEvent(QDragEnterEvent *event)
{
if (event->mimeData()->hasFormat("friend"))

4
src/widget/friendlistwidget.h
View File

@ -23,6 +23,7 @@
#include <QWidget>
#include <QHash>
#include <QList>
#include <QVector>
#include "src/core/corestructs.h"
#include "src/widget/genericchatroomwidget.h"
@ -43,12 +44,13 @@ public:
void addGroupWidget(GroupWidget *widget);
void addCircleWidget();
void addCircleWidget(FriendWidget *widget = nullptr);
void removeCircleWidget(CircleWidget *widget);
void searchChatrooms(const QString &searchString, bool hideOnline = false, bool hideOffline = false, bool hideGroups = false);
QList<GenericChatroomWidget*> getAllFriends();
QVector<CircleWidget*> getAllCircles();
void reDraw();

42
src/widget/friendwidget.cpp
View File

@ -38,6 +38,10 @@
#include <QDebug>
#include <QInputDialog>
#include "circlewidget.h"
#include "friendlistwidget.h"
#include <cassert>
FriendWidget::FriendWidget(int FriendId, QString id)
: friendId(FriendId)
, isDefaultAvatar{true}
@ -71,10 +75,30 @@ void FriendWidget::contextMenuEvent(QContextMenuEvent * event)
if (groupActions.isEmpty())
inviteMenu->setEnabled(false);
circleMenu->addAction(tr("To new circle"));
circleMenu->addAction(tr("Remove from this circle"));
CircleWidget *circleWidget = dynamic_cast<CircleWidget*>(parentWidget());
QAction* newCircleAction = circleMenu->addAction(tr("To new circle"));
QAction *removeCircleAction;
if (circleWidget != nullptr)
removeCircleAction = circleMenu->addAction(tr("Remove from this circle"));
circleMenu->addSeparator();
FriendListWidget *friendList;
if (circleWidget == nullptr)
friendList = dynamic_cast<FriendListWidget*>(parentWidget());
else
friendList = dynamic_cast<FriendListWidget*>(circleWidget->parentWidget());
assert(friendList != nullptr);
QVector<CircleWidget*> circleVec = friendList->getAllCircles();
QMap<QAction*, CircleWidget*> circleActions;
for (CircleWidget* circle : circleVec)
{
QAction* circleAction = circleMenu->addAction(tr("Add to circle \"%1\"").arg(circle->getName()));
circleActions[circleAction] = circle;
}
QAction* setAlias = menu.addAction(tr("Set alias..."));
menu.addSeparator();
@ -119,11 +143,25 @@ void FriendWidget::contextMenuEvent(QContextMenuEvent * event)
Settings::getInstance().setAutoAcceptDir(id, dir);
}
}
else if (selectedItem == newCircleAction)
{
friendList->addCircleWidget(this);
}
else if (groupActions.contains(selectedItem))
{
Group* group = groupActions[selectedItem];
Core::getInstance()->groupInviteFriend(friendId, group->getGroupId());
}
else if (removeCircleAction != nullptr && selectedItem == removeCircleAction)
{
friendList->moveWidget(this, FriendList::findFriend(friendId)->getStatus(), true);
}
else if (circleActions.contains(selectedItem))
{
CircleWidget* circle = circleActions[selectedItem];
circle->addFriendWidget(this, FriendList::findFriend(friendId)->getStatus());
circle->expand();
}
}
}