StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity
895 Commits 3 Branches 42 Tags 60 MiB
eb687b2bfe
Commit Graph

382 Commits

Author SHA1 Message Date
dubslow
6c365c2260 Merge branch 'newsettings' of https://github.com/tux3/qTox into newsettings 
Conflicts:
	res.qrc
	widget/widget.cpp
 2014-09-16 12:10:52 -05:00
dubslow
9d36833a8b scaling still isn't quite right... 2014-09-15 22:42:41 +02:00
dubslow
575862f25f cosmetics 2014-09-15 22:42:41 +02:00
bill
5ec79fc260 new settings infrastructure done, though there's a double free or something in ~Widget() 2014-09-15 22:42:41 +02:00
bill
e55f15725e move buttons to bottom 2014-09-15 22:42:41 +02:00
dubslow
e4e36dc946 initial new settings widget, subforms not started 
also "filing" some files under misc
 2014-09-15 22:42:41 +02:00
apprb
ecd922c72d fix: Force video output to follow aspect ratio #130 2014-09-16 00:51:25 +07:00
dubslow
d971d7e647 scaling still isn't quite right... 2014-09-15 08:48:17 -05:00
dubslow
5dc4128215 cosmetics 2014-09-15 08:31:42 -05:00
bill
aa801f9615 new settings infrastructure done, though there's a double free or something in ~Widget() 2014-09-15 05:45:59 -05:00
bill
741824c019 move buttons to bottom 2014-09-14 13:42:27 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
41261c5379
Update translations 2014-09-13 15:15:35 +02:00
dubslow
55437df210 initial new settings widget, subforms not started 
also "filing" some files under misc
 2014-09-13 03:32:24 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
5c1ae49f81
Typo 2014-09-12 23:55:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
627e5b178b
Change settings dialog title 2014-09-12 23:41:13 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
904a584d75 Change video preview button text 2014-09-12 23:35:44 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
b6ccbfc62f Fix greentext 
Thanks to dewbasaur for reporting the bug
 2014-09-12 22:51:13 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7e577359fd Improve chat form performance 
Should help with #266
 2014-09-12 21:38:48 +02:00
dubslow
72a76dba03 implement sanitize, one tweak 2014-09-12 14:38:14 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
983260e836 Merge pull request #286 from krepa098/master 
added smiley selection to the new settings dialog...
 2014-09-12 21:17:50 +02:00
apprb
968b46a86b get rid of .setBlockFormat(..) in ChatAreaWidget::insertMessage(..) function 2014-09-13 01:54:03 +07:00
Dubslow
d16b6cd283 Merge commit '5a005a1aafe96061301a4e113cb5450770009b88' into profiles 
Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
 2014-09-12 13:53:29 -05:00
