Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,710 Commits 63 Branches 22 Tags 194 MiB
ac2dacf515
Commit Graph

611 Commits

Author SHA1 Message Date
csoler
6cb499065f fixed compilation with qt4 2017-05-08 10:06:40 +02:00
defnax
24eca4a64f Moved status icon column to the last position 2017-05-07 19:39:20 +02:00
Gioacchino Mazzurco
5159e326c7 Merge branch 'master' into gxs_mail_experiments 2017-05-05 15:44:22 +02:00
Phenom
4fbcc1e85f Add Double Click on Name for Chat to add their name in text writer. 2017-04-29 22:14:18 +02:00
Phenom
6f2d7bbca0 Fix Clang warnings: implicit conversion from 'double' to 'int' 
warning: implicit conversion from 'double' to 'int' changes value from
2.5 to 2 [-Wliteral-conversion]
        QSize buttonSize = QSize(iconSize + QSize(FMM,FMM));
 2017-04-17 21:42:13 +02:00
Phenom
07b67e9cc9 Fix Clang warnings: 'PopupDistantChatDialog::init' hides overloaded 
virtual function

warning: 'PopupDistantChatDialog::init' hides overloaded virtual
function [-Woverloaded-virtual]
                virtual void init(const DistantChatPeerId& peer_id);
/retroshare-gui/src/gui/chat/PopupChatDialog.h:49: hidden overloaded
virtual function 'PopupChatDialog::init' declared here: different number
of parameters (2 vs 1)
        virtual void init(const ChatId &chat_id, const QString &title);
 2017-04-17 21:41:38 +02:00
Phenom
eea49d96bf Fix Clang warnings: change ChatDialog::init definition 
warning: 'PopupChatDialog::init' hides overloaded virtual function [-
Woverloaded-virtual]
    virtual void init(const ChatId &chat_id, const QString &title);
                 ^
/retroshare-gui/src/gui/chat/ChatDialog.h:87: hidden overloaded virtual
function 'ChatDialog::init' declared here: type mismatch at 1st
parameter ('ChatId' vs 'const ChatId &')
    virtual void init(ChatId id, const QString &title);
                 ^
 2017-04-17 21:40:25 +02:00
Phenom
e0225efef3 Fix Clang warnings: 'ChatLobbyDialog::init' hides overloaded virtual 
function

warning: 'ChatLobbyDialog::init' hides overloaded virtual function [-
Woverloaded-virtual]
    virtual void init();
                 ^
/retroshare-gui/src/gui/chat/ChatDialog.h:87: hidden overloaded virtual
function 'ChatDialog::init' declared here: different number of
parameters (2 vs 0)
    virtual void init(ChatId id, const QString &title);
                 ^
 2017-04-17 21:37:17 +02:00
Gioacchino Mazzurco
2630ed4573 Merge branch 'master' into gxs_mail_experiments 2017-03-13 22:57:33 +01:00
mestaritonttu
b4445675ec Added period 2017-03-07 13:34:53 +02:00
csoler
1e1fe7708f fixed styles loading in chat. Added missing history/compact/colored style 2017-03-02 22:30:51 +01:00
RetroPooh
328168d9a7 add space after quoting sign 2017-03-02 20:03:16 +03:00
Gioacchino Mazzurco
08161db43b PopupDistantChatDialog fix some strings 2017-03-02 00:08:12 +01:00
Gioacchino Mazzurco
953b70fbe4 Improve async distant chat, fix chat msg receiving 
DistantChatService::initiateDistantChatConnexion(...) made notification
  message optional (enabled by default)
p3ChatService removed duplicion avoidance as it is not necessary
p3ChatService::sendStatusString(...) send status only if peer is online
protect p3ChatService::mDistantGxsMap with mutex as operation on it may
  be done by different threads
p3ChatService::receiveGxsMai(...) set chat message item peer id with
  distant tunnel id, so it is recognized as a distant message later
made p3GxsTunnelService::makeGxsTunnelId(...) static as it need no
  access to this, now it can be used easier by other components
rename RsGxsMailItem::recipientsHint to recipientHint as for now only
  one recipient is possible (TODO: update documentation too)
