Git commit d3aef78f00d6a7f420b2905678ce0aa58aea79ce by Emmanuel Lepage Vall= ee. Committed on 31/05/2013 at 21:45. Pushed by lepagevalleeemmanuel into branch 'abstractmodels'. [ #24595 ] Fix typo M +2 -2 src/CMakeLists.txt M +2 -2 src/delegates/historydelegate.cpp R +0 -0 src/icons/tips/ringing.svg [from: src/icons/tips/rigging.svg= - 100% similarity] M +1 -1 src/lib/call.cpp M +8 -8 src/sflphoneview.cpp R +7 -7 src/widgets/tips/ringingtip.cpp [from: src/widgets/tips/rigg= ingtip.cpp - 094% similarity] R +3 -3 src/widgets/tips/ringingtip.h [from: src/widgets/tips/riggin= gtip.h - 095% similarity] M +9 -9 src/widgets/tips/tipcollection.cpp M +2 -2 src/widgets/tips/tipcollection.h http://commits.kde.org/sflphone-kde/d3aef78f00d6a7f420b2905678ce0aa58aea79ce diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 08d0eb5..c38f2a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -82,7 +82,7 @@ SET( widgets/callviewoverlaytoolbar.cpp widgets/tips/conftip.cpp widgets/tips/dialpadtip.cpp - widgets/tips/riggingtip.cpp + widgets/tips/ringingtip.cpp widgets/tips/connectionlosttip.cpp widgets/tips/tipcollection.cpp widgets/tips/removeconferencetip.cpp @@ -170,7 +170,7 @@ INSTALL( FILES icons/tips/keyboard.svg DESTIN= ATION ${DATA_INSTALL_DIR INSTALL( FILES icons/tips/upArrow.svg DESTINATION ${DATA_INSTA= LL_DIR}/sflphone-client-kde/tips ) INSTALL( FILES icons/tips/downArrow.svg DESTINATION ${DATA_INSTA= LL_DIR}/sflphone-client-kde/tips ) INSTALL( FILES icons/tips/dragAndDrop.svg DESTINATION ${DATA_INSTA= LL_DIR}/sflphone-client-kde/tips ) -INSTALL( FILES icons/tips/rigging.svg DESTINATION ${DATA_INSTA= LL_DIR}/sflphone-client-kde/tips ) +INSTALL( FILES icons/tips/ringing.svg DESTINATION ${DATA_INSTA= LL_DIR}/sflphone-client-kde/tips ) INSTALL( FILES icons/tips/reload.svg DESTINATION ${DATA_INSTA= LL_DIR}/sflphone-client-kde/tips ) INSTALL( FILES icons/tips/phoneDown.svg DESTINATION ${DATA_INSTA= LL_DIR}/sflphone-client-kde/tips ) INSTALL( FILES icons/tips/ring1.svg DESTINATION ${DATA_INSTA= LL_DIR}/sflphone-client-kde/tips ) diff --git a/src/delegates/historydelegate.cpp b/src/delegates/historydeleg= ate.cpp index eadf21f..239aebe 100644 --- a/src/delegates/historydelegate.cpp +++ b/src/delegates/historydelegate.cpp @@ -36,7 +36,7 @@ #include "klib/configurationskeleton.h" #include "widgets/playeroverlay.h" #include "delegatedropoverlay.h" -#include "../widgets/tips/riggingtip.h" +#include "../widgets/tips/ringingtip.h" #include "klib/tipanimationwrapper.h" = static const char* icnPath[4] =3D { @@ -212,7 +212,7 @@ void HistoryDelegate::paint(QPainter* painter, const QS= tyleOptionViewItem& optio else if ((currentState =3D=3D Call::State::RINGING || currentState =3D= =3D Call::State::INCOMING) && index.model()->rowCount() > 1) { if (!m_AnimationWrapper) { ((HistoryDelegate*)this)->m_AnimationWrapper =3D new TipAnimation= Wrapper(); - ((HistoryDelegate*)this)->m_pRingingTip =3D new RiggingTip(); + ((HistoryDelegate*)this)->m_pRingingTip =3D new RingingTip(); m_AnimationWrapper->setTip(m_pRingingTip); } if (!m_pRingingTip->isVisible()) diff --git a/src/icons/tips/rigging.svg b/src/icons/tips/ringing.svg similarity index 100% rename from src/icons/tips/rigging.svg rename to src/icons/tips/ringing.svg diff --git a/src/lib/call.cpp b/src/lib/call.cpp index 9875df5..ffc296e 100644 --- a/src/lib/call.cpp +++ b/src/lib/call.cpp @@ -249,7 +249,7 @@ Call* Call::buildIncomingCall(const QString & callId) return call; } //buildIncomingCall = -///Build a rigging call (from dbus) +///Build a ringing call (from dbus) Call* Call::buildRingingCall(const QString & callId) { CallManagerInterface& callManager =3D CallManagerInterfaceSingleton::ge= tInstance(); diff --git a/src/sflphoneview.cpp b/src/sflphoneview.cpp index 12e2c50..7016bdc 100644 --- a/src/sflphoneview.cpp +++ b/src/sflphoneview.cpp @@ -572,7 +572,7 @@ void SFLPhoneView::updateWindowCallState() actionTexts [ SFLPhone::Refuse ] =3D ACTION_LABEL_REFUSE= ; m_pMessageBoxW->setVisible(false || IM_ACTIVE) ; if (TipCollection::manager()) { - TipCollection::manager()->setCurrentTip(TipCollection::rigg= ing()); + TipCollection::manager()->setCurrentTip(TipCollection::ring= ing()); } break; = @@ -581,7 +581,7 @@ void SFLPhoneView::updateWindowCallState() enabledActions [ SFLPhone::Transfer ] =3D false = ; m_pMessageBoxW->setVisible(false) = ; if (TipCollection::manager()) { - TipCollection::manager()->setCurrentTip(TipCollection::rigg= ing()); + TipCollection::manager()->setCurrentTip(TipCollection::ring= ing()); } break; = @@ -674,16 +674,16 @@ void SFLPhoneView::updateWindowCallState() } = //Manage tips - //There is little way to be sure when to end the rigging animation, = for now, brute force the check - bool displayRigging =3D false; - if (TipCollection::rigging()->isVisible() || TipCollection::manager(= )->currentTip() =3D=3D TipCollection::rigging()) { + //There is little way to be sure when to end the ringing animation, = for now, brute force the check + bool displayRinging =3D false; + if (TipCollection::ringing()->isVisible() || TipCollection::manager(= )->currentTip() =3D=3D TipCollection::ringing()) { foreach (Call* call2, SFLPhone::model()->getCallList()) { if(dynamic_cast(call2) && (call2->getState() =3D=3D Cal= l::State::INCOMING || call2->getState() =3D=3D Call::State::RINGING)) { - displayRigging =3D true; + displayRinging =3D true; } } - if (!displayRigging) { - TipCollection::manager()->hideTip(TipCollection::rigging()); + if (!displayRinging) { + TipCollection::manager()->hideTip(TipCollection::ringing()); } } if (TipCollection::dragAndDrop()) { diff --git a/src/widgets/tips/riggingtip.cpp b/src/widgets/tips/ringingtip.= cpp similarity index 94% rename from src/widgets/tips/riggingtip.cpp rename to src/widgets/tips/ringingtip.cpp index c5fb8f8..2217a4d 100644 --- a/src/widgets/tips/riggingtip.cpp +++ b/src/widgets/tips/ringingtip.cpp @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License = * * along with this program. If not, see .= * *************************************************************************= **/ -#include "riggingtip.h" +#include "ringingtip.h" = //Qt #include @@ -34,7 +34,7 @@ #include = ///Constructor -RiggingTip::RiggingTip(QWidget* parent) : Tip(QString(),parent),m_pTimer(n= ullptr),m_Counter(0) +RingingTip::RingingTip(QWidget* parent) : Tip(QString(),parent),m_pTimer(n= ullptr),m_Counter(0) = { setHasBackground(false); @@ -49,19 +49,19 @@ RiggingTip::RiggingTip(QWidget* parent) : Tip(QString()= ,parent),m_pTimer(nullptr } = ///Destructor -RiggingTip::~RiggingTip() +RingingTip::~RingingTip() { if (m_pTimer) delete m_pTimer; } = ///Return the image rect -QRect RiggingTip::getDecorationRect() +QRect RingingTip::getDecorationRect() { return QRect(0,0,135,120); } = ///Paint the image/decoration -void RiggingTip::paintDecorations(QPainter& p, const QRect& textRect) +void RingingTip::paintDecorations(QPainter& p, const QRect& textRect) { Q_UNUSED(textRect); if (!m_pR) { @@ -113,7 +113,7 @@ void RiggingTip::paintDecorations(QPainter& p, const QR= ect& textRect) } //paintDecorations = ///Start tip animation, this one implement a few sinus curve to simmulate = sound wave -void RiggingTip::startAnimation(bool visibility) +void RingingTip::startAnimation(bool visibility) { if (!m_pTimer && visibility) { m_pTimer =3D new QTimer(this); @@ -129,7 +129,7 @@ void RiggingTip::startAnimation(bool visibility) } //startAnimation = ///Next animation frame -void RiggingTip::timeout() +void RingingTip::timeout() { m_Counter +=3D 1; //Animation speed if (m_Counter > 35) diff --git a/src/widgets/tips/riggingtip.h b/src/widgets/tips/ringingtip.h similarity index 95% rename from src/widgets/tips/riggingtip.h rename to src/widgets/tips/ringingtip.h index a2ce6eb..dc72476 100644 --- a/src/widgets/tips/riggingtip.h +++ b/src/widgets/tips/ringingtip.h @@ -31,12 +31,12 @@ class QSvgRenderer; class QPainter; = ///A tip to be passed to the TipLoader -class RiggingTip : public Tip +class RingingTip : public Tip { Q_OBJECT public: - explicit RiggingTip(QWidget* parent =3D nullptr); - virtual ~RiggingTip(); + explicit RingingTip(QWidget* parent =3D nullptr); + virtual ~RingingTip(); = //It is not a notification, it doesn't need to be as visible virtual float opacity() { return 0.5f; } diff --git a/src/widgets/tips/tipcollection.cpp b/src/widgets/tips/tipcolle= ction.cpp index 1e545c1..9545932 100644 --- a/src/widgets/tips/tipcollection.cpp +++ b/src/widgets/tips/tipcollection.cpp @@ -20,7 +20,7 @@ #include = #include "dialpadtip.h" -#include "riggingtip.h" +#include "ringingtip.h" #include "connectionlosttip.h" #include "conftip.h" #include "removeconferencetip.h" @@ -33,7 +33,7 @@ ConfTip* TipCollection::m_spConf = =3D nullptr; //Call related Tip* TipCollection::m_spEndCall =3D nullptr; Tip* TipCollection::m_spEndBusy =3D nullptr; -Tip* TipCollection::m_spRigging =3D nullptr; +Tip* TipCollection::m_spRinging =3D nullptr; Tip* TipCollection::m_spRemoveConference =3D nullptr; = //Account related @@ -91,15 +91,15 @@ Tip* TipCollection::endBusy() return m_spEndBusy; } = -///Return rigging tip -Tip* TipCollection::rigging() +///Return ringing tip +Tip* TipCollection::ringing() { - if (!m_spRigging) { - m_spRigging =3D new RiggingTip(); - m_spRigging->setAnimationIn(Tip::TipAnimation::Fade); - m_spRigging->setAnimationOut(Tip::TipAnimation::Fade); + if (!m_spRinging) { + m_spRinging =3D new RingingTip(); + m_spRinging->setAnimationIn(Tip::TipAnimation::Fade); + m_spRinging->setAnimationOut(Tip::TipAnimation::Fade); } - return m_spRigging; + return m_spRinging; } = //Account related diff --git a/src/widgets/tips/tipcollection.h b/src/widgets/tips/tipcollect= ion.h index 642ae25..33ff463 100644 --- a/src/widgets/tips/tipcollection.h +++ b/src/widgets/tips/tipcollection.h @@ -34,7 +34,7 @@ public: //Call related static Tip* endCall(); static Tip* endBusy(); - static Tip* rigging(); + static Tip* ringing(); static Tip* removeConference(); = //Account related @@ -54,7 +54,7 @@ private: //Call related static Tip* m_spEndCall; static Tip* m_spEndBusy; - static Tip* m_spRigging; + static Tip* m_spRinging; static Tip* m_spRemoveConference; = //Account related