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

495 Commits

Author SHA1 Message Date
PKev
0152937eb4 fix: save position when moving widget
fix #2063
2015-10-06 16:13:47 +03:00
TheNain38
05d511bb66 Fix another parsing bug, fix Action message bold
When you are the author of an 'action' message, it is not in bold, but if reloading history it is
2015-10-04 14:36:38 +02:00
TheNain38
f99c9f127d Fix ACTION messages, status, username HTML parsing 2015-10-03 21:31:41 +02:00
tux3
e1509a9f03
Further cleanup Widget::retranslateUi 2015-09-28 00:05:42 +02:00
tux3
14235c5a19
Refactor code duplication in Widget::retranslateUi 2015-09-27 23:52:10 +02:00
TheNain38
879c396efc Added dynamic translation to status and username 2015-09-27 21:36:17 +02:00
Impyy
c49ce6208e Load user status from data file 2015-09-25 20:56:11 +02:00
tux3
6229e045f2
Merge branch 'pr2223'
Fixes #659
2015-09-14 19:51:10 +02:00
PKEv
564b32eb7c save alias 2015-09-14 20:10:35 +03:00
TheSpiritXIII
d0e682214b Multi-window: Fix blinking tray icon regression 2015-09-12 19:07:45 +02:00
TheSpiritXIII
280737fda8 Multi-window: Fix group chat event flag regression 2015-09-12 19:07:45 +02:00
TheSpiritXIII
828dbf436f Multi-window: Fix compile for non-OS X 2015-09-12 19:07:45 +02:00
TheSpiritXIII
97bdaa5e5f Multi-window: OS X window list, fix OS X translations 2015-09-12 19:07:45 +02:00
TheSpiritXIII
23e7f9326e Multi-window: Fix open group in separate window when already open 2015-09-12 19:07:45 +02:00
TheSpiritXIII
ee627afc87 Multi-window: Fix buttons staying pressed while in separate window mode, make dialogs alert, fix group chat event flags 2015-09-12 19:07:45 +02:00
TheSpiritXIII
f825985856 Multi-window: Translate all dialogs correctly, don't allow remove friend on dialogs 2015-09-12 19:07:44 +02:00
TheSpiritXIII
6a5fb9f518 Multi-window: Dispaly own username on detached windows, fix log out while having detached windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
29c72549a2 Multi-window: Fix segfault on removing groups and friends who are also in active windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c5317c6137 Multi-window: Fix dialog null states/geometry 2015-09-12 19:07:44 +02:00
TheSpiritXIII
868099d484 Multi-window: Normalize window size on separate change, notification separate fix, segfault groupchat fix 2015-09-12 19:07:44 +02:00
TheSpiritXIII
014ba45ebb Multi-window: Keep window size, fix segfault, circle integration, changed defaults 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c181df6336 Multi-window: Cycle widgets in opened windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
9867e3b4c5 Multi-window: Allow opening new window when already open, fix drop when already open 2015-09-12 19:07:44 +02:00
TheSpiritXIII
7bcf654c72 Multi-window: Add drag/drop friends to windows, fix call confirm widget 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c684d31d02 Multi-window: Alert window storing chat, add group widgets, update statuses and avatars 2015-09-12 19:07:44 +02:00
TheSpiritXIII
fa3ab02cec Multi-window: Tabbed interface 2015-09-12 19:07:44 +02:00
TheSpiritXIII
22fcc3f7a0 Multi-window capabilities for all chats and menus 2015-09-12 19:07:44 +02:00
aaannndddyyy
4fb4ba7617 correct a typo 2015-09-07 20:50:41 +00:00
tux3
8fbc0c8b59
Remove some debug output fluff 2015-09-06 00:11:47 +02:00
agilob
12e8d07a97
revert change history to -7 2015-09-03 17:58:23 +01:00
agilob
31c44b9db0
Merge branch 'master' of github.com:tux3/qTox into default_dir_for_saving 2015-09-03 17:57:23 +01:00
Zetok Zalbavar
06611d618e
Revert changes from merge of #2092 pull request
That pull request made qTox crash in a number of ways, with no quick fix
available.

