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

1176 Commits

Author SHA1 Message Date
Zetok Zalbavar
67e9aeec63
Fix incorrect copyright headers
The qTox Project is not associated with the Tox Project in any way, 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-06-06 14:51:28 +01:00
tux3
c269306bf4
Fix #1811 2015-06-06 03:45:44 +02:00
tux3
0a04c48f33
Move adjustingscrollarea.cpp 2015-06-06 02:16:52 +02:00
tux3
8438c209d1
Fix #1037 2015-06-06 01:51:08 +02:00
tux3
20f254651d
Reorganize files 2015-06-06 01:44:47 +02:00
tux3
9b7db8bb26
Fix #1806 2015-06-06 00:35:18 +02:00
tux3
601fdae7bb
Make login screen a bit larger
So the text fits on all translations
2015-06-05 23:06:28 +02:00
tux3
b948ef890f
Auto focus the chat input box when typing
Fixes #1779 for real
2015-06-05 22:08:29 +02:00
tux3
15ca7a587f
Dynamic translation
qTox can now retranslate its GUI dynamically, without needing a restart

Fixes #1671

Closes #1672
2015-06-05 21:37:01 +02:00
tux3
1ded562d9d
Clean Settings interface 2015-06-05 16:24:47 +02:00
tux3
0923e2b733
Add quit (CTRL+Q) shortcut to login screen 2015-06-05 15:45:43 +02:00
tux3
ac0beffd0c
Fix #1792 2015-06-05 15:39:01 +02:00
tux3
9581be95dc
Make the login screen save global settings 2015-06-05 15:28:35 +02:00
tux3
68122b40ac
Auto focus input field in login screen
Fixes #1779
2015-06-05 15:26:45 +02:00
tux3
276f411ad2
Implment auto-login 2015-06-05 15:24:02 +02:00
tux3
676c483046
Merge branch 'pr1798' 2015-06-05 13:12:05 +02:00
tux3
192d9a5e29
Cleanup main() a bit 2015-06-05 12:44:22 +02:00
tux3
6bf0317e3e
Translate all GUI, not just Widget 2015-06-05 12:26:04 +02:00
Zetok Zalbavar
abb2f28b5d
Small improvements of displayed strings on login screen
Messages that user faces should be a bit more clear now.
2015-06-05 11:25:12 +01:00
tux3
e3dd2dc9e1
Limit desktop streamins FPS
Otherwise we get overwhelmed and start dropping frames
2015-06-04 23:34:17 +02:00
tux3
b9febaa27d Update login logo image 2015-06-04 21:34:13 +02:00
tux3
fdcd02980d New password strengh function 2015-06-04 21:34:13 +02:00
tux3
0ebaef3c34 Password strenght meter on login screen 2015-06-04 21:34:13 +02:00
tux3
aa9e500e22 Allow long (32k chars) passwords 2015-06-04 21:34:13 +02:00
tux3
ba0bc12ac2 Fix loginscreen not resetting pass confirm 2015-06-04 21:34:13 +02:00
tux3
ea45d4617f Allow creating unencrypted accounts again 2015-06-04 21:34:13 +02:00
tux3
67e85b3ddc Add change password button 2015-06-04 21:34:13 +02:00
tux3
0642c1b0d7 Add button to delete password 2015-06-04 21:34:13 +02:00
tux3
2dbf2e54b1 Implement restarting toxcore 2015-06-04 21:34:13 +02:00
tux3
a03eea9b5f Don't allow overwriting on profile rename 2015-06-04 21:34:13 +02:00
tux3
10ce65c22b Reject passwords shorter than 6 characters 2015-06-04 21:34:13 +02:00
tux3
5f94f33117 Use profile password for all encryption 2015-06-04 21:34:13 +02:00
tux3
42a7efb053 Implement the -p option 2015-06-04 21:34:13 +02:00
tux3
7fc087ea95 Implement profile renaming 2015-06-04 21:34:13 +02:00
tux3
21db31c215 Implement profile deletion 2015-06-04 21:34:13 +02:00
tux3
f7546a731f Fix profile saving on exit 2015-06-04 21:34:13 +02:00
tux3
3fd6d5d3e9 Implement logout button 2015-06-04 21:34:13 +02:00
tux3
abf65a5060 Remove deprecated profile management functions 2015-06-04 21:34:12 +02:00
tux3
933dce485d Add tox save loading/saving to Profile 2015-06-04 21:34:12 +02:00
tux3
840fd7dc40 Cleanly create new profiles 2015-06-04 21:34:12 +02:00
tux3
bf29d4a6d5 Allow to load/create from login screen
Saving is not implemented, so bad things will happen if you let qTox save those profiles
2015-06-04 21:34:12 +02:00
tux3
032c561e62 Make Nexus own and start the LoginScreen
And start implementing some of the required methods to make Core, LoginScreen and Nexus use Profile
2015-06-04 21:34:12 +02:00
tux3
7d6167d90c Scan profiles for login screen 2015-06-04 21:34:12 +02:00
tux3
68f6a5d032 Use combobox for login username 2015-06-04 21:34:12 +02:00
tux3
22c8b38fd9 Update login screen ui 2015-06-04 21:34:12 +02:00
tux3
c6268cd604 Connect LoginScreen signals 2015-06-04 21:34:12 +02:00
tux3
f4cad23314 Fix login screen window title 2015-06-04 21:34:12 +02:00
tux3
93df0dec2b Add Tox logo at login 2015-06-04 21:34:12 +02:00
tux3
9ebfc9eb77 Create login screen UI 2015-06-04 21:34:12 +02:00
tux3
039575a775
Merge branch 'pr1769' 2015-06-04 21:25:21 +02:00
Zetok Zalbavar
b21ce5ef07
Fix tab-completion for names starting with '@'
continuation of #1377
2015-06-04 09:45:56 +01:00
PKev
98819df90c Correct redraw after filtering
fix #1757
It looks a bit strange, but a redraw on another call fails. Moreover, order calling functions radically changes the behavior of the widget
2015-06-03 22:26:33 +03:00
tux3
bc946308c8 Fix double free when switching camera 2015-06-03 02:10:53 +02:00
tux3
8e866b1a5e Remove video post-processing sliders
Since they don't currently do anything
2015-06-03 02:10:53 +02:00
tux3
0f7015941c Restore CallId param in onAvStarting
We actually use it now.
2015-06-03 02:10:52 +02:00
tux3
bf3b9239b5 Never resize frames with Qt, use sws_scale
If we're going to convert between pixel formats with sws_scale, we might as well do the rescaling in the same step.
Giving a potentially hueg fram to Qt and having it rescale in a separate step is wasted cycles.
2015-06-03 02:10:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
61f331635f Disable the hue/bright/sat/contrast sliders
Since they aren't implemented for now.
2015-06-03 02:10:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
27bb71f195 Implement video modesetting for dshow 2015-06-03 02:10:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
e5684a4bbf Save video dev name in settings 2015-06-03 02:10:52 +02:00
tux3
d53b426750 Replace OpenCV with FFmpeg 2015-06-03 02:10:52 +02:00
tux3
a086e6d7b1
Merge branch 'pr1763' 2015-06-03 02:10:37 +02:00
PKev
fa21c793f2 scroll emoticon selector
fix #1561
2015-06-01 21:00:22 +03:00
PKEv
0791c64efd Correct_after_cpp_check
style and typos
2015-05-30 23:44:56 +03:00
PKEv
64f7e6c63d Correct screenshot 2nd monitor
but only if a second monitor on the right side
2015-05-28 00:23:26 +03:00
Zetok Zalbavar
50c29af537
Make string 'Search Contacts' translatable 2015-05-26 12:02:38 +01:00
PKEv
1aa8a43e1e Creat dir for screenshots #1696 2015-05-26 01:33:10 +03:00
PKEv
6fa42c1aa0 Correct duplication long messages on sender side #1703 & #1697 2015-05-26 00:08:39 +03:00
tux3
2db617bc6f
Recover if tox fails to start 2015-05-25 22:37:19 +02:00
ovitei
52e0dae0d8 added Norwegian Bokmal (nb_NO) translations 2015-05-25 02:15:34 +02:00
TheLastProject
5e9081abd7 Update profileform.cpp 2015-05-25 01:25:00 +02:00
Ansa89
6b337ce935 Italian translation: update 2015-05-24 17:30:13 +02:00
tux3
be87047896
Merge branch 'pr1710' 2015-05-24 14:42:40 +02:00
Zetok Zalbavar
227c061ea1
Code consistency fixes → 's/ToxID/ToxId/'
Since consistency in code is most important, 'ToxId' is used
for code, whereas 'Tox ID' anywhere outside of code.