GxsMailsClient::receiveGxsMail(...) changed paramethers for better
  abstracion, now destination id is passed too because it is usually a
  very useful information
ChatWidget some adaptation to async chat, a couple of method have been
  deprecated too
PopupDistantChatDialog::updateDisplay(...) adapt message shown to the
  user to the new async chat paradigm (TODO: need review)
 2017-03-01 23:31:13 +01:00
csoler
99cf69a98c Merge pull request #703 from RetroShare/v0.6-ImprovedGUI 
V0.6 improved gui
 2017-02-26 20:14:34 +01:00
Phenom
3452821fb9 Add Shift+Enter to create new line in chat widget when Ctrl+Enter option 
is disabled. Proposed by MMT1

In the same time I fix the completer only when chat is lobby.
 2017-02-26 11:31:43 +01:00
csoler
67af166c0c moved Options window into a new Preferences tab 2017-01-26 22:35:33 +01:00
csoler
ca5fa7afa8 Merge pull request #653 from RetroPooh/master 
chatlobby option to disable sending typing notifications; friend connect wizard minor tweaks
 2017-01-23 21:11:22 +01:00
csoler
baa9713384 partially changed lobby->chat room in displayed strings in the GUI 2017-01-21 21:38:10 +01:00
RetroPooh
0ca477d01b add chatlobby option to disable sending typing notifications 2017-01-20 22:26:50 +03:00
felisucoibi
717b455699 Merge pull request #13 from felisucoibi/0.6-buttons 
0.6 buttons renamed chat lobbies to chat rooms
 2017-01-18 10:55:01 +01:00
felisucoibi
837bb76d33 Update CreateLobbyDialog.cpp 2017-01-18 10:31:50 +01:00
felisucoibi
564618764b Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-18 00:48:00 +01:00
felisucoibi
66ab7c9eab Update ChatLobbyUserNotify.cpp 2017-01-17 16:49:36 +01:00
RetroPooh
f079e99642 fix mute option in chatlobby id menu 2017-01-17 17:21:51 +03:00
csoler
e7a119f22c added a warning and skip files with missing hash in copy link 2017-01-15 21:13:27 +01:00
csoler
f314e7d330 simplified code in PR/630 2017-01-15 20:56:44 +01:00
RetroPooh
75d717c2df fix 2017-01-15 20:29:59 +03:00
RetroPooh
cef62e30fc fix 2017-01-13 18:20:19 +03:00
RetroPooh
8ae9eff928 chatlobby id context menu - fix reputation change actions 2017-01-12 16:26:35 +03:00
RetroPooh
10ba3a6364 chatlobby id context menu - fix display conditions 2017-01-12 16:26:06 +03:00
RetroPooh
36dbdee409 show in people - enabled for yourself; Votes in tooltip; lastpost 1970 to Never 2017-01-11 22:44:27 +03:00
unknown
c2214c8cfa chatlobby id menu - add open people tab for id 2017-01-09 18:22:47 +03:00
unknown
cc3b8bde52 lobby id dialog - add vote neutral option 2017-01-09 16:05:23 +03:00
unknown
bc43cb8cf0 small gui tweaks 2017-01-07 23:29:24 +03:00
Phenom
674b6de381 Fix Some gcc warnings 383 to 208 lines 
Left explicit #warning and deprecated.
Some lines are wrong indented and produce mal formed code.
 2016-11-30 22:01:01 +01:00
hopetech
ecaea051fa Fix some compilation warnings 2016-10-19 15:41:25 +02:00
Phenom
fdfd2e9248 Add context menu to show hidden image on lobby. 
A tooltip show hidden image too.
The RSImageBlockWidget is removed.
 2016-10-05 12:27:31 +02:00
defnax
5e22ddc93e updating icons more flat replacement 
improving people page layout
 2016-08-24 03:28:57 +02:00
