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

Widget code cleanup: removed isFriendWidgetActive and isGroupWidgetActive

Browse Source
This commit is contained in:
apprb 2014-08-31 23:48:02 +07:00
parent 76971f5238
commit fd4c47cba3
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
widget/widget.cpp
View File

@ -209,8 +209,6 @@ Widget::Widget(QWidget *parent)
coreThread->start(); coreThread->start();
friendForm.show(*ui); friendForm.show(*ui);
isFriendWidgetActive = 0;
isGroupWidgetActive = 0;
} }
Widget::~Widget() Widget::~Widget()
@ -325,16 +323,16 @@ void Widget::onTransferClicked()
{ {
hideMainForms(); hideMainForms();
filesForm.show(*ui); filesForm.show(*ui);
isFriendWidgetActive = 0; activeFriendWidget = nullptr;
isGroupWidgetActive = 0; activeGroupWidget = nullptr;
} }
void Widget::onSettingsClicked() void Widget::onSettingsClicked()
{ {
hideMainForms(); hideMainForms();
settingsForm.show(*ui); settingsForm.show(*ui);
isFriendWidgetActive = 0; activeFriendWidget = nullptr;
isGroupWidgetActive = 0; activeGroupWidget = nullptr;
} }
void Widget::hideMainForms() void Widget::hideMainForms()
@ -508,8 +506,7 @@ void Widget::onFriendWidgetClicked(FriendWidget *widget)
} }
activeFriendWidget = widget; activeFriendWidget = widget;
widget->setAsActiveChatroom(); widget->setAsActiveChatroom();
isFriendWidgetActive = 1; activeGroupWidget = nullptr;
isGroupWidgetActive = 0;
if (f->hasNewEvents != 0) if (f->hasNewEvents != 0)
f->hasNewEvents = 0; f->hasNewEvents = 0;
@ -528,7 +525,7 @@ void Widget::onFriendMessageReceived(int friendId, const QString& message)
if (activeFriendWidget != nullptr) if (activeFriendWidget != nullptr)
{ {
Friend* f2 = FriendList::findFriend(activeFriendWidget->friendId); Friend* f2 = FriendList::findFriend(activeFriendWidget->friendId);
if (((f->friendId != f2->friendId) || isFriendWidgetActive == 0) || isWindowMinimized || !isActiveWindow()) if ((f->friendId != f2->friendId) || isWindowMinimized || !isActiveWindow())
{ {
f->hasNewEvents = 1; f->hasNewEvents = 1;
newMessageAlert(); newMessageAlert();
@ -612,7 +609,7 @@ void Widget::onGroupMessageReceived(int groupnumber, int friendgroupnumber, cons
g->chatForm->addGroupMessage(message, friendgroupnumber); g->chatForm->addGroupMessage(message, friendgroupnumber);
if ((isGroupWidgetActive != 1 || (activeGroupWidget && g->groupId != activeGroupWidget->groupId)) || isWindowMinimized || !isActiveWindow()) if (((activeGroupWidget && g->groupId != activeGroupWidget->groupId)) || isWindowMinimized || !isActiveWindow())
{ {
if (message.contains(core->getUsername(), Qt::CaseInsensitive)) if (message.contains(core->getUsername(), Qt::CaseInsensitive))
{ {
@ -668,8 +665,7 @@ void Widget::onGroupWidgetClicked(GroupWidget* widget)
} }
activeGroupWidget = widget; activeGroupWidget = widget;
widget->setAsActiveChatroom(); widget->setAsActiveChatroom();
isFriendWidgetActive = 0; activeFriendWidget = nullptr;
isGroupWidgetActive = 1;
if (g->hasNewMessages != 0) if (g->hasNewMessages != 0)
{ {
@ -739,7 +735,7 @@ bool Widget::isFriendWidgetCurActiveWidget(Friend* f)
if (activeFriendWidget != nullptr) if (activeFriendWidget != nullptr)
{ {
Friend* f2 = FriendList::findFriend(activeFriendWidget->friendId); Friend* f2 = FriendList::findFriend(activeFriendWidget->friendId);
if ((f->friendId != f2->friendId) || isFriendWidgetActive == 0) if (f->friendId != f2->friendId)
return false; return false;
} }
else else
@ -765,13 +761,13 @@ bool Widget::event(QEvent * e)
this->style()->polish(this); this->style()->polish(this);
} }
isWindowMinimized = 0; isWindowMinimized = 0;
if (isFriendWidgetActive && activeFriendWidget != nullptr) if (activeFriendWidget != nullptr)
{ {
Friend* f = FriendList::findFriend(activeFriendWidget->friendId); Friend* f = FriendList::findFriend(activeFriendWidget->friendId);
f->hasNewEvents = 0; f->hasNewEvents = 0;
f->widget->updateStatusLight(); f->widget->updateStatusLight();
} }
else if (isGroupWidgetActive && activeGroupWidget != nullptr) else if (activeGroupWidget != nullptr)
{ {
Group* g = GroupList::findGroup(activeGroupWidget->groupId); Group* g = GroupList::findGroup(activeGroupWidget->groupId);
g->hasNewMessages = 0; g->hasNewMessages = 0;

1
widget/widget.h
View File

@ -145,7 +145,6 @@ private:
FriendWidget* activeFriendWidget; FriendWidget* activeFriendWidget;
GroupWidget* activeGroupWidget; GroupWidget* activeGroupWidget;
FriendListWidget* contactListWidget; FriendListWidget* contactListWidget;
int isFriendWidgetActive, isGroupWidgetActive;
SelfCamView* camview; SelfCamView* camview;
Camera* camera; Camera* camera;
bool notify(QObject *receiver, QEvent *event); bool notify(QObject *receiver, QEvent *event);