1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #5 from tux3/master

``Rebase'' on upstream
This commit is contained in:
Nobody of note. 2014-07-06 10:45:03 -07:00
commit 3404c9768d
49 changed files with 1202 additions and 75 deletions

View File

@ -673,3 +673,103 @@ the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
GN UGENERAL
PUBLICLICENSEVe rsion2Ju ne
1991Copyr ightC1 9891991FreeSo ftwareFo un dationI
nc5 9Te m plePlaceSuite330BostonMA 021111307USAEveryoneIsP
ermittedToCopyAndDi stributeVerbatimCopiesofTh isLicenseDocumentbutC
hangingItIsNotAllowedPreambleTheLicensesForMostSoftwareAreDesignedToTakeAwa
yYourfreedomToShareAndC hangeItByContrasttheGNUGeneralPublicLicenseIsIntendedTo
GuaranteeYourFreedomToShareAndChangeF reeso f tw aretoMakeSureTheSoftwar eIsFr
eeForAllItsUsersT hisGeneralPublicLic ens eA p p liesToMostOfTheFreeSof t
wareFoundationsSoftwareAndToAnyOt h erPr ogramW ho se Au t horsCommitTousingItSomeOt
herFreeSoftwareFoundationSoftw ar e I s Cov er edBytheGNULibraryGen e
ralPublicLicenseInsteadYouCa nA p p l y I tToyourProgramstooWh en
WeSpeakOfFreeSoftwarewe AreReferr i n g T oFre e do mnotpriceOurGeneralP u
blicLicensesAreDesignedT oMake Su re Th at YouhaveTheFreed omToD is
tributeCopiesOfFreeSoftwar eand Ch ar geF orthisServ iceI fY
ouWishthatYouReceiveSou r ceCod eO rC anG etItifYouWantItthat
YouCanChangeTheSoftware OrUsePi e ce sOfItinNewFreePro grams
AndThatYouKnowYouCanDoTheseTh ingsToProtectYourRig htswe
NeedToMak eRestrictionsTh a tForbi danyoneToDenyYou Thes
eRightsOrToAskYouToS u r renderTh eRigh tsTheseRestrict
ionsTranslateToCerta i nR espo nsibi litiesForYouIfYoud
istributeCopiesOfT h eSo ftwa reorI fYouModifyItFor Examplei
fYouDistributeCopi es O f Suc hAProgramwh ethergratisOrF or
AFeeyouMustGiveTh e R e cip i entsAllTheRightsThatyouHaveY
ouMustMakeSureTha tT h ey too receiveOrCanGetThesourceCodeA
ndYouMustShowThemThes e Ter ms SoT h eyKnowTh eirrightsWeProtec t
Yo urRights WithTwoSt eps 1 CopyrightTheS oftwarean d 2Of
f erYouThisLicenseW h i ch G ivesYouLegalPe rmissionToCopyd is
t ribut eAndorModifyTh eS o f twar eAlsoforEachAutho rsProtectionAnd Ou
rsweWantToMak eC ert a i n th a t EveryoneUnderstandsThatThereIsNoWarr a
nty ForThisFr ee soft wa r e I f The SoftwareI sModifiedBySomeoneElseA
ndPassedOnwewan tItsRe c i pi ent s ToKnowThatWh atTheyHaveIsNotTheOrigina
lsothatAnyPr oblem sIntr o d u c e d B yO thersWillNotReflectOnTheOriginalau t
horsReputationsFinal ly an y F r e e Pr ogramIsT hreatenedConstantlyBySoftw a re
patentsWeWishToAvoidTheDange rT hatRedistributorsOfAFreeprogramWillIndivi du a
llyObt ainPatentLicens esin Eff ectM akin g TheprogramProprietaryToPreventThis weHav
eMadeItClearThatAnypatentMust B eLic ens e dForEver yon esFreeU seOrNotLicensedAtAllThePreciseTe r ms
AndConditionsForCopyingdi st r i butionAndm odificatio nFollowG NUGE NE RALPUBLICLICENSETERMSANDCONDIT I
ONSFORCOPYINGDISTRIBUTIONAN D M ODIFICATION0ThisLice n s eAppliesTo AnyProgramOrOtherWorkWhichConta i n
s aNoticePlacedByTheC opyright Holde rS a yingItMayBeDist r ibutedund e rTheT e rmsOfThisGeneralPublicLicenseTh e
ProgrambelowrefersToA nySuc h ProgramOrW o rkandAw orkB asedOnTheProgrammeansEi therTheProgra m
OrAnyDerivativeWorkUnderCop yrightLawthatIsToSayaWo r k Co nta inin gTheProgramOrAPortionO fIteitherVerbat
i mOrWithModificationsAndorTr anslatedIntoAnotherl an guag eH ere inaftertran s la tio nIsIncludedWithoutLimitationInth
e TermmodificationEachLicens eeIsAdd r e ss edAsyouAc tivitiesOt her Tha nCopyingdistributionA ndModificationAr e N
o tcoveredByThisLicenseTheyAreOu tsideIt s ScopeTh eActOfrunningT he Pro g r a m IsNotRestrictedandTheOutputFromTh e
Pr ogramisCovere dOnlyIfItsContent s ConstituteA WorkB as ed OnTh eProgramind ependentOfHav in gB een Ma de ByRunningTheProgramWhetherThatIsTr
u eDependsOnWhatTheProgramDo es1 Y o uMayCop yAndDistrib uteVerbatimCop iesOfThePr ogramssou rc e C od eAsYouReceiveItinAnyM ediumprovi d
e dThatYouconspicu ouslyAn dAppropriatel yPublishOnEac hCopyAn Appro p r iateco py rightNoti ce A nd DisclaimerOfWarrantyKeep IntactAllTh e
n oticesThatReferToThisLicenseAn dToT heAbsenc eOfA nyWa rran ty an dGiveAnyOthe r Rec ip ientsOf T heP rogramACopyOfThis LicensealongWithTh e
P rogramYouMayChargeAFeeFo rTheP hysicalAct OfTransf er rin gA Co p y a n dyouMa yAtY o u rOptionOfferWarran tyProtectionInExc h
angeForAFee2YouMayModi fyYou rCopyOrCop iesOfTheProgramOrAn yP ortion o fI tthusF o r min gAWorkBasedOnTheProgramandCopyAnd d
istributeSuchModificationsO r WorkUnder Th e Ter ms OfS ec t ion1abovep r o vi de dTha tYouA lsoM eetAllOfTheseConditionsaYouMu
s tCauseTheModifiedFilesToCarr yProminen tNotic e s sta tingThat Y ouChang e dT h e Fi lesAndTheDateOfAnyChangebYouMustCa u
se AnyWorkThatYouDistributeOr Publishtha t Inwho leOr I n Part Con ta i nsOr Is DerivedFromTheProgramOrAnypartThe r
eoftoBeLicensedAsAWholeAtNoC hargeToAllT hirdp a rtiesU n de r T heTerm sOfThisLic ensecIfTheModifiedProgramN
o r mallyReadsCommandsInteracti velyw henRunyouMus tCa us e Itw he nSt a rtedR u n ningForSuchin teractiveUseInTheMos tO
r dinaryWaytoPrintOrDisplayAna nnou n ce m e n tIn cl u d in gAnA ppropriateCopyrightNoticeAndAnoticeTh
a tThereIsNoWarrantyorElsesayin gThat Yo u P r ovi de a War r an ty AndTh atUsersMayRedistributeTheProgramUnder
theseConditionsandTellingTheUs erH ow ToVi e wA C opyO fThisLicenseExceptionIfTheProgra mItse
lfIsInteractiveButdoesNotNormal l yP r in tSuch A n Ann ouncementyourWorkBasedOntheProgr amIsNotRequ
i re dToPrintAnAnnouncementThese Re qu i r e m ent sApp l y ToT heModifiedWorkAsAWholeIfidentifiableSect
i o nsOfThatWor kAreNotDerivedFromTh e Pro gramandC a nBeRea sonablyConsideredIndependentAn dSepa
ra teWorksInthemselvesthenThisL ice ns ea n dIt sTerm s do No tAp plyT oThosesectionsWhenYouDistributeT
h em AsSeparateWorksButWhenYoudistr i b u teT h eS am eSecti o n sAsPartOfAWholeWhichIsAWorkBasedonTh
eP r ogramtheDi stributionOfTheWhole M u s tBe On T heT er msO fthisLicensewhos ePermissionsFor
O th erLicenseesExtendToTheentireW h o l ea ndT husToEa chAndEveryPartRegard lessOfWhoWroteI
t ThusitIsNotTheIntentOfThisSectionTo C l ai mR ightsOrCo nte s t y ou rRightsToWorkWrittenEntirelyByYouRatherthe
In tentIsToexerciseTheRightToControl T h e Di stribut ionOfDe ri va t iveOrcol le ctiveWorksBasedOnTheProgramInAdditi
onmereAggregationOfAnotherWorkNotBase d O nT heP rogram w ithTh e Pr og ramo r Wi t hAWorkBasedOnTheProgramOnAVolumeOfa
S torageOrDistributionMediumDoesNotBri ngT h eO therWorkUnde r theSc opeOfTh is Li cense3YouMa yCopyAndDistribute TheProgramorAWor
kBa sedOnItunderSection2InObjectCodeOr E xe cu tableF ormUnderTheT ermsOfSe ct i on s1 And2AboveProvidedThatYouAlsoDoOneOfTheFo llo
wi ngaAccompanyItWithTheCompleteCorrespond i ngMachiner e adablesource Co dewhichM us t Be Di stributedU nderTheTermsOfSection s1And2Above
OnA MediumCustomarilyUsedForSoftwareIn te rchangeOrbAccompa nyItWithAWrittenOfferv ali dFo rAt L ea s tThreeyear stoGiveAnyThirdP artyforACharge
No M oreThanYourcostOfPhysicallyP erform in g Sour ceDistributionaComplet emachinere adableCopyOfTheCorr espo n di ngSourceCodetoBedistributedUnde rTheTermsOfSect
i ons 1And2AboveOnAMediumcustomarilyUs ed Fo rSoftwareInterchang eOrcAccompanyItWithTheIn formationY o uRece ivedAsToT heOffertoDistributeCorrespondin
g SourceCodeThisAlternativeIsallowedOnl yF o r N oncommercialDistributionAndOnlyIfYou receivedT heProgramI nObj ec tC o deOrExecutableFormWithSuchanOfferinA ccordWithS
u bsectionBAboveTheSourceCodeForAWor kM e a nsThePreferredFo rmOfTheWorkFor m aking Modific ationsToI tFor A n Ex e cuta bleWorkcompleteSourceco deMeansAllTheSource
Co deForAllModulesItContainsplusAny associ a t edIn te rfaceDefin itionFile splus Th e ScriptsUsed T oco ntr olC o mpil ationAndInstallationOfTheExecutableHoweverasAs
pecialExceptiontheSourceCodeDistribu te d N e e dNotIncludean ythi ngThatIsNo rmallyDistributedinEitherSourceO r Bin ar yf orm W ithTheMajorCo mpone ntscompilerkernelandSoOn
O fTheoperatingSystemOnWhichTheExecutab l eRunsunlessThatCompone nt itselfAccompa nie sThe Ex ecutab le IfDi s t r ibu tio nOfExecutabl eOrObjectCodeIsMadeByOfferingacce
s sToCopyFromADesignatedPlacethenOfferin gEq uiv alen ta ccessToCopyTheSourceCode FromTh eSamePlac eCou ntsA sdi stribu tio n O fThe SourceCodeev enThoughThirdPart iesAreNotcompe
ll edToCopyTheSourceAlongWithTheObjectC o de 4YouMayN otCopymodifysubli cens eo rD istribute T heProgr a m exceptAsExpre sslyProvi dedUnderThisLi censeAnyAttemp
t otherwiseToCopymodifysublicenseOrD istrib u t eThe ProgramIsvoidandWill A ut oma ticall y T e rmin at e Y ou rRightsUnderThisLicenseHow everpartiesWhoHaveRecei
v edCopiesorRightsfromYouUnderthisLicense W il lNotHaveTheirLic ensesTerm i n a t ed SoLongAsS uchpartie sR e mainInFullCompliance5YouAreNotRequiredToAcceptThisLice
n sesinceYouHaveNotsignedItHowevernothingEl s eGran ts YouPer mission To Mo d if yOrdis trib uteTheProgra mO rItsDeri vativeWorksTheseActionsArepr ohibitedByLawIfYouDoNot
AcceptThisLicenseThereforebymodifyin gOrD istributi ng TheP r ogra morAnyWorkBase d OnThe P rogra my ouIndicateY o ur Acc eptanceOfThisLicenseToDoSoandallItsTermsAndConditionsFo
rCopyingdistributingOrModifyingtheProgram OrWork sBasedOn It6Ea c hTimeY ouRedi stribute T h eProgr am orAny WorkBasedOnTheProgramtheRecipientAutomaticallyReceivesAL
icenseFromTheoriginalLicensorToCopydis tributeOr Modify TheP r o gramS ubj e c t To t heseTermsAndCond i tion sYouMayNotImposeAnyFurtherrestrictionsOnTheRecipients
GN UGENERALPUBLICLICENSEVersion2June1991CopyrightC19891 991 Fr e eSoftwa r e Fo un dationIn c 59Temp lePlaceSuite330BostonMA0211 11307USAEveryoneIsPermitt
ed ToCopyAndDistributeVerbatimCopiesofThisLicens eD ocumentbutCh a ng in g I tI sNo t Al lowedP reamble TheLicen sesForMostSoftwareAreDesignedToTakeAwayYourfreed
o m ToShareAndChangeItByContrasttheGNUGeneralPub licLi censeIsIn te n d e d ToGuaran t ee YourFre ed om ToShareAndChangeFreesoftwaretoMakeSureTheSoftwareIsFreeF
or AllItsUsersThisGeneralPublicLicenseApplies ToMostOf TheFree S of twa re Fo un dat ions So ftware A ndToAnyOthe rProgramWhoseAuthorsCommitTous ingItSome OtherFreeSoftware
F oundationSoftwareIsCoveredBytheGNULibraryGeneralP ubli c Licens e In s te adYo uCanApplyItToyour Pr og ra mst ooWh en WeSpeakOfFreeSoftwareweAreReferringToFreedomnotpriceOurGen
er alPublicLicensesAreDesignedToMakeSureThatYouhaveTheFreedom ToDis tributeCopiesOfFreeSoftwar e a ndCharg e ForthisServiceIfYouWishthatYouReceiveSourceCodeOrCanGetItifYouWantItthatYouC
anChangeTheSoftwareOrUsePiecesOfItinNewFreeProgramsAndThatYouKnowYou Ca nD oTheseThingsToProtectYourRigh tswe N eedToMakeRes tr ictionsThatForbidanyoneToDenyYouTheseRightsOrToAskYouToSur
renderTheRightsTheseRestrictionsTranslateToCertainResponsibili tiesForYouIfYoudistributeCopiesOfTheSoftwa reo rIf YouModifyItForExampleifYouDistributeCopiesOfSuchAProgramwhethergratisO
r F orAFeeyouMustGiveTheRecipientsAllTheRightsThatyouHaveYouMustMakeSureT hatTheytooreceiveOrCanGetThe sourceCodeAnd YouMustShowThemTheseTermsSoTheyKnowTheirrightsWeProtectYourRightsWithTwoS
t eps1CopyrightTheSoftwareand2OfferYouThisLicen seWhichGivesYouLegalPermissionToCopydistributeA n dorModifyTheSoftwareAlsoforEachAuthorsProtectionAndOursweWantToMakeCertainthatEveryoneUnd
ers tandsThatThereIsNoWarrantyForThisFreesoftw areIfTheSoft wareIsModif iedBySomeoneElseAndPassed O n wewantItsRecipientsToKnowThatWhatTheyHaveIsNotTheOriginalsothatAnyProblemsIntroducedByO

