pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'upstream/master'

pull/67/head
marcel 11 years ago
parent
a3e9281ab5 9eca1784f7
commit
f281ad87ec
12 changed files with 84 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bootstrap.bat
  2. 5
      bootstrap.sh
  3. BIN
      img/status/dot_busy.png
  4. BIN
      img/status/dot_busy_2x.png
  5. BIN
      img/status/dot_busy_notification.png
  6. 3
      res.qrc
  7. 6
      toxgui.pro
  8. 51
      widget.ui
  9. 11
      widget/tool/clickablelabel.cpp
  10. 20
      widget/tool/clickablelabel.h
  11. 32
      widget/widget.cpp
  12. 1
      widget/widget.h

2
bootstrap.bat
Unescape View File

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@mkdir %~dp0libs
%~dp0tools\wget --no-check-certificate http://jenkins.libtoxcore.so/job/libtoxcore-win32-i686/lastSuccessfulBuild/artifact/libtoxcore-win32-i686.zip -O %~dp0libs\libtoxcore-latest.zip
%~dp0tools\unzip %~dp0libs\libtoxcore-latest.zip -d %~dp0libs\
%~dp0tools\unzip -o %~dp0libs\libtoxcore-latest.zip -d %~dp0libs\
@del %~dp0libs\libtoxcore-latest.zip

5
bootstrap.sh
Unescape View File

@ -7,6 +7,11 @@ SCRIPT_DIR=`dirname $SCRIPT_NAME` @@ -7,6 +7,11 @@ SCRIPT_DIR=`dirname $SCRIPT_NAME`
# create libs dir if necessary
mkdir -p ${SCRIPT_DIR}/libs
# maybe an earlier run of this script failed
# thus we should remove the libtoxcore-latest dir
# if exists, otherwise cloning the git repo may fail
rm -rf ${SCRIPT_DIR}/libs/libtoxcore-latest
# clone current master of libtoxcore
git clone https://github.com/irungentoo/toxcore.git ${SCRIPT_DIR}/libs/libtoxcore-latest

BIN
img/status/dot_busy.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 308 B

BIN
img/status/dot_busy_2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 947 B

BIN
img/status/dot_busy_notification.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 791 B

3
res.qrc
Unescape View File

@ -97,5 +97,8 @@ @@ -97,5 +97,8 @@
<file>ui/window/restoreButtonPressed.png</file>
<file>ui/friendList/friendList.css</file>
<file>ui/window/window.css</file>
<file>img/status/dot_busy.png</file>
<file>img/status/dot_busy_2x.png</file>
<file>img/status/dot_busy_notification.png</file>
</qresource>
</RCC>

6
toxgui.pro
Unescape View File

@ -62,7 +62,8 @@ HEADERS += widget/form/addfriendform.h \ @@ -62,7 +62,8 @@ HEADERS += widget/form/addfriendform.h \
widget/selfcamview.h \
widget/videosurface.h \
widget/camera.h \
widget/netcamview.h
widget/netcamview.h \
widget/tool/clickablelabel.h
SOURCES += \
widget/form/addfriendform.cpp \
@ -92,4 +93,5 @@ SOURCES += \ @@ -92,4 +93,5 @@ SOURCES += \
widget/selfcamview.cpp \
widget/videosurface.cpp \
widget/camera.cpp \
widget/netcamview.cpp
widget/netcamview.cpp \
widget/tool/clickablelabel.cpp

51
widget.ui
Unescape View File

@ -226,16 +226,7 @@ @@ -226,16 +226,7 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
@ -704,16 +695,7 @@ @@ -704,16 +695,7 @@
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@ -1693,7 +1675,7 @@ @@ -1693,7 +1675,7 @@
<string>Your status</string>
</property>
</widget>
<widget class="QLabel" name="statImg">
<widget class="ClickableLabel" name="statImg">
<property name="geometry">
<rect>
<x>170</x>
@ -2189,16 +2171,7 @@ @@ -2189,16 +2171,7 @@
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@ -2735,16 +2708,7 @@ @@ -2735,16 +2708,7 @@
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
@ -2858,6 +2822,11 @@ @@ -2858,6 +2822,11 @@
<extends>QLabel</extends>
<header>widget/tool/editablelabelwidget.h</header>
</customwidget>
<customwidget>
<class>ClickableLabel</class>
<extends>QLabel</extends>
<header>widget/tool/clickablelabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="res.qrc"/>

11
widget/tool/clickablelabel.cpp
Unescape View File