Also fixed wrong comments in core.h:
* qTox gets only public key of a grouchat peer, not their
  Tox ID
* qTox tries to return full address (Tox ID) or public key
2015-05-23 20:15:41 +01:00
Zetok Zalbavar
1554b3b131
Better error message for image resizing
Now user will know what is the acceptable file size limit.
2015-05-20 07:17:12 +01:00
tux3
4306f87df4
Fix call on null object, unititialized bool 2015-05-19 19:40:01 +02:00
Sean
b8bbe3654f Revert "Fixing behaviour for a tray icon on OS X"
This reverts commit f35f7e261a.
2015-05-18 13:55:19 -07:00
Sean
a0ecf86c20 Revert "Fixing tray icon visibility issue on OS X"
This reverts commit a4df4125e3.
2015-05-18 13:54:58 -07:00
tux3
7590d3d422
Fix tr() without QObject 2015-05-18 14:43:18 +02:00
marcel
f96db5a761 replaced ToxID struct with ToxId class. 2015-05-17 22:55:50 +02:00
marcel
2ffabb19ec Renamed function isMine to isActiveProfile.
As an user can have multiple profiles where each profile has its own
Tox ID the name isMine is not very accurate.
2015-05-17 22:26:56 +02:00
Yuri
cfd04d22d9 Copy ToxID into XA_PRIMARY clipboard too to make retrieval easier. 2015-05-17 21:24:20 +02:00
agilob
976bd346d6 style for comobobox in friendlist panel 2015-05-17 21:24:18 +02:00
marcel
920362349e removed warnings 2015-05-16 14:01:56 +02:00
tux3
57871c9270
Use GTK systray backend on MATE 2015-05-13 14:43:45 +02:00
Pro
15f0360d4e change to Qt::CaseInseisitive 2015-05-12 19:18:55 -07:00
Pro
e3ce8b486a make /ME work 2015-05-12 18:17:12 -07: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
tux3
600401a606
Fix vol/mic toggle buttons
They were suffering from double-connection syndrom, and the way muting worked was now conflicting with how the output sound level setting works

