Dubslow
9079b334b9
Merge branches 'pr1433', 'pr1435', 'pr1436', 'pr1438' and 'pr1439'
2015-03-19 23:02:02 -05:00
PKEv
e940459596
Correct for Maximized window
2015-03-19 22:41:31 +03:00
kushagra
cb8d892724
fixed display of contact_dark.svg
2015-03-18 21:21:58 +05:30
Dubslow
6a43aa8680
Merge branches 'pr1419', 'pr1420', 'pr1421' and 'pr1424'
2015-03-18 08:21:19 -05:00
kushagra
41dc562b64
fixes #1091
2015-03-18 14:15:51 +05:30
TheLastProject
6164426b13
Oops, forgot about groups
2015-03-18 00:51:22 +01:00
TheLastProject
ebf4af830d
Fix #1204
2015-03-18 00:45:57 +01:00
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
fc720f570d
Merge branch 'pr1392'
2015-03-16 17:37:38 -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
PKEv
e3946b4435
#1379 correct
2015-03-14 23:06:33 +03:00
tux3
2547029140
Merge branch 'pr1390'
2015-03-14 19:51:17 +01:00
tux3
c5a8a17e21
Merge branch 'pr1389'
2015-03-14 19:49:04 +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
Flakebi
b73c8bcce6
Add askQuestion with custom 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
63150ab022
Reset activeChatroomWidget when switching to addFriendForm
2015-03-14 17:16:32 +01: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
Zetok Zalbavar
9ed4b3fb7d
Add missing comment for #1367
2015-03-14 08:12:42 +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
zero-one
4a875ce8f5
Merges Away, Busy, and Online friend list layouts into a single layout.
...
Also comments out the debug output in
FriendListWidget::getFriendLayout() because hitting the default return
statement is no longer anomalous behavior.
2015-03-11 17:30:01 -07:00
zero-one
fdb4fef374
Adds functionality for sorting FriendWidgets alphabetically in the
...
friends list. Widgets are sorted upon being added to the friends list in
the first place, and re-sorted if a user changes their name, or if a
user is given an alias.
-Friend now inherits from QObject
-Friend objects now emit a signal when their display name is changed
-FriendListWidget::moveWidget() is now a slot
2015-03-11 17:23:22 -07:00
Dubslow
2f2e51fb6a
Merge branch 'master' of ssh://github.com/krepa098/qTox
2015-03-11 17:44:16 -05: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
Dubslow
d09a61e692
Merge branches 'pr1363', 'pr1365', 'pr1366' and 'pr1367'
2015-03-11 10:10:29 -05:00
