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

95 Commits

Author SHA1 Message Date
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
3c8f39c2ca Merge pull request #244 from apprb/dev
fix #243 : Smileys are broken
2014-09-01 19:48:12 +02:00
apprb
24971f50e9 fix #243 : Smileys are broken 2014-09-01 18:55:07 +07: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
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
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
af9c370169 Forbid sending sequential files
They aren't seekable, and tend to be infinitely big..
2014-08-28 19:06:51 +02: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
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
1c27b55470 use Style::get 2014-08-11 17:23:41 +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
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
Marcel
9c0af06c0b use default invite message as placeholder text 2014-07-23 23:52:55 +02:00
Bill Winslow
f9a3192f30 incremental improvements to profiles, more work required 2014-07-23 04:22:09 -05: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
Tux3 / Mlkj / !Lev.uXFMLA
ed0616dd91 Add option to make qTox portable 2014-07-12 22:59:36 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
941a237d4d Preparation for large file transfers 2014-07-12 17:36:38 +02:00
dubslow
5cad5fb265 devil's in the details 2014-07-12 05:38:36 -04:00
dubslow
ba2bc21489 *tweaks, omg. The vagaries of version control... 2014-07-12 05:31:10 -04:00
Bill Winslow
310fd21123 A few teaks... sadly, it doesn't quite work for now
See the comment in filesform.cpp
Also Flynn, a better matching icon is required
2014-07-11 18:07:00 -04:00
Bill Winslow
806b8ea7c3 cleanup 2014-07-11 12:17:37 -04:00
Bill Winslow
26f2f143fa Initial commit for activating the file transfer button
It compiles, but is in fact untested (and requires one small new icon)
2014-07-11 12:05:18 -04:00
Kevin Flynn
a2815e76f0 Fix buttons on OS X 2014-07-06 14:43:02 -07:00