Fixes #1442
2015-05-12 02:45:04 +02:00
tux3
4a40269698
Implement and enable the audio sliders
It was about time
2015-05-12 01:27:32 +02:00
tux3
23c01f2d67
Merge branch 'pr1627'
qTox will no longer violate GPLv3 :>

closes #1361
2015-05-11 23:16:06 +02:00
agilob
904dd333b7 license box in advanced 2015-05-11 22:07:32 +01:00
tux3
12bbd47239
Fix #928
If the status button is disabled, then we stay consistent by disallowing the desktop GUI's status setting actions, which are used by the tray icon.
2015-05-11 23:01:25 +02:00
tux3
45c3491180
Merge branch 'pr1624'
QFormLayout for Public Information
2015-05-11 22:50:42 +02:00
tux3
70e7f34ecb
Don't ask to remove history for fake friend removal 2015-05-11 22:48:32 +02:00
saneki
55f92f86a8 Vertically aligned Public Information QFormLayout to appear more centered 2015-05-11 15:42:49 -05:00
saneki
50987fd37a Changed Public Information area in User Profile form to use a QFormLayout 2015-05-11 15:04:49 -05:00
tux3
a8b89e7d7d
Merge branch 'pr1621'
closes tux3/qtox#768

added values to slides in av settings, converted slot to qt5 style
audio sliders are disabled, they don't change anything anyway
2015-05-11 21:38:56 +02:00
agilob
3f11eab454 closes tux3/qtox#768
added values to slides in av settings, converted slot to qt5 style
audio sliders are disabled
2015-05-11 20:15:32 +01:00
agilob
826d21d21f closes tux3/qtox#1354
more signals/slots were converted to qt5 style
2015-05-11 19:14:09 +01:00
tux3
ef688f6097
Remove pointless or potentially sensitive log messages 2015-05-11 16:06:12 +02:00
sudden6
1506a9a30e Change log messages to fit new log format 2015-05-11 15:37:56 +02:00
tux3
ef780421f3
Merge branch 'pr1612'
Redesign draft for settings pane and proper UX for Mac

