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

712 Commits

Author SHA1 Message Date
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
Flakebi
804cd4f88a Inline funtion calls 2015-03-11 16:01:24 +01:00
agilob
1abef6c0c6
prevent segfault ;_; repaint only after changing alias 2015-03-11 11:20:27 +00:00
agilob
b489e7f712
probably closes tux3/qtox#1330 2015-03-11 11:12:08 +00: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
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
tux3
bd12381bea
Merge branch 'pr1349' 2015-03-06 23:58:34 +01:00
TheLastProject
829415eed9 Fix yet another regression by using padding-less bigger icons 2015-03-06 18:00:54 +01: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
tux3
a96dbf6973
Merge branch 'pr1327' 2015-03-04 19:54:46 +01:00
tux3
17042c1aff
Merge branch 'pr1244' 2015-03-04 19:29:49 +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
krepa098
00af059a4f use QUrl::fromLocalFile (fix #1305) 2015-03-01 10:43:43 +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
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
tux3
fe23af6a09
Don't include appindicator for GTK backend 2015-02-25 11:54:57 +01:00
tux3
94250d4aea
Use Qt systray again on KDE4
Fixes #1277
2015-02-25 11:42:34 +01:00
tux3
5c92c3b89d
Use GTK status icon on Gnome
Instead of Unity, which has less features and is a hack
2015-02-25 11:30:15 +01:00
tux3
559be200ff
Merge branch 'pr1272' 2015-02-25 11:03:01 +01:00
tux3
80c4cb8b45
Merge branch 'pr1267' 2015-02-25 10:41:47 +01:00
tux3
8a83a6114f
Implement GTK systray icon backend
This one is deprecated, but should work much better than any other system tray icon backend we currently have, both in term of supported features and reliability. It justs needs some testing to see where we can enable it now.
2015-02-24 23:27:08 +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
tux3
bee584bdb1
Only use StatusNotifier on KDE5 2015-02-24 10:19:40 +01:00
agilob
842774ecfc
fix tux3/qtox #891 2015-02-23 23:08:07 +00:00
tux3
3af631ebab
Merge branch 'pr1266' 2015-02-23 23:27:53 +01:00
tux3
d89c722b9c
Only use StatusNotifier on KDE
According to the qtox wiki table, Qt's backend works better on non-kde DEs
2015-02-23 23:25:08 +01:00
tux3
925e32f23a
Fix system tray icon on GNOME classic
There doesn't seem to be a system tray icon at all in GNOME shell ?
2015-02-23 20:06:16 +01:00
tux3
dbc3a5b137
Merge branch 'pr1255' 2015-02-22 23:42:00 +01:00
tux3
c0c04d1575
Start new Material Design android GUI 2015-02-22 23:32:14 +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
tux3
5ab703eb27
Android: Catch Back key and exit 2015-02-22 19:08:18 +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
tux3
84e613c609
SystemTrayIcon: Log what backend is used 2015-02-22 12:14:31 +01:00
tux3
5e27d64a95
Merge branch 'pr1232' 2015-02-22 11:54:10 +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
tux3
fa57206620
statusnotifier: Handle middle clicks 2015-02-22 01:43:33 +01:00
tux3
c3700fdfec
Create systray statusnotifier ctor icon properly 2015-02-22 01:36:51 +01:00
tux3
18a9955f43
Prioritize Unity sistray backend over StatusNotifier 2015-02-22 01:28:12 +01:00
tux3
55d78698c2
Fix statusnotifier icon color conversion
We were passing premultiplied ARGB data to GTK, where it expected premultiplied RGBA
2015-02-22 00:56:20 +01:00
tux3
d2f10f624d
Generate statusnotifier context menu icons 2015-02-22 00:54:42 +01:00
tux3
4630129dbf
Create statusnotifier main icon via pixbuf
Instead of creating a temporary file
2015-02-22 00:48:06 +01:00