Hopefully there will be a way to fix crash, so that this commit could be
reverted, and fix applied.
2015-08-30 21:28:53 +01:00
agilob
db5903c2fe
set one global initial file accept directory for all file transfers 2015-08-30 20:36:39 +01:00
agilob
d6b176d955
Merge remote-tracking branch 'TheSpirit/requests'
merge awaiting friend requests, fix formatting conflict
2015-08-30 14:25:46 +01:00
rku
74d98fd0c2 This dialog solves all confusion that arose from current verification method and is accident-proof. Current method asks if
user also wants to remove chat history. However confused user may not carefully read message and click "no" because he does
not want to remve contact. However in this case contact is in fact removed but history is preserved. It is also open to
possiblity that key smashing deletes contact by accident. This is very inconvenient because tox ids are long and hard to
memorize. If someone removes contact by accident then he would need to find id of that contact in order to contact him/her.
Sometimes this may be difficult.

New contact removal confirmation dialog prompts use to enter "YES" in the text boxin order to enable "OK" button so removal
can be accepted. It also has checkbox for history removal. Dialog will work with translations. Russian user would need to
enter "Да" in order to accept removal.
2015-08-22 12:17:04 +03:00
TheSpiritXIII
d21a6d29de Fix request translations and make group button stay down 2015-08-21 12:36:59 -04:00
TheSpiritXIII
2043908e15 Remove dialog for group invites 2015-08-21 10:32:00 -04:00
TheSpiritXIII
997418a9de Store friend requests 2015-08-20 17:58:03 -04:00
TheSpiritXIII
814bd922ca Video: Group audio view avatars 2015-08-18 13:40:11 -04:00
TheSpiritXIII
1522d3848c Video: Show avatar, clean ups 2015-08-13 09:31:15 -04:00
TheSpiritXIII
9d12c295be Keep aspect ratio of inner video 2015-08-11 14:01:49 -04:00
tux3
74b771373d
Merge branch 'pr1953' 2015-07-22 23:33:21 +02:00
TheSpiritXIII
b9882c3680 OSX: Remove dead code and make Widget own all their actions 2015-07-17 08:20:47 -04:00
TheSpiritXIII
49071baac7 OSX usable menu bar on login screen 2015-07-09 08:43:19 -04:00
TheSpiritXIII
7bb56bcda9 OSX main menu bar 2015-07-08 14:14:25 -04:00
TheSpiritXIII
bb29b07d70 Fix activity sorting out of bounds, update activity category when changed 2015-07-01 09:10:55 -04:00
TheSpiritXIII
d2c0301103 Circles: Fix circle color on theme change, remove debugging stuff
Conflicts:
	res.qrc