krepa098
7e7cebf6b6 added smiley selection to the new settings dialog, new default search- 2014-09-12 19:09:05 +02:00
Marcel
1b2855e05b use settings dialog in widget 2014-09-12 15:46:34 +02:00
Marcel
4e5d1c170b do not use getInstance of camera 2014-09-12 15:45:02 +02:00
Marcel
28e8406be9 added settingsdialog 2014-09-12 15:41:46 +02:00
Marcel
c3a8cd01f3 removed settingsform, removed selfcamview from widget 2014-09-12 15:35:48 +02:00
apprb
6c5cd7c010 filetransfer: corrected pause/resume behaviour 2014-09-12 01:32:31 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
6440ef8310 Make group <unknown> name translatable 2014-09-11 18:05:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
a7c75e63a5 Clean code, improve compilation speed 2014-09-11 15:44:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e91846e821 Fix #205 2014-09-11 13:40:44 +02:00
krepa098
b6848772fc converted notification.wav to notification.pcm (raw audio) fixes #256 2014-09-10 23:21:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
0ae0d01a61 Generalize #275 to groupchats 2014-09-10 23:00:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c76f6a7e73 Fix #275 2014-09-10 22:53:02 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
960fbfff48 Remove \n when copying own tox ID 2014-09-10 22:27:56 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c564367354 Fix #234 2014-09-10 22:24:01 +02:00
apprb
db68afe8dd sometimes names are just incredible 2014-09-11 02:28:43 +07:00
apprb
096874d5f4 HTML table chat representation replaced by QTextTable one 2014-09-11 02:28:43 +07:00
apprb
ff9e0bbf93 autoscroll fix 2014-09-11 01:28:05 +07:00
krepa098
c3e55489b0 don't accept RichText as input 2014-09-10 18:52:54 +02:00
krepa098
1b4afcb937 detect URLs and show them as hyperlink 2014-09-10 18:52:54 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5aa5e266b2 Free some RAM when a file transfer ends 2014-09-10 18:46:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7f2edfae7d Fix #266 2014-09-10 18:30:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
737e76c72f Undo #266 fix 2014-09-10 16:17:44 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
afa794d92a Fix #266 2014-09-10 15:42:22 +02:00
Dubslow
05c654373f Fixed misusing tox_load; profiles are significantly less buggy 2014-09-10 08:12:43 -05:00
Dubslow
e477c4ef64 Merge branch 'master' into profiles 2014-09-10 07:01:05 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
3f35a5a48d Fix #266 2014-09-09 22:36:34 +02:00
krepa098
a39339e06f cleanup 2014-09-09 18:29:03 +02:00
krepa098
ddf955afd3 fixed #255 2014-09-09 18:28:07 +02:00
apprb
aa2f67c983 code cleanup 2014-09-07 19:17:47 +07:00
apprb
9970fe293d files renaming 2014-09-07 00:28:26 +07:00
apprb
b68cc66ede scroll fix 2014-09-07 00:21:47 +07:00
apprb
db4c84a222 cleanup 2014-09-07 00:21:47 +07:00
apprb
0fe14953c8 somehow working example 2014-09-07 00:21:47 +07:00
apprb
25ee6a24d9 new chat beginning 2014-09-07 00:21:39 +07:00
apprb
502229a6f2 cleanup 2014-09-05 23:35:29 +07:00
apprb
2826e83cef addMessage moved to parent class 2014-09-05 23:03:26 +07:00
apprb
522d570e62 code cleanup 2014-09-05 23:03:26 +07:00
apprb
02da6803f1 initial merging common parts of chatforms' widget 2014-09-05 23:03:08 +07:00
Dubslow
7aab85251e Merge branch 'master' into profiles 
Holy shit first big merge of my career, I'm mildly amazed it even compiles

Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
	widget/widget.cpp
 2014-09-05 03:53:00 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
627f58087c Disable status button when disconnected 2014-09-03 00:01:04 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
bedc995659 Merge pull request #248 from apprb/chat_widget 
FriendWidget and GroupWidget improvements
 2014-09-01 21:24:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
3c8f39c2ca Merge pull request #244 from apprb/dev 
fix #243 : Smileys are broken
 2014-09-01 19:48:12 +02:00
apprb
e76464a320 further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer 2014-09-01 23:58:01 +07:00
apprb
35b7ad3a58 Chatroom: common parts moved to the parent class 2014-09-01 23:57:51 +07:00
apprb
24971f50e9 fix #243 : Smileys are broken 2014-09-01 18:55:07 +07:00
krepa098
7e6c4f5129 cleanup 2014-09-01 12:27:41 +02:00
krepa098
1cd954ba42 compatibility with old widgets 2014-09-01 11:16:41 +02:00
krepa098
26c028f416 removed ClickableLabel, EditableLabelWidget, ElideLabel, EscLineEdit, 
CopyableElideLabel
 2014-09-01 11:08:02 +02:00
krepa098
7c0cdd710f editable CroppingLabel 2014-09-01 11:00:06 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c54cfd6ff3 Reduce precision of human readable, now more readable! 2014-08-31 23:07:07 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
73309d8b90 Fix #235, Fix #84 2014-08-31 22:26:45 +02:00
apprb
fd4c47cba3 Widget code cleanup: removed isFriendWidgetActive and isGroupWidgetActive 2014-08-31 23:49:15 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
76971f5238 Make notifications consistent 
Notify of AV and FT requests if we're selected but not active or minimised, and add sound (consistent with how message notifications work)
 2014-08-31 18:30:04 +02:00
