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

1707 Commits

Author SHA1 Message Date
agilob
a53f6f2adf
Merge remote-tracking branch 'PKEv/restor_window_after_screenshot' 2015-09-19 23:03:26 +01:00
agilob
a09d448ec4
Merge remote-tracking branch 'zetok/login' 2015-09-19 01:03:38 +01:00
PKev
9484488c31 restore window after screenshot 2015-09-18 22:45:58 +03:00
Zetok Zalbavar
6998c2c757
Make 'None' and 'Desktop' camera device names translatable
fixes #2252
2015-09-18 19:12:10 +01:00
TheNain38
6c526fe5fe More consistent translation strings in groupchatform.cpp
It should not be able to be translated differently as one update when the number of user in the group chat change and the other is when language change, so it should be translated together.
2015-09-18 19:10:37 +02:00
Zetok Zalbavar
35a15f119e
Reword login window: "Login" → "Load Profile"
thanks to @LittleVulpix suggestion

fixes #1898
2015-09-18 08:07:58 +01:00
aaannndddyyy
9269b0f967 rename two options 2015-09-17 18:25:23 +00:00
tux3
21ab9088b3
Remove broken 'Copy friend ID' feature 2015-09-15 17:58:46 +02:00
tux3
54fc35e714
Fix group name changes not displaying 2015-09-14 20:25:16 +02:00
tux3
6229e045f2
Merge branch 'pr2223'
Fixes #659
2015-09-14 19:51:10 +02:00
tux3
cf5fb0397a Remove 'Open Chat' menu action
Apparently, nobody uses it
2015-09-14 19:31:03 +02:00
PKEv
564b32eb7c save alias 2015-09-14 20:10:35 +03:00
agilob
346c2c64db
Merge remote-tracking branch 'zetok/wording' 2015-09-13 22:59:50 +01:00
agilob
8058d85f75
Merge remote-tracking branch 'zetok/wording2' 2015-09-13 22:59:14 +01:00
agilob
78a07dc5d9
Merge remote-tracking branch 'antis81/ngf/fix/virt-overloads' 2015-09-13 22:57:27 +01:00
Nils Fenner
fa6bd18ad7
fix virtual overrides 2015-09-13 23:20:54 +02:00
Nils Fenner
d14e93ef91
fix faulty parented QFileDialog
closes issue #2205
2015-09-13 23:09:21 +02:00
tux3
1f81e1f066 Don't reload content dialog if nothing changed
Should fix the zetok's Resizing problem in #1938
2015-09-12 19:07:45 +02:00
TheSpiritXIII
d0e682214b Multi-window: Fix blinking tray icon regression 2015-09-12 19:07:45 +02:00
TheSpiritXIII
16ebb7f3a9 Multi-window: Unminimize requested window 2015-09-12 19:07:45 +02:00
TheSpiritXIII
280737fda8 Multi-window: Fix group chat event flag regression 2015-09-12 19:07:45 +02:00
TheSpiritXIII
828dbf436f Multi-window: Fix compile for non-OS X 2015-09-12 19:07:45 +02:00
TheSpiritXIII
97bdaa5e5f Multi-window: OS X window list, fix OS X translations 2015-09-12 19:07:45 +02:00
TheSpiritXIII
23e7f9326e Multi-window: Fix open group in separate window when already open 2015-09-12 19:07:45 +02:00
TheSpiritXIII
ee627afc87 Multi-window: Fix buttons staying pressed while in separate window mode, make dialogs alert, fix group chat event flags 2015-09-12 19:07:45 +02:00
TheSpiritXIII
4e5c4cb678 Multi-window: Fix circle modified from dialog window, fix groupchat leave warnings, flip dialog window title 2015-09-12 19:07:45 +02:00
TheSpiritXIII
aa9a10fa8b Multiwindow: Fix segfault on quiting groups, remove dead code 2015-09-12 19:07:45 +02:00
TheSpiritXIII
1109e0347e Multi-window: Fix segfault for removing last friend on window friend list 2015-09-12 19:07:45 +02:00
TheSpiritXIII
f825985856 Multi-window: Translate all dialogs correctly, don't allow remove friend on dialogs 2015-09-12 19:07:44 +02:00
TheSpiritXIII
6a5fb9f518 Multi-window: Dispaly own username on detached windows, fix log out while having detached windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
29c72549a2 Multi-window: Fix segfault on removing groups and friends who are also in active windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c5317c6137 Multi-window: Fix dialog null states/geometry 2015-09-12 19:07:44 +02:00
TheSpiritXIII
868099d484 Multi-window: Normalize window size on separate change, notification separate fix, segfault groupchat fix 2015-09-12 19:07:44 +02:00
TheSpiritXIII
014ba45ebb Multi-window: Keep window size, fix segfault, circle integration, changed defaults 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c181df6336 Multi-window: Cycle widgets in opened windows 2015-09-12 19:07:44 +02:00
TheSpiritXIII
730626fc2c Multi-window: Sort window chat list, fix group window bugs 2015-09-12 19:07:44 +02:00
TheSpiritXIII
9867e3b4c5 Multi-window: Allow opening new window when already open, fix drop when already open 2015-09-12 19:07:44 +02:00
TheSpiritXIII
7bcf654c72 Multi-window: Add drag/drop friends to windows, fix call confirm widget 2015-09-12 19:07:44 +02:00
TheSpiritXIII
c684d31d02 Multi-window: Alert window storing chat, add group widgets, update statuses and avatars 2015-09-12 19:07:44 +02:00
TheSpiritXIII
fa3ab02cec Multi-window: Tabbed interface 2015-09-12 19:07:44 +02:00
TheSpiritXIII
22fcc3f7a0 Multi-window capabilities for all chats and menus 2015-09-12 19:07:44 +02:00
Zetok Zalbavar
ccc2dd2ad9
More visually appealing wording for DB writing mode 2015-09-10 16:08:30 +01:00
Zetok Zalbavar
7449e0efcd
Change wording "tox{1,3}" → "toxdns{1,3}"
Should help avoid confusion about security of Tox protocol.
2015-09-10 13:09:01 +01:00
Zetok Zalbavar
2409827582
Merge pull request #2192 from ovalseven8:patch-5
Replace char in file
2015-09-08 14:27:52 +01:00
ovalseven8
2a8354a52e Replace char in file
- Qt Linguist had problems with it
- Additionally, improved readability
2015-09-08 15:14:00 +02:00
aaannndddyyy
4fb4ba7617 correct a typo 2015-09-07 20:50:41 +00:00
tux3
5f16c5c1da
Don't save settings a billion times on startup 2015-09-06 00:17:41 +02:00
tux3
8fbc0c8b59
Remove some debug output fluff 2015-09-06 00:11:47 +02:00
tux3
b14bc68702
Merge branch 'pr2172' 2015-09-05 20:36:32 +02:00
tux3
0596210099
Merge branch 'pr2150' 2015-09-05 19:30:47 +02:00
tux3
54c837a03e
Fix portable mode settings loading
Fixes partially #1883, avatars still don't carry over.
2015-09-05 19:20:18 +02:00
Zetok Zalbavar
7796421f73
Improve wording of login page: "Create Account" → "Create Profile"
This should improve situation with misunderstandings, and add more
consistency.
2015-09-04 14:03:24 +01:00
Zetok Zalbavar
6f032cca53
Show toxcore version
Even though currently it's listed as 0.0.0, it sill should be shown.

