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

176 Commits

Author SHA1 Message Date
tux3
5188242561
Merge branch 'pr1264' 2015-02-23 22:44:35 +01:00
tux3
165a7769da
Enable Unity/Gnome systray backend by default 2015-02-23 20:18:03 +01:00
Zetok Zalbavar
4d18ca8a3b
[qtox.pro] add more INCLUDEPATH for GTK deps
On some distributions there is no /usr/lib/{x86_64-linux-gnu,i386-linux-gnu}
2015-02-23 18:19:12 +00:00
tux3
fdb86ca7e9
Android: Don't build Desktop-only code
This reduce greatly reduce compilation time and binary size
2015-02-23 01:00:25 +01:00
tux3
43c8c45b82
Enable StatusNotifier by default on Linux 2015-02-23 00:01:57 +01:00
tux3
5dd72c3dab
Don't build android files on desktop platforms 2015-02-22 23:50:06 +01:00
tux3
c0c04d1575
Start new Material Design android GUI 2015-02-22 23:32:14 +01:00
tux3
245c09b25e
Android: Better search for libopenal.so 2015-02-22 18:24:07 +01:00
tux3
ff313670f3
Android: add ./libs/lib to linker search path 2015-02-22 17:25:46 +01:00
tux3
ab554693a5
Android: Don't link with libsodium.so 2015-02-22 17:24:47 +01:00
tux3
559f7a60e8
Don't compile statusnotifier if disabled 2015-02-22 01:58:13 +01:00
tux3
a98639bc6f
Initial statusnotifier systray context menu support 2015-02-22 00:47:18 +01:00
tux3
d6fcb9faa2
Start StatusNotifier system tray backend
Can show/hide an icon and react to left clicks for now
2015-02-21 22:55:54 +01:00
Sean
9b81816484 How did both code reviewers miss this 2015-02-18 10:07:31 -08:00
Dubslow
b0db53682b
Fix spurious dependencies on non-unity Tox repo packages 2015-02-18 02:03:18 -06:00
Dubslow
bb0a652276
Add static OpenAL to Jenkins 2015-02-18 01:26:35 -06:00
Dubslow
733c684759
Add x32 deps to unity backend compilation, and linker opts to JENKINS 2015-02-17 01:28:30 -06:00
Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
Dubslow
c769c10138
Merge branches 'pr1105', 'pr1121' and 'pr1122' 2015-02-08 13:30:03 -06:00
Dubslow
4d56a6fdd8
Merge branch 'pr947'
Conflicts:
	src/misc/settings.cpp
2015-02-08 13:29:19 -06:00
Joseph Anania III
c1b39f5af1 Split smileys to seperate qrc file and added it to qtox.pro 2015-02-08 11:22:12 -05:00
krepa098
5506379a97 Merge branch 'master' into chatlog_v3_1 2015-02-07 18:49:06 +01:00
apprb
bf2ebe9220
Offline messaging refactoring: Separated class for this purpose + more reliable resenging 2015-02-08 01:59:10 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
659a0bf2c4
First draft of the Android GUI
Very much not finished and non-functional
2015-02-07 12:46:55 +01:00
novist
ff693807af Autorun on OS startup 2015-02-06 18:10:54 +02:00
tux3/mlkj
46bba3f2f1 Initial Android support
We create a GUI class to abstract common GUI needs (showing a message box, asking a question, ...) from the actual GUI backend.

We also create a Nexus class to manage the startup and lifetime of our main systems (Core, GUI, ...) instead of delegating that to Widget.

Eventually, Widget will only be in charge of the Desktop GUI and AndroidGUI of the mobile GUI. Nexus will overview the system and GUI will provide a clean platform-independant interface.
2015-02-06 12:28:49 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
2225fcaf9d
Initial android support 2015-02-06 01:27:07 +01:00
Dubslow
82c881ff49
Merge branch 'pr1087'
Conflicts:
	src/widget/widget.h