Phenom
7dd78f28d8 Fix Lobby Load embedded image option. 2016-08-22 23:08:11 +02:00
Phenom
9780f1ff78 Add AutoHide to RSImageBlockWidget 2016-08-17 23:33:41 +02:00
defnax
6682a7a491 added new mainwindow icons for RetroShare. 2016-08-16 22:02:30 +02:00
defnax
b0b4320c0b decrease chat bar widget icon size 2016-08-13 16:20:58 +02:00
Phenom
f71aad4b9c Add Chat Load Embedded Images Option like forum and message. 2016-08-13 09:46:31 +02:00
defnax
0e1c0c2eb3 Added search filter for participants list. 2016-08-12 22:19:44 +02:00
Phenom
d0482707c5 Add Case Sensitive option for Lobby Notify. 2016-08-07 19:00:23 +02:00
defnax
dea776a61a Moved font menu to Settings menu 2016-08-06 18:35:07 +02:00
defnax
f3d1a6c1ec Added missed notify icon 2016-08-05 19:13:59 +02:00
defnax
e2bb477899 Added new blue icon set for Chat Widget (icons by Beluga) svg ad png Format 2016-08-05 01:00:53 +02:00
Phenom
bef7db4b4d Fix IdChooser in Signed Lobby. 
So you cannot choose an unsigned Id.
 2016-07-30 19:14:59 +02:00
defnax
da11995ca3 Clean up the Chat Toolbar Buttons 
Fixed display of Info Text on PGg details
 2016-06-15 23:32:01 +02:00
Phenom
ddbcd2150c Add buttons to send message in plain text and without EmoteIcon. 2016-06-14 23:01:08 +02:00
Chuck Rhode aka Manuel Davis
8be53dd79a Improve inserting placemark in ChatLobby. 
*append* inserts text at end but with formatting in effect at
current cursor position, such as in the middle of a hotlink,
which would be strange.  This OTOH inserts text with
formatting in effect on the last line, which may be strange
or not.
 2016-04-19 11:11:58 -05:00
Phenom
45f77def2b Change Lobby Send button tooltip. 2016-04-13 20:42:12 +02:00
Phenom
718d6f9b19 Resize Chat Tool Bar Button for Hight DPI screen. 2016-04-13 20:26:36 +02:00
Phenom
42a2b37abb Move SearchBar to Tool Bar and remove Show/Hide action. 
As asked by Cyril in PR#346
 2016-04-13 19:21:18 +02:00
Phenom
c5873f3216 Move Chat notify button from search bar to tool bar. 
As search bar is hidden by default.
 2016-04-13 18:35:42 +02:00
Phenom
c6f1cc4e63 Clear WebAPI when clear chat history in GUI. 
Move notifyChatCleared call to p3ChatService
To maintain notify direction.
 2016-03-31 22:52:53 +02:00
Phenom
16c59af9f4 Correct Colored Name Contrast in chat, same way than text. 2016-03-12 13:25:10 +01:00
csoler
0282c2aeb3 added ban menu entry to chat lobby participant list 2016-03-09 21:49:24 -05:00
csoler
58e59d1181 added sounds to chat lobbies (patch fromManuel Davis) 2016-01-28 20:19:44 -05:00
Cyril Soler
b1f165fec8 added sound event to lobbies (patch from Manuel Davis) 2016-01-28 10:22:32 -05:00
csoler
749ca08f9f slightly improved message shown over lobby names 2016-01-26 22:30:04 -05:00
Phenom
1d2be232f0 Fix Quote Lines With Image 
When get text with image from toPlainText(), a (-4) char is inserted.
 2016-01-23 18:38:30 +01:00
Cyril Soler
9063612c33 fixed utf8 issue in ChatWidget. To be tested. 2016-01-20 11:19:36 -05:00
defnax
19011ba002 clean up emotes, removed some unused. 
changed icons for emotes button.
reduze the size of the emoticons
 2016-01-05 18:23:43 +01:00
sehraf
54f9912c32 Add whitespaces around smileys. 
Only replace smileys with an image when they are surrounded by whitespaces.
This fixes smileys in links and other text that happen to include the sequence for a smiley.
 2016-01-05 15:01:22 +01:00