Closes #2086
2015-09-04 12:11:41 +01:00
agilob
12e8d07a97
revert change history to -7 2015-09-03 17:58:23 +01:00
agilob
31c44b9db0
Merge branch 'master' of github.com:tux3/qTox into default_dir_for_saving 2015-09-03 17:57:23 +01:00
tux3
05fece4fab
Remove unused clearAllLocks function 2015-09-03 17:25:09 +02:00
tux3
30c8980d1b
Profile locks are only stale if orphaned
Locks used to become stale after 30s of use, they now only become stale if their parent process dies.
2015-09-03 17:24:33 +02:00
tux3
dde68625ad
Merge branch 'pr2014' 2015-09-03 17:19:13 +02:00
agilob
602143068c
fix opening directory/file in file transfer widger 2015-08-31 13:59:39 +01:00
agilob
8db085c2c0
change logging, typing notification and compact layout to enabled 2015-08-31 11:47:09 +01:00
Zetok Zalbavar
06611d618e
Revert changes from merge of #2092 pull request
That pull request made qTox crash in a number of ways, with no quick fix
available.

Hopefully there will be a way to fix crash, so that this commit could be
reverted, and fix applied.
2015-08-30 21:28:53 +01:00
agilob
db5903c2fe
set one global initial file accept directory for all file transfers 2015-08-30 20:36:39 +01:00
ProMcTagonist
6092a7e8a6 matchy tooltips no linedowns 2015-08-30 12:16:50 -07:00
ProMcTagonist
328726a1cb Compress string 2015-08-30 11:50:01 -07:00
ProMcTagonist
54e4c3c1f8 Fix confusing statement
it sounds like you can press enter to make a new selection
2015-08-30 11:37:21 -07:00
PKEv
44f0ef2043 add Ability to unhide qTox window in screenshot mode
fix #2139
fix #2127
2015-08-30 20:44:33 +03:00
agilob
d6b176d955
Merge remote-tracking branch 'TheSpirit/requests'
merge awaiting friend requests, fix formatting conflict
2015-08-30 14:25:46 +01:00
agilob
582db9cb5b
fix uri detection, puts dots between toxcore versions 2015-08-29 23:28:21 +01:00
agilob
d6a0910fc8
fix uri parsing and tox URI detection, closes #2118 2015-08-29 23:26:05 +01:00
agilob
126ca6337c
hide toxcore version 2015-08-29 22:51:01 +01:00
agilob
0a5d847cf5
better, more flexible about page, versions section 2015-08-29 22:50:21 +01:00
agilob
7b3ddff202
Merge remote-tracking branch 'zetok/settings' 2015-08-28 19:27:10 +01:00
Evstifeev Roman
507c8b9a9d White text on white bg on login screen is invisible
When used dark Qt theme, text color should be set explicitly for explicitly white background.
2015-08-28 20:23:54 +03:00
Zetok Zalbavar
9561660104
Simplyfy advanced settings - DB setting
thanks to @AWeinb for idea, fixes #1514
2015-08-28 11:33:53 +01:00
ovalseven8
67193c9d8a Update generalsettings.ui
to avoid misunderstandings
2015-08-27 13:11:13 +02:00
agilob
b02cf2dbc7
Merge remote-tracking branch 'PKEv/fix_#1977_no_link_if_no_GIT_VERSION'
no link if no GIT_VERSION
2015-08-26 19:53:11 +01:00
agilob
5438099359
Merge remote-tracking branch 'PKEv/exp_func_screenshot'
ability to hide the window during a screenshot (by pressing spacebar)
2015-08-26 19:50:40 +01:00
agilob
78f3044317
Merge remote-tracking branch 'zetok/profile'
Fix 2 minor issues introduced by #1989
2015-08-26 19:45:11 +01:00
Impyy
4fdff0cfde Added toxme.io to the pinned servers list 2015-08-25 13:41:17 +02:00
Zetok Zalbavar
32f9cfccf2
Fix 2 minor issues introduced by #1989
* Add space between ":" and name of profile file
* Fix opening location of profile on UNIX-like
2015-08-24 18:21:37 +01:00
agilob
030a72f561
Merge remote-tracking branch 'PKEv/del_chat_history'
add ability to delete chat history when disabling chat logging
2015-08-24 12:30:40 +01:00
agilob
796e1e04aa
Merge remote-tracking branch 'Impyy/tox3-fix'
fallback to _tox.name lookup
2015-08-24 12:14:03 +01:00
agilob
3b6d245f61 Merge remote-tracking branch 'PKEv/add_profileFileName_in_profilePage'
fix #1951
2015-08-24 12:13:05 +01:00
agilob
a4a52f9cc9
Merge remote-tracking branch 'rku/contact-removal-dialog' 2015-08-24 11:26:37 +01:00
PKEv
7f29940625 fix #2103
ability to hide the window during a screenshot
2015-08-24 01:10:31 +03:00
PKEv
86610f3d7a fix #2089 (copy QR image) 2015-08-23 18:41:49 +03:00
ovalseven8
ba9e89f2ea Update generalsettings.ui
Remove useless HTML.
2015-08-22 17:59:08 +02:00
rku
74d98fd0c2 This dialog solves all confusion that arose from current verification method and is accident-proof. Current method asks if
user also wants to remove chat history. However confused user may not carefully read message and click "no" because he does
not want to remve contact. However in this case contact is in fact removed but history is preserved. It is also open to
possiblity that key smashing deletes contact by accident. This is very inconvenient because tox ids are long and hard to
memorize. If someone removes contact by accident then he would need to find id of that contact in order to contact him/her.
Sometimes this may be difficult.