apprb
f0c8be43db change status light on incoming file request 2014-08-31 22:02:08 +07:00
apprb
a3785f3c27 Widget::updateFriendStatusLights moved to FriendWidget 2014-08-31 22:02:08 +07:00
apprb
7fe938a7ca filenames and paths processing little fix 2014-08-31 22:02:08 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
6668cdc1e7 Never use [-]9.9e[+|-]999 format for human readable numbers 2014-08-31 13:27:42 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
4a66026676 Fix #174, was only partially fixed 2014-08-31 12:49:58 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f97729261a Clean & remove old code and dependencies 
We don't use QtMultimedia and OpenCV_imgproc anymore

Fixes #218
 2014-08-30 15:15:23 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5b617dd4fb Always unmute mic when a call ends 
Since the mute mic button will be disabled
 2014-08-29 19:28:22 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
3fc9cc0d83 Fix #219, handle av media changes 
Can now start or stop video on demand of the peer
 2014-08-29 19:20:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
bd1ca80ffd Fix #213 2014-08-29 18:16:16 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
ccdb3b57fd Remove all Qt video code 2014-08-29 14:42:38 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
938650fa40 Color compatibility with uTox 2014-08-29 14:33:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6348976df7 Switch network camera to OpenCV 2014-08-29 14:20:32 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f4b1b64ae6 Switch self cam view to OpenCV 2014-08-29 13:40:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2612073842 Fix #215, update translations 2014-08-29 11:56:42 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
74e9d7a4f5 Fix division by 0 when receiving from empty files 
Like /dev/zero.
 2014-08-28 19:21:48 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
af9c370169 Forbid sending sequential files 
They aren't seekable, and tend to be infinitely big..
 2014-08-28 19:06:51 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
8602327d16 Term deadlocked threads on exit 
To prevent deadlocking the whole thing when we really just want to exit

Qt w/ pulseaudio can deadlock internally on call start if it fails to connect to the PA context. Awesome.
 2014-08-28 13:09:26 +02:00
apprb
11c6dd7bec sort the friendlist by contact Status 2014-08-23 02:12:37 +07:00
midnight079
ec1facccf8 fixed some bugs with micButton 2014-08-19 21:49:35 +02:00
midnight079
b474ff2c2b realized micButton for calls 2014-08-19 21:49:32 +02:00
midnight079
ca9a9b79cb micButton and volButton were added to chatForm, but micButton for some 
reason is blinking
 2014-08-19 21:46:59 +02:00
krepa098
75f15dd349 fixed null dereference 2014-08-18 17:35:43 +02:00
krepa098
01c3124722 use trimmed() 2014-08-18 15:56:48 +02:00
krepa098
7e67078187 fix issue #184 2014-08-18 10:58:51 +02:00
krepa098
eefa8d8ae6 only show tooltip if required 2014-08-16 19:27:16 +02:00
krepa098
1f92ad18a8 CroppingLabel, fixes issue #184 2014-08-16 19:27:16 +02:00
krepa098
2cbbfb7037 this actually belongs here 2014-08-16 19:27:16 +02:00
apprb
5f4c282215 Fix #102 (Greentext only lines with ">") 2014-08-14 18:55:04 +07:00
krepa098
e5f0ac7c91 moved scrollbar to the left, cleanup 2014-08-11 19:46:14 +02:00
krepa098
9c0d85da0c Merge branch 'style' 2014-08-11 17:25:45 +02:00
krepa098
1c27b55470 use Style::get 2014-08-11 17:23:41 +02:00
krepa098
0d748b93d6 consider scrollbar's width 2014-08-11 17:06:57 +02:00
krepa098
5304621e86 fixed warnings 2014-08-11 14:13:13 +02:00
krepa098
6bb85c65b8 save/restore status of the splitter 2014-08-11 14:07:27 +02:00
krepa098
c9d04748dd put back the not so native window decoration, status panel respects 
friendlist width, some tweaks to the layout
 2014-08-11 13:56:52 +02:00
krepa098
921b8478f6 removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
krepa098
af4623695c styling cleanup 2014-08-10 18:14:50 +02:00
krepa098
1a88b079e2 tweaked page button 2014-08-10 15:11:59 +02:00
krepa098
d0b11074eb use the new signal slot syntax as they are checked at compile time 2014-08-10 14:47:46 +02:00
krepa098
58b1f043e2 show smiley widget only if there are smileys to show 2014-08-10 14:38:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c0f1f196b1 Merge pull request #176 from krepa098/smileys 
Smileys
 2014-08-01 16:06:05 +02:00