2015-06-26 13:38:51 +02:00
TheSpiritXIII
b6df8ce34a Circles: Fix sort circles on menus, fix groupchat rename through widget, improve activity sort performance 2015-06-26 10:54:50 +02:00
TheSpiritXIII
7f7ab9a1bc Circles: Fix quick switch crash, remove circle crash 2015-06-26 10:54:50 +02:00
TheSpiritXIII
79424de10a Circles: Use history for activity, fix search 2015-06-26 10:54:49 +02:00
TheSpiritXIII
d9d6f20bf7 Circles: Fix convention, crash and activity cycling 2015-06-26 10:54:49 +02:00
TheSpiritXIII
c662c0aa92 Update activity on friendship, fix category friend removing (circles and activity) 2015-06-26 10:54:49 +02:00
TheSpiritXIII
4ee38e7c69 Update activity on AV and files 2015-06-26 10:54:49 +02:00
TheSpiritXIII
ecdf863c02 Recent list selectable from drop list, bug fixes 2015-06-26 10:54:49 +02:00
TheSpiritXIII
c24a508c38 Switch between recent and alphabetical layouts 2015-06-26 10:54:49 +02:00
TheSpiritXIII
15f10c2f34 Recent list (right click empty list to test) 2015-06-26 10:54:49 +02:00
TheSpiritXIII
62873e9d71 Fix circle related rebase bugs 2015-06-26 10:54:49 +02:00
TheSpiritXIII
cc9edf6f90 Minor code cleanup for circles and related 2015-06-26 10:54:00 +02:00
TheSpiritXIII
8e796a1d8b Update renamed friends and groups during search 2015-06-26 10:54:00 +02:00
TheSpiritXIII
167a8971ec Search optimizations and bug fixes, rename focus fix 2015-06-26 10:54:00 +02:00
TheSpiritXIII
ac2263b3e8 Save circle settings after each modification 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
e0b9e81938 Minor circle widget base class cleanup 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
715ef0ce65 Store circle widgets, fixed related bugs 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
10c7a745c5 Fix circle white box glitch, circle cycling 2015-06-26 10:54:00 +02:00
Daniel Hrabovcak
00022355e8 Fixed circle compact mode and sort bugs, inline text editing stylesheet 2015-06-26 10:53:59 +02:00
Daniel Hrabovcak
27237e6164 Compact settings and minor circle widget cleanup 2015-06-26 10:53:01 +02:00
Daniel Hrabovcak
ff37812a53 Contact grouping deleting and renaming 2015-06-26 10:53:01 +02:00
Daniel Hrabovcak
682feb7a58 Search within contact groupings 2015-06-26 10:53:01 +02:00
Daniel Hrabovcak
3fc9dd1070 Fixed sorting within contact groups 2015-06-26 10:53:01 +02:00
Daniel Hrabovcak
631148cdae Basic contact grouping 2015-06-26 10:51:04 +02:00
tux3
c9bfba89c8
Merge branch 'pr1874' 2015-06-24 21:24:51 +02:00
PKEv
4e1b3b3471 Add friend name in removal dialog(fix #1860) 2015-06-16 01:10:45 +03:00
TheSpiritXIII
7e451cc23e Don't track active chatrooms for notifications 2015-06-10 13:20:52 -04:00
TheSpiritXIII
b83b5dbe59 Show edge markers for notifications
Add margin for edge notification marker

Fix conventions

Make AdjustingScrollArea not final
2015-06-10 13:20:52 -04:00
tux3
4eab3dcbb8
Fix #1837
Fix #1839
2015-06-08 21:31:40 +02:00
tux3
443df45d21
Disable RTTI 2015-06-07 20:24:55 +02:00
tux3
f8b9741bc4
Fix GenericChatroomWidget rigth click glitch
Qt doesn't get mouse move events after a right click, so right clicking on a GenericChatroomWidget would get it stuck in the highlighed style until hovered in and out again

We now explicitely interpret a right click as the mouse going out and fix the style accordingly

Since the stylesheet has precedence over a QPalette, there wasn't a clean way to handle that with a stylesheet, so we now use a QPalette directly
2015-06-07 00:33:03 +02:00
tux3
d8e9b7d77e
Fix #1821
We focus the chat form when we get a call now
2015-06-06 21:45:11 +02:00
tux3
8cd1e23eb9
Merge branch 'pr1816' 2015-06-06 15:55:21 +02:00
Zetok Zalbavar
67e9aeec63
Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any way, 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-06-06 14:51:28 +01:00
tux3
c269306bf4
Fix #1811 2015-06-06 03:45:44 +02:00
tux3
20f254651d
Reorganize files 2015-06-06 01:44:47 +02:00
tux3
15ca7a587f
Dynamic translation
qTox can now retranslate its GUI dynamically, without needing a restart

Fixes #1671

Closes #1672
2015-06-05 21:37:01 +02:00
tux3
6bf0317e3e
Translate all GUI, not just Widget 2015-06-05 12:26:04 +02:00
tux3
2dbf2e54b1 Implement restarting toxcore 2015-06-04 21:34:13 +02:00
tux3
039575a775
Merge branch 'pr1769' 2015-06-04 21:25:21 +02:00
PKev
98819df90c Correct redraw after filtering
fix #1757
It looks a bit strange, but a redraw on another call fails. Moreover, order calling functions radically changes the behavior of the widget
2015-06-03 22:26:33 +03:00
tux3
d53b426750 Replace OpenCV with FFmpeg 2015-06-03 02:10:52 +02:00
PKEv
0791c64efd Correct_after_cpp_check
style and typos
2015-05-30 23:44:56 +03:00
Zetok Zalbavar
50c29af537
Make string 'Search Contacts' translatable 2015-05-26 12:02:38 +01:00
tux3
2db617bc6f
Recover if tox fails to start 2015-05-25 22:37:19 +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
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
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
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
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
70e7f34ecb
Don't ask to remove history for fake friend removal 2015-05-11 22:48:32 +02: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
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
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
kushagra
5e5da24ad3 Implemented search of contacts 2015-05-07 20:37:26 +02:00
tux3
4e1dd74269
Make tool buttons inactive when showing profile 2015-05-07 19:47:18 +02:00
Rohil Surana
084b6c9300 Added tool menu active button indicator.
Disable active button to remove repainting of ui each time it is pressed.
2015-05-07 19:39:46 +02:00
Jookia
1d58f476f7 Add keyboard bindings for cycling contacts.
I've moved the key bindings in the main widget instead of the chat form given it
doesn't seem to be the chat form's responsibility to handle switching between
conversations it shouldn't know about in the first place. I've also included new
shortcuts to provide a more familiar feel to most people.

All in all this provides Ctrl+Tab and Ctrl+Shift+Tab for cycling as well as
Ctrl+PgUp and Ctrl+PgDown for cycling. This mimics common application behaviour.
2015-05-07 19:02:18 +02:00
Jookia
59a8ea13e7 Implemented cycling through contacts.
I've implemented this by having the contacts list container return all contact
widgets in the order they appear each time it's time to cycle. It's perhaps
inefficient but given cycling isn't done often I don't see a need to optimize.

This code does make the assumption that the friends list isn't empty, which I'd
guess would be the case if there's an active conversation.
2015-05-07 18:46:08 +02:00
Rohil Surana
0b1d3e3d3d Added chat room status to window title 2015-05-07 18:28:51 +02:00
tux3
0e65d150e3
Don't show call buttons in text-only groupchats
I'm not sure why there are text-only groupchats in the first place, but that's fixed.
2015-04-25 01:50:35 +02:00
tux3
1c51cd788b
Merge branch 'pr1509' into back_in_the_game 2015-04-24 22:37:01 +02:00
kushagra
b4f72b620d fixes action bugs
1) action received gets modified on restart
2) sender's name is written twice if action is sent using offline messaging
3) /me is written when action is sent in groupchat having one peer
4) /me is not saved in last message variable in friendd chat
2015-04-24 22:20:52 +02:00
Yuri
11883bab85 Added Ctrl+Q shortcut. 2015-04-24 21:44:48 +02:00
Zetok Zalbavar
92f3b6a20f Code style improvements 2015-04-24 15:43:57 +02:00
tux3
e4859efe18
Refactor Core
Refactor Core's file transfer callbacks into their CoreFile class and files

