Dubslow
99e8d71fca
Merge branch 'pr1400', with style fixes @agilob
...
Conflicts:
src/widget/form/profileform.cpp
2015-03-17 13:18:47 -05:00
Dubslow
9d5b77aa61
Fix qr label wordwrap
2015-03-17 11:14:16 -05:00
Dubslow
42fe29e83d
Merge branch 'pr1397'
2015-03-16 17:53:00 -05:00
sudden6
0c4cc87ed0
fix #1394
2015-03-16 17:46:56 -05:00
Dubslow
4087778b88
Merge branch 'pr1378'
2015-03-16 16:47:12 -05:00
Dubslow
e96211199d
Check for writability for Qr saves
2015-03-16 16:41:59 -05:00
Dubslow
ad09980ce7
Less agressive tooltip
2015-03-16 16:15:34 -05:00
Dubslow
b908852e3b
Cleanup QR PR
...
Fix coding style, #include "" -> #include <>
Remove tooltip
Move "tox:" addition out of qr-related code
Conflicts:
src/misc/qrwidget.cpp
2015-03-16 15:41:39 -05:00
Dubslow
01a4cdd07e
Merge branch 'pr1351'
2015-03-16 14:56:01 -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
agilob
209f8a19ba
disable css interitance in setpassworddialog
2015-03-16 18:03:14 +00:00
agilob
b60cfef749
closes tux3/qtox #1399
...
disabling scrolling on comboboxes in all settings forms
2015-03-15 20:29:23 +00:00
agilob
42133a3d00
copy image to clipboard
2015-03-15 18:53:10 +00:00
agilob
9d99007e2c
qrcode always visible, button to save
2015-03-15 15:45:28 +00:00
agilob
e4c51e2a29
text in the label dateformat
2015-03-14 20:22:28 +00:00
agilob
4cf62bdefa
closes tux3/qtox#1368 - settings to change dateformat
2015-03-14 20:15:56 +00:00
tux3
2547029140
Merge branch 'pr1390'
2015-03-14 19:51:17 +01:00
tux3
48dd053d07
Merge branch 'pr1388'
2015-03-14 19:48:05 +01:00
Flakebi
ae9cf96631
Rename dialog buttons
2015-03-14 18:44:26 +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
53589df799
Disable call buttons in a lonely groupchat
2015-03-14 17:04:06 +01:00
Davor
200ae23de3
Update generalform.cpp
2015-03-14 16:34:12 +01:00
agilob
a501620d92
fixing conflict
2015-03-14 11:36:38 +00: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
Dubslow
407ffef1b9
Merge branch 'pr1370'
2015-03-11 22:33:30 -05:00
Dubslow
50c1e09a5c
Autofocus name edit in profileform
...
fixes #1364
2015-03-11 22:00:54 -05:00
Dubslow
21780b9d31
remove duplicate code
2015-03-11 21:17:52 -05:00
zero-one
8b1de8e3f0
grammar correction
2015-03-11 17:50:28 -07:00
zero-one
2d186109c8
Adds a configuration option allowing users to choose whether they want
...
groupchats placed at the top of the friends list, or below the online
contacts.
-A checkbox was added to generalsettings.ui
-FriendListWidget's constructor was changed so that the friends list can
be initialized with the appropriate layout arrangement
2015-03-11 17:41:18 -07:00
novist
5554412a72
Window icon is set same as tray icon
...
Removed use of "qtox" theme icon as it is no longer relevant
2015-03-11 20:07:35 +02:00
Dubslow
4f0798bde7
Rename widget/form/settings/identitysettings.ui to widget/form/profileform.ui
2015-03-11 10:15:53 -05:00
Flakebi
804cd4f88a
Inline funtion calls
2015-03-11 16:01:24 +01:00
Flakebi
4920f2a2d4
Allow writing messages in a lonely groupchat
2015-03-11 03:21:35 +01:00
Dubslow
fb63232318
Tidying new profile form
...
Fixing up Widget code for simplicity and consistency, add picture to form heading
2015-03-10 21:01:13 -05:00
Dubslow
114ddd8c50
Merge branch '1012-enhancement-quick-tox-id-access' of https://github.com/ovidiusabou/qTox into master
2015-03-10 17:34:51 -05:00
Dubslow
2ea3d73756
Merge branches 'pr1355' and 'pr1357'
2015-03-08 17:37:53 -05:00
Shane McKee
03329d8171
Issue #1119 fixed OS X fullscreen bug
2015-03-08 17:33:55 -05:00
kushagra
38f5c4f2dc
solves issue 1309
2015-03-08 22:30:57 +05:30
agilob
4b1c5e80e9
qrcode support by html tooltip
2015-03-07 12:40:45 +00:00
Domen Skamlic
af319bfa82
Added Slovenian translation.
2015-03-06 17:35:09 +01:00
Ovidiu Sabou
69678c011b
Silence warning
2015-03-05 20:39:26 +02:00
Ovidiu Sabou
1444b851a2
Refresh the profile list when the new id is available in the core
...
The status set signal (when getting online) seems to correspond with the availability of the new profile in the list
2015-03-05 20:35:19 +02:00
Ovidiu Sabou
e8465c73dd
Fix a crash bug when closing the application
2015-03-05 20:09:58 +02:00
Ovidiu Sabou
98fb61525b
Merge branch 'master' into 1012-enhancement-quick-tox-id-access
...
Conflicts:
src/widget/widget.h
2015-03-04 21:43:46 +02:00
Ovidiu Sabou
c3dd285864
Set a header to be consistent and to have the profile page remain open when switching profiles
2015-03-04 21:35:34 +02:00
tux3
50601b4049
Merge branch 'pr1303'
2015-03-04 20:11:53 +01:00
Ovidiu Sabou
75f5901aec
Refresh the available profiles when the profile page is shown. Fix regression for #1012
...
I carelessly removed perfectly good code from the present() method and this commit brings that back
2015-03-04 00:04:16 +02:00
Ovidiu Sabou
b155830e4c
Move the identity settings tab into its own dedicated profile page
...
Make the page directly accessible from the main screen by clicking the avatar or the username. Changing the avatar or the username are now possible only from the profile page
2015-03-03 22:29:01 +02:00
baloo79
9494f63841
Update generalform.cpp (for Hungarian translation)
2015-03-03 20:13:15 +01:00
Dubslow
75a0e8ac2e
Merge branch 'pr1275'
...
Conflicts:
src/widget/form/genericchatform.cpp
2015-02-28 12:20:40 -06:00
agilob
8ceacdd519
clearing chatarea
2015-02-27 18:25:27 +00:00
agilob
2ec1bd0977
keyboard shortcut to change current chat
2015-02-27 17:56:47 +00:00
agilob
7a6b8ab256
qlabels will not support richtext, plaintext only
...
removes support for HTML, QML, JS and CSS in username/status labels
this commit closes #1298(bug) #1295(bug) and #1224(feature request)
2015-02-27 14:05:03 +00:00
tux3
e04bd15181
Merge branch 'pr1231'
2015-02-25 15:40:50 +01:00
tux3
559be200ff
Merge branch 'pr1272'
2015-02-25 11:03:01 +01:00
agilob
9a3a15c2e7
closes again tux3/qtox #988
2015-02-24 18:39:44 +00:00
TheLastProject
75734c35ac
Make default friend request message contain nickname
2015-02-24 14:10:51 +01:00
agilob
842774ecfc
fix tux3/qtox #891
2015-02-23 23:08:07 +00:00
tux3
dbc3a5b137
Merge branch 'pr1255'
2015-02-22 23:42:00 +01:00
TheLastProject
0726d0f7e1
Clicking the yellow button on an incoming call answers
2015-02-22 20:44:05 +01:00
TheLastProject
398746a129
Make call tooltips depend on status, grey out vol and mic settings when not in a call
2015-02-22 20:37:00 +01:00
TheLastProject
695bd74ce5
Use blacklist for executables, explicitly run executables with QProcess to work around KDE4.4 security measure which disallows running executables
2015-02-22 13:21:42 +01:00
TheLastProject
7202b18079
Make askQuestion more flexible, defaulting to Yes/No
2015-02-20 16:36:35 +01:00
TheLastProject
48c58322f3
Fix regression showing is typing too often
2015-02-19 20:35:08 +01:00
TheLastProject
ad1852622f
Allow user to open all transferred files, but warn for executable files
2015-02-19 20:14:19 +01:00
TheLastProject
3116e84095
Hide is typing status when friend disconnects
2015-02-18 14:02:10 +01:00
Dubslow
9946a4642e
Merge branch 'pr1194'
...
Reduced merge that drops the unnecessary changes
2015-02-16 18:07:56 -06:00
Dubslow
7edb50ea3e
Merge branches 'pr1185', 'pr1188', 'pr1192', 'pr1193', 'pr1200' and 'krepa'
2015-02-16 18:03:36 -06:00
krepa098
deb8440c6a
fix issue #1181
2015-02-16 18:13:22 +01:00
Zetok Zalbavar
c0df870c62
Update toolTip for Compact contact list
...
Restart should not be a requirement anymore
2015-02-16 10:59:01 +00:00
BroncoTc
51799dc857
add spaces between language names
2015-02-16 18:36:51 +08:00
BroncoTc
dff30915a3
edit the three config & source file
...
manully and same way as commit a004fc872f
2015-02-16 12:43:39 +08:00
Dubslow
03168a02d2
Merge branches 'pr1134', 'pr1157' and 'pr1171'
2015-02-15 17:36:45 -06:00
Dubslow
73e51865e7
Merge branch 'chatlog_merge_v3'
...
Conflicts:
src/chatlog/chatlog.h
2015-02-15 05:24:53 -06:00
krepa098
c57cba21ae
fix issue #14
2015-02-15 11:58:02 +01:00
Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
...
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
krepa098
2bc7594049
redo layout on Settings::emojiFontChanged
2015-02-15 11:43:01 +01:00
krepa098
205f950073
refactoring & dark-theme awareness
2015-02-15 10:51:54 +01:00
Dubslow
c3d61f8dfe
Make Dutch selectable translation
2015-02-14 18:10:45 -06:00
Dubslow
eeb8c10bc3
Fix #1158
2015-02-14 17:26:21 -06:00
Zetok Zalbavar
e4e6401182
Rename 'Start automatically' → 'Autostart'
2015-02-14 07:39:28 +00:00
Dubslow
11d4ec2599
Refactor OfflineMsgEngine, fix potential segfault
...
(@apprb take note please)
2015-02-13 00:02:52 -06:00
krepa098
f765daf98d
reverse history entries as they are no longer reversed in
...
ChatLog::insertChatlineOnTop
2015-02-12 09:12:14 +01:00
Dubslow
4055cbe956
Minor translation things in the ui files
2015-02-11 14:52:42 -06:00
Dubslow
3fc778ae3d
Fix #1131
2015-02-10 22:51:57 -06:00
Dubslow
0164b53aba
Fix #1129
2015-02-10 22:43:25 -06:00
Urras
3312331723
Fixed OS X build
2015-02-09 10:07:01 -05:00
Dubslow
4d56a6fdd8
Merge branch 'pr947'
...
Conflicts:
src/misc/settings.cpp
2015-02-08 13:29:19 -06:00
krepa098
624b73edc7
clear previous id on action (issue #7 )
2015-02-07 22:55:42 +01:00
krepa098
5506379a97
Merge branch 'master' into chatlog_v3_1
2015-02-07 18:49:06 +01:00
apprb
bf2ebe9220
Offline messaging refactoring: Separated class for this purpose + more reliable resenging
2015-02-08 01:59:10 +09:00
Dubslow
830f0ddc13
Cleanup 331baa7447
2015-02-06 14:03:34 -06:00
tux3/mlkj
331baa7447
Use GUI instead of Widget for common GUI tasks
2015-02-06 19:01:36 +01:00
novist
ff693807af
Autorun on OS startup
2015-02-06 18:10:54 +02:00
tux3/mlkj
46bba3f2f1
Initial Android support
...
We create a GUI class to abstract common GUI needs (showing a message box, asking a question, ...) from the actual GUI backend.
We also create a Nexus class to manage the startup and lifetime of our main systems (Core, GUI, ...) instead of delegating that to Widget.
Eventually, Widget will only be in charge of the Desktop GUI and AndroidGUI of the mobile GUI. Nexus will overview the system and GUI will provide a clean platform-independant interface.
2015-02-06 12:28:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2225fcaf9d
Initial android support
2015-02-06 01:27:07 +01:00
Dubslow
b7800b66ca
Tweak re-enabling old history popups
2015-02-04 16:31:09 -06:00
Dubslow
e2fd298d68
chat logs -> chat history, miscellaneous rewordings
2015-02-03 13:56:08 -06:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
...
Conflicts:
src/core.cpp
src/historykeeper.h
2015-02-03 10:21:59 -06:00
Dubslow
625eb3cf5b
Code cleanup
2015-02-02 21:28:20 -06:00
Dubslow
8d999efae7
Fix the previous todo
2015-02-02 17:56:51 -06:00
Dubslow
ca5e9c324d
When enabling history encryption, check for and use previously-ignored encrypted history
...
Should close dubslow/qTox#5 and close dubslow/qTox#6
Note that the GUI isn't updated with the ignored history, that's a TODO
2015-02-02 17:19:43 -06:00
krepa098
8d7a32f4ec
selection rect: change color on focus-in/out, action cleanup
2015-02-02 18:11:29 +01:00
krepa098
e67db1575d
fixup! Merge branch 'master' into chatlog_v3_1
2015-02-02 14:50:06 +01:00
krepa098
52f220c9e4
Merge branch 'master' into chatlog_v3_1
...
Conflicts:
qtox.pro
res.qrc
src/widget/form/chatform.cpp
src/widget/form/chatform.h
src/widget/form/genericchatform.cpp
src/widget/tool/chatactions/chataction.h
src/widget/tool/chatactions/messageaction.cpp
src/widget/widget.cpp
ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
Christoffer Sterner
866c38e7df
Add support for playback audio slider setting
2015-02-01 16:58:59 +01:00
Zetok Zalbavar
c2eaa3cdb4
Some tweaks for tooltips in settings
2015-02-01 10:56:28 +00:00
krepa098
783caf932c
revert to "[user] is typing"
2015-01-31 19:22:45 +01:00
Zetok Zalbavar
13bd334d78
Add tooltips in settings
...
some tooltips changed to be more helpful/reflect reality
2015-01-31 09:53:12 +00:00
Tux3 / Mlkj / !Lev.uXFMLA
c32eb98e6c
CppCheck, some video perf improvements
2015-01-30 13:40:04 -06:00
kushagra
0e0e1fe83c
issue 960
2015-01-29 19:22:43 +01:00
Dubslow
2dc5cea1d2
Merge branch 'encryption' into master
...
Conflicts:
src/autoupdate.cpp
src/core.cpp
src/core.h
src/misc/settings.cpp
src/widget/widget.cpp
2015-01-27 18:29:39 -06:00
Dubslow
0470b5a6af
Potential fix for history issues, both dubslow/qTox#5 and dubslow/qTox#6
2015-01-27 17:25:41 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
a62b1dc7ac
Merge branch 'pr1045'
2015-01-27 21:33:44 +01:00
Dubslow
a1239747ac
fix button typo, closes dubslow/qTox#7
2015-01-26 19:12:36 -06:00
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
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
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
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
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
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
8876dad457
Save camera video res in settings
...
Fixes #1033
2015-01-24 02:04:00 +01:00
Dubslow
f6ff421aff
Fix two minor bugs
2015-01-23 08:31:13 -06:00
Dubslow
358a56c555
Confirm decrypt data, various ui/txt tweaks
2015-01-23 07:07:52 -06:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
...
Conflicts:
src/main.cpp
2015-01-23 01:51:39 -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
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
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
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
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
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
krepa098
2914a9883c
ChatMessage::createTypingNotification, resized images to 18x18, new
...
(spinning) notification icon
2015-01-18 12:20:13 +01:00
krepa098
882d19d311
"%user is typing..." -> "%user ..."
2015-01-18 11:54:08 +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
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
derMart
c018165497
fix missing showEvent in AVForm
2015-01-14 15:27:57 +01: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
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
85568337e3
cleanup
2015-01-11 12:02:24 +01:00
krepa098
f574a43581
FileTransferWidget: fixed autoaccept
2015-01-11 11:57: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
Bruno Kühnen Meneguello
2e38a1fdb8
Add Portuguese translation
2015-01-08 10:28:53 -02:00
agilob
cbfe94d6a2
closes tux3/qtox#988
2015-01-06 14:36:03 +00: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
apprb
017c59bd82
more userfriendly history load dialog
2015-01-05 20:37:10 +06:00
krepa098
5399b40874
history: fixed regression
2015-01-05 14:05:01 +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
Zetok Zalbavar
d36c471f4f
Some wording improvements
2015-01-04 20:25:37 +00: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
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
14ad87069e
Merge branch 'pr979'
2015-01-04 15:18:07 +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
64f7f7c45e
use resolveToxID
2015-01-03 20:38:06 +01:00
krepa098
8a1ea18ed4
fixed history
2015-01-03 14:08:04 +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
2828a97d54
styled chatlog, cleanup
2015-01-03 10:21:15 +01:00
krepa098
b0c3b4032f
chatlog: save chat log
2015-01-03 10:20:40 +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
Dubslow
f7bef8d5c3
Merge branch 'pr966'
2014-12-31 00:55:59 -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
a14da15d79
fix #963
2014-12-28 18:32:25 +06: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
a8b1f60256
Merge branch 'pr923'
2014-12-12 18:40:24 -06:00
novist
e2bf37c139
Light tray icon option
2014-12-12 12:12:12 +02:00
Zetok Zalbavar
e0993a72f6
Style corrections
...
'if()' → 'if ()'
'for()' → 'for ()'
2014-12-11 18:05:52 +00:00
lumirayz
c73b07db72
added a compact layout for the friends list
2014-12-11 13:02:45 +01:00
Sascha Brendel
17bcd969b2
Update chatform.cpp
...
Improved that line of code.
Thanks to @dubslow
2014-12-08 20:28:34 +01:00
Lednerb
dfb51d7d29
Added Translation for error message on sending a file. Also included the German Version.
2014-12-08 19:07:51 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
983c0b7e6b
Merge branch 'pr857'
2014-12-06 14:02:24 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
53d7bc9dc1
Push to talk with input msgedit focused
2014-12-06 13:59:19 +01:00
Simon Vermeersch
424af0505e
Focus the text input area when clicking on the text area
2014-12-06 13:54:37 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
324d075cfe
Change push to talk shortcut to CTRL+P
2014-12-06 13:49:04 +01:00
apprb
c0303e7a0f
password strength meter
2014-12-06 12:27:54 +06:00
Dubslow
7c7c603045
word wrap the privacy tab string
2014-12-05 21:24:03 -06:00
Dubslow
67027814e5
tweak to popup questions
2014-12-05 19:56:33 -06:00
Dubslow
2e6b0f7b2b
remove files that I shouldn't have added in the first place
2014-12-05 19:17:02 -06:00
Dubslow
961d5830c3
add fancier tray icons with status, remove relevant option
2014-12-05 17:14:48 -06:00
Dubslow
7f12c267e1
turns out the password code saving Configuration was useless anyways
...
would have avoided the bug I just "fixed"
2014-12-04 13:35:34 -06:00
apprb
4c85f92e7d
plain db encryption
2014-12-04 23:44:45 +06:00
Dubslow
dccb0a9951
finishing touches
2014-12-04 10:55:14 -06:00
apprb
bac485400e
small code unification
2014-12-04 22:07:16 +06:00
agilob
561f5f9895
fixing bug #891
2014-12-04 15:51:01 +00:00
apprb
000eb8977d
history: encrypted <-> plain convertion
2014-12-04 21:22:17 +06:00
Dubslow
9a92e6c980
Clarification
2014-12-03 18:14:28 -06:00
dubslow
fc30d342bc
Added change pw buttons; encryption is very nearly done.
...
@apprb there is one question and one TODO that you should look over in privacyform.cpp, as well as a TODO in historykeeper.cpp
Also both the encryption settings box and the pw dialog lineedits should probably be in a QGridLayout... but I don't really want to do that by hand :P
2014-12-03 18:14:28 -06:00
dubslow
4eb3036414
Ah, much cleaner
2014-12-03 18:14:28 -06:00
dubslow
bafca96554
Incremental work, starting to take shape
2014-12-03 18:14:28 -06:00
dubslow
dde410bb9c
incremental
2014-12-03 18:10:07 -06:00
apprb
a9fb75b5ed
proper encrypted history loading
2014-12-03 18:01:31 -06:00
apprb
3c15909ffc
correct displaying of the targeted messages
2014-12-03 23:47:07 +06:00
Dubslow
3943d5213d
deleting a profile now cleans out all personal data
2014-12-02 18:48:50 -06:00
Dubslow
1c78cbc0c9
add a basic platform-disabling define
2014-12-01 18:18:27 -06:00
Dubslow
4781c8cfbb
Merge branch 'pr862'
...
Conflicts:
src/widget/widget.cpp
2014-12-01 15:37:09 -06:00
Dubslow
48e5315cdf
clarify systray show-status status
2014-12-01 14:55:35 -06:00
Dubslow
173eda7700
Merge branch 'pr870'
...
Conflicts:
src/widget/form/settings/generalform.cpp
2014-12-01 14:47:54 -06:00
Dubslow
840dadafdd
Merge branch 'pr876'
...
Conflicts:
res.qrc
2014-11-29 22:41:53 -06:00
Dubslow
6452cfa702
put tr list in "alphabetical" order
2014-11-29 22:32:12 -06:00
Zetok Zalbavar
5d297a78d5
Sort res.qrc and remove some unnecessary spaces
2014-11-29 11:27:36 +00:00
accino
a004fc872f
Added Spanish translation
2014-11-28 21:32:48 +01:00
novist
99fa5d9e19
Global auto-away
2014-11-28 11:41:44 +02:00
dubslow
bc381a8459
warn on can't read file, fixes #860
2014-11-27 15:00:04 -06:00
Maximilian
e989379535
Refactored system tray settings in generalform
2014-11-27 19:46:40 +02:00
novist
479644833e
Option for tray icon to display user status
2014-11-27 19:46:36 +02:00
Carsten Brandt
b1b1c468e3
adjusted translation messages
...
as discusses here: https://github.com/tux3/qTox/pull/848#discussion_r20851990
2014-11-25 21:39:21 +01:00
apprb
465da29a43
minor fixes in ChatAction's creation/processing
2014-11-25 01:58:57 +09:00
apprb
ba4d877b89
rescan audio devices button
2014-11-25 01:17:34 +09:00
apprb
56ea1f1e66
using ToxID in groupchats
2014-11-24 00:58:53 +09:00
apprb
f59a67f08a
Group class refactoring
2014-11-24 00:58:53 +09:00
apprb
85718fa637
auto-update audio devices list on tab show
2014-11-24 00:58:53 +09:00