@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
#include "clickablelabel.h"
ClickableLabel::ClickableLabel(QWidget *parent) :
QLabel(parent)
{
}
void ClickableLabel::mousePressEvent(QMouseEvent* event)
{
emit clicked();
}

20
widget/tool/clickablelabel.h
Unescape View File

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
#ifndef CLICKABLELABEL_H
#define CLICKABLELABEL_H
#include <QLabel>
class ClickableLabel : public QLabel
{
Q_OBJECT
public:
explicit ClickableLabel(QWidget *parent = 0);
signals:
void clicked();
protected:
void mousePressEvent ( QMouseEvent * event );
};
#endif // CLICKABLELABEL_H

32
widget/widget.cpp
Unescape View File

@ -200,6 +200,7 @@ Widget::Widget(QWidget *parent) : @@ -200,6 +200,7 @@ Widget::Widget(QWidget *parent) :
connect(ui->settingsButton, SIGNAL(clicked()), this, SLOT(onSettingsClicked()));
connect(ui->nameLabel, SIGNAL(textChanged(QString,QString)), this, SLOT(onUsernameChanged(QString,QString)));
connect(ui->statusLabel, SIGNAL(textChanged(QString,QString)), this, SLOT(onStatusMessageChanged(QString,QString)));
connect(ui->statImg, SIGNAL(clicked()), this, SLOT(onStatusImgClicked()));
connect(&settingsForm.name, SIGNAL(textChanged(QString)), this, SLOT(onUsernameChanged(QString)));
connect(&settingsForm.statusText, SIGNAL(textChanged(QString)), this, SLOT(onStatusMessageChanged(QString)));
connect(&friendForm, SIGNAL(friendRequested(QString,QString)), this, SIGNAL(friendRequested(QString,QString)));
@ -276,8 +277,10 @@ void Widget::onStatusSet(Status status) @@ -276,8 +277,10 @@ void Widget::onStatusSet(Status status)
{
if (status == Status::Online)
ui->statImg->setPixmap(QPixmap(":img/status/dot_online_2x.png"));
else if (status == Status::Busy || status == Status::Away)
else if (status == Status::Away)
ui->statImg->setPixmap(QPixmap(":img/status/dot_idle_2x.png"));
else if (status == Status::Busy)
ui->statImg->setPixmap(QPixmap(":img/status/dot_busy_2x.png"));
else if (status == Status::Offline)
ui->statImg->setPixmap(QPixmap(":img/status/dot_away_2x.png"));
}
@ -507,10 +510,14 @@ void Widget::updateFriendStatusLights(int friendId) @@ -507,10 +510,14 @@ void Widget::updateFriendStatusLights(int friendId)
f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
else if (status == Status::Online && f->hasNewMessages == 1)
f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
else if ((status == Status::Busy || status == Status::Away) && f->hasNewMessages == 0)
else if (status == Status::Away && f->hasNewMessages == 0)
f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_idle.png"));
else if ((status == Status::Busy || status == Status::Away) && f->hasNewMessages == 1)
else if (status == Status::Away && f->hasNewMessages == 1)
f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_idle_notification.png"));
else if (status == Status::Busy && f->hasNewMessages == 0)
f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_busy.png"));
else if (status == Status::Busy && f->hasNewMessages == 1)
f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_busy_notification.png"));
else if (status == Status::Offline && f->hasNewMessages == 0)
f->widget->statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
else if (status == Status::Offline && f->hasNewMessages == 1)
@ -1099,3 +1106,22 @@ void Widget::minimizeBtnClicked() @@ -1099,3 +1106,22 @@ void Widget::minimizeBtnClicked()
}
}
void Widget::onStatusImgClicked()
{
QMenu menu;
menu.addAction("Online");
menu.addAction("Away");
menu.addAction("Busy");
QPoint pos = QCursor::pos();
QAction* selectedItem = menu.exec(pos);
if (selectedItem)
{
if (selectedItem->text() == "Online")
core->setStatus(Status::Online);
else if (selectedItem->text() == "Away")
core->setStatus(Status::Away);
else if (selectedItem->text() == "Busy")
core->setStatus(Status::Busy);
}
}

1
widget/widget.h
Unescape View File

@ -88,6 +88,7 @@ private slots: @@ -88,6 +88,7 @@ private slots:
void removeFriend(int friendId);
void copyFriendIdToClipboard(int friendId);
void removeGroup(int groupId);
void onStatusImgClicked();
protected slots:
void moveWindow(QMouseEvent *e);

Write Preview
Loading…
Cancel
Save