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

styled chatlog, cleanup

Browse Source
This commit is contained in:
krepa098 2015-01-02 13:04:59 +01:00
parent 96789182cf
commit 2828a97d54
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widget/form/chatform.cpp
View File

@ -75,8 +75,9 @@ ChatForm::ChatForm(Friend* chatFriend)
connect(volButton, SIGNAL(clicked()), this, SLOT(onVolMuteToggle())); connect(volButton, SIGNAL(clicked()), this, SLOT(onVolMuteToggle()));
connect(Core::getInstance(), &Core::fileSendFailed, this, &ChatForm::onFileSendFailed); connect(Core::getInstance(), &Core::fileSendFailed, this, &ChatForm::onFileSendFailed);
connect(this, SIGNAL(chatAreaCleared()), this, SLOT(clearReciepts())); connect(this, SIGNAL(chatAreaCleared()), this, SLOT(clearReciepts()));
connect(nameLabel, &CroppingLabel::textChanged, this, [=](QString text, QString orig) connect(nameLabel, &CroppingLabel::textChanged, this, [=](QString text, QString orig) {
{if (text != orig) emit aliasChanged(text);} ); if (text != orig) emit aliasChanged(text);
} );
setAcceptDrops(true); setAcceptDrops(true);
} }

9
src/widget/form/genericchatform.cpp
View File

@ -145,10 +145,8 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
connect(emoteButton, SIGNAL(clicked()), this, SLOT(onEmoteButtonClicked())); connect(emoteButton, SIGNAL(clicked()), this, SLOT(onEmoteButtonClicked()));
connect(chatWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint))); connect(chatWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
connect(chatWidget, SIGNAL(onClick()), this, SLOT(onChatWidgetClicked()));
//chatWidget->document()->setDefaultStyleSheet(Style::getStylesheet(":ui/chatArea/innerStyle.css")); chatWidget->setStyleSheet(Style::getStylesheet(":/ui/chatArea/chatArea.css"));
//chatWidget->setStyleSheet(Style::getStylesheet(":/ui/chatArea/chatArea.css"));
headWidget->setStyleSheet(Style::getStylesheet(":/ui/chatArea/chatHead.css")); headWidget->setStyleSheet(Style::getStylesheet(":/ui/chatArea/chatHead.css"));
//ChatAction::setupFormat(); //ChatAction::setupFormat();
@ -235,11 +233,6 @@ void GenericChatForm::onEmoteButtonClicked()
} }
} }
void GenericChatForm::onChatWidgetClicked()
{
msgEdit->setFocus();
}
void GenericChatForm::onEmoteInsertRequested(QString str) void GenericChatForm::onEmoteInsertRequested(QString str)
{ {
// insert the emoticon // insert the emoticon

1
src/widget/form/genericchatform.h
View File

@ -72,7 +72,6 @@ protected slots:
void onEmoteButtonClicked(); void onEmoteButtonClicked();
void onEmoteInsertRequested(QString str); void onEmoteInsertRequested(QString str);
void clearChatArea(bool); void clearChatArea(bool);
void onChatWidgetClicked();
protected: protected:
QString resolveToxID(const ToxID &id); QString resolveToxID(const ToxID &id);

4
ui/chatArea/chatArea.css
View File

@ -4,7 +4,7 @@ QTextEdit
color: back; color: back;
} }
QTextBrowser QGraphicsView
{ {
border: none; border: none;
} }