Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-25 14:56:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,130 Commits 63 Branches 22 Tags
Commit Graph

640 Commits

Author SHA1 Message Date
thunder2
90c3c24412 Moved font size definitions from ui files to default qss. 
Added new base class StyledLabel to emulate the missing font-size by factor in qss.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-06 22:09:44 +00:00
defnax
b11459329b * Moved to display own video at bottom and Friend at top. 
* Added to display system message text when call is stopped.
* Fixing spaces on chat window.
* Clean up chatwidget buttons, moved text color to the font menu button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-06 14:21:36 +00:00
defnax
e44b8fa872 Fixed Layout Spacing 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-05 14:54:34 +00:00
defnax
1648842dd6 * Moved to Display the Video Widget on the right side 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-04 13:49:04 +00:00
defnax
981df0c7e0 * Enabled Minimize/Maximize Button for File Transfer details dialog. 
* Clean up Buttons on ChatWidget, for Fonts use now Font Button.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7717 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-28 16:33:56 +00:00
defnax
e68eb075af Changed rs logo icons, for better look and feel on the Taskbar 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-25 23:21:46 +00:00
csoler
7b8cdd685d cleaned up ChatStyle.cpp from obvious comments 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-23 19:22:57 +00:00
defnax
03d4d5e949 Added HTML Text Optimization by Phenom 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7701 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-22 22:16:22 +00:00
csoler
fd20f629dc fixed GUI for distant chat: correct display of peer names, chat window on client shows up when chat is openned. Window on server only shows up when first message is received. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7688 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-17 21:56:41 +00:00
csoler
8480d46eb5 improved the logic in distant chat. Now all traffic is referred to by the GXS id of the contact instead of virtual peer id which would change with tunnel route. Work still needed to fix up the GUI 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7687 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-16 22:46:18 +00:00
defnax
16be0a16f9 changed the chat bubbles when typing/chat on the private chat, which displays on the Taskbar & window icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7658 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-11-02 13:20:48 +00:00
thunder2
a3af37c7e4 Fixed start of chat with right or double click on a friend item (not location) in friend list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7633 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-25 12:26:09 +00:00
csoler
b593a918a0 optim: changed postfixed ++ into prefix++ for non trivial operators, replaced test on std::list::size() by std::list::empty() (Patch from Phenom, modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-21 22:33:02 +00:00
defnax
eac4b29849 *Set a minimum size for users list 
*Fixed the default header size of the "Author" item
*Disabled Messenger Window, not more useable, needs a better design.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7536 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-15 14:43:01 +00:00
thunder2
d20ce41c96 - Removed all usages of the old windows icon (rstray3.png) and used the standard icon of the application 
- Added possibility to change the icon of the GxsGroupDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 23:26:04 +00:00
thunder2
6792348402 - Moved settings for user notify into the base class 
- Removed defines TRAYNOTIFY_...

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 20:01:12 +00:00
csoler
9006c567a1 added method to add new widget in chatWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-15 15:59:12 +00:00
csoler
8667cf9f92 add changing state for Send button in chat when msg size exceeds allowed size (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-06 11:33:04 +00:00
csoler
be82951e2e fixed popup of distant chat dialog, and display of peer names. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-12 22:06:43 +00:00
defnax
f5d9182327 some titlebar layout changes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7398 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-04 15:10:39 +00:00
thunder2
a68211e65c Fixed compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7396 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-06-01 13:17:30 +00:00
defnax
6d8f567a58 Added Patch from Phenom AddChatMutedIconActivity_v0.6_7355 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-29 15:19:19 +00:00
drbob
d42bb9175f added missing #include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-27 08:40:23 +00:00
defnax
f93d41991e Changed the QFrame of QScrollArea on Settings to noFrame 
Added Search and Marker Feature for the Chat Widget, thx to Phenom for the Patch (AddSearchAndMarkerOnChatWidget_v0.6_7377.patch)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7380 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-26 21:51:53 +00:00
csoler
b6c68d1812 - started changing distant chat so that it works with GXS ids instead of PGP ids. Something is still broken in 
service control. Crypto is not done yet => distant chat is unencrypted.
- changed GUI for distant chat. Removed invitation system.
- added menu item to distant chat GXS ids from IdentityItem (only entry point for now).
- fixed bug in chat lobbies causing re-connexion of lobbies not to happen everytime (bug reported bu Lain)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7378 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-25 21:43:05 +00:00
defnax
78f3ab21fd moved the nick list to the right side of the Chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7354 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-08 13:33:39 +00:00
chrisparker126
0f29d28b1b merge of branch v0.6-idclean 7180 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-17 20:56:06 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk. 
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-01 14:16:15 +00:00
csoler
1d19938295 added jpeg to the list of image extensions for messages/avatars/etc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 21:38:11 +00:00
drbob
3b71e8e140 Improvements to enable Edit/Show of GxsGroups. 
NB: The actual update doesn't happen yet - mainly just the display of info.
  - Fixed up Constructor, and loading of MetaData via TokenService.
  - Fixed up Enabled / ReadOnly for Show.
  - Updated children to match new functionality.
  - Fixed up Show in Circles Dialog too.
  - removed a few compile errors.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 07:57:58 +00:00
drbob
bbe3ee8d2f - Switched to new RsAccounts interface. 
- Reworked ServerPage to support HiddenNode configuration.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 02:35:06 +00:00
thunder2
dacec52e4f Fixed display of the nickname for the chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-08 11:37:16 +00:00
thunder2
92fabf4c56 Modified the patch from electron. 
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat).
Recompile needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 00:56:46 +00:00
defnax
7b0a6afa56 patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows now Buttons from different Plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 22:25:49 +00:00
thunder2
abd6b46ca0 Added a custom context menu for pasting RS-links to the base class MimeTextEdit and removed the custom context menu from derived classes. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-30 19:12:16 +00:00
thunder2
135a5e579a Code maintenance for Qt 5: 
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 21:10:33 +00:00
csoler
b9a79db9b0 removed some debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-17 18:45:59 +00:00
thunder2
b49ba8b98f Changed the additional buttons of ChatLobbyDialog and AudioPopupChatDialog to QToolButton. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 12:13:09 +00:00
csoler
695e417fd5 changed std::wstring for std::string+utf8 in chat, and messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-03 21:41:34 +00:00
defnax
6ae9178712 Added a new frame for the Plugin Buttons, add the plugin buttons before the send button. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-01 20:21:57 +00:00
csoler
e21d869006 - added history parameters for chat lobbies 
- added max storage time for items in chat history. Avoids filling up the history with chat from volatile peers.
- worked out the layout in config->ChatPage in a more compact design and added help
- set the max size of chat messages to 6000 bytes instead of 2000 which was a bit too low
- default max number of lobby messages saved in each lobby is 20. Avoids flooding for peers who havn't configured it yet.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-27 21:18:44 +00:00
thunder2
6b1613d8bb - Added blocking of embedded images (+ settings) to forums and messages 
- Added image support for forum messages
- Renamed LinkTextBrowser to RSTextBrowser
- Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-23 19:53:26 +00:00
defnax
2aa3201774 Added a default stylesheet, for the lobby info label. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6651 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-30 15:41:53 +00:00
thunder2
d6194164a5 Moved the send button in ChatWidget back to the toolbar below the input. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6650 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-30 12:42:11 +00:00
csoler
477c05e71f reset block format for text (Patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6640 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 20:36:37 +00:00
csoler
08a8868865 patch from phenom to fix date display in chat history 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6638 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 20:25:06 +00:00
csoler
5bf1ce8f07 hability to delete some lines in chat history browser (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:45:59 +00:00
csoler
4db4742f00 fixed up completer for nicknames in chat lobbies (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:22:41 +00:00
csoler
283785cd70 end of Phenom patch for chat Icon activity 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:13:51 +00:00
csoler
e74be8e484 added activity status in chat lobby participants list (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6604 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-24 15:07:31 +00:00