This pull request is capable of:

    Repairing settings UX on Mac (#1594)
    Turning scroll areas in settings panes to vertical scrolling only
    Proposing a redesign of settings pane (#1069)
2015-05-11 13:20:47 +02:00
Ilya Kowalewski
dce8182e3d Persistent aliases, finally resolves #697 2015-05-11 12:44:29 +03:00
Ilya Kowalewski
a8de72570f Fixing smiley alignment and wrong copyright years 2015-05-11 02:01:09 +03:00
Ilya Kowalewski
4ff2d339a0 Resolves issues reported in PR before and some BEAST features:
+ Works great on little boxes
+ Fixed the bug spotted by @zetok
+ Smiles are centered under the smiles combo box
+ Namings for layouts
2015-05-11 01:41:52 +03:00
Ilya Kowalewski
6c8b130a25 Redesign draft for settings pane and proper UX for Mac 2015-05-11 00:41:34 +03:00
Ilya Kowalewski
f35f7e261a Fixing behaviour for a tray icon on OS X 2015-05-10 23:19:40 +03:00
Ilya Kowalewski
a4df4125e3 Fixing tray icon visibility issue on OS X
Some quirking since Qt doesn't render SVG tray icons on OS X.
2015-05-10 21:54:21 +03:00
tux3
7adfd10e21
Merge branch 'pr1602' 2015-05-10 12:01:49 +02:00
agilob
dda7625d2b fix popup colors 2015-05-10 10:20:30 +01:00
agilob
69972e0d80 ask to remove history 2015-05-10 10:12:49 +01:00
Rohil Surana
21371a0f7d Toolicon Menu was not indicating active button 2015-05-10 09:40:59 +05:30
tux3
a232e5afd6
Merge branch 'pr1489'
Removes chat history of friend when removed, fixes #1486
2015-05-10 01:04:00 +02:00
tux3
8407bbada9
Limit outbound avatar size to 64kB 2015-05-10 00:56:41 +02:00
tux3
67e09de085
Save memory with lazy loading
Load the setting's cameria preview opengl context lazily and destroy it when done. Only preallocte Core's video buffer if we have any calls active, free up when all calls are done
2015-05-10 00:05:30 +02:00
tux3
1f926b3e6c
Fix small memory leak cleaning up video calls 2015-05-09 22:56:15 +02:00
tux3
a01e0db7ba
Fix some memory leaks and mismatches 2015-05-09 22:35:58 +02:00
llya Kowalewski
9d9fa90271 Include: complex -> cstdlib 2015-05-08 01:10:33 +03:00
llya Kowalewski
275f2a97f1 Fixing clang build on OSX
std::abs() is function from <complex>, current HEAD doesn't build on OSX with latest clang because of missing include. This commit fixes the build.
2015-05-08 00:31:42 +03:00
tux3
e79d40e356
Merge branch 'pr1446'
Conflicts:
	src/chatlog/chatlog.cpp
	src/chatlog/content/filetransferwidget.cpp
	src/core.cpp
	src/core/coreencryption.cpp
	src/toxdns.cpp
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/friendwidget.cpp
	src/widget/widget.cpp
2015-05-07 22:00:50 +02:00
tux3
19bf083b41
Merge branch 'pr1515' 2015-05-07 21:39:32 +02:00
tux3
ad4ef7f53f
Merge branch 'pr1579' 2015-05-07 21:32:57 +02:00
tux3
04d102160f
Merge branch 'pr1577' 2015-05-07 21:30:11 +02:00
tux3
649ea371ee
Merge branch 'pr1576' 2015-05-07 21:25:57 +02:00
tux3
19d0465efe
Merge branch 'pr1574' 2015-05-07 21:21:04 +02:00
tux3
a61f222411
Merge branch 'pr1573' 2015-05-07 21:17:11 +02:00
kushagra
5e5da24ad3 Implemented search of contacts 2015-05-07 20:37:26 +02:00
tux3
9fa9fafe75
Use old Qt connect syntax for QTimer::singleShot
The new syntax is for Qt>=5.4 only, but we need to support back to Qt 5.2
2015-05-07 20:36:11 +02: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
f982938919 Screen grabber: Hide the flyout when the chat form is hidden. 2015-05-07 20:01:02 +02:00
Stefan Merettig
ffa1628f38 Screen grabber: Make sure the flyout is hidden on leave
When the user moved from right to left in moderate speed, the flyout
didn't get the mouse leave event.
2015-05-07 20:00:21 +02:00
Stefan Merettig
0a68cff60c Screen grabber: Hide mid-animation when leaving file button
The flyout is now more responsive and will start collapsing while it's
expanding, when the user leaves the attach file button mid-animation.
2015-05-07 20:00:21 +02:00
Stefan Merettig
f0d524e960 Screen grabber: hide() the flyout at first
I don't remember why I did show() at first, but works fine without, and
fixes the issue of a 1px wide flyout showing up somewhere in the
chatform
2015-05-07 20:00:21 +02:00
Stefan Merettig
f4610c41f9 Screen grabber: Only show flyout if the attach button is enabeld
Fixes the bug that the flyout was shown in group chats.
2015-05-07 20:00:21 +02:00
Stefan Merettig
f032df223f Screen grabber: Fix position of handles with negative selection
When you clicked, and then move towards top-left with the cursor,
and release, the handles were displayed inside the resulting rectangle,
instead of outside.
2015-05-07 20:00:21 +02:00
Stefan Merettig
076609afb9 Screen grabber: Calculate bounding rect, fixes some drawing issues
This commit should fix drawing artifacts occuring when quickly clicking
on the screen while moving the cursor in circles.
2015-05-07 20:00:21 +02:00
Stefan Merettig
db8b70e225 Screen grabber: Show correct tooltip for selected/no-selection states
When the user just clicks somewhere, and thus rejects the selection due
to the previous commit, show the initial 'nothing selected' helper
tooltip again.
2015-05-07 20:00:21 +02:00
Stefan Merettig
96a1cf93d5 Screen grabber: Reject small selections (< 2px width/height)
When the user just clicks, or moves the cursor barely (less than 2px),
auto reject the region and show no selection.
2015-05-07 20:00:20 +02:00
Stefan Merettig
1149ed1f91 Screen grabber: Modified helper tooltip texts
The english texts are now more coherent
2015-05-07 20:00:20 +02:00
Stefan Merettig
be194e6fa8 Screen grabber: Don't wait for the flyout to collapse
The menu is now collapsed in the background half a second after
the user clicked on the screenshot button. This is to let the WM have
some time to open the fullscreen window, which itself is now shown
immediately.
2015-05-07 20:00:20 +02:00
Stefan Merettig
e83aac7af7 Screen grabber: Remove forced redraw
If this doesn't help we'll need to split the screen capture display
into tiles and display those instead, allowing Qt to only draw
a few of them instead of everything.
2015-05-07 20:00:20 +02:00
Stefan Merettig
9539a38f15 Screen grabber: Moving from button -> flyout -> button doesn't collapse 2015-05-07 20:00:20 +02:00
Stefan Merettig
7ab64d5628 Screen grabber: Wait for the flyout to collapse before grabbing
After clicking the "Screenshot" button in the file flyout, the flyout
now collapses and then triggers the screenshot functionality. This adds
a delay of ca. 1/3 seconds between the click and the action.
2015-05-07 20:00:20 +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
4e1dd74269
Make tool buttons inactive when showing profile 2015-05-07 19:47:18 +02:00
Rohil Surana
084b6c9300 Added tool menu active button indicator.
Disable active button to remove repainting of ui each time it is pressed.
2015-05-07 19:39:46 +02:00
PKEv
91c192487a Add_www_link_possibility 2015-05-07 19:17:09 +02:00
PKEv
d697e06b56 fix drag and drop in chat history (windows) 2015-05-07 19:13:49 +02:00
tux3
39fd870ef0
Merge branch 'pr1470' 2015-05-07 19:09:41 +02:00
tux3
9cdff0a21a
Merge branch 'pr1460' 2015-05-07 19:05:13 +02:00
Jookia
1d58f476f7 Add keyboard bindings for cycling contacts.
I've moved the key bindings in the main widget instead of the chat form given it
doesn't seem to be the chat form's responsibility to handle switching between
conversations it shouldn't know about in the first place. I've also included new
shortcuts to provide a more familiar feel to most people.

All in all this provides Ctrl+Tab and Ctrl+Shift+Tab for cycling as well as
Ctrl+PgUp and Ctrl+PgDown for cycling. This mimics common application behaviour.
2015-05-07 19:02:18 +02:00
Jookia
f6a2925331 Tabs with modifiers are passed up from chat boxes.
In Qt chat boxes filter out events related to text editing, including tabs.
Unfortunately tabs with modifiers like those used to cycle through contacts are
being filtered despite not being used for anything.

This fixes the keybind for cycling forward through contacts (Ctrl+Tab).
2015-05-07 18:46:08 +02:00
Jookia
59a8ea13e7 Implemented cycling through contacts.
I've implemented this by having the contacts list container return all contact
widgets in the order they appear each time it's time to cycle. It's perhaps
inefficient but given cycling isn't done often I don't see a need to optimize.

This code does make the assumption that the friends list isn't empty, which I'd
guess would be the case if there's an active conversation.
2015-05-07 18:46:08 +02:00
Rohil Surana
0b1d3e3d3d Added chat room status to window title 2015-05-07 18:28:51 +02:00
Mario Preksavec
4eeabbbe85 Unhide faux offline messaging checkbox 2015-05-04 19:27:40 +02:00
Mario Preksavec
ecee27b31d Respect configured emoticon size 2015-05-04 06:01:02 +02:00
Mario Preksavec
220fea66a0 Make dropdown menus look better on high dpi 2015-05-04 02:12:02 +02:00
Mario Preksavec
b874f31b0d Fallback XFCE detection 2015-05-04 01:03:58 +02:00
Mario Preksavec
f88f8dc3cb Remove StatusNotifier dependency 2015-04-28 17:28:21 +02:00
tux3
542cae85d3
Give appropriately scary name to dangerous function
"isPathWritable" didn't convey really well the meaning of "let's try to open it, wipe everything the hell out, and see if it worked"
2015-04-26 17:39:39 +02:00
tux3
0e65d150e3
Don't show call buttons in text-only groupchats
I'm not sure why there are text-only groupchats in the first place, but that's fixed.
2015-04-25 01:50:35 +02:00
tux3
8b6ef7ab9d
Merge branch 'pr1524' into back_in_the_game
Conflicts:
	src/widget/form/groupchatform.cpp
2015-04-24 23:04:11 +02:00
tux3
1c51cd788b
Merge branch 'pr1509' into back_in_the_game 2015-04-24 22:37:01 +02:00
tux3
f8eb90f74d
Merge branch 'pr1498' into back_in_the_game 2015-04-24 22:34:21 +02:00
kushagra
b4f72b620d fixes action bugs
1) action received gets modified on restart
2) sender's name is written twice if action is sent using offline messaging
3) /me is written when action is sent in groupchat having one peer
4) /me is not saved in last message variable in friendd chat
2015-04-24 22:20:52 +02:00
Yuri
11883bab85 Added Ctrl+Q shortcut. 2015-04-24 21:44:48 +02:00
tux3
ea417d3688
Update lock when renaming profile 2015-04-24 19:19:01 +02:00
Zetok Zalbavar
92f3b6a20f Code style improvements 2015-04-24 15:43:57 +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
tux3
e03d80392a
Fix GUI refresh when creating new profile
Previously the username/status, and the combobox in profileForm weren't refreshing themselves
2015-04-23 23:42:50 +02:00
tux3
228398d5de
Initial porting to the new Tox API
Builds and runs, but some features will be missing, may crash with an assert, or silently fail with broken QObject connections