Move all core*.{h|cpp} into a core/ folder
2015-04-24 02:32:09 +02:00
tux3
228398d5de
Initial porting to the new Tox API
Builds and runs, but some features will be missing, may crash with an assert, or silently fail with broken QObject connections

We're back in the game.
2015-04-19 23:12:44 +02:00
Rohil Surana
fb97662b5d Added add friend on window on first start 2015-04-07 14:19:55 +05:30
kushagra
07ba0c9ae0 Removes chat history of friend when removed, fixes #1486 2015-03-29 13:35:39 +05:30
Dubslow
885dc0638a
No more PRs shall be merged until the new_api branch in my repo is merged. Contributions are welcome.
This commit fixes some minor style issues with #1406
2015-03-27 17:36:35 -05:00
Dubslow
2e388f03df
Merge branches 'pr1474', 'pr1406', 'pr1463' and 'pr1472' 2015-03-27 17:33:53 -05:00
PKEv
4f650b3177 System menu translation 2015-03-26 23:02:08 +03:00
Dubslow
27f58c9ca6
Style fixes 2015-03-25 11:27:33 -05:00
zero-one
a1e228e60d style fixes to conform to Allman style 2015-03-23 02:38:24 -07:00
zero-one
c15cc60137 Merge branch 'master' into friend_list 2015-03-23 02:35:20 -07:00
zero-one
de8eb5293c Merge branch 'master' into friend_list
Conflicts:
	src/widget/form/settings/generalform.cpp
