Dubslow
2e388f03df
Merge branches 'pr1474', 'pr1406', 'pr1463' and 'pr1472'
2015-03-27 17:33:53 -05:00
Dubslow
5d129b471f
Possibly fix an old segfault that may or may not be a problem
2015-03-27 15:01:42 -05:00
Rohil Surana
b98af21456
On add friend clicked pastes Tox Id from clipboard if there is one
2015-03-27 22:13:25 +05:30
Rohil Surana
5a4443b7bb
Set focus to toxId Line edit on add friend window
2015-03-26 16:53:20 +05:30
kushagra
b2481fc1d8
proper splitting in friends chat,fixes #1375
...
what happened was- When message exceeded TOX_MESSAGE_LENGTH, the whole message was inserted in sender's chatlog X times.
if length of message is N,
X = (N/TOX_MESSAGE_LENGTH) + 1
There is no bug in recieving end. Receving end gets X messages (splitted).
In the sample case provided, the message had whitespaces in the end, so the reciever thought the message is empty.
2015-03-26 11:15:05 +05:30
PKEv
9857f5b60b
#1402 duplicate of the sender's name
...
set if interval more 5 minuts, sender name repet
not tested for group chats!!!
2015-03-26 00:31:39 +03:00
Dubslow
bab280a0ea
Change default datetime formats (d/m m/d agnostic), style fixes, removed unnecessary signals
2015-03-25 11:45:58 -05:00
Dubslow
14a565bc3a
Merge branch 'pr1393'
2015-03-25 11:32:05 -05:00
Dubslow
27f58c9ca6
Style fixes
2015-03-25 11:27:33 -05:00
kushagra
86bbe537bc
autocomplete will work for : also,fixes #1377
2015-03-23 23:11:28 +05:30
zero-one
a1e228e60d
style fixes to conform to Allman style
2015-03-23 02:38:24 -07:00
zero-one
c15cc60137
Merge branch 'master' into friend_list
2015-03-23 02:35:20 -07:00
zero-one
de8eb5293c
Merge branch 'master' into friend_list
...
Conflicts:
src/widget/form/settings/generalform.cpp
2015-03-23 02:34:12 -07:00
Jookia
e3bdd6d221
Added option to disable notification sounds.
2015-03-23 07:27:44 +11:00
agilob
5f15bc8b75
iso date
2015-03-21 15:48:43 +00:00
agilob
77e333ab05
long time format
2015-03-21 15:47:09 +00:00
Zetok Zalbavar
f3aa3073b0
Fix coding style and add copyright header
...
* added copyright header to src/platform/statusnotifier/enums.c
* 'switch(' → 'switch ('
* use Allman style
----
for / if / while / switch () {
↓
for / if / while / switch ()
{
----
----
for / if / while ()
{
1_line;
}
↓
for / if / while ()
1_line;
----
----
for / if / while ()
1_line;
line_out_of_loop;
↓
for / if / while ()
1_line;
line_out_of_loop;
----
2015-03-21 08:59:28 +00:00
Zetok Zalbavar
f95291af3e
Some style fixes
...
"if(" → "if ("
"for(" → "for ("
"while(" → "while ("
2015-03-20 18:38:10 +00:00
agilob
a873bb571f
generalsettings: time and date format from qlocale
2015-03-20 08:17:18 +00:00
kushagra
cb8d892724
fixed display of contact_dark.svg
2015-03-18 21:21:58 +05:30
isn0gud
de423571eb
add friend on enter key pressed #1404
2015-03-17 13:23:34 -05:00
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
