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
6,318 Commits 63 Branches 22 Tags 194 MiB
7815efb16f
Commit Graph

74 Commits

Author SHA1 Message Date
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
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
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
thunder2
4f9a107e83 Hide ip column in friend list by default 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6728 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-10 22:04:39 +00:00
csoler
f474663fc2 removed tabs in help strings that caused translated text to show arrows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6718 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-08 15:08:36 +00:00
thunder2
e5d8860e21 Moved friend recommendations into the ConnectFriendWizard 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6679 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 22:51:26 +00:00
thunder2
495cc17da3 Moved service permission matrix to the left toolbar 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6678 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 21:48:23 +00:00
thunder2
cc92fdfc81 Moved the filter edit and the display button from FriendsDialog and MessengerWindow into FriendList. 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6649 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-30 12:24:39 +00:00
drbob
fd66a963d2 Improvements for ProgressDialog. 
- Launch progress dialog after connectWizard.
 - fix display of location on connectWizard.
 - add cleanup code to ProgressDialog.
 - Qt4.7 bugfix.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6616 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-26 07:24:37 +00:00
csoler
d1d2fbb869 added attach picture system to broadcast (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:41:50 +00:00
csoler
c007cb1051 link from hashed file is paste in edit window, not in sent messages (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-25 20:24:47 +00:00
csoler
9e7d6aa00b changed welcome message in broadcast chat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6529 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-22 12:34:05 +00:00
csoler
15f1df9e63 added more help panels 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-19 18:36:09 +00:00
csoler
d7e25e24e5 Remorked GUI layout a little bit: 
- made all pages have a bar with full width
- added help button to each of them (needs adding text)
- improved help system so that it's easy to register a new help button
FriendsDialog still needs some cleaning.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-19 12:18:58 +00:00
csoler
7c6a7edfde Sorted out the mess in friends list: 
- removed entries from rightmost menu:
	* add friend: removed, already on the left bar
	* add group, recommendations and service perms => moved to context menu in friend list
	* create chat lobby: removed. Not relevant.
	* avatar and state string: removed. Can be done right at right, by clicking on the things.
- removed rightmost menu
- icons in context menu still need fixing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 22:33:45 +00:00
csoler
d215ca1af9 renamed known people into keyring 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 20:00:46 +00:00
csoler
6e9d1beda9 fixed auto-raise of pages that are not in the top level 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-23 14:29:36 +00:00
csoler
50db473329 Merged branch for GUI improvements into trunk. The improvement phase is not finsihed yet. The work on GUI will continue into trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-22 21:42:27 +00:00
thunder2
439ccc94f4 Added new dialog to set service permissions for friends. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-23 00:22:17 +00:00
thunder2
968f72f303 Fixed missing seconds in time format. 
Added new basic class for date/time format.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5825 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-15 21:35:37 +00:00
csoler
f61a50c5a6 fixed permission of drap+dropped files. all attached files get added to extra list, but with different permission flags depending on the client. From that, we compute sharing permissions : turtle, or direct transfer only 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-11 21:17:00 +00:00
thunder2
a573211629 Added and modified patch from Henry 
Modified the date format according to the chosen language (locale).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-10 18:59:58 +00:00
thunder2
9b5ee85fd0 Removed context help button from the dialogs (currently not used) and added minimize/maximize buttons to the "floating" dialogs. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 23:26:47 +00:00
thunder2
adee9517c1 Removed some unnecessary filter icons and added some new placeholder for the filter. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-06 00:28:11 +00:00
thunder2
a7c29c0f24 Removed the filter comboboxes and replaced it with a menu in LineEditClear. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-29 10:59:26 +00:00
thunder2
a6cb81fd43 Cleaned includes in FriendsDialog.cpp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-24 13:22:14 +00:00
defnax
8efc8808f7 Added Search Filter for the FriendsList 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-18 22:30:32 +00:00
thunder2
b40a716e87 Fixed sensitivity of the action in the context menu to copy a link from the chat text when scrollbars are visible. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-26 17:52:58 +00:00
thunder2
28ec721c1b Added patch from Anonymous Coward - readable chat 
Added new options to the Chat settings window:
- Enable custom fonts
- Enable custom font size
- Enable bold
- Enable italics
- Minimum text contrast

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-21 21:23:14 +00:00
thunder2
fb389f6116 Enabled the menu item in the context menu again to copy the link when right clicking on a link. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-07 21:28:25 +00:00
thunder2
5d482b9a6f Moved some internal stylesheets to the file Standard.qss. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5474 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-26 20:31:10 +00:00
thunder2
28def71b4e Added clear chat history to the context menu of the message text browser. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-22 08:19:46 +00:00
thunder2
1cefe1123a Removed some unnecessary style sheets. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-21 13:02:44 +00:00
thunder2
2921cbaf23 Show count of new messages in the toolbar. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5394 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-08 10:48:29 +00:00
thunder2
b21e66241b Reworked notification code in system tray. 
Added a base class and a possibility for the main dialogs and the plugins (derived from MainPage) to provide a notifier.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5381 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-05 20:12:55 +00:00
thunder2
dc2d6c975e - Moved HandleRichText from the folder "chat" to "util" and redesigned the source 
- Extended RsHtml::formatText to replace the RetroShare links with an image and enabled this for the certificate links in the system messages (friend recommendation and user request)
- Added new ObjectPainter for painting a button on a pixmap


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-12 00:40:53 +00:00
thunder2
8bd1b7aa4a Added (and modified) patch from Imanuel 
- Added ability to style the system messages in chat (e.g. Lobby management)
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5130 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-01 12:58:28 +00:00
thunder2
f2f5d60a8a Added modified patch from AC 
- don't remove color and font when the last char is deleted from the chat text entry box

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-04-12 23:00:39 +00:00
thunder2
37986e00a3 Added three new toasters - private chat, group chat and chat lobby. 
Fixed some utf8 issues in toasters and feeds.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-30 23:02:52 +00:00
thunder2
4cb844c44d Removed most of the usages of std::ostringstream in the gui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-28 18:02:49 +00:00
thunder2
67cf9c5f3c Changed display of the own name in FriendsDialog from "Name (me) Location" to "Name (Location)". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-22 09:01:17 +00:00
thunder2
8f0f6a9f3e Moved the news feed tab to the first position. 
Added icon to the ConnectFriendWizard.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4944 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-15 21:13:16 +00:00
thunder2
d828d23ca7 The standard font is now used for new chat lobbies. 
Added a new menu item to set the font of a private chat and chat lobby to the default font.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-11 21:41:41 +00:00
thunder2
3b314e3a69 Added multi friend recommendation dialog. 
You can start it from the tools menu in FriendsDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-09 19:18:15 +00:00
thunder2
602ae72d7d Added new compact style for chat. 
Improved the HTML optimizer.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-31 00:06:24 +00:00
thunder2
4433872cb6 Fixed wrong display of the news feed notify in FriendsDialog when the tabs were moved. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-25 21:45:23 +00:00
thunder2
3cba51abf4 Reworked SoundManager and SoundPage in the settings. 
Added new icon in the statusbar to switch off the sound.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-22 22:58:23 +00:00
thunder2
912e5339ca Moved the chat lobby tabs to the FriendsDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-18 20:02:19 +00:00
thunder2
35c7605704 Extracted a new widget ChatWidget for the basic chat handling from the PopupChatDialog and use it in ChatLobbyDialog too. 
Added an own ui for the ChatLobbyDialog.
Saved settings of the ChatLobbyDialog.
Changed parameters of RsStatus interface from "std::string" to "const std::string&"
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-17 20:36:36 +00:00