2015-03-23 02:34:12 -07:00
Dubslow
f55fd40ec6
Merge branches 'pr1452', 'pr1453', 'pr1456' and 'pr1457' 2015-03-22 16:17:00 -05:00
PKEv
72c45a65fa Correct #1448 2015-03-22 23:44:42 +03:00
Jookia
e3bdd6d221 Added option to disable notification sounds. 2015-03-23 07:27:44 +11:00
Zetok Zalbavar
f3aa3073b0
Fix coding style and add copyright header
* added copyright header to src/platform/statusnotifier/enums.c
* 'switch(' → 'switch ('
* use Allman style

----
for / if / while / switch () {
 ↓
for / if / while / switch ()
{
----

----
for / if / while ()
{
    1_line;
}
 ↓
for / if / while ()
    1_line;

----

----
for / if / while ()
    1_line;
line_out_of_loop;
 ↓
for / if / while ()
    1_line;

line_out_of_loop;
----
2015-03-21 08:59:28 +00:00
Zetok Zalbavar
f95291af3e
Some style fixes
"if(" → "if ("
"for(" → "for ("
"while(" → "while ("
2015-03-20 18:38:10 +00:00
Dubslow
9079b334b9
Merge branches 'pr1433', 'pr1435', 'pr1436', 'pr1438' and 'pr1439' 2015-03-19 23:02:02 -05:00
PKEv
e940459596 Correct for Maximized window 2015-03-19 22:41:31 +03:00
kushagra
41dc562b64 fixes #1091 2015-03-18 14:15:51 +05:30
Dubslow
fc720f570d
Merge branch 'pr1392' 2015-03-16 17:37:38 -05:00
Dubslow
4087778b88
Merge branch 'pr1378' 2015-03-16 16:47:12 -05:00
zero-one
21a7152316 Merge branch 'master' into friend_list
Conflicts:
	src/widget/form/settings/generalform.cpp
2015-03-16 11:10:28 -07:00
PKEv
e3946b4435 #1379 correct 2015-03-14 23:06:33 +03:00
tux3
c5a8a17e21
Merge branch 'pr1389' 2015-03-14 19:49:04 +01:00
agilob
3ec5d30f35
UI fixes in general form:
disable light tray icon if system tray icon disabled (didn't work for
some reason)

disable emoticons combobox if emoticons disabled globally

prevent comoboxes and spinboxes stealing mouse scroll event while
scrolling in generalform, prevents from accidential language/timestamp
format/theme/skin changes while scrolling in the widget

disable passing CSS to qfiledialog in general form, qfiledialog will use
default system theme instead of not fully written from qwidget

fixed tab order in generalsettings
2015-03-14 17:01:59 +00:00
Flakebi
63150ab022 Reset activeChatroomWidget when switching to addFriendForm 2015-03-14 17:16:32 +01:00
novist
c6312fd196 PNG images replaced with SVG
Closes #1050
2015-03-13 20:30:54 +02:00
Dubslow
b6175ac96f
Mark which peers are playing, styling is open to suggestions
closes #757
2015-03-13 01:04:37 -05:00