krepa098
51ac007baf default settings 2014-08-01 14:46:28 +02:00
krepa098
566402a1bf a shiny new widget 2014-08-01 14:32:51 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2a04fcfcf9 Merge pull request #175 from krepa098/smileys 
Smileys
 2014-07-31 18:04:35 +02:00
krepa098
6fed143048 cleanup 2014-07-31 17:36:55 +02:00
krepa098
f0306bb25f cleanup 2014-07-31 16:08:44 +02:00
krepa098
f7a357d671 wire up the emote button 2014-07-30 22:07:26 +02:00
krepa098
0d493f4bcf ability to detect smileyPacks 2014-07-30 09:18:41 +02:00
Bill Winslow
5b6ccf67fd incremental, commiting in order to push 2014-07-28 16:52:05 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
cc65aa4fd5 Merge pull request #166 from krepa098/smileys 
Smileys
 2014-07-28 13:41:22 +02:00
Bill Winslow
22375e3b8f Randomized the bootstrap table, to distribute load away from the first 5 2014-07-27 15:55:22 -05:00
Bill Winslow
08ab94bf5a more incremental commits, compiles and sort of works now 2014-07-27 03:27:15 -05:00
krepa098
e01467e386 basic support for smileys 2014-07-25 14:52:14 +02:00
Kevin Flynn
f7e462272a Fix friendList mixed horizontal & vertical scroll, improved scrollbar theme on OS X 2014-07-23 19:05:14 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
fdfe799886 Merge pull request #161 from dubslow/master 
two minutiae, one of which is an updated bootstrap that's more useful to me
 2014-07-24 02:28:54 +02:00
Marcel
9c0af06c0b use default invite message as placeholder text 2014-07-23 23:52:55 +02:00
Marcel
f080eb12e7 added placeholder text for chat input widget 2014-07-23 23:41:05 +02:00
Bill Winslow
7e208e3302 updated bootstrap.sh so I don't have to not-add it and other minutiae 2014-07-23 05:00:55 -05:00
Bill Winslow
f9a3192f30 incremental improvements to profiles, more work required 2014-07-23 04:22:09 -05:00
Bill Winslow
8aa451bb5b Merge branch 'master' of https://github.com/tux3/qTox into profiles 2014-07-23 02:50:10 -05:00
Bill Winslow
e14b7d66d4 Merge branch 'master' of https://github.com/dubslow/toxgui 2014-07-22 02:54:18 -05:00
Bill Winslow
e31b4457c9 Check that file transfer target is writable 2014-07-22 02:51:20 -05:00
Kevin Flynn
88cc57f4bc Fix #142 2014-07-20 11:17:06 -07:00
dubslow
46848d7712 Profiles, with at least a few bugs: 
sanitizing file names isn't done, delete fails because of autosaves, and imports segfault for me
 2014-07-16 20:00:23 -05:00
dubslow
f423c174e7 forgot a button, also the ui is fucked at default size (expand a few pixels and its fine though) 2014-07-16 17:46:51 -05:00
dubslow
e3da9badac Basic infrastructure for profiles is in place, now I gotta hook up the UI 2014-07-16 17:43:30 -05:00
dubslow
1644f8c139 Updated the completed transfers widget to work as advertised 2014-07-15 21:37:08 -04:00
dubslow
4bb2ec3356 Add tooltips to user-provided text (helps to accomodate too-long names and msgs) 
Ideally this would be done only if the widget is too small for the message, but
that can be quite difficult
 2014-07-15 12:04:26 -04:00
Kevin Flynn
ece497b722 Fix status on F1ynn's theme, notify on non-active window (like uTox) 2014-07-13 19:57:09 -07:00
Tux3 / Mlkj / !Lev.uXFMLA
ed0616dd91 Add option to make qTox portable 2014-07-12 22:59:36 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f173a5dfa9 Fix FT progressbar int overflow 2014-07-12 18:40:01 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e63153bfa6 Fix crash on file transfer completed 2014-07-12 18:05:25 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
dc2d7f1085 Various improvement 
Aka this commit is a mess, if you're bissecting this, good luck :)
 2014-07-12 17:42:41 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
941a237d4d Preparation for large file transfers 2014-07-12 17:36:38 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
ae1ce8ec88 Preparation for new file transfer 2014-07-12 17:29:56 +02:00