We're back in the game.
2015-04-19 23:12:44 +02:00
PKEv
55d33fbcc0 correct after CppCheck 2015-04-13 00:49:24 +03:00
Rohil Surana
fb97662b5d Added add friend on window on first start 2015-04-07 14:19:55 +05:30
Rohil Surana
a5919dc767 Typing indicator shows up once typing is resumed 2015-03-31 02:57:52 +05:30
kushagra
07ba0c9ae0 Removes chat history of friend when removed, fixes #1486 2015-03-29 13:35:39 +05:30
Dubslow
885dc0638a
No more PRs shall be merged until the new_api branch in my repo is merged. Contributions are welcome.
This commit fixes some minor style issues with #1406
2015-03-27 17:36:35 -05:00
Dubslow
72e78ff6cd
Merge branch 'pr1480'
Conflicts:
	src/widget/form/addfriendform.cpp
2015-03-27 17:36:08 -05:00
Dubslow
2e388f03df
Merge branches 'pr1474', 'pr1406', 'pr1463' and 'pr1472' 2015-03-27 17:33:53 -05:00
Dubslow
5d129b471f
Possibly fix an old segfault that may or may not be a problem 2015-03-27 15:01:42 -05:00
Rohil Surana
b98af21456 On add friend clicked pastes Tox Id from clipboard if there is one 2015-03-27 22:13:25 +05:30
PKEv
4f650b3177 System menu translation 2015-03-26 23:02:08 +03:00
Rohil Surana
5a4443b7bb Set focus to toxId Line edit on add friend window 2015-03-26 16:53:20 +05:30
kushagra
b2481fc1d8 proper splitting in friends chat,fixes #1375
what happened was- When message exceeded TOX_MESSAGE_LENGTH, the whole message was inserted in sender's chatlog X times.
if length of message is N,
X = (N/TOX_MESSAGE_LENGTH) + 1