Cyril Soler
f30f71db8e Merge pull request #218 from csoler/v0.6-ContactList 
V0.6 contact list
 2015-12-23 18:07:10 -05:00
defnax
15a7487c27 Save sorting on Chat lobby 2015-12-23 16:55:23 +01:00
csoler
5d9272055f merged with upstream/master 2015-12-22 18:33:01 -05:00
defnax
8e9fe6d800 Merge pull request #189 from hunbernd/feature/chat-enhancements 
Chat enhancements
 2015-12-22 01:07:02 +01:00
hunbernd
33b3eb7284 /me style is defined in chat styles 2015-12-21 01:21:04 +01:00
hunbernd
77804bbf16 Remove location from user name when using /me 2015-12-20 21:31:45 +01:00
defnax
03896d7f8c Added Sorting Menu entry. 2015-12-18 01:40:39 +01:00
defnax
42bf9962a2 Sort lobby Parcipants by activity 
Set spacing between items
 2015-12-15 20:20:11 +01:00
hunbernd
bc4691ceb4 Show save image option only when it is needed 2015-12-12 22:41:15 +01:00
hunbernd
cdda411c79 /me 
TODO: allow customizing the style
 2015-12-07 01:21:16 +01:00
hunbernd
ff44965e2c Added save image function into chat 2015-12-06 23:00:29 +01:00
hunbernd
0b92c79eb0 Quote function on chat 
select text --> right click --> Quote
 2015-12-06 21:44:53 +01:00
csoler
0c1e6301b3 merged with latest upstream trunk 2015-12-05 16:49:00 -05:00
csoler
9193d3579b merged with latest master before creating PR 2015-12-04 21:24:51 -05:00
csoler
b198f1a007 fixed some cleaning of remotely closed tunnels in GxsTunnelService 2015-12-03 00:34:13 -05:00
csoler
81ab43beb9 fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation 2015-11-30 00:02:44 -05:00
csoler
a29f15ae32 fixed compilation, added missing methods for new distant chat 2015-11-28 14:55:56 -05:00
csoler
a2e0f4196b updated GUI for new distant chat 2015-11-26 20:40:06 -05:00
csoler
1de55d8fc5 replaced the few bools in RsIdentityDetail by a set of flags 2015-11-19 21:14:32 -05:00
defnax
3a2b5f1f07 calculate correct icon size for the status icon 2015-11-04 23:47:12 +01:00
defnax
2a998c1e71 Added new higher resolution bullet icons with better quality 2015-11-04 17:05:39 +01:00
Phenom
6df42a0b7d Add GXS Id in anchor in Chat. 2015-10-28 07:20:17 +01:00
sehraf
164c7265aa suggestion from cyril 2015-10-21 22:40:49 +02:00
sehraf
c06118904e mark chat participants as inactive as long as no activity was seen and reduce time to inactivity from 30 min to 10 min (patches #67) 2015-10-21 22:18:43 +02:00
Phenom
245a2826c6 Fix centered Typing Label on ChatWidget. 2015-10-13 20:11:30 +02:00
defnax
95bdd7f0a7 Fixed ChatWidget Margin's 
Set Alignment for frame off's Video icon
 2015-10-07 01:35:31 +02:00
Phenom
2b1d39cea1 Add HideChat Button. 
Change layout of video when text is hidden.
Add toolbar in fullscreen.
 2015-10-05 21:04:26 +02:00
Phenom
8a7e359557 Add a button on VOIP to hide text when video is on. 2015-10-05 21:04:26 +02:00
Phenom
64389e35d8 Fiw Delete key event in ChatWidget. 2015-10-03 11:00:16 +02:00
Phenom
3f155b9b75 Add minimum font size in chat. 2015-09-13 17:35:19 +02:00
defnax
2c1743f5bb Added send message function for Participants list. 2015-09-07 15:13:32 +02:00
defnax
3d6e9783f6 Fixed Status Label on Distant Chat 2015-09-02 13:06:15 +02:00
AsamK
b43e0ab2e0 Fix compile with qt < 4.7 
Reenable placeholder text for lobby name, not sure why it was disabled
 2015-08-31 23:38:50 +02:00