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

fixed #255

Browse Source
This commit is contained in:
krepa098 2014-09-09 18:28:07 +02:00
parent 39ba354651
commit ddf955afd3
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widget/form/chatform.cpp
View File

@ -29,7 +29,7 @@ ChatForm::ChatForm(Friend* chatFriend)
nameLabel->setText(f->getName()); nameLabel->setText(f->getName());
avatarLabel->setPixmap(QPixmap(":/img/contact_dark.png")); avatarLabel->setPixmap(QPixmap(":/img/contact_dark.png"));
statusMessageLabel = new QLabel(); statusMessageLabel = new CroppingLabel();
netcam = new NetCamView(); netcam = new NetCamView();
headTextLayout->addWidget(statusMessageLabel); headTextLayout->addWidget(statusMessageLabel);

2
widget/form/chatform.h
View File

@ -68,7 +68,7 @@ private slots:
private: private:
Friend* f; Friend* f;
QLabel *statusMessageLabel; CroppingLabel *statusMessageLabel;
NetCamView* netcam; NetCamView* netcam;
bool audioInputFlag; bool audioInputFlag;
int callId; int callId;

3
widget/form/genericchatform.cpp
View File

@ -30,7 +30,7 @@ GenericChatForm::GenericChatForm(QObject *parent) :
mainWidget = new QWidget(); headWidget = new QWidget(); mainWidget = new QWidget(); headWidget = new QWidget();
nameLabel = new QLabel(); nameLabel = new CroppingLabel();
avatarLabel = new QLabel(); avatarLabel = new QLabel();
QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout(); QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout();
headTextLayout = new QVBoxLayout(); headTextLayout = new QVBoxLayout();
@ -115,7 +115,6 @@ GenericChatForm::GenericChatForm(QObject *parent) :
headWidget->setLayout(headLayout); headWidget->setLayout(headLayout);
headLayout->addWidget(avatarLabel); headLayout->addWidget(avatarLabel);
headLayout->addLayout(headTextLayout); headLayout->addLayout(headTextLayout);
headLayout->addStretch();
headLayout->addLayout(volMicLayout); headLayout->addLayout(volMicLayout);
headLayout->addWidget(callButton); headLayout->addWidget(callButton);
headLayout->addWidget(videoButton); headLayout->addWidget(videoButton);

4
widget/form/genericchatform.h
View File

@ -25,6 +25,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPushButton> #include <QPushButton>
#include "widget/croppinglabel.h"
#include "widget/chatareawidget.h" #include "widget/chatareawidget.h"
#include "widget/tool/chattextedit.h" #include "widget/tool/chattextedit.h"
@ -58,7 +59,8 @@ protected slots:
void onEmoteInsertRequested(QString str); void onEmoteInsertRequested(QString str);
protected: protected:
QLabel *nameLabel, *avatarLabel; CroppingLabel *nameLabel;
QLabel *avatarLabel;
QWidget *mainWidget, *headWidget; QWidget *mainWidget, *headWidget;
QPushButton *fileButton, *emoteButton, *callButton, *videoButton, *volButton, *micButton; QPushButton *fileButton, *emoteButton, *callButton, *videoButton, *volButton, *micButton;
QVBoxLayout *headTextLayout; QVBoxLayout *headTextLayout;