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

805 Commits

Author SHA1 Message Date
tux3
be87047896
Merge branch 'pr1710' 2015-05-24 14:42:40 +02:00
Zetok Zalbavar
227c061ea1
Code consistency fixes → 's/ToxID/ToxId/'
Since consistency in code is most important, 'ToxId' is used
for code, whereas 'Tox ID' anywhere outside of code.

Also fixed wrong comments in core.h:
* qTox gets only public key of a grouchat peer, not their
  Tox ID
* qTox tries to return full address (Tox ID) or public key
2015-05-23 20:15:41 +01:00
Zetok Zalbavar
1554b3b131
Better error message for image resizing
Now user will know what is the acceptable file size limit.
2015-05-20 07:17:12 +01:00
tux3
4306f87df4
Fix call on null object, unititialized bool 2015-05-19 19:40:01 +02:00
Sean
b8bbe3654f Revert "Fixing behaviour for a tray icon on OS X"
This reverts commit f35f7e261a.
2015-05-18 13:55:19 -07:00
Sean
a0ecf86c20 Revert "Fixing tray icon visibility issue on OS X"
This reverts commit a4df4125e3.
2015-05-18 13:54:58 -07:00
tux3
7590d3d422
Fix tr() without QObject 2015-05-18 14:43:18 +02:00
marcel
f96db5a761 replaced ToxID struct with ToxId class. 2015-05-17 22:55:50 +02:00
marcel
2ffabb19ec Renamed function isMine to isActiveProfile.
As an user can have multiple profiles where each profile has its own
Tox ID the name isMine is not very accurate.
2015-05-17 22:26:56 +02:00
Yuri
cfd04d22d9 Copy ToxID into XA_PRIMARY clipboard too to make retrieval easier. 2015-05-17 21:24:20 +02:00
agilob
976bd346d6 style for comobobox in friendlist panel 2015-05-17 21:24:18 +02:00
marcel
920362349e removed warnings 2015-05-16 14:01:56 +02:00
tux3
57871c9270
Use GTK systray backend on MATE 2015-05-13 14:43:45 +02:00
Pro
15f0360d4e change to Qt::CaseInseisitive 2015-05-12 19:18:55 -07:00
Pro
e3ce8b486a make /ME work 2015-05-12 18:17:12 -07:00
tux3
76cbaf18f1
Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any ways, with the exception of "qTox" using the Tox Projet's "toxcore" collection of libraries.
In particular, the Tox Projet does not own copyright over the qTox Project's "qTox" collection of software, source code, and assets.
The qTox Project's assets are under the sole copyright of the qTox contributors, and no partiular rights are granted to the Tox Project.
2015-05-12 04:12:53 +02:00
tux3
600401a606
Fix vol/mic toggle buttons
They were suffering from double-connection syndrom, and the way muting worked was now conflicting with how the output sound level setting works

Fixes #1442
2015-05-12 02:45:04 +02:00
tux3
4a40269698
Implement and enable the audio sliders
It was about time
2015-05-12 01:27:32 +02:00
tux3
23c01f2d67
Merge branch 'pr1627'
qTox will no longer violate GPLv3 :>

closes #1361
2015-05-11 23:16:06 +02:00
agilob
904dd333b7 license box in advanced 2015-05-11 22:07:32 +01:00
tux3
12bbd47239
Fix #928
If the status button is disabled, then we stay consistent by disallowing the desktop GUI's status setting actions, which are used by the tray icon.
2015-05-11 23:01:25 +02:00
tux3
45c3491180
Merge branch 'pr1624'
QFormLayout for Public Information
2015-05-11 22:50:42 +02:00
tux3
70e7f34ecb
Don't ask to remove history for fake friend removal 2015-05-11 22:48:32 +02:00
saneki
55f92f86a8 Vertically aligned Public Information QFormLayout to appear more centered 2015-05-11 15:42:49 -05:00
saneki
50987fd37a Changed Public Information area in User Profile form to use a QFormLayout 2015-05-11 15:04:49 -05:00
tux3
a8b89e7d7d
Merge branch 'pr1621'
closes tux3/qtox#768

