StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity
3,978 Commits 3 Branches 42 Tags 60 MiB
5529590a3b
Commit Graph

255 Commits

Author SHA1 Message Date
tux3
63fe107c2e Disable exceptions support 
With -fno-exceptions

Now if we could just get -fno-rtti
 2015-06-03 02:10:52 +02:00
tux3
d53b426750 Replace OpenCV with FFmpeg 2015-06-03 02:10:52 +02:00
Ansa89
f716027180 Fix needed to compile on slackware64 14.1 (with multilib) 2015-05-24 14:33:51 +02:00
marcel
08e6004361 added separate class for ToxId 2015-05-17 21:23:52 +02:00
tux3
76cbaf18f1
Fix incorrect copyright headers 
The qTox Project is not associated with the Tox Project in any ways, with the exception of "qTox" using the Tox Projet's "toxcore" collection of libraries.
In particular, the Tox Projet does not own copyright over the qTox Project's "qTox" collection of software, source code, and assets.
The qTox Project's assets are under the sole copyright of the qTox contributors, and no partiular rights are granted to the Tox Project.
 2015-05-12 04:12:53 +02:00
sudden6
0e91d59454 rework the logging and debug output 2015-05-11 15:37:56 +02:00
Ilya Kowalewski
6c8b130a25 Redesign draft for settings pane and proper UX for Mac 2015-05-11 00:41:34 +03:00
Stefan Merettig
f14c399297 Screen grabber: Fix flying-flyout bug when resizing window while open 2015-05-07 20:11:32 +02:00
Stefan Merettig
04dc650596 Screen grabber: Flyout menu for the screenshot button 
When hovering over the "attach file" button in the chat form, an
additional button for the screenshot functionality will 'fly out'
to the left, showing a computer monitor as icon. Leaving the attach
file or the take screenshot button will collapse the fly out again.

Bug: Moving the mouse over the fly out and then back again to the
attach button collapses the fly out. Will sort this out later.

Also used the opportunity to rename headers from hpp -> h extension
I added earlier.
 2015-05-07 20:00:20 +02:00
Stefan Merettig
c6d5b4cc55 WIP: KSnapshot-like screenshot grabber 
WIP of a screenshot grabber accessible from the chat form to allow
users to easily send a part of a screenshot
 2015-05-07 19:55:28 +02:00
tux3
66cb02d1c3
Fix qTox Android build 2015-04-27 17:59:44 +02:00
tux3
bd5eebbc2e
Cache avatar sending, fix image file preview 
- Add AvatarBroadcaster, in charge of making sure our friends have our avatar without spamming file transfers

- Fix file sending code not closing the file after transfer, which prevented file previews, and make the QFile a shared_ptr to fix the obvious memory leak

Some small additions to Core to support AvatarBroadcaster
 2015-04-25 16:51:58 +02:00
tux3
bbf75aefb9
Profile locking 2015-04-24 18:53:19 +02:00
tux3
e4859efe18
Refactor Core 
Refactor Core's file transfer callbacks into their CoreFile class and files

Move all core*.{h|cpp} into a core/ folder
 2015-04-24 02:32:09 +02:00
Dubslow
34e927560a
Add -lqrencode to JENKINS 2015-03-16 17:26:09 -05:00
agilob
a501620d92
fixing conflict 2015-03-14 11:36:38 +00:00
Dubslow
4f0798bde7
Rename widget/form/settings/identitysettings.ui to widget/form/profileform.ui 2015-03-11 10:15:53 -05:00
agilob
34360741cb
I am not sure about this commit, someone check it please 2015-03-07 12:41:45 +00: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
Sean
f19b6230ed High DPI scaling 
High DPI scaling

Update qtox.pro

Oh right not everyone uses Qt5.4

Why did I use the web ui
 2015-03-04 19:52:50 +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
Zetok Zalbavar
2ec206b97a
[qtox.pro] fix building with support for libappindicator 
* added INCLUDEPATHs for libappindicator support
* added INCLUDEPATHs for GTK tray backend
* sorted some INCLUDEPATHs
 2015-02-26 20:51:13 +00:00
sudden6
1a17b2efb8 Fix build for openSUSE and probably others 2015-02-25 19:46:59 +01:00
tux3
3824b567ef
Don't build desktop resource files on android 2015-02-25 19:36:06 +01:00
tux3
068f65b389
Fix missing brace 2015-02-25 17:50:34 +01:00
tux3
0cb45e6527
Disable systray unity backend by default 
It's confusing too many people, lacks some features, and is only useful on Unity
 2015-02-25 17:48:43 +01:00
tux3
d834fd2577
Compile toxme support 2015-02-25 11:33:13 +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
Sean
dd0a4bae21 Attempt to fix #1269 with macho weak linking 2015-02-23 17:39:32 -08:00
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
Maximilian Wuttke
e0cb122abe Merge branch 'filter_audio' of https://github.com/mwuttke97/qTox into filter_audio 
Added some `#ifdef QTOX_FILTER_AUDIO`s.
Conflicts:
	qtox.pro

Conflicts:
	src/coreav.cpp
 2014-12-14 10:55:38 +01:00
Dubslow
2e6b0f7b2b
remove files that I shouldn't have added in the first place 2014-12-05 19:17:02 -06:00
dubslow
bafca96554 Incremental work, starting to take shape 2014-12-03 18:14:28 -06:00
dubslow
dde410bb9c incremental 2014-12-03 18:10:07 -06:00
dubslow
4567f8e5c6 move encryption to separate file for sanity 2014-12-03 18:10:07 -06:00
Dubslow
3f234fb2eb
disabling platform extensions now affects linking, and can be set from cmd line 
`qmake DISABLE_PLATFORM_EXT=YES`
 2014-12-02 15:03:29 -06:00
Dubslow
1c78cbc0c9
add a basic platform-disabling define 2014-12-01 18:18:27 -06:00
novist
a71e98abbb Switched places platform name and file name 2014-11-28 11:41:45 +02:00
novist
677058eb65 Reorganized platform-dependent code 
Auto-away timer check reduced to 1s
 2014-11-28 11:41:45 +02:00
Sean
985c25f77e Can't forget CoreFoundation 2014-11-28 11:41:44 +02:00
Sean
fb375cd07e Link against IOKit 2014-11-28 11:41:44 +02:00
novist
99fa5d9e19 Global auto-away 2014-11-28 11:41:44 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
6afe34fe02
Fix zlib link order on windows x64 2014-11-18 20:04:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
c1f2e9a71d
Refactor audio out of code, better resource management 
Fixes #739 and fixes #777
 2014-11-16 19:04:45 +01:00
krepa098
74bd802863 progress 2014-11-16 12:40:44 +01:00
Sean
d607c089d8 Update for new folder 2014-11-14 17:30:47 -08:00
Tux3 / Mlkj / !Lev.uXFMLA
c4f9baf04b
Merge branch 'pr750' 2014-11-14 18:32:03 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
d834eaca33
Horrible hack to get timestamps not to hang on windows 
Turns out date is a valid command on windowndows, and running it waits for user input. That hangs qmake. This hack is a valid batch command that returns 0 and at the same time a valid bash command that tries to run date or return 0

I'm so sorry.
 2014-11-14 18:12:00 +01:00
apprb
08f523b8ff
AdvancedSettings tab introduced 2014-11-15 01:18:17 +09:00
Tux3 / Mlkj / !Lev.uXFMLA
d0dae300cc
Remember compile time timestamp 
Will be used to guarantee we don't downgrade if there's a bad update
 2014-11-13 13:59:04 +01:00
krepa098
de52bad1db initial commit 2014-11-12 14:11:25 +01:00