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
2,387 Commits 3 Branches 42 Tags 60 MiB
ecd8210162
Commit Graph

967 Commits

Author SHA1 Message Date
krepa098
f509e07c45 make use of EmojiFontPointSize (fix #1026) 2015-01-26 23:19:18 +01:00
krepa098
a558733507 ChatLog::selectAll, refactoring of actions (issue #808) 2015-01-26 19:32:33 +01:00
krepa098
ecf15a6ca3 fix regression: chatlog didn't scroll to bottom on startup 2015-01-26 19:15:29 +01:00
krepa098
0442db2bae reposition busy notification *after* resize 2015-01-26 19:01:18 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
ac2700fdeb
Fix rounding for non-square CallConfirmWidget 
Thanks to @krepa098
 2015-01-26 18:29:13 +01:00
krepa098
bbd20496fd specify background brush 2015-01-26 17:12:22 +01:00
Dubslow
03fe9a355f
Merge branch 'pr1052' 2015-01-26 07:25:23 -06:00
Dubslow
e90293b47a
Make compact contact layout dynamically changeable 
There was some various minor incidental cleanups as well
 2015-01-26 07:13:35 -06:00
krepa098
5be6caca68 [HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent 
This does not enable HiDPI support!

issue #975
 2015-01-26 14:01:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
1b2b4a1267
Merge branch 'pr1053' 2015-01-26 14:01:20 +01:00
agilob
2f18b2c72b
fixing problem with +1 lines in msg edit 2015-01-26 12:34:52 +00:00
novist
3a5a94c666 Fixed showing window when clicking tray icon / shortcut and window is minimized 
Double-clicking tray icon shows window
Middle-clicking tray icon hides window
 2015-01-26 12:43:34 +02:00
Dubslow
f7feb8ecbb
Make greentext pickier 
> must be the first character (i.e. leading whitespace disables greentext)
> must be followed by a "word" character, with an optional space (sorry zetok, but this is much more intuitive)
> followed by two+ spaces doesn't count
Fixes #945
 2015-01-26 04:17:52 -06:00
Tux3/Mlkj
fcd58b2c63
Update outdated autoupdate comments 2015-01-26 09:53:43 +01:00
agilob
6989346f41
dont clear msg everytime 2015-01-26 00:51:17 +00:00
agilob
c9e96300b2
added comment to explain this spaghetti 2015-01-26 00:31:54 +00:00
agilob
d3cdebd46f
removed unused code 2015-01-26 00:27:22 +00:00
agilob
fe8f6593c7
arrow up to paste previous message 2015-01-26 00:25:45 +00:00
agilob
4b854f86d1
fixed memory leaks 2015-01-25 23:06:44 +00:00
agilob
a6680916b5
undo double polishing in chatform 2015-01-25 22:28:29 +00:00
agilob
b71eafc8c8 Merge branch 'master' of https://github.com/tux3/qTox into disabling_callbutons 2015-01-25 22:20:43 +00:00
agilob
17561a8c3b
closes tux3/qtox#850 2015-01-25 22:19:25 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
69d5619db0
Don't call auto-updates unstable anymore 2015-01-25 22:51:19 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
0eba4fefca
Change some signal connections to new style 2015-01-25 21:51:21 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
328f75ac6d
Add real buttons for CallConfirmWidget 
Still sort of placeholders, those are just upscaled buttons extracted from a screeshot, but those will work in the meantime
 2015-01-25 19:12:36 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
279debdab9
CallConfirmWidget: track anchor's position 2015-01-25 18:43:30 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b10edb9baf
CallConfirmWidget: don't overflow to the right 2015-01-25 17:53:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
40478d6bac Show call confirm under video if appropriate 2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
b13c27202a Stylized CallConfirmedWidget, placeholder buttons 2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32bf56c7d9 Implement new call confirm widget logic 
Works, but does not have any styling at the moment
 2015-01-25 17:39:26 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3f433f1176
Pixel-perfect spacing of chat form buttons 2015-01-25 17:18:20 +01:00
krepa098
a418ae3df6 use html <center> instead of ColumnFormat::Center 2015-01-25 15:59:44 +01:00
krepa098
cae965e750 ChatMessage::createChatInfoMessage: use toHtmlChars 2015-01-25 15:53:13 +01:00
krepa098
6719ebebae Added Timestamp class, moved output generation while saving to 
GenericChatForm and changed the generated layout
 2015-01-25 14:34:36 +01:00
krepa098
6e05782fb7 ChatLog: busy-screen during resize 
Gets rid of most ugly hacks
 2015-01-25 14:06:06 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
909ade6d5e
Fix #1039 
And fix ChatTextEdit's inconsistent behavior of not forwarding backspace key press events while we're at it.
 2015-01-24 23:37:43 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
33ac7deee0
Fix #1040 2015-01-24 22:46:11 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
801554bbd8
Fix #1037 2015-01-24 21:46:53 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3262326657
Fix #681 
When minimized to tray, if a popup is closed, Qt notices that the last window is closed and exits. Tel Tell friend request dialogs to not exit on close
 2015-01-24 19:58:16 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
9b9b6bae99
Prevent possible deadlock on exit 2015-01-24 19:48:23 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
6e1484252a
Fix possible crashes on exit, add debug info 2015-01-24 19:32:15 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d35ebb22f0
Fix some memory leaks and fix #1038 2015-01-24 15:31:50 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8876dad457 Save camera video res in settings 
Fixes #1033
 2015-01-24 02:04:00 +01:00
Dubslow
c31192abee
Fix threading issue while widget's killing itself 2015-01-23 08:58:33 -06:00
Dubslow
f6ff421aff
Fix two minor bugs 2015-01-23 08:31:13 -06:00
Dubslow
7552fc0ceb
Fix the segfault fix 2015-01-23 08:18:46 -06:00
Dubslow
7fb7ae1fc8
oops, fortunately this wasn't a bug yet... 2015-01-23 08:00:50 -06:00
Dubslow
358a56c555
Confirm decrypt data, various ui/txt tweaks 2015-01-23 07:07:52 -06:00
Dubslow
18e875ef20 Fix bug with initial password dialogs accepting empty passwords 2015-01-23 07:07:31 -06:00
Dubslow
dea2ccf0b7 Fix segfault, minor cleanup 2015-01-23 07:07:15 -06:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master 
Conflicts:
	src/main.cpp
 2015-01-23 01:51:39 -06:00
Dubslow
44ddb8789c
In groupchats, check for sanitized name as well 
Fixes #952
 2015-01-23 01:35:21 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
aa9d0e06d1
Use Yes/No, not Ok/No when asking questions 2015-01-22 20:21:13 +01:00
Dubslow
908dafd3b8
Simplify regex 2015-01-22 10:20:38 -06:00
Dubslow
34b9236d58
Fix most of the things suhr mentioned 
also added colons a buncha places
translation->language
save files in->save to
moved emoticon size after smiley pack
Ignoring the excellent point raised by zer0-One for now
 2015-01-22 10:07:20 -06:00
Dubslow
0428b5c87a
Move "Make Tox portable" to advanced settings tab 2015-01-22 09:55:24 -06:00
krepa098
9cb7ba06ed cleanup 2015-01-21 15:58:43 +01:00
novist
3bec2751e0 Separate setting to show window on new message (without focusing window) 
Setting to always notify on messages in group chats (like normal chats)
Check for mentioned name only triggers if name is not in the middle of other word
 2015-01-21 13:54:51 +02:00
novist
eade2969fe General settings UI cleanup 2015-01-21 13:14:08 +02:00
Zetok Zalbavar
4d045950e9
Remove unnecesary word 2015-01-21 06:35:28 +00:00
krepa098
ad39251166 typo 2015-01-20 11:51:34 +01:00
krepa098
d0bd6e9dca show 2 decimals starting from MiB 2015-01-20 11:08:40 +01:00
krepa098
2fa2fc1df5 fix divide by zero 2015-01-20 11:07:40 +01:00
krepa098
13e0a8a292 cleanup 2015-01-20 10:55:51 +01:00
Dubslow
b245fe034a
Merge branch 'pr949' 2015-01-20 03:48:37 -06:00
krepa098
5d5a0903f7 renamed get/setRowIndex to get/setRow 2015-01-20 10:31:50 +01:00
Dubslow
f0c3ca1c9e
check -P option for invalid profiles 
closes #977
 2015-01-20 02:24:25 -06:00
Dubslow
96fd1e514d
Fix #967 2015-01-20 02:07:56 -06:00
Dubslow
2d2522626c
Typing notifications disappear automagically 
Fixes #984
 2015-01-20 01:27:48 -06:00
Dubslow
7aa52ff754
Fix profile settings issue from command line, default unencrypt history is Cancel 2015-01-19 22:23:13 -06:00
Dubslow
5ea6e412f8
Slightly more useful initial password dialogs 2015-01-19 21:59:27 -06:00
Dubslow
f645faff51
Ignore empty history files on start 
This fixes an esoteric issue of enabling chat log encryption and then restarting before adding any messages
 2015-01-19 21:49:41 -06:00
Dubslow
b1180a2038
Improve dialogs around unencrypting history, per zetok's suggestions 2015-01-19 21:16:28 -06:00
Dubslow
e233c8171f
minor reword 
(I meant to apply this with the relevant merge commit, but forgot to "git add"... life is hard)
 2015-01-19 19:21:34 -06:00
krepa098
bb29536df1 NotificationIcon 2015-01-19 19:04:19 +01:00
krepa098
b5b6ae99c0 Text: extractSanitizedText, hookup double-click selection 2015-01-19 17:56:37 +01:00
krepa098
1fd456833c Merge pull request #3 from dubslow/chatlog_v3_1 
minor code cleanup
 2015-01-19 15:25:22 +01:00
krepa098
34c7c7250b double-click selection 2015-01-19 15:19:54 +01:00
krepa098
a6e3fc671e removed selectAll() 2015-01-19 15:07:15 +01:00
krepa098
85764d5973 Text: Do not rely on QTextCursor for selection 2015-01-19 15:04:11 +01:00
krepa098
f17ffdc491 cleanup 2015-01-19 11:14:53 +01:00
krepa098
2c8e7c638d nice! 2015-01-19 10:08:43 +01:00
krepa098
691a8b0b71 fixed potential null deref. & memory leak 2015-01-19 10:07:51 +01:00
Dubslow
2805737b8d
Merge branch 'pr1015' 
also minor re-reword
 2015-01-18 19:55:15 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
ef64a0ef4c
Check that dropped files are readable&non-sequential 
Fixes #934

No, you're not allowed to send /dev/urandom to your friends. Ever.
 2015-01-19 00:22:40 +01:00
Dubslow
44921db440
minor code cleanup 2015-01-18 13:57:51 -06:00
krepa098
2914a9883c ChatMessage::createTypingNotification, resized images to 18x18, new 
(spinning) notification icon
 2015-01-18 12:20:13 +01:00
krepa098
16812633cb extended spinner class 2015-01-18 12:17:21 +01:00
krepa098
9df5200fc9 update typing notification on resize 2015-01-18 12:15:02 +01:00
krepa098
882d19d311 "%user is typing..." -> "%user ..." 2015-01-18 11:54:08 +01:00
krepa098
b4f53944cc FileTransferWidget: calculate mean 2015-01-18 11:51:48 +01:00
krepa098
4d5470710a createChatInfoMessage: increase icon size from 16 to 20 px 2015-01-17 12:09:13 +01:00
krepa098
ee902ee1b0 don't forget to reposition the typingNotification on insertChatline* 2015-01-17 11:35:09 +01:00
krepa098
e85ff58223 refactoring 2015-01-17 11:31:57 +01:00
Zetok Zalbavar
a23d2acf21
Re-word 'Compact layout' → 'Compact contact list' 
Apparently it can be worded better, to be more self-explanatory for users
 2015-01-16 06:36:20 +00:00
Dubslow
826d60c876
fix bug with "use other password" 
It's more trouble than it's worth to shallow copy; changed to deep copy with STL
 2015-01-15 21:41:10 -06:00
krepa098
b4fa8323af refactoring, reverted ChatLog::getVisibleRect 2015-01-15 11:48:41 +01:00
krepa098
1ae3999576 FileTransferWidget::acceptTransfer: Regression - check whether the path 
is NOT writable
 2015-01-15 10:14:26 +01:00
Dubslow
33dfb88962
Merge branches 'pr990', 'pr1008', 'pr1009' and 'pr1011' 2015-01-15 01:48:11 -06:00
Dubslow
1ab9bb77e6
Fix OS X bug with overlapping buttons 
Fixes #910
 2015-01-15 01:45:42 -06:00
derMart
4540fb09aa fix resetting AVForm resolution combobox index to get change signal always fired during init 2015-01-14 23:44:38 +01:00
krepa098
a0693c2fc9 tweaked ChatLog::getSelectedText 
*Actions are copied as "*name action*"
*SystemInfoMessages are not copied
 2015-01-14 20:31:40 +01:00
krepa098
3478a5c794 refactoring 2015-01-14 20:13:41 +01:00
krepa098
13746f5c38 More pleasant multi-line selection, refactoring 2015-01-14 20:10:17 +01:00
krepa098
3be99ae663 comments 2015-01-14 18:22:42 +01:00
derMart
c018165497 fix missing showEvent in AVForm 2015-01-14 15:27:57 +01:00
derMart
def43706eb fix incompatibility of MSAA (SampleBuffers) and SingleBuffer mode in VideoSurface 2015-01-14 15:26:02 +01:00
krepa098
437282b80c Don't stick to bottom if the user scrolls while the worker is still 
running
 2015-01-14 11:27:52 +01:00
krepa098
4930b32641 fixed chatlog not scrolling to bottom after resize 2015-01-14 10:56:44 +01:00
krepa098
bde32d2171 cleanup 2015-01-14 10:34:52 +01:00
krepa098
fb0c372c81 cleanup 2015-01-13 23:59:38 +01:00
krepa098
29fc6ab03f FileTransferWidget: use baseName instead of completeBaseName + tweaked 
autoAccept
 2015-01-13 21:52:19 +01:00
Zetok Zalbavar
a45b72701f
Small spelling fix 2015-01-13 15:55:06 +00:00
derMart
290f6d4697 refactoring audio device initialization in av setting to prevent opening devices twice 2015-01-12 18:08:25 +01:00
derMart
7d11e9192c 0x0 resolution removed 
better camera initializing in av settings
 2015-01-12 18:08:14 +01:00
derMart
e5d736e6c0 fix videosurface flipping buffers 2015-01-12 18:07:58 +01:00
derMart
3a107e33c8 fix utf8 audio device specifier names on windows 2015-01-12 18:07:30 +01:00
Dubslow
d74b95a7b7
Merge branches 'pr920', 'pr1001', 'pr1003' and 'pr1005' 2015-01-12 06:01:50 -06:00
krepa098
62b4b83106 tweaked FileTransferWidget min size 2015-01-11 12:04:35 +01:00
krepa098
85568337e3 cleanup 2015-01-11 12:02:24 +01:00
krepa098
f574a43581 FileTransferWidget: fixed autoaccept 2015-01-11 11:57:33 +01:00
krepa098
3bb52e5538 tweaks, colorize the blue * in /me 2015-01-10 22:21:33 +01:00
krepa098
904627e50a moved typing notifications to ChatLog 2015-01-10 11:57:46 +01:00
minj
97a78d5c14 add lt.ts 2015-01-10 07:27:31 +02:00
krepa098
d9e15fb0ba Merge branch 'master' into chatlog_v3_1 
Conflicts:
	src/widget/chatareawidget.cpp
	src/widget/form/chatform.h
	src/widget/form/genericchatform.cpp
 2015-01-09 19:41:16 +01:00
krepa098
95dca34865 cleanup 2015-01-09 15:50:23 +01:00
krepa098
ed65261e37 Text: copy image keys 2015-01-09 15:50:13 +01:00
krepa098
d21a00e8d5 cleanup 2015-01-09 15:48:58 +01:00
Bruno Kühnen Meneguello
2e38a1fdb8 Add Portuguese translation 2015-01-08 10:28:53 -02:00
novist
313f666a2b Including only required opencv headers. Workaround for opencv bug where partial builds would lack certain headers but opencv.hpp includes them anyway resulting in a build error. 2015-01-08 13:59:05 +02:00
novist
cfcf16252f Fixed warning in timer_win.cpp 2015-01-08 13:59:05 +02:00
krepa098
39d2bbb341 towards better scrolling 
Experimental changes!
Known bug: Scrolling gets extremly slow while the cursor is inside
qTox's main window.
Cause: Unknown.
 2015-01-07 15:03:02 +01:00
krepa098
0f52bf3f5c moved history loading to FriendWidget::setAsActiveChatroom() 2015-01-07 13:16:09 +01:00
krepa098
debe6903a3 faster scrolling, more cheating 2015-01-07 13:05:28 +01:00
krepa098
1274c213d0 Revert "[test] use BspTreeIndex (might be slower?)" 
This reverts commit b92d4f3d2f.
 2015-01-06 20:22:30 +01:00
krepa098
1bf0898121 optimized ChatLog::getContentFromPos 2015-01-06 17:47:57 +01:00
krepa098
b92d4f3d2f [test] use BspTreeIndex (might be slower?) 2015-01-06 15:38:05 +01:00
agilob
cbfe94d6a2
closes tux3/qtox#988 2015-01-06 14:36:03 +00:00
krepa098
e2d7dd815b [test] use std::vector rather than QVector 
might be faster because std::vector doesn't do implicit sharing
 2015-01-06 15:10:37 +01:00
krepa098
0a6bd85308 speed up ChatLine::moveBy 2015-01-06 14:58:50 +01:00
krepa098
b82c5835ce error symbol 2015-01-06 14:30:24 +01:00
krepa098
e365b0eb2d FileTransferWidget: limit browse to pics and archives 2015-01-06 13:58:42 +01:00
krepa098
9793ebd094 renamed deltaRepos to deltaY 2015-01-06 10:37:07 +01:00
krepa098
af575c09e6 cache innerStyle as it gets used frequently 2015-01-06 10:28:15 +01:00
krepa098
82746dc050 fixed first message not getting displayed properly 2015-01-06 10:27:03 +01:00
krepa098
f7be91c6d0 change previousId on action 2015-01-06 10:05:01 +01:00
Dubslow
139cd3f4a6
Merge branch 'encryption' into master 
Conflicts:
	src/core.cpp
	src/misc/settings.cpp
	src/widget/widget.cpp
	src/widget/widget.h
 2015-01-05 20:55:47 -06:00
Dubslow
a0bf23f3ff
Merge branch 'pr973' 2015-01-05 20:28:24 -06:00
apprb
017c59bd82
more userfriendly history load dialog 2015-01-05 20:37:10 +06:00
krepa098
4f01f5ec0e refactoring 2015-01-05 14:06:14 +01:00
krepa098
5399b40874 history: fixed regression 2015-01-05 14:05:01 +01:00
krepa098
960ebecc4e hopefully less noticeably partial updates 2015-01-05 10:59:56 +01:00
krepa098
77fe3f7256 ChatLog::insertChatlineOnTop: overload taking a list 2015-01-05 10:51:01 +01:00
krepa098
c7fe34c077 history: require markAsSent 2015-01-05 10:02:41 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
56e9f6f1be
Better checks before applying update 
Check that each file was downloaded and that the size matches. We don't check the signatures inside qTox so as not to freeze the GUI during startup. The updater will check the signatures anyway

We now try to restart update downloads if we detect that it was interrupted
 2015-01-05 09:54:56 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
8813d6e4ca
Fix #909 2015-01-05 09:54:03 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
5b7e57751c
Filter outgoing audio, not incoming 
Reverts bad previous commit
 2015-01-05 09:18:11 +01:00
Zetok Zalbavar
d36c471f4f
Some wording improvements 2015-01-04 20:25:37 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
c3505d0939
Ask user to fallback to tox1 if needed 
With a warning, tox1 is insecure

Fixes #907

Fixes #886
 2015-01-04 21:02:24 +01:00
krepa098
bc97948be7 changed output of ChatLog::toPlainText 2015-01-04 20:24:56 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
9991c38342
Fix some audio bugs 
Including a fix for a 7 years old OpenAL-soft bug with ALSA (disabled by default)

I love alsa
 2015-01-04 20:24:11 +01:00
krepa098
27e967b67e cleanup 2015-01-04 19:58:14 +01:00
krepa098
6711fd6ee4 history fixes 2015-01-04 19:29:06 +01:00
krepa098
12a1fa1549 ChatLog: insertChatlineAtBottom, refactoring 2015-01-04 19:28:27 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
86d0558c71
Conform with toxav API change 2015-01-04 18:53:02 +01:00
krepa098
b09805f9bf refactoring 2015-01-04 18:21:35 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
fbc77864aa
Fix some ChatForm debug spam 
Don't log an event if it isn't meant for you
 2015-01-04 17:59:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
37ea7c359c
Thread safe, encapsulated audio 2015-01-04 17:55:39 +01:00
krepa098
a74b9ce11c ChatLog: Autoscroll while selecting 2015-01-04 15:18:23 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
14ad87069e
Merge branch 'pr979' 2015-01-04 15:18:07 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
10a2213e66
Merge branch 'pr978' 2015-01-04 15:07:36 +01:00
Nokta-strigo
1ec40b74b7 Contacts changing status to offline and having new events are not moved to the bottom of the list. (see issue #740) 2015-01-04 14:54:22 +01:00
krepa098
64024c77a6 Moved the context menu to GenericChatForm 2015-01-04 14:21:05 +01:00
krepa098
f4c6bc3452 cleanup 2015-01-04 13:33:11 +01:00
krepa098
03ea61079b ChatLine/ChatMessage: use shared_ptr 2015-01-04 13:29:14 +01:00
novist
4b05c10308 Fixed text copying from chat windows 
Tiny formatting fix (space after if)
 2015-01-04 13:23:28 +02:00
novist
2a8cbd189d Added typing notification support and enabled by default 2015-01-04 13:21:56 +02:00
krepa098
ea467152aa filetransferwidget: fixed pause button, ETA, font size, resource usage 2015-01-04 12:04:30 +01:00
zero-one
672cd42065 Merge remote-tracking branch 'upstream/master' into alphabetize 2015-01-04 01:30:11 -08:00
zero-one
7569003e87 Alphabetizes groupchat user list (fixes #701) 2015-01-04 01:26:53 -08:00
Tux3 / Mlkj / !Lev.uXFMLA
d042c2f346
Filter incoming audio, not sent audio 2015-01-04 02:04:07 +01:00
krepa098
f630583e59 cleanup 2015-01-03 21:20:51 +01:00
krepa098
b3507152eb fixed eliding (ie. invisible nicknames) 2015-01-03 21:19:28 +01:00
krepa098
64f7f7c45e use resolveToxID 2015-01-03 20:38:06 +01:00
krepa098
d04a79a599 ChatLine: cell spacing 2015-01-03 20:37:40 +01:00
krepa098
99a230ccf5 cleanup 2015-01-03 19:06:10 +01:00
krepa098
698fcb70f0 check "use emoticons" 2015-01-03 19:05:38 +01:00
krepa098
a0a56e32a0 fix no visible line case 2015-01-03 15:32:12 +01:00
krepa098
2938702c1e refactoring, fixes 2015-01-03 15:03:33 +01:00
krepa098
8a1ea18ed4 fixed history 2015-01-03 14:08:04 +01:00
krepa098
d7f5068fbf quoting support, toHtmlChars, fixes 2015-01-03 13:52:56 +01:00
krepa098
f3d5b4bb57 fixed anchors 2015-01-03 13:20:53 +01:00
krepa098
d88aa965fa fixup merge 2015-01-03 13:13:12 +01:00
apprb
64e0116476 honouring aliases in the loaded history 
Conflicts:
	src/widget/form/chatform.cpp
 2015-01-03 13:10:19 +01:00
krepa098
2ee1363be5 don't set cache mode 2015-01-03 10:24:12 +01:00
krepa098
1945bcc1f6 don't use DesignMetrics 2015-01-03 10:24:04 +01:00
krepa098
b76e9a295d disabled group joined/left messages 
Conflicts:
	src/widget/widget.cpp
 2015-01-03 10:23:50 +01:00
krepa098
40cc14bd44 respect time format 2015-01-03 10:21:50 +01:00
krepa098
2828a97d54 styled chatlog, cleanup 2015-01-03 10:21:15 +01:00
krepa098
96789182cf chatlog: Don't accept drops 2015-01-03 10:21:05 +01:00
krepa098
5ae111e7c4 chatline: set row and col number 2015-01-03 10:20:53 +01:00
krepa098
b0c3b4032f chatlog: save chat log 2015-01-03 10:20:40 +01:00
krepa098
1c653c5f65 filetransferwidget: use CroppingLabel 2015-01-03 10:20:29 +01:00
krepa098
3c9e071a39 chatlinecontentproxy: scaling behaviour 2015-01-03 10:20:05 +01:00
krepa098
4997788b13 fix selection 2015-01-03 10:19:54 +01:00
krepa098
eecd886745 filetransferwidget layout changes 2015-01-03 10:19:41 +01:00
krepa098
a0ea0675a7 Merge branch 'master' into chatlog_v3_1 
Conflicts:
	qtox.pro
	res.qrc
	src/misc/smileypack.cpp
	src/widget/chatareawidget.cpp
	src/widget/chatareawidget.h
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/generalform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/systemmessageaction.cpp
	src/widget/widget.cpp
 2015-01-03 10:17:53 +01:00
krepa098
f1f42fc237 innerStyle, groupchats 2014-12-31 13:42:06 +01:00
krepa098
7a4af239b0 Text: toHtmlChars 2014-12-31 09:59:35 +01:00
Dubslow
f7bef8d5c3
Merge branch 'pr966' 2014-12-31 00:55:59 -06:00
Dubslow
75331af311
Merge branch 'pr965' 2014-12-31 00:50:03 -06:00
apprb
1194df2f78
renaming: Direct Connect -> None 2014-12-30 22:02:26 +06:00
apprb
f8bdaac121
messages splitting fix 2014-12-28 23:32:19 +06:00
apprb
1719c72f67
tiny polishing 2014-12-28 19:04:32 +06:00
apprb
a14da15d79
fix #963 2014-12-28 18:32:25 +06:00
novist
30d9862c4f Removed explanations from tray menu 2014-12-18 20:32:28 +02:00
Dubslow
54e8be75d2
Merge branch 'pr938' 2014-12-17 14:43:34 -06:00
agilob
5861c6daa5
removing fixed size from mic/volume buttons so they align nicely 2014-12-17 12:36:34 +01:00
agilob
f8d870f374
removing spacing from microphone layout 2014-12-17 12:00:41 +01:00
Dubslow
fc749880eb
minor style tweaks 2014-12-16 18:05:13 -06:00
Maximilian Wuttke
e0cb122abe Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio 
Added some `#ifdef QTOX_FILTER_AUDIO`s.
Conflicts:
	qtox.pro

Conflicts:
	src/coreav.cpp
 2014-12-14 10:55:38 +01:00
krepa098
3190530686 filling the gaps 2014-12-13 21:11:03 +01:00
Dubslow
84dea5e12c
Revert "fix #902" 
@apprb #932
This reverts commit 13306031e2.
 2014-12-13 12:18:43 -06:00
Dubslow
a8b1f60256
Merge branch 'pr923' 2014-12-12 18:40:24 -06:00
Dubslow
cc4cc7d7a8
Merge branch 'pr922' 2014-12-12 18:37:06 -06:00
novist
e2bf37c139 Light tray icon option 2014-12-12 12:12:12 +02:00
lumirayz
f469e1b892 fix more consistency issues 2014-12-11 19:11:21 +01:00
Zetok Zalbavar
e0993a72f6
Style corrections 
'if()' → 'if ()'
'for()' → 'for ()'
 2014-12-11 18:05:52 +00:00
apprb
13306031e2
fix #902 2014-12-11 21:33:38 +06:00
lumirayz
038b4cedcb make the code style more consistent 2014-12-11 15:31:01 +01:00
lumirayz
c73b07db72 added a compact layout for the friends list 2014-12-11 13:02:45 +01:00
krepa098
380d7b9a07 Text: detect anchors 2014-12-10 19:56:08 +01:00
krepa098
170e2e6e29 Text: selection use fuzzy hit 2014-12-10 19:31:27 +01:00
krepa098
fd7fe15e31 renamed firstLineVOffset to getAscent 2014-12-10 16:45:12 +01:00
krepa098
0692c484f0 adjusted Image, Spinner, ChatLineContentProxy vOffset 2014-12-10 16:42:12 +01:00
krepa098
2003f7c5aa Text: use ascent rather than height 2014-12-10 16:35:07 +01:00
krepa098
26718f7147 cleanup 2014-12-10 10:59:10 +01:00
krepa098
ba24da3184 filetransferwidget.ui: reverted margins. chatlinecontentproxy: calculate 
firstLineVOffset
 2014-12-10 10:57:09 +01:00
krepa098
b6fd9ed02e chatline: fixed bbox height calculation 2014-12-10 10:41:22 +01:00
krepa098
5ae506fe3b filetransferwidget: added open (browse?) button, fixed layout 2014-12-10 10:35:56 +01:00
Dubslow
de6a443f37
fix loading an encrypted chat log failing 2014-12-09 19:13:39 -06:00
Dubslow
a1a1a6f989
fix clearing duplicate passwords 
fixes dubslow/qTox#2
 2014-12-09 19:12:20 -06:00
Dubslow
09602731f7
when loading, try using main password for history 2014-12-09 18:40:05 -06:00
Dubslow
31c072d296
more file open checking 2014-12-09 18:08:38 -06:00
Dubslow
0e21a8d497
check for non-existent file 2014-12-09 17:44:20 -06:00
Dubslow
c5b945bbd5
minor tweaks 2014-12-09 15:43:56 -06:00
Dubslow
7fc7b57934
refactor/fix switching profile with separate settings 2014-12-09 15:43:43 -06:00
krepa098
0f2a339a98 margins, update selection rect during resize 2014-12-09 21:47:25 +01:00
Dubslow
5cb1b6fe8e
check for no systray, fixes #908 
cant believe it took this long to figure out ;_;
 2014-12-09 14:18:12 -06:00
krepa098
2b20a23c3d changed color of selGraphItem 2014-12-09 19:24:01 +01:00