added values to slides in av settings, converted slot to qt5 style
audio sliders are disabled, they don't change anything anyway
2015-05-11 21:38:56 +02:00
agilob
3f11eab454 closes tux3/qtox#768
added values to slides in av settings, converted slot to qt5 style
audio sliders are disabled
2015-05-11 20:15:32 +01:00
agilob
826d21d21f closes tux3/qtox#1354
more signals/slots were converted to qt5 style
2015-05-11 19:14:09 +01:00
tux3
ef688f6097
Remove pointless or potentially sensitive log messages 2015-05-11 16:06:12 +02:00
sudden6
1506a9a30e Change log messages to fit new log format 2015-05-11 15:37:56 +02:00
tux3
ef780421f3
Merge branch 'pr1612'
Redesign draft for settings pane and proper UX for Mac

This pull request is capable of:

    Repairing settings UX on Mac (#1594)
    Turning scroll areas in settings panes to vertical scrolling only
    Proposing a redesign of settings pane (#1069)
2015-05-11 13:20:47 +02:00
Ilya Kowalewski
dce8182e3d Persistent aliases, finally resolves #697 2015-05-11 12:44:29 +03:00
Ilya Kowalewski
a8de72570f Fixing smiley alignment and wrong copyright years 2015-05-11 02:01:09 +03:00
Ilya Kowalewski
4ff2d339a0 Resolves issues reported in PR before and some BEAST features:
+ Works great on little boxes
+ Fixed the bug spotted by @zetok
+ Smiles are centered under the smiles combo box
+ Namings for layouts
2015-05-11 01:41:52 +03:00
Ilya Kowalewski
6c8b130a25 Redesign draft for settings pane and proper UX for Mac 2015-05-11 00:41:34 +03:00
Ilya Kowalewski
f35f7e261a Fixing behaviour for a tray icon on OS X 2015-05-10 23:19:40 +03:00
Ilya Kowalewski
a4df4125e3 Fixing tray icon visibility issue on OS X
Some quirking since Qt doesn't render SVG tray icons on OS X.
2015-05-10 21:54:21 +03:00
tux3
7adfd10e21
Merge branch 'pr1602' 2015-05-10 12:01:49 +02:00
agilob
dda7625d2b fix popup colors 2015-05-10 10:20:30 +01:00
agilob
69972e0d80 ask to remove history 2015-05-10 10:12:49 +01:00
Rohil Surana
21371a0f7d Toolicon Menu was not indicating active button 2015-05-10 09:40:59 +05:30
tux3
a232e5afd6
Merge branch 'pr1489'
Removes chat history of friend when removed, fixes #1486
2015-05-10 01:04:00 +02:00
tux3
8407bbada9
Limit outbound avatar size to 64kB 2015-05-10 00:56:41 +02:00
tux3
67e09de085
Save memory with lazy loading
Load the setting's cameria preview opengl context lazily and destroy it when done. Only preallocte Core's video buffer if we have any calls active, free up when all calls are done
2015-05-10 00:05:30 +02:00
tux3
1f926b3e6c
Fix small memory leak cleaning up video calls 2015-05-09 22:56:15 +02:00
tux3
a01e0db7ba
Fix some memory leaks and mismatches 2015-05-09 22:35:58 +02:00
llya Kowalewski
9d9fa90271 Include: complex -> cstdlib 2015-05-08 01:10:33 +03:00
llya Kowalewski
275f2a97f1 Fixing clang build on OSX
std::abs() is function from <complex>, current HEAD doesn't build on OSX with latest clang because of missing include. This commit fixes the build.
2015-05-08 00:31:42 +03:00
tux3
e79d40e356
Merge branch 'pr1446'
Conflicts:
	src/chatlog/chatlog.cpp
	src/chatlog/content/filetransferwidget.cpp
	src/core.cpp
	src/core/coreencryption.cpp
	src/toxdns.cpp
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/friendwidget.cpp
	src/widget/widget.cpp
2015-05-07 22:00:50 +02:00
tux3
19bf083b41
Merge branch 'pr1515' 2015-05-07 21:39:32 +02:00