View File

@ -57,6 +57,8 @@ export PATH=/location/to/qmake/binary:$PATH
For myself, the qmake binary was located in /Users/mouseym/Qt/5.3/clang_64/bin/.
This is not a permanent change, it will revert when you close the terminal window, to add it permanently you will need to add echo the above line to your .profile/.bash_profile.
Once this is installed, do the following;
```bash
@ -71,7 +73,7 @@ Open up the Makefile in a text editor (TextEdit/TextWrangler, etc).
You will need to modify the Makefile to point to your toxcore libs/includes.
The first change you will need to make is to point the Makefile towards the tox libs installed on your system. (Generally this is /usr/local/libs/).
The first change you will need to make is to point the Makefile towards the tox libs installed on your system. (Generally this is /usr/local/lib/).
Look for the line in the Makefile which references /toxgui/lib/libs/ and replace with the above).
@ -80,8 +82,9 @@ The second change to Makefile is to add the location of the includes (On my syst
To do this, search for the INCLUDES line and add the following to the end;
```bash
-I/usr/local/include/tox/
-I/usr/local/include/
```
Do not point it to the tox/ directory as the build script will look in there for you.
Save the Makefile.

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "audiobuffer.h"
AudioBuffer::AudioBuffer() :

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef AUDIOBUFFER_H
#define AUDIOBUFFER_H

Binary file not shown.

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "friend.h"
#include "friendlist.h"
#include "widget/friendwidget.h"

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef FRIEND_H
#define FRIEND_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "friend.h"
#include "friendlist.h"
#include <QMenu>

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef FRIENDLIST_H
#define FRIENDLIST_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "group.h"
#include "widget/groupwidget.h"
#include "widget/form/groupchatform.h"

16
group.h
View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef GROUP_H
#define GROUP_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "grouplist.h"
#include "group.h"

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef GROUPLIST_H
#define GROUPLIST_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "widget/widget.h"
#include "settings.h"
#include <QApplication>

17
res.qrc
View File

@ -1,3 +1,19 @@
<!--
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
-->
<RCC>
<qresource prefix="/conf">
<file alias="settings.ini">res/settings.ini</file>
@ -109,5 +125,6 @@
<file>ui/statusButton/dot_online.png</file>
<file>ui/statusButton/statusButton.css</file>
<file>ui/statusButton/menu_indicator.png</file>
<file>translations/de.qm</file>
</qresource>
</RCC>

View File

@ -4,6 +4,22 @@
#
#-------------------------------------------------
# Copyright (C) 2014 by Project Tox <https://tox.im>
#
# This file is part of qTox, a Qt-based graphical interface for Tox.
#
# This program is libre 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 COPYING file for more details.
QT += core gui network multimedia multimediawidgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@ -13,7 +29,8 @@ FORMS += widget.ui
CONFIG += c++11
TRANSLATIONS = translations/fr.ts \
translations/ru.ts
translations/ru.ts \
translations/de.ts
RESOURCES += res.qrc
@ -22,7 +39,7 @@ INSTALLS += target
INCLUDEPATH += libs/include
win32 {
LIBS += $$PWD/libs/lib/libtoxav.a $$PWD/libs/lib/libopus.a $$PWD/libs/lib/libvpx.a $$PWD/libs/lib/libtoxcore.a -lws2_32 $$PWD/libs/lib/libsodium.a
LIBS += $$PWD/libs/lib/libtoxav.a $$PWD/libs/lib/libopus.a $$PWD/libs/lib/libvpx.a $$PWD/libs/lib/libtoxcore.a -lws2_32 $$PWD/libs/lib/libsodium.a -lpthread
} else {
LIBS += -L$$PWD/libs/lib/ -ltoxcore -ltoxav -lsodium -lvpx
}

BIN
translations/de.qm Normal file

Binary file not shown.

315
translations/de.ts Normal file
View File

@ -0,0 +1,315 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0" language="de_DE">
<context>
<name>AddFriendForm</name>
<message>
<location filename="../widget/form/addfriendform.cpp" line="15"/>
<source>Add Friends</source>
<translation>Freunde hinzufügen</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="18"/>
<source>Tox ID</source>
<comment>Tox ID of the person you&apos;re sending a friend request to</comment>
<translation>Tox ID</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="19"/>
<source>Message</source>
<comment>The message you send in friend requests</comment>
<translation>Nachricht</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="20"/>
<source>Send friend request</source>
<translation>Freundschaftseinladung versenden</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="67"/>
<source>Tox me maybe?</source>
<comment>Default message in friend requests if the field is left blank. Write something appropriate!</comment>
<translation>Lass uns Toxen!</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="75"/>
<source>Please fill in a valid Tox ID</source>
<comment>Tox ID of the friend you&apos;re sending a friend request to</comment>
<translation>Bitte gib eine gültige Tox ID ein</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="92"/>
<source>This address does not exist</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="96"/>
<source>Error while looking up DNS</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation>Fehler beim Auflösen des DNS</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="102"/>
<source>Unexpected number of text records</source>
<comment>Error with the DNS</comment>
<translation>Unererwartete Anzahl von Texteinträgen</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="108"/>
<source>Unexpected number of values in text record</source>
<comment>Error with the DNS</comment>
<translation>Unerwartete Anzahl von Werten innerhalb des Texteintrages</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="115"/>
<source>The DNS lookup does not contain any Tox ID</source>
<comment>Error with the DNS</comment>
<translation>Der DNS Eintrag enthält keine gültige TOX ID</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="121"/>
<location filename="../widget/form/addfriendform.cpp" line="127"/>
<source>The DNS lookup does not contain a valid Tox ID</source>
<comment>Error with the DNS</comment>
<translation>Der DNS Eintrag enthält keine gültige TOX ID</translation>
</message>
</context>
<context>
<name>Camera</name>
<message>
<location filename="../widget/camera.cpp" line="145"/>
<source>Camera eror</source>
<translation>Kamerafehler</translation>
</message>
<message>
<location filename="../widget/camera.cpp" line="146"/>
<source>Camera format %1 not supported, can&apos;t use the camera</source>
<translation>Kameraformat %1 wird nicht unterstützt. Die Kamera kann nicht verwendet werden</translation>
</message>
</context>
<context>
<name>ChatForm</name>
<message>
<location filename="../widget/form/chatform.cpp" line="265"/>
<source>Send a file</source>
<translation>Datei versenden</translation>
</message>
<message>
<location filename="../widget/form/chatform.cpp" line="590"/>
<location filename="../widget/form/chatform.cpp" line="596"/>
<source>Save chat log</source>
<translation>Chatverlauf speichern</translation>
</message>
</context>
<context>
<name>CopyableElideLabel</name>
<message>
<location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
</context>
<context>
<name>FileTransfertWidget</name>
<message>
<location filename="../widget/filetransfertwidget.cpp" line="249"/>
<source>Save a file</source>
<comment>Title of the file saving dialog</comment>
<translation>Datei speichern</translation>
</message>
</context>
<context>
<name>FriendRequestDialog</name>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="30"/>
<source>Friend request</source>
<comment>Title of the window to aceept/deny a friend request</comment>
<translation>Freundschaftsanfrage</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="32"/>
<source>Someone wants to make friends with you</source>
<translation>Es möchte jemand mit dir befreundet sein</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="33"/>
<source>User ID:</source>
<translation>Benutzer ID:</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="37"/>
<source>Friend request message:</source>
<translation>Nachricht</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="44"/>
<source>Accept</source>
<comment>Accept a friend request</comment>
<translation>Akzeptieren</translation>
</message>
<message>
<location filename="../widget/tool/friendrequestdialog.cpp" line="45"/>
<source>Reject</source>
<comment>Reject a friend request</comment>
<translation>Ablehnen</translation>
</message>
</context>
<context>
<name>FriendWidget</name>
<message>
<location filename="../widget/friendwidget.cpp" line="71"/>
<source>Copy friend ID</source>
<comment>Menu to copy the Tox ID of that friend</comment>
<translation>Tox ID kopieren</translation>
</message>
<message>
<location filename="../widget/friendwidget.cpp" line="72"/>
<source>Invite in group</source>
<comment>Menu to invite a friend in a groupchat</comment>
<translation>In Gruppe einladen</translation>
</message>
<message>
<location filename="../widget/friendwidget.cpp" line="82"/>
<source>Remove friend</source>
<comment>Menu to remove the friend from our friendlist</comment>
<translation>Freund entfernen</translation>
</message>
</context>
<context>
<name>GroupChatForm</name>
<message>
<location filename="../widget/form/groupchatform.cpp" line="32"/>
<source>%1 users in chat</source>
<comment>Number of users in chat</comment>
<translation>%1 Personen im Chat</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="155"/>
<source>&lt;Unknown&gt;</source>
<translation>&lt;Unbekannt&gt;</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="224"/>
<source>%1 users in chat</source>
<translation>%1 Personen im Chat</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="243"/>
<source>Save chat log</source>
<translation>Chatverlauf speichern</translation>
</message>
</context>
<context>
<name>GroupWidget</name>
<message>
<location filename="../widget/groupwidget.cpp" line="38"/>
<location filename="../widget/groupwidget.cpp" line="130"/>
<source>%1 users in chat</source>
<translation>%1 Personen im Chat</translation>
</message>
<message>
<location filename="../widget/groupwidget.cpp" line="40"/>
<location filename="../widget/groupwidget.cpp" line="132"/>
<source>0 users in chat</source>
<translation>0 Personen im Chat</translation>
</message>
<message>
<location filename="../widget/groupwidget.cpp" line="73"/>
<source>Quit group</source>
<comment>Menu to quit a groupchat</comment>
<translation>Gruppe verlassen</translation>
</message>
</context>
<context>
<name>SelfCamView</name>
<message>
<location filename="../widget/selfcamview.cpp" line="16"/>
<source>Tox video test</source>
<comment>Title of the window to test the video/webcam</comment>
<translation>Tox Video testen</translation>
</message>
</context>
<context>
<name>SettingsForm</name>
<message>
<location filename="../widget/form/settingsform.cpp" line="15"/>
<source>User Settings</source>
<comment>&quot;Headline&quot; of the window</comment>
<translation>Einstellungen</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="18"/>
<source>Name</source>
<comment>Username/nick</comment>
<translation>Benutzername</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="19"/>
<source>Status</source>
<comment>Status message</comment>
<translation>Status</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="28"/>
<source>Test video</source>
<comment>Text on a button to test the video/webcam</comment>
<translation>Video testen</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="29"/>
<source>Enable IPv6 (recommended)</source>
<comment>Text on a checkbox to enable IPv6</comment>
<translation>IPv6 aktivieren (empfohlen)</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="31"/>
<source>Use translations</source>
<comment>Text on a checkbox to enable translations</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Widget</name>
<message>
<location filename="../widget.ui" line="26"/>
<source>Tox</source>
<translation>Tox</translation>
</message>
<message>
<location filename="../widget.ui" line="1935"/>
<source>Your name</source>
<translation>Dein Name</translation>
</message>
<message>
<location filename="../widget.ui" line="2017"/>
<source>Your status</source>
<translation>Dein Status</translation>
</message>
<message>
<location filename="../widget.ui" line="3293"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
<location filename="../widget.ui" line="3296"/>
<source>Ctrl+Q</source>
<translation>Strg+Q</translation>
</message>
<message>
<source>Online</source>
<comment>Button to set your status to &apos;Online&apos;</comment>
<translation type="obsolete">Online</translation>
</message>
<message>
<source>Away</source>
<comment>Button to set your status to &apos;Away&apos;</comment>
<translation type="obsolete">Abwesend</translation>
</message>
<message>
<source>Busy</source>
<comment>Button to set your status to &apos;Busy&apos;</comment>
<translation type="obsolete">Beschäftigt</translation>
</message>
</context>
</TS>

View File

@ -38,32 +38,38 @@
<translation>Merci de remplir un ID Tox valide</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="90"/>
<location filename="../widget/form/addfriendform.cpp" line="92"/>
<source>This address does not exist</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="96"/>
<source>Error while looking up DNS</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation>Erreur en consultant le serveur DNS</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="96"/>
<location filename="../widget/form/addfriendform.cpp" line="102"/>
<source>Unexpected number of text records</source>
<comment>Error with the DNS</comment>
<translation>Nombre d&apos;entrées texte innatendu</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="102"/>
<location filename="../widget/form/addfriendform.cpp" line="108"/>
<source>Unexpected number of values in text record</source>
<comment>Error with the DNS</comment>
<translation>Nombre d&apos;entrées numériques dans l&apos;entrée texte innatendu</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="109"/>
<location filename="../widget/form/addfriendform.cpp" line="115"/>
<source>The DNS lookup does not contain any Tox ID</source>
<comment>Error with the DNS</comment>
<translation>La réponse DNS ne contient aucun ID Tox</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="115"/>
<location filename="../widget/form/addfriendform.cpp" line="121"/>
<location filename="../widget/form/addfriendform.cpp" line="127"/>
<source>The DNS lookup does not contain a valid Tox ID</source>
<comment>Error with the DNS</comment>
<translation>La réponse DNS ne contient pas d&apos;ID Tox valide</translation>
@ -85,13 +91,13 @@
<context>
<name>ChatForm</name>
<message>
<location filename="../widget/form/chatform.cpp" line="261"/>
<location filename="../widget/form/chatform.cpp" line="265"/>
<source>Send a file</source>
<translation>Envoyer un fichier</translation>
</message>
<message>
<location filename="../widget/form/chatform.cpp" line="586"/>
<location filename="../widget/form/chatform.cpp" line="592"/>
<location filename="../widget/form/chatform.cpp" line="590"/>
<location filename="../widget/form/chatform.cpp" line="596"/>
<source>Save chat log</source>
<translation>Sauvegarder l&apos;historique de conversation</translation>
</message>
@ -107,7 +113,7 @@
<context>
<name>FileTransfertWidget</name>
<message>
<location filename="../widget/filetransfertwidget.cpp" line="231"/>
<location filename="../widget/filetransfertwidget.cpp" line="249"/>
<source>Save a file</source>
<comment>Title of the file saving dialog</comment>
<translation>Sauvegarder un fichier</translation>
@ -152,19 +158,19 @@
<context>
<name>FriendWidget</name>
<message>
<location filename="../widget/friendwidget.cpp" line="65"/>
<location filename="../widget/friendwidget.cpp" line="71"/>
<source>Copy friend ID</source>
<comment>Menu to copy the Tox ID of that friend</comment>
<translation>Copier l&apos;ID ami</translation>
</message>
<message>
<location filename="../widget/friendwidget.cpp" line="66"/>
<location filename="../widget/friendwidget.cpp" line="72"/>
<source>Invite in group</source>
<comment>Menu to invite a friend in a groupchat</comment>
<translation>Inviter dans un groupe</translation>
</message>
<message>
<location filename="../widget/friendwidget.cpp" line="76"/>
<location filename="../widget/friendwidget.cpp" line="82"/>
<source>Remove friend</source>
<comment>Menu to remove the friend from our friendlist</comment>
<translation>Supprimer ami</translation>
@ -184,12 +190,12 @@
<translation>&lt;Inconnu&gt;</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="220"/>
<location filename="../widget/form/groupchatform.cpp" line="224"/>
<source>%1 users in chat</source>
<translation>%1 personnes</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="239"/>
<location filename="../widget/form/groupchatform.cpp" line="243"/>
<source>Save chat log</source>
<translation>Sauvegarder l&apos;historique de conversation</translation>
</message>
@ -198,18 +204,18 @@
<name>GroupWidget</name>
<message>
<location filename="../widget/groupwidget.cpp" line="38"/>
<location filename="../widget/groupwidget.cpp" line="126"/>
<location filename="../widget/groupwidget.cpp" line="130"/>
<source>%1 users in chat</source>
<translation>%1 personnes</translation>
</message>
<message>
<location filename="../widget/groupwidget.cpp" line="40"/>
<location filename="../widget/groupwidget.cpp" line="128"/>
<location filename="../widget/groupwidget.cpp" line="132"/>
<source>0 users in chat</source>
<translation>0 personnes</translation>
</message>
<message>
<location filename="../widget/groupwidget.cpp" line="68"/>
<location filename="../widget/groupwidget.cpp" line="73"/>
<source>Quit group</source>
<comment>Menu to quit a groupchat</comment>
<translation>Quitter le groupe</translation>
@ -227,80 +233,83 @@
<context>
<name>SettingsForm</name>
<message>
<location filename="../widget/form/settingsform.cpp" line="13"/>
<location filename="../widget/form/settingsform.cpp" line="15"/>
<source>User Settings</source>
<comment>&quot;Headline&quot; of the window</comment>
<translation>Configuration</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="16"/>
<location filename="../widget/form/settingsform.cpp" line="18"/>
<source>Name</source>
<comment>Username/nick</comment>
<translation>Nom</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="17"/>
<location filename="../widget/form/settingsform.cpp" line="19"/>
<source>Status</source>
<comment>Status message</comment>
<translation>Status</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="22"/>
<location filename="../widget/form/settingsform.cpp" line="28"/>
<source>Test video</source>
<comment>Text on a button to test the video/webcam</comment>
<translation>Tester la vidéo</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="23"/>
<location filename="../widget/form/settingsform.cpp" line="29"/>
<source>Enable IPv6 (recommended)</source>
<comment>Text on a checkbox to enable IPv6</comment>
<translation>Activer IPv6 (recommandé)</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="31"/>
<source>Use translations</source>
<comment>Text on a checkbox to enable translations</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Widget</name>
<message>
<location filename="../widget.ui" line="20"/>
<location filename="../widget.ui" line="26"/>
<source>Tox</source>
<translation>Tox</translation>
</message>
<message>
<location filename="../widget.ui" line="1593"/>
<location filename="../widget.ui" line="1935"/>
<source>Your name</source>
<translation>Votre nom</translation>
</message>
<message>
<location filename="../widget.ui" line="1675"/>
<location filename="../widget.ui" line="2017"/>
<source>Your status</source>
<translation>Votre status</translation>
</message>
<message>
<location filename="../widget.ui" line="2811"/>
<location filename="../widget.ui" line="3293"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
<location filename="../widget.ui" line="2814"/>
<location filename="../widget.ui" line="3296"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
<location filename="../widget/widget.cpp" line="1112"/>
<source>Online</source>
<comment>Button to set your status to &apos;Online&apos;</comment>
<translation>Connecté</translation>
<translation type="obsolete">Connecté</translation>
</message>
<message>
<location filename="../widget/widget.cpp" line="1113"/>
<source>Away</source>
<comment>Button to set your status to &apos;Away&apos;</comment>
<translation>Indisponnible</translation>
<translation type="obsolete">Indisponnible</translation>
</message>
<message>
<location filename="../widget/widget.cpp" line="1114"/>
<source>Busy</source>
<comment>Button to set your status to &apos;Busy&apos;</comment>
<translation>Occupé</translation>
<translation type="obsolete">Occupé</translation>
</message>
</context>
</TS>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ru_RU">
<TS version="2.0" language="ru_RU">
<context>
<name>AddFriendForm</name>
<message>
@ -41,31 +41,37 @@
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="92"/>
<source>This address does not exist</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="96"/>
<source>Error while looking up DNS</source>
<comment>The DNS gives the Tox ID associated to toxme.se addresses</comment>
<translation>Ошибка при просмотре DNS</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="98"/>
<location filename="../widget/form/addfriendform.cpp" line="102"/>
<source>Unexpected number of text records</source>
<comment>Error with the DNS</comment>
<translation>Непредвиденное количество текстовых записей</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="104"/>
<location filename="../widget/form/addfriendform.cpp" line="108"/>
<source>Unexpected number of values in text record</source>
<comment>Error with the DNS</comment>
<translation>Непредвиденное количество значений в текстовой записи</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="111"/>
<location filename="../widget/form/addfriendform.cpp" line="115"/>
<source>The DNS lookup does not contain any Tox ID</source>
<comment>Error with the DNS</comment>
<translation>В ответе DNS ни одного Tox ID</translation>
</message>
<message>
<location filename="../widget/form/addfriendform.cpp" line="117"/>
<location filename="../widget/form/addfriendform.cpp" line="123"/>
<location filename="../widget/form/addfriendform.cpp" line="121"/>
<location filename="../widget/form/addfriendform.cpp" line="127"/>
<source>The DNS lookup does not contain a valid Tox ID</source>
<comment>Error with the DNS</comment>
<translation>Ответ DNS не содержит корректных Tox ID</translation>
@ -87,13 +93,13 @@
<context>
<name>ChatForm</name>
<message>
<location filename="../widget/form/chatform.cpp" line="261"/>
<location filename="../widget/form/chatform.cpp" line="265"/>
<source>Send a file</source>
<translation type="unfinished">Отправить файл</translation>
</message>
<message>
<location filename="../widget/form/chatform.cpp" line="586"/>
<location filename="../widget/form/chatform.cpp" line="592"/>
<location filename="../widget/form/chatform.cpp" line="590"/>
<location filename="../widget/form/chatform.cpp" line="596"/>
<source>Save chat log</source>
<translation>Сохранить лог чата</translation>
</message>
@ -109,7 +115,7 @@
<context>
<name>FileTransfertWidget</name>
<message>
<location filename="../widget/filetransfertwidget.cpp" line="233"/>
<location filename="../widget/filetransfertwidget.cpp" line="249"/>
<source>Save a file</source>
<comment>Title of the file saving dialog</comment>
<translation>Сохранить файл</translation>
@ -188,12 +194,12 @@
<translation>&lt;Неизвестно&gt;</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="220"/>
<location filename="../widget/form/groupchatform.cpp" line="224"/>
<source>%1 users in chat</source>
<translation>%1 пользователей в чате</translation>
</message>
<message>
<location filename="../widget/form/groupchatform.cpp" line="239"/>
<location filename="../widget/form/groupchatform.cpp" line="243"/>
<source>Save chat log</source>
<translation>Сохранить лог чата</translation>
</message>
@ -208,13 +214,13 @@
</message>
<message>
<location filename="../widget/groupwidget.cpp" line="38"/>
<location filename="../widget/groupwidget.cpp" line="128"/>
<location filename="../widget/groupwidget.cpp" line="130"/>
<source>%1 users in chat</source>
<translation>%1 пользователей в чате</translation>
</message>
<message>
<location filename="../widget/groupwidget.cpp" line="40"/>
<location filename="../widget/groupwidget.cpp" line="130"/>
<location filename="../widget/groupwidget.cpp" line="132"/>
<source>0 users in chat</source>
<translation>Ни одного пользователя в чате</translation>
</message>
@ -231,35 +237,41 @@
<context>
<name>SettingsForm</name>
<message>
<location filename="../widget/form/settingsform.cpp" line="13"/>
<location filename="../widget/form/settingsform.cpp" line="15"/>
<source>User Settings</source>
<comment>&quot;Headline&quot; of the window</comment>
<translation>Пользовательские настройки</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="16"/>
<location filename="../widget/form/settingsform.cpp" line="18"/>
<source>Name</source>
<comment>Username/nick</comment>
<translation>Имя</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="17"/>
<location filename="../widget/form/settingsform.cpp" line="19"/>
<source>Status</source>
<comment>Status message</comment>
<translation>Статус</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="22"/>
<location filename="../widget/form/settingsform.cpp" line="28"/>
<source>Test video</source>
<comment>Text on a button to test the video/webcam</comment>
<translation>Проверить видео</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="23"/>
<location filename="../widget/form/settingsform.cpp" line="29"/>
<source>Enable IPv6 (recommended)</source>
<comment>Text on a checkbox to enable IPv6</comment>
<translation>Включить IPv6 (рекомендуется)</translation>
</message>
<message>
<location filename="../widget/form/settingsform.cpp" line="31"/>
<source>Use translations</source>
<comment>Text on a checkbox to enable translations</comment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Widget</name>
@ -269,43 +281,40 @@
<translation>Tox</translation>
</message>
<message>
<location filename="../widget.ui" line="1683"/>
<location filename="../widget.ui" line="1935"/>
<source>Your name</source>
<translation>Ваше имя</translation>
</message>
<message>
<location filename="../widget.ui" line="1759"/>
<location filename="../widget.ui" line="2017"/>
<source>Your status</source>
<translation>Ваш статус</translation>
</message>
<message>
<location filename="../widget.ui" line="3005"/>
<location filename="../widget.ui" line="3293"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
<location filename="../widget.ui" line="3008"/>
<location filename="../widget.ui" line="3296"/>
<source>Ctrl+Q</source>
<translation>Ctrl+Q</translation>
</message>
<message>
<location filename="../widget/widget.cpp" line="1149"/>
<source>Online</source>
<comment>Button to set your status to &apos;Online&apos;</comment>
<translation>В сети</translation>
<translation type="obsolete">В сети</translation>
</message>
<message>
<location filename="../widget/widget.cpp" line="1150"/>
<source>Away</source>
<comment>Button to set your status to &apos;Away&apos;</comment>
<translatorcomment>Вероятно, это не столь долгое путешествие</translatorcomment>
<translation>Отошёл</translation>
<translation type="obsolete">Отошёл</translation>
</message>
<message>
<location filename="../widget/widget.cpp" line="1151"/>
<source>Busy</source>
<comment>Button to set your status to &apos;Busy&apos;</comment>
<translation>Занят</translation>
<translation type="obsolete">Занят</translation>
</message>
</context>
</TS>

View File

@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
-->
<ui version="4.0">
<class>Widget</class>
<widget class="QWidget" name="Widget">
@ -18,8 +34,8 @@
</property>
<property name="maximumSize">
<size>
<width>1920</width>
<height>1080</height>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
@ -2030,7 +2046,7 @@ QSplitter:handle{
</property>
<property name="sizeHint" stdset="0">
<size>
<width>2</width>
<width>10</width>
<height>20</height>
</size>
</property>
@ -2115,7 +2131,7 @@ QSplitter:handle{
<rect>
<x>0</x>
<y>0</y>
<width>255</width>
<width>256</width>
<height>199</height>
</rect>
</property>
@ -2590,6 +2606,9 @@ QSplitter:handle{
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Add friends</string>
</property>
<property name="text">
<string/>
</property>
@ -2629,6 +2648,9 @@ QSplitter:handle{
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Create a group chat</string>
</property>
<property name="text">
<string/>
</property>
@ -2674,6 +2696,9 @@ QSplitter:handle{
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>(button inactive currently)</string>
</property>
<property name="text">
<string/>
</property>
@ -2719,6 +2744,9 @@ QSplitter:handle{
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Change your settings</string>
</property>
<property name="text">
<string/>
</property>

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "camera.h"
#include <QVideoSurfaceFormat>
#include <QMessageBox>

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef CAMERA_H
#define CAMERA_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "filetransfertwidget.h"
#include "widget.h"
#include "core.h"

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef FILETRANSFERTWIDGET_H
#define FILETRANSFERTWIDGET_H

View File

@ -1,9 +1,26 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "addfriendform.h"
#include <QFont>
#include <QMessageBox>
#include <tox/tox.h>
#define TOX_ID_SIZE 76
#define TOX_ID_LENGTH 2*TOX_FRIEND_ADDRESS_SIZE
AddFriendForm::AddFriendForm() : dns(this)
{
@ -50,7 +67,7 @@ void AddFriendForm::show(Ui::Widget &ui)
bool AddFriendForm::isToxId(const QString &value) const
{
const QRegularExpression hexRegExp("^[A-Fa-f0-9]+$");
return value.length() == TOX_ID_SIZE && value.contains(hexRegExp);
return value.length() == TOX_ID_LENGTH && value.contains(hexRegExp);
}
void AddFriendForm::showWarning(const QString &message) const
@ -117,12 +134,12 @@ void AddFriendForm::handleDnsLookup()
}
idx += idKeyWord.length();
if (entry.length() < idx + static_cast<int>(TOX_ID_SIZE)) {
if (entry.length() < idx + static_cast<int>(TOX_ID_LENGTH)) {
showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS"));
return;
}
const QString friendAdress = entry.mid(idx, TOX_ID_SIZE);
const QString friendAdress = entry.mid(idx, TOX_ID_LENGTH);
if (!isToxId(friendAdress)) {
showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS"));
return;

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef ADDFRIENDFORM_H
#define ADDFRIENDFORM_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "chatform.h"
#include "friend.h"
#include "widget/friendwidget.h"

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef CHATFORM_H
#define CHATFORM_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "groupchatform.h"
#include "group.h"
#include "widget/groupwidget.h"

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef GROUPCHATFORM_H
#define GROUPCHATFORM_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "settingsform.h"
#include "widget/widget.h"
#include "settings.h"
@ -17,7 +33,7 @@ SettingsForm::SettingsForm()
nameLabel.setText(tr("Name","Username/nick"));
statusTextLabel.setText(tr("Status","Status message"));
idLabel.setText("Tox ID (click here to copy)");
idLabel.setText("Tox ID " + tr("(click here to copy)", "Click on this text to copy TID to clipboard"));
id.setFont(small);
id.setTextInteractionFlags(Qt::TextSelectableByMouse);
id.setReadOnly(true);
@ -48,6 +64,7 @@ SettingsForm::SettingsForm()
connect(&videoTest, SIGNAL(clicked()), this, SLOT(onTestVideoClicked()));
connect(&enableIPv6, SIGNAL(stateChanged(int)), this, SLOT(onEnableIPv6Updated()));
connect(&useTranslations, SIGNAL(stateChanged(int)), this, SLOT(onUseTranslationUpdated()));
connect(&idLabel, SIGNAL(clicked()), this, SLOT(copyIdClicked()));
}

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef SETTINGSFORM_H
#define SETTINGSFORM_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "friendwidget.h"
#include "group.h"
#include "grouplist.h"

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef FRIENDWIDGET_H
#define FRIENDWIDGET_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "groupwidget.h"
#include "grouplist.h"
#include "group.h"

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef GROUPWIDGET_H
#define GROUPWIDGET_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "netcamview.h"
NetCamView::NetCamView(QWidget* parent)

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef NETCAMVIEW_H
#define NETCAMVIEW_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "selfcamview.h"
#include <QActionGroup>
#include <QMessageBox>

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef SELFCAMVIEW_H
#define SELFCAMVIEW_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "chattextedit.h"
#include <QKeyEvent>

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef CHATTEXTEDIT_H
#define CHATTEXTEDIT_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "clickablelabel.h"
ClickableLabel::ClickableLabel(QWidget *parent) :

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef CLICKABLELABEL_H
#define CLICKABLELABEL_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "videosurface.h"
#include "core.h"
#include <QVideoFrame>

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef VIDEOSURFACE_H
#define VIDEOSURFACE_H

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#include "widget.h"
#include "ui_widget.h"
#include "settings.h"
@ -175,6 +191,9 @@ Widget::Widget(QWidget *parent) :
currentSizes[0] = 225;
ui->centralWidget->setSizes(currentSizes);
ui->statusButton->setObjectName("offline");
ui->statusButton->style()->polish(ui->statusButton);
camera = new Camera;
camview = new SelfCamView(camera);

View File

@ -1,3 +1,19 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre 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 COPYING file for more details.
*/
#ifndef WIDGET_H
#define WIDGET_H