Commit 81fb5626 authored by Ming Rui Zhang's avatar Ming Rui Zhang
Browse files

project: remove unused files and change file arrangement

Change-Id: I4831d09585441320055425fbf79350b0b609bbc8
parent 6cc1c1aa
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AnimatedOverlay</class>
<widget class="QWidget" name="AnimatedOverlay">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</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">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="backgroundLabel">
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
/**************************************************************************
* Copyright (C) 2019-2019 by Savoir-faire Linux *
* Author: Isa Nanic <isa.nanic@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
**************************************************************************/
#include "avatargraphicsview.h"
AvatarGraphicsView::AvatarGraphicsView(QWidget* parent)
: QGraphicsView(parent)
{
setDragMode(QGraphicsView::ScrollHandDrag);
}
void
AvatarGraphicsView::wheelEvent(QWheelEvent* event)
{
QPoint numSteps = event->angleDelta() / (8*15);
if (!numSteps.isNull()) {
zoomImage(numSteps);
}
event->accept();
}
void
AvatarGraphicsView::zoomImage(const QPoint& steps)
{
steps.y() == 1 ? scale(zoomIncrement_, zoomIncrement_) : scale(1 / zoomIncrement_, 1 / zoomIncrement_);
}
void
AvatarGraphicsView::paintEvent(QPaintEvent* e)
{
QGraphicsView::paintEvent(e);
QPainter painter(viewport());
QPainterPath square;
QPainterPath circle;
square.addRect(0, 0, width(), height());
circle.addEllipse(QPoint(width() / 2 - 0.5, height() / 2 - 0.5), circleSize_ + 1, circleSize_ + 1);
painter.setOpacity(0.3);
painter.fillPath(square.subtracted(circle), QBrush(QColor(Qt::black)));
}
\ No newline at end of file
/**************************************************************************
* Copyright (C) 2019-2019 by Savoir-faire Linux *
* Author: Isa Nanic <isa.nanic@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
**************************************************************************/
#pragma once
#include <QGraphicsView>
#include <QWheelEvent>
#include <QDragMoveEvent>
class AvatarGraphicsView : public QGraphicsView
{
Q_OBJECT
AvatarGraphicsView(const AvatarGraphicsView& cpy);
public:
AvatarGraphicsView(QWidget* parent = nullptr);
inline void setAvatarSize(int size) { circleSize_ = size; };
private:
void wheelEvent(QWheelEvent* event);
void zoomImage(const QPoint& steps);
void paintEvent(QPaintEvent* e);
const qreal zoomIncrement_ = 1.03;
int circleSize_ = 130;
};
\ No newline at end of file
......@@ -70,6 +70,7 @@ unix {
INCLUDEPATH += $${LRC}/include/libringclient
INCLUDEPATH += $${LRC}/include
INCLUDEPATH += ../src
LIBS += -L$${LRC}/lib -lringclient
LIBS += -lqrencode
......@@ -78,172 +79,168 @@ unix {
# Input
HEADERS += ./aboutdialog.h \
./banneditemwidget.h \
./conversationsfilterwidget.h \
./idlabel.h \
./messagewebview.h \
./ringbutton.h \
./smartlistmodel.h \
./utils.h \
./accountitemdelegate.h \
./bannedlistmodel.h \
./currentaccountcombobox.h \
./invitebuttonswidget.h \
./nameregistrationdialog.h \
./ringcontactlineedit.h \
./smartlistselectorbuttonnotifier.h \
./version.h \
./accountlistmodel.h \
./bezierconnectorwidget.h \
./deleteaccountdialog.h \
./levelmeter.h \
./navwidget.h \
./ringthemeutils.h \
./smartlistview.h \
./videooverlay.h \
./advancedsettingswidget.h \
./callwidget.h \
./deviceitemwidget.h \
./linkdevicedialog.h \
./newwizardwidget.h \
./runguard.h \
./splashscreen.h \
./videoview.h \
./advancedsipsettingwidget.h \
./contactpicker.h \
./lrcinstance.h \
./passworddialog.h \
./selectareadialog.h \
./toggleswitch.h \
./animationhelpers.h \
./contactpickeritemdelegate.h \
./globalsystemtray.h \
./mainwindow.h \
./photoboothwidget.h \
./settingskey.h \
./updateconfirmdialog.h \
./webchathelpers.h \
./avatargraphicsview.h \
./conversationitemdelegate.h \
./iconbutton.h \
./messagewebpage.h \
./pixbufmanipulator.h \
./settingswidget.h \
./updatedownloaddialog.h \
./sipinputpanel.h \
./callaudioonlyavataroverlay.h \
./overlaybutton.h \
./accountmigrationdialog.h \
./previewwidget.h \
./rendermanager.h \
./distantwidget.h \
./videowidgetbase.h \
./section.h \
./collapsiblepasswordwidget.h \
./notifypushbutton.h \
./popupdialog.h \
./recordoverlay.h \
./widgethelpers.h \
./recordwidget.h \
./networkmanager.h \
./connectivitymonitor.h
SOURCES += ./aboutdialog.cpp \
./banneditemwidget.cpp \
./conversationsfilterwidget.cpp \
./idlabel.cpp \
./messagewebview.cpp \
./ringbutton.cpp \
./smartlistview.cpp \
./videoview.cpp \
./accountitemdelegate.cpp \
./bannedlistmodel.cpp \
./currentaccountcombobox.cpp \
./invitebuttonswidget.cpp \
./nameregistrationdialog.cpp \
./ringcontactlineedit.cpp \
./splashscreen.cpp \
./accountlistmodel.cpp \
./bezierconnectorwidget.cpp \
./deleteaccountdialog.cpp \
./levelmeter.cpp \
./navwidget.cpp \
./runguard.cpp \
./toggleswitch.cpp \
./webchathelpers.cpp \
./advancedsettingswidget.cpp \
./callwidget.cpp \
./deviceitemwidget.cpp \
./linkdevicedialog.cpp \
./newwizardwidget.cpp \
./selectareadialog.cpp \
./updateconfirmdialog.cpp \
./advancedsipsettingwidget.cpp \
./contactpicker.cpp \
./main.cpp \
./passworddialog.cpp \
./settingswidget.cpp \
./updatedownloaddialog.cpp \
./animationhelpers.cpp \
./contactpickeritemdelegate.cpp \
./globalsystemtray.cpp \
./mainwindow.cpp \
./photoboothwidget.cpp \
./smartlistmodel.cpp \
./utils.cpp \
./avatargraphicsview.cpp \
./conversationitemdelegate.cpp \
./iconbutton.cpp \
./messagewebpage.cpp \
./pixbufmanipulator.cpp \
./smartlistselectorbuttonnotifier.cpp \
./videooverlay.cpp \
./sipinputpanel.cpp \
./callaudioonlyavataroverlay.cpp \
./overlaybutton.cpp \
./accountmigrationdialog.cpp \
./previewwidget.cpp \
./rendermanager.cpp \
./distantwidget.cpp \
./videowidgetbase.cpp \
./section.cpp \
./collapsiblepasswordwidget.cpp \
./notifypushbutton.cpp \
./popupdialog.cpp \
./recordoverlay.cpp \
./widgethelpers.cpp \
./recordwidget.cpp \
./networkmanager.cpp \
./connectivitymonitor.cpp
FORMS += ./aboutdialog.ui \
./advancedsipsettingwidget.ui \
./callwidget.ui \
./deviceitemwidget.ui \
./mainwindow.ui \
./passworddialog.ui \
./ringbutton.ui \
./updatedownloaddialog.ui \
./animatedoverlay.ui \
./contactpicker.ui \
./invitebuttonswidget.ui \
./nameregistrationdialog.ui \
./settingswidget.ui \
./videooverlay.ui \
./advancedsettingswidget.ui \
./banneditemwidget.ui \
./deleteaccountdialog.ui \
./linkdevicedialog.ui \
./newwizardwidget.ui \
./photoboothwidget.ui \
./updateconfirmdialog.ui \
./videoview.ui \
./sipkeypad.ui \
./callaudioonlyavataroverlay.ui \
./accountmigration.ui \
./section.ui \
./collapsiblepasswordwidget.ui \
./popupdialog.ui \
./recordoverlay.ui \
./recordwidget.ui \
HEADERS += ./src/aboutdialog.h \
./src/banneditemwidget.h \
./src/conversationsfilterwidget.h \
./src/idlabel.h \
./src/messagewebview.h \
./src/ringbutton.h \
./src/smartlistmodel.h \
./src/utils.h \
./src/accountitemdelegate.h \
./src/bannedlistmodel.h \
./src/currentaccountcombobox.h \
./src/invitebuttonswidget.h \
./src/nameregistrationdialog.h \
./src/ringcontactlineedit.h \
./src/smartlistselectorbuttonnotifier.h \
./src/version.h \
./src/accountlistmodel.h \
./src/bezierconnectorwidget.h \
./src/deleteaccountdialog.h \
./src/levelmeter.h \
./src/navwidget.h \
./src/ringthemeutils.h \
./src/smartlistview.h \
./src/videooverlay.h \
./src/advancedsettingswidget.h \
./src/callwidget.h \
./src/deviceitemwidget.h \
./src/linkdevicedialog.h \
./src/newwizardwidget.h \
./src/runguard.h \
./src/splashscreen.h \
./src/videoview.h \
./src/advancedsipsettingwidget.h \
./src/contactpicker.h \
./src/lrcinstance.h \
./src/passworddialog.h \
./src/selectareadialog.h \
./src/toggleswitch.h \
./src/animationhelpers.h \
./src/contactpickeritemdelegate.h \
./src/globalsystemtray.h \
./src/mainwindow.h \
./src/photoboothwidget.h \
./src/settingskey.h \
./src/updateconfirmdialog.h \
./src/webchathelpers.h \
./src/conversationitemdelegate.h \
./src/iconbutton.h \
./src/messagewebpage.h \
./src/pixbufmanipulator.h \
./src/settingswidget.h \
./src/updatedownloaddialog.h \
./src/sipinputpanel.h \
./src/callaudioonlyavataroverlay.h \
./src/overlaybutton.h \
./src/accountmigrationdialog.h \
./src/previewwidget.h \
./src/rendermanager.h \
./src/distantwidget.h \
./src/videowidgetbase.h \
./src/section.h \
./src/collapsiblepasswordwidget.h \
./src/notifypushbutton.h \
./src/popupdialog.h \
./src/recordoverlay.h \
./src/widgethelpers.h \
./src/recordwidget.h \
./src/networkmanager.h \
./src/connectivitymonitor.h
SOURCES += ./src/aboutdialog.cpp \
./src/banneditemwidget.cpp \
./src/conversationsfilterwidget.cpp \
./src/idlabel.cpp \
./src/messagewebview.cpp \
./src/ringbutton.cpp \
./src/smartlistview.cpp \
./src/videoview.cpp \
./src/accountitemdelegate.cpp \
./src/bannedlistmodel.cpp \
./src/currentaccountcombobox.cpp \
./src/invitebuttonswidget.cpp \
./src/nameregistrationdialog.cpp \
./src/ringcontactlineedit.cpp \
./src/splashscreen.cpp \
./src/accountlistmodel.cpp \
./src/bezierconnectorwidget.cpp \
./src/deleteaccountdialog.cpp \
./src/levelmeter.cpp \
./src/navwidget.cpp \
./src/runguard.cpp \
./src/toggleswitch.cpp \
./src/webchathelpers.cpp \
./src/advancedsettingswidget.cpp \
./src/callwidget.cpp \
./src/deviceitemwidget.cpp \
./src/linkdevicedialog.cpp \
./src/newwizardwidget.cpp \
./src/selectareadialog.cpp \
./src/updateconfirmdialog.cpp \
./src/advancedsipsettingwidget.cpp \
./src/contactpicker.cpp \
./src/main.cpp \
./src/passworddialog.cpp \
./src/settingswidget.cpp \
./src/updatedownloaddialog.cpp \
./src/animationhelpers.cpp \
./src/contactpickeritemdelegate.cpp \
./src/globalsystemtray.cpp \
./src/mainwindow.cpp \
./src/photoboothwidget.cpp \
./src/smartlistmodel.cpp \
./src/utils.cpp \
./src/conversationitemdelegate.cpp \
./src/iconbutton.cpp \
./src/messagewebpage.cpp \
./src/pixbufmanipulator.cpp \
./src/smartlistselectorbuttonnotifier.cpp \
./src/videooverlay.cpp \
./src/sipinputpanel.cpp \
./src/callaudioonlyavataroverlay.cpp \
./src/overlaybutton.cpp \
./src/accountmigrationdialog.cpp \
./src/previewwidget.cpp \
./src/rendermanager.cpp \
./src/distantwidget.cpp \
./src/videowidgetbase.cpp \
./src/section.cpp \
./src/collapsiblepasswordwidget.cpp \
./src/notifypushbutton.cpp \
./src/popupdialog.cpp \
./src/recordoverlay.cpp \
./src/widgethelpers.cpp \
./src/recordwidget.cpp \
./src/networkmanager.cpp \
./src/connectivitymonitor.cpp
FORMS += ./src/aboutdialog.ui \
./src/advancedsipsettingwidget.ui \
./src/callwidget.ui \
./src/deviceitemwidget.ui \
./src/mainwindow.ui \
./src/passworddialog.ui \
./src/ringbutton.ui \
./src/updatedownloaddialog.ui \
./src/contactpicker.ui \
./src/invitebuttonswidget.ui \
./src/nameregistrationdialog.ui \
./src/settingswidget.ui \
./src/videooverlay.ui \
./src/advancedsettingswidget.ui \
./src/banneditemwidget.ui \
./src/deleteaccountdialog.ui \
./src/linkdevicedialog.ui \
./src/newwizardwidget.ui \
./src/photoboothwidget.ui \
./src/updateconfirmdialog.ui \
./src/videoview.ui \
./src/sipkeypad.ui \
./src/callaudioonlyavataroverlay.ui \
./src/accountmigration.ui \
./src/section.ui \
./src/collapsiblepasswordwidget.ui \
./src/popupdialog.ui \
./src/recordoverlay.ui \
./src/recordwidget.ui
RESOURCES += ressources.qrc
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -450,7 +450,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="ressources.qrc">:/images/logo-jami-standard-coul.png</pixmap>
<pixmap resource="../ressources.qrc">:/images/logo-jami-standard-coul.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
......@@ -965,7 +965,7 @@ p, li { white-space: pre-wrap; }
<tabstop>creditsButton</tabstop>
</tabstops>
<resources>
<include location="ressources.qrc"/>
<include location="../ressources.qrc"/>
</resources>
<connections/>
</ui>
......@@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>358</width>
<height>573</height>
<height>587</height>
</rect>
</property>
<property name="windowTitle">
......@@ -558,7 +558,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="ressources.qrc">:/images/jami_eclipse_spinner.gif</pixmap>
<pixmap resource="../ressources.qrc">:/images/jami_eclipse_spinner.gif</pixmap>
</property>
</widget>
</item>
......@@ -628,7 +628,7 @@
</layout>
</widget>
<resources>
<include location="ressources.qrc"/>
<include location="../ressources.qrc"/>
</resources>
<connections/>
</ui>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment