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

263 Commits

Author SHA1 Message Date
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
Dubslow
f55fd40ec6
Merge branches 'pr1452', 'pr1453', 'pr1456' and 'pr1457' 2015-03-22 16:17:00 -05:00
PKEv
72c45a65fa Correct #1448 2015-03-22 23:44:42 +03:00
Jookia
e3bdd6d221 Added option to disable notification sounds. 2015-03-23 07:27:44 +11:00
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
41dc562b64 fixes #1091 2015-03-18 14:15:51 +05:30
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
zero-one
21a7152316 Merge branch 'master' into friend_list
Conflicts:
	src/widget/form/settings/generalform.cpp
2015-03-16 11:10:28 -07:00
PKEv
e3946b4435 #1379 correct 2015-03-14 23:06:33 +03:00
tux3
c5a8a17e21
Merge branch 'pr1389' 2015-03-14 19:49:04 +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
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
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
novist
95649f2476 Support for theming qTox tray and window icons
This patch adds ability to override qTox window and tray icons with ones from user's desktop theme. Some people prefer keeping tray icons consistent to achieve best looks.

Following theme icons used:
* qtox: general window icon which is also used in taskbar
* qtox-online, qtox-offline, qtox-busy, qtox-away, qtox-invisible, qtox-event: tray icons

If theme icon is not available then default built-in icon will be used.
2015-03-11 13:01:10 +02: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
TheLastProject
829415eed9 Fix yet another regression by using padding-less bigger icons 2015-03-06 18:00:54 +01: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
tux3
17042c1aff
Merge branch 'pr1244' 2015-03-04 19:29:49 +01: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
krepa098
00af059a4f use QUrl::fromLocalFile (fix #1305) 2015-03-01 10:43:43 +01:00
agilob
2ec1bd0977
keyboard shortcut to change current chat 2015-02-27 17:56:47 +00:00
agilob
439dde5c8d
+comment 2015-02-26 21:10:35 +00:00
agilob
ed1cd04340 closes tux3/qtox #1289 2015-02-26 21:08:32 +00:00
tux3
1a1debf167
Merge branch 'pr1243' 2015-02-25 15:55:32 +01:00
tux3
e04bd15181
Merge branch 'pr1231' 2015-02-25 15:40:50 +01:00
novist
9523484bfe Reworked IPC class:
* Simpler design
  * Suport for named events
  * Support for checking if events were handled
  * Support for sending events to specific application instance
2015-02-22 16:31:48 +02: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
novist
192f1f7d62 Delayed tray icon creation to timer event.
Added null checks around usage of tray icon object.

This change solves issues/crashes where tray is not immediately available when qTox is started. It is common on linux desktops. While for example lxqt has option to delay application autostart until panel (and thus tray) is available other desktops (like KDE) do not. Adding checks around use of icon object was not enough because application may start a little bit earlier than panel is available. For that reason tray icon creation is delayed to timer event and tried multiple times with delay of one second. Usually after few tries icon creation succeeds and signal is disconnected.

In case tray is not available qTox window is shown. This creates a side effect where starting qTox before tray is available will make application window briefly appear and when tray is available window will be hidden or remain visible as per settings. Window has to be visible if tray is unavailable because otherwise users may end up with qTox running and no way to access it. If application is started and tray is available no window flashing happens and settings are restored as usual.

Without this patch if qTox started before tray is available window is shown and changing tray icon visibility option crashes application. Thats probably a known issue.
2015-02-22 12:36:12 +02:00
TheLastProject
eb8527675c Oops, default for file transfer message should be no 2015-02-20 16:38:09 +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
718aad2c5a Actually use yes/no question 2015-02-19 20:32:37 +01:00
TheLastProject
ad1852622f Allow user to open all transferred files, but warn for executable files 2015-02-19 20:14:19 +01:00
tux3
41d8e2dd53 Attempt at fixing #1187 2015-02-18 21:22:19 +01:00
dubslow
7c0fa46b42 Merge pull request #1221 from TheLastProject/offlineTypingFix
Hide is typing status when friend disconnects
2015-02-18 11:57:42 -06:00
TheLastProject
3116e84095 Hide is typing status when friend disconnects 2015-02-18 14:02:10 +01:00