There is no bug in recieving end. Receving end gets X messages (splitted).
In the sample case provided, the message had whitespaces in the end, so the reciever thought the message is empty.
2015-03-26 11:15:05 +05:30
PKEv
9857f5b60b #1402 duplicate of the sender's name
set if interval more 5 minuts, sender name repet
not tested for group chats!!!
2015-03-26 00:31:39 +03:00
Dubslow
bab280a0ea
Change default datetime formats (d/m m/d agnostic), style fixes, removed unnecessary signals 2015-03-25 11:45:58 -05:00
Dubslow
14a565bc3a
Merge branch 'pr1393' 2015-03-25 11:32:05 -05:00
Dubslow
27f58c9ca6
Style fixes 2015-03-25 11:27:33 -05:00
kushagra
86bbe537bc autocomplete will work for : also,fixes #1377 2015-03-23 23:11:28 +05:30
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
PKEv
becd923c09 #1441 correct 2015-03-22 02:26:17 +03:00
agilob
5f15bc8b75 iso date 2015-03-21 15:48:43 +00:00
agilob
77e333ab05 long time format 2015-03-21 15:47:09 +00:00
Zetok Zalbavar
f3aa3073b0
Fix coding style and add copyright header
* added copyright header to src/platform/statusnotifier/enums.c
* 'switch(' → 'switch ('
* use Allman style

