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

code cleanup

Browse Source
This commit is contained in:
apprb 2014-09-05 22:05:57 +07:00
parent 02da6803f1
commit 522d570e62
7 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res.qrc
View File

@ -124,5 +124,6 @@
<file>ui/micButton/micButtonPressed.png</file>
<file>ui/micButton/micButton.css</file>
<file>ui/volButton/volButton.css</file>
<file>ui/fileButton/fileButtonDisabled.png</file>
</qresource>
</RCC>

5
ui/fileButton/fileButton.css
View File

@ -17,6 +17,11 @@ QPushButton:pressed
background-image: url(":/ui/fileButton/fileButtonPressed.png");
}
QPushButton[enabled="false"]
{
background-image: url(":/ui/fileButton/fileButtonDisabled.png");
}
QPushButton:focus {
outline: none;
}

BIN
ui/fileButton/fileButtonDisabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 457 B

28
widget/form/chatform.cpp
View File

@ -52,7 +52,6 @@ ChatForm::ChatForm(Friend* chatFriend)
connect(msgEdit, &ChatTextEdit::enterPressed, this, &ChatForm::onSendTriggered);
connect(chatArea->verticalScrollBar(), &QScrollBar::rangeChanged, this, &ChatForm::onSliderRangeChanged);
connect(chatArea, &QScrollArea::customContextMenuRequested, this, &ChatForm::onChatContextMenuRequested);
connect(emoteButton, &QPushButton::clicked, this, &ChatForm::onEmoteButtonClicked);
connect(micButton, SIGNAL(clicked()), this, SLOT(onMicMuteToggle()));
}
@ -530,33 +529,6 @@ void ChatForm::onCancelCallTriggered()
emit cancelCall(callId, f->friendId);
}
void ChatForm::onEmoteButtonClicked()
{
// don't show the smiley selection widget if there are no smileys available
if (SmileyPack::getInstance().getEmoticons().empty())
return;
EmoticonsWidget widget;
connect(&widget, &EmoticonsWidget::insertEmoticon, this, &ChatForm::onEmoteInsertRequested);
QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
if (sender)
{
QPoint pos = -QPoint(widget.sizeHint().width() / 2, widget.sizeHint().height()) - QPoint(0, 10);
widget.exec(sender->mapToGlobal(pos));
}
}
void ChatForm::onEmoteInsertRequested(QString str)
{
// insert the emoticon
QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
if (sender)
msgEdit->insertPlainText(str);
msgEdit->setFocus(); // refocus so that we can continue typing
}
void ChatForm::onMicMuteToggle()
{
if (audioInputFlag == true)

2
widget/form/chatform.h
View File

@ -81,8 +81,6 @@ private slots:
void onAnswerCallTriggered();
void onHangupCallTriggered();
void onCancelCallTriggered();
void onEmoteButtonClicked();
void onEmoteInsertRequested(QString str);
private:
Friend* f;

43
widget/form/genericchatform.cpp
View File

@ -19,6 +19,8 @@
#include <QScrollBar>
#include <QFileDialog>
#include <QTextStream>
#include "smileypack.h"
#include "widget/emoticonswidget.h"
#include "style.h"
GenericChatForm::GenericChatForm(QObject *parent) :
@ -134,8 +136,6 @@ GenericChatForm::GenericChatForm(QObject *parent) :
headTextLayout->addStretch();
headTextLayout->addWidget(nameLabel);
// headTextLayout->addWidget(statusMessage);
// headTextLayout->addStretch();
chatArea->setWidget(chatAreaWidget);
@ -145,17 +145,7 @@ GenericChatForm::GenericChatForm(QObject *parent) :
fileButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
emoteButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
// connect(Widget::getInstance()->getCore(), &Core::fileSendStarted, this, &ChatForm::startFileSend);
// connect(Widget::getInstance()->getCore(), &Core::videoFrameReceived, netcam, &NetCamView::updateDisplay);
// connect(sendButton, &QPushButton::clicked, this, &ChatForm::onSendTriggered);
// connect(fileButton, &QPushButton::clicked, this, &ChatForm::onAttachClicked);
// connect(callButton, &QPushButton::clicked, this, &ChatForm::onCallTriggered);
// connect(videoButton, &QPushButton::clicked, this, &ChatForm::onVideoCallTriggered);
// connect(msgEdit, &ChatTextEdit::enterPressed, this, &ChatForm::onSendTriggered);
// connect(chatArea->verticalScrollBar(), &QScrollBar::rangeChanged, this, &ChatForm::onSliderRangeChanged);
// connect(chatArea, &QScrollArea::customContextMenuRequested, this, &ChatForm::onChatContextMenuRequested);
// connect(emoteButton, &QPushButton::clicked, this, &ChatForm::onEmoteButtonClicked);
// connect(micButton, SIGNAL(clicked()), this, SLOT(onMicMuteToggle()));
connect(emoteButton, SIGNAL(clicked()), this, SLOT(onEmoteButtonClicked()));
}
void GenericChatForm::setName(const QString &newName)
@ -230,3 +220,30 @@ GenericChatForm::~GenericChatForm()
delete mainWidget;
delete headWidget;
}
void GenericChatForm::onEmoteButtonClicked()
{
// don't show the smiley selection widget if there are no smileys available
if (SmileyPack::getInstance().getEmoticons().empty())
return;
EmoticonsWidget widget;
connect(&widget, SIGNAL(insertEmoticon(QString)), this, SLOT(onEmoteInsertRequested(QString)));
QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
if (sender)
{
QPoint pos = -QPoint(widget.sizeHint().width() / 2, widget.sizeHint().height()) - QPoint(0, 10);
widget.exec(sender->mapToGlobal(pos));
}
}
void GenericChatForm::onEmoteInsertRequested(QString str)
{
// insert the emoticon
QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
if (sender)
msgEdit->insertPlainText(str);
msgEdit->setFocus(); // refocus so that we can continue typing
}

2
widget/form/genericchatform.h
View File

@ -54,6 +54,8 @@ protected slots:
void onChatContextMenuRequested(QPoint pos);
void onSliderRangeChanged();
void onSaveLogClicked();
void onEmoteButtonClicked();
void onEmoteInsertRequested(QString str);
protected:
QLabel *nameLabel, *avatarLabel;