2015-02-04 17:45:04 -06:00
Dubslow
c7b110f902
Add svg to dependencies 2015-02-04 15:19:43 -06:00
krepa098
038a7fcd55 add svg to CONFIG (link against the svg module) 2015-02-04 14:50:03 +01:00
Dubslow
a572ccff27
Merge branch 'encryption' into master
Conflicts:
	src/core.cpp
	src/historykeeper.h
2015-02-03 10:21:59 -06:00
krepa098
52f220c9e4 Merge branch 'master' into chatlog_v3_1
Conflicts:
	qtox.pro
	res.qrc
	src/widget/form/chatform.cpp
	src/widget/form/chatform.h
	src/widget/form/genericchatform.cpp
	src/widget/tool/chatactions/chataction.h
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/widget.cpp
	ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
krepa098
53ba982203 optimizations and tweaks 2015-02-02 11:11:09 +01:00
Tux3/Mlkj
fe83dd9445 Implement SystemTrayIcon Unity backend
With some limitations and some awful hacks, since appindicators can not differentiate left click, right click and middle click. It's already a massive pain to just get a signal when the menu is shown, without actually knowing what opened it.

I love ubuntu.
2015-01-29 17:33:17 +01:00
Tux3/Mlkj
f75e32e1e3 Implement SystemTrayIcon with Qt backend and Unity stub 2015-01-29 14:56:53 +01:00
Dubslow
2dc5cea1d2
Merge branch 'encryption' into master
Conflicts:
	src/autoupdate.cpp
	src/core.cpp
	src/core.h
	src/misc/settings.cpp
	src/widget/widget.cpp
2015-01-27 18:29:39 -06:00
krepa098
d04e356a0c cleanup previous commit 2015-01-26 14:06:05 +01:00
krepa098
5be6caca68 [HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent
This does not enable HiDPI support!

issue #975
2015-01-26 14:01:42 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
32bf56c7d9 Implement new call confirm widget logic
Works, but does not have any styling at the moment
2015-01-25 17:39:26 +01:00
krepa098
6719ebebae Added Timestamp class, moved output generation while saving to
GenericChatForm and changed the generated layout
2015-01-25 14:34:36 +01:00
Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
Conflicts:
	src/main.cpp
2015-01-23 01:51:39 -06:00
krepa098
bb29536df1 NotificationIcon 2015-01-19 19:04:19 +01:00
krepa098
85568337e3 cleanup 2015-01-11 12:02:24 +01:00
krepa098
d9e15fb0ba Merge branch 'master' into chatlog_v3_1
Conflicts:
	src/widget/chatareawidget.cpp
	src/widget/form/chatform.h
	src/widget/form/genericchatform.cpp
2015-01-09 19:41:16 +01:00
novist
46cc81b482 Updated linked libs for win32:
* Removed libs that were not used
  * Reordered few libs to make mingw happy
  * Updated version of opencv libs to 249
2015-01-08 13:59:06 +02:00
Dubslow
139cd3f4a6
Merge branch 'encryption' into master
Conflicts:
	src/core.cpp
	src/misc/settings.cpp
	src/widget/widget.cpp
	src/widget/widget.h
2015-01-05 20:55:47 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
ab2f70e452
Fix windows builds: Link with filter_audio 2015-01-04 00:42:54 +01:00
krepa098
a0ea0675a7 Merge branch 'master' into chatlog_v3_1
Conflicts:
	qtox.pro
	res.qrc
	src/misc/smileypack.cpp
	src/widget/chatareawidget.cpp
	src/widget/chatareawidget.h
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/generalform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/systemmessageaction.cpp
	src/widget/widget.cpp
2015-01-03 10:17:53 +01:00
Dubslow
9bc6ae57fa
try mac fix 2014-12-17 16:49:17 -06:00
Dubslow
5cbe175ddc
update the build system 2014-12-16 18:50:52 -06:00