----
for / if / while / switch () {
 ↓
for / if / while / switch ()
{
----

----
for / if / while ()
{
    1_line;
}
 ↓
for / if / while ()
    1_line;

----

----
for / if / while ()
    1_line;
line_out_of_loop;
 ↓
for / if / while ()
    1_line;

line_out_of_loop;
----
2015-03-21 08:59:28 +00:00
Zetok Zalbavar
f95291af3e
Some style fixes
"if(" → "if ("
"for(" → "for ("
"while(" → "while ("
2015-03-20 18:38:10 +00:00
agilob
a873bb571f
generalsettings: time and date format from qlocale 2015-03-20 08:17:18 +00: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
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
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
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
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
tux3
9c807f2da8 Fix #1104 2015-02-19 21:32:29 +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
Joseph Anania III
bfc06df8a5 changed emoticon widget to show 24x24 emoticons 2015-02-18 11:31:40 -05:00
TheLastProject
3116e84095 Hide is typing status when friend disconnects 2015-02-18 14:02:10 +01:00
Dubslow
ec6bed5a99
Fix #1169 2015-02-17 21:07:56 -06:00
Dubslow
9946a4642e
Merge branch 'pr1194'
Reduced merge that drops the unnecessary changes
2015-02-16 18:07:56 -06:00
Dubslow
7edb50ea3e
Merge branches 'pr1185', 'pr1188', 'pr1192', 'pr1193', 'pr1200' and 'krepa' 2015-02-16 18:03:36 -06:00
TheLastProject
ac9904face Turn group invite warning into question. Fixes #1199 2015-02-16 23:53:33 +01:00
krepa098
deb8440c6a fix issue #1181 2015-02-16 18:13:22 +01:00
Zetok Zalbavar
c0df870c62
Update toolTip for Compact contact list
Restart should not be a requirement anymore
2015-02-16 10:59:01 +00:00
BroncoTc
51799dc857 add spaces between language names 2015-02-16 18:36:51 +08:00
BroncoTc
dff30915a3 edit the three config & source file
manully and same way as commit a004fc872f
2015-02-16 12:43:39 +08:00
Dubslow
03168a02d2
Merge branches 'pr1134', 'pr1157' and 'pr1171' 2015-02-15 17:36:45 -06:00
Dubslow
07b87616a2
Refactor image filter as discussed 2015-02-15 17:35:27 -06:00
Dubslow
dcf87f7475
Ask before joining group
Fixes #1101, closes #1177
2015-02-15 17:25:27 -06:00
Dubslow
73e51865e7
Merge branch 'chatlog_merge_v3'
Conflicts:
	src/chatlog/chatlog.h
2015-02-15 05:24:53 -06:00
krepa098
c57cba21ae fix issue #14 2015-02-15 11:58:02 +01:00
Dubslow
4dcfec0151
Merge branch 'chatlog_merge_v3'
"unconfirmed" -> "Waiting to send..."
2015-02-15 04:55:25 -06:00
krepa098
2bc7594049 redo layout on Settings::emojiFontChanged 2015-02-15 11:43:01 +01:00
krepa098
205f950073 refactoring & dark-theme awareness 2015-02-15 10:51:54 +01:00
Dubslow
c3d61f8dfe
Make Dutch selectable translation 2015-02-14 18:10:45 -06:00
Dubslow
eeb8c10bc3
Fix #1158 2015-02-14 17:26:21 -06:00
Zetok Zalbavar
e4e6401182
Rename 'Start automatically' → 'Autostart' 2015-02-14 07:39:28 +00:00
Chloe
484fb2e89c Update widget.cpp
Added support for dynamically generating supported format list.
2015-02-13 09:23:21 -05:00
Dubslow
11d4ec2599 Refactor OfflineMsgEngine, fix potential segfault
(@apprb take note please)
2015-02-13 00:02:52 -06:00
krepa098
f765daf98d reverse history entries as they are no longer reversed in
ChatLog::insertChatlineOnTop
2015-02-12 09:12:14 +01:00
Dubslow
4055cbe956
Minor translation things in the ui files 2015-02-11 14:52:42 -06:00
Dubslow
3fc778ae3d
Fix #1131 2015-02-10 22:51:57 -06:00