New contact removal confirmation dialog prompts use to enter "YES" in the text boxin order to enable "OK" button so removal
can be accepted. It also has checkbox for history removal. Dialog will work with translations. Russian user would need to
enter "Да" in order to accept removal.
2015-08-22 12:17:04 +03:00
PKEv
31f2a39efe Correct strings 2015-08-21 23:26:14 +03:00
TheSpiritXIII
d21a6d29de Fix request translations and make group button stay down 2015-08-21 12:36:59 -04:00
TheSpiritXIII
2043908e15 Remove dialog for group invites 2015-08-21 10:32:00 -04:00
TheSpiritXIII
997418a9de Store friend requests 2015-08-20 17:58:03 -04:00
Nils Fenner
19278f76c1 Merge pull request #2052 from agilob/1973
Disables maximize button on login window
2015-08-20 23:46:44 +02:00
agilob
6afde9437c
make sure to zero window flag for login window 2015-08-20 22:27:13 +01:00
Zetok Zalbavar
aed6c25fda
Merge pull request #2078 from mvystrcil:master
Added czech translation
2015-08-20 22:14:21 +01:00
agilob
af400ee71c Merge pull request #2041 from zetok/wording
Better wording for accepting / rejecting avatars
2015-08-20 22:00:28 +01:00
agilob
eea7fd1c63 Merge pull request #2045 from TheSpiritXIII/recent
Fix friend list when day changes
2015-08-20 21:59:19 +01:00
Zetok Zalbavar
ff4ebe6bfe
Fix compiling qTox against static Qt 5.5 2015-08-17 00:40:26 +01:00
Martin Vystcil
e89213e01d Added czech translation 2015-08-16 13:10:09 +02:00
agilob
d0d9951eb3 closes #1973 2015-08-03 21:14:29 +01:00