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

1132 Commits

Author SHA1 Message Date
Tux3 / Mlkj / !Lev.uXFMLA
f06ec65bca Merge pull request #299 from apprb/dev
bug fix in ChatAreaWidget
2014-09-17 21:31:05 +02:00
apprb
9d3bcaa387 bug fix in ChatAreaWidget: absolute coordinates should be used to detect clicks on a FileTransferInstance's buttons 2014-09-18 00:55:43 +07:00
dubslow
35128e5048 cleanup 2014-09-16 12:13:21 -05:00
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
Tux3 / Mlkj / !Lev.uXFMLA
21267b3a68 Merge pull request #297 from apprb/master
fix: Force video output to follow aspect ratio #130
2014-09-15 23:05:49 +02: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
dubslow
59869b4a87 first thing's first, gotta placate the ocd 2014-09-15 22:37:05 +02:00
apprb
ecd922c72d fix: Force video output to follow aspect ratio #130 2014-09-16 00:51:25 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
588cf513df Merge pull request #296 from Ansa89/italian-translation
Italian translation: update
2014-09-15 19:28:11 +02:00
dubslow
d971d7e647 scaling still isn't quite right... 2014-09-15 08:48:17 -05:00
Marcel
b567392649 added images 2014-09-15 08:32:21 -05:00
dubslow
5dc4128215 cosmetics 2014-09-15 08:31:42 -05:00
Ansa89
d7df703b87 Italian translation: update 2014-09-15 15:17:20 +02: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
4875da2eae Merge pull request #293 from zetok/translation
Update Polish translation
2014-09-13 19:14:56 +02:00
Zetok Zalbavar
aaecc9ba7c
Update Polish translation 2014-09-13 16:38:50 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
1225a513c7
Update French translation 2014-09-13 15:24:53 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
41261c5379
Update translations 2014-09-13 15:15:35 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
54ab545434 Embed new translations 2014-09-13 15:03:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
0ea0d3681a Update README.md 2014-09-13 14:00:37 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
5e12a5fa3e
Update translations 2014-09-13 11:49:58 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
87d14d0b23 Merge pull request #292 from zetok/translation
Add Polish translation
2014-09-13 11:39:42 +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
dubslow
4c89233656 first thing's first, gotta placate the ocd 2014-09-13 00:55:21 -05:00
Zetok Zalbavar
1a6d2d925e
Add Polish translation 2014-09-12 23:24:23 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b2c75dbc51 Update Mannol translation 2014-09-13 00:12:00 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
965c76a315 Add Manol translation
Ayy ! You have mothafucking friend request you little bitch !
2014-09-13 00:07:25 +02: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
e9fa8de43d Enable Polish translation 2014-09-12 21:59:49 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
70079015c7 Update translations, add Polish 2014-09-12 21:57:51 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
1b5d1b2ab0 Merge pull request #289 from suhr/master
update russian translation
2014-09-12 21:50:58 +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
Сухарик
77b44fde99 update russian translation 2014-09-12 23:32:31 +04: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
Tux3 / Mlkj / !Lev.uXFMLA
d7fbcb60db Merge pull request #287 from apprb/dev
get rid of .setBlockFormat(..)
2014-09-12 21:16:26 +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
Tux3 / Mlkj / !Lev.uXFMLA
2aff9fde5c Merge pull request #284 from retuxx/config-new
"rebased" Settings Dialog
2014-09-12 15:55:43 +02:00
Marcel
f3ecf4fa0f added images 2014-09-12 15:50:39 +02:00
Marcel
1b2855e05b use settings dialog in widget 2014-09-12 15:46:34 +02:00