Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-14 18:34:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,877 Commits 63 Branches 22 Tags 195 MiB
9c65836503
Commit Graph

115 Commits

Author SHA1 Message Date
thunder2
212e5c28f2 Added user notify for chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-12 23:50:35 +00:00
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
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
bcff888eb7 Added new Gui Design changes from Pheonom, Added new ListWidget for Page selection, via settings can switch to use List or Toolbar AddFrameListeInsteadOfToolBar_v0.6_7357.patch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7360 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-10 02:38:47 +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
csoler
490abbeffc fixed small issue in chat lobby list. Not yet the cause for the ghost lobby 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-26 21:44:02 +00:00
csoler
cb7dccf0b8 added lobby ID as tooltip to lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-26 19:35:12 +00:00
thunder2
6dbcc3e99b Code maintenance for Qt 5: 
- Added new options to retroshare-gui.pro for Qt 5
- Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5
  - QHeaderView::setResizeMode -> QHeaderView::setSectionResizeMode
  - QHeaderView::setMovable -> QHeaderView::setSectionsMovable

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 13:25:06 +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
5865c80a76 added new tree items for subscribed lobbies. Helps spoting them in the list (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-11 20:46:25 +00:00
thunder2
3ced628dc3 Fixed showing info page in ChatLobbyWidget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-24 21:09:49 +00:00
defnax
83abd53872 moved the Info Page to the UI, the get look more user friendly 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-23 22:31:52 +00:00
csoler
5beefde701 patch from Phenom to add columns and sorting to chat lobbies (modified: removed unused Delegate code) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6749 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-19 19:22:17 +00:00
thunder2
ec6218d0e8 Fixed some typos and added new strings to translation (Patch from Henry) 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6694 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-05 20:18:47 +00:00
thunder2
04e543a154 Show gray icons for not subscribed lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-05 20:12:24 +00:00
defnax
40ded5d97d Added a headerFrame to Create distant chat 
Enabled default context menu icons for Subscribe, Unsubscribe actions
Added a default stylesheet for the info label

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6686 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-05 00:57:48 +00:00
csoler
3f66f9d338 removed top level icons in lobby list. Only kept the icons in front of each lobby. Makes the list clearer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6677 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 20:23:52 +00:00
defnax
0416a0d888 Added Search Filter to the ChatLobbyWidget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6669 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-02 00:08:38 +00:00
csoler
cefe23504b fixed icons in chat lobby list (patch from phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6641 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 21:13:35 +00:00
csoler
dbb8e4980e removed time shift warning (too invasive), and replaced it by a warning in the help panel of chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6636 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-28 20:02:09 +00:00
thunder2
5155c99296 Set the active lobby tree item in the tree when activating the lobby from the toaster. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6629 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-27 15:26:11 +00:00
thunder2
68a1e46b0d Fixed display of icons in chat lobby tree. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6624 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-26 23:37:13 +00:00
defnax
52efb8b21d added icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-18 14:19:03 +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
thunder2
3208cf9e3a Removed some more hardcoded colors 
- NetworkDialog
- ChatLobbyWidget
- FeedReader
Fixed style blacknight

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-04 20:09:46 +00:00
thunder2
30c4a6ef93 Added quick fix to show the plain name and title in the chat lobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-01 20:35:07 +00:00
csoler
7414659bd9 Patch (modified) from Phenom to allow auto-subscribe to chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-29 16:15:33 +00:00
thunder2
27d72c6fba Fixed some compiler warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-10 13:27:24 +00:00
csoler
263c15d6bd removed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-21 20:55:07 +00:00
thunder2
60e617150e Set initial size of the chat lobby splitter. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6255 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 22:34:30 +00:00
csoler
9348310f79 attempt at fixing layout in chat lobby widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6250 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:49:24 +00:00
csoler
ef240cc6f0 removed column 1 and 2 of lobby lists. Put the info in tooltip => space gained. Enabled sorting in lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6244 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 19:46:39 +00:00
csoler
85aaebe576 re-enabled context menu in chat lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6236 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-17 15:03:21 +00:00
csoler
cc821d94ac do not show msg icon for current lobby (Improved upon patch from AC) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-03 21:41:56 +00:00
csoler
9bc52689bc patch from AC to better handle colors in lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6181 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-02 21:27:38 +00:00
csoler
e397560654 fixed bug causing crash when invitation is received foran unsubscribed lobby 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6174 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-01 20:51:40 +00:00
csoler
5ccfed1cf4 fixed bug with chat lobby icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-28 21:47:37 +00:00
csoler
061a8113bb fixed icons in chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6160 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-27 22:17:49 +00:00
defnax
2677957df2 fixed compile on windows, include was missed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6144 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-25 14:16:07 +00:00
csoler
86def5bbdf fixed stupid bug in my previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6143 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-24 22:55:58 +00:00
csoler
170c0c533d Removed tabs in chat lobbies: 
- unsubscribed lobbies display complete info in a blank page, with some additional help
- double click to subscribe.
- added unsubscribe button to ChatLobbyDialog. Needs a more appropriate icon (e.g. An open door with a leaving arrow)
- the lobby list is now used to display typing status. It could be used to show all sorts of info, the exact same way, such as joining/leaving peers, etc, using various different icons.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6142 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-24 22:44:14 +00:00
csoler
718314af75 removed debug info, added missing error message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-23 13:24:16 +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
csoler
d01745e54f Made the private lobbies more accessible: 
- record which friend participates in a lobby even after they unsubscribed. The lobby list that is sent to these 
  friends contains the privaye lobby as well. In practice, people jsut need to be invited once to a private lobby. 
  Afterwards, they get the lobby in the list of nearby lobbies and can join by clicking on it.

- added new item RsChatLobbyList_deprecated2, to replace old existing item. Should be removed in v0.6
- changed PublicLobbies for VisibleLobbies in the code, to avoid confusion

- the change is backward compatible, although old peers won't receive private lobby info from new peers, of course.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-04 21:36:05 +00:00
thunder2
f2072e9522 Removed some unnecessary style sheets. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5455 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-21 23:54:39 +00:00
thunder2
0989897696 Fixed sorting (case insensitive, numbers) in SearchDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5207 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-09 14:14:04 +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
csoler
40b9e17a2e fixed small issue in sorting information from different peers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5025 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-16 23:07:28 +00:00
csoler
65cde95fba - added/fixed patch from defnax to allow setting up a topic for each chat lobby. The topic is displayed to friends. 
- handled backward compatibility by keeping/sending old LobbyList item. Should be remove in the near future.
- removed constraint to have at least one friends invited when creating a new lobby.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-03-16 22:47:49 +00:00
thunder2
970d88200d Removed some more compiler warnings from Windows compile (GCC 4.4). 
Added -Wextra to the Windows compile.
Added new define in libbitdht for snprintf and fprintf to proper handling of "%ll" under Windows.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4951 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-17 10:03:38 +00:00
thunder2
b4d9828438 Added new translation for chat lobby invitation. 
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-06 18:48:23 +00:00
thunder2
55d53e6dd4 Start the CreateLobbyDialog from the list of chat lobbies with the privacy level of the selected item. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4866 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-30 23:20:42 +00:00
csoler
6c7535a3aa suppressed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-28 13:20:01 +00:00
thunder2
0cf53e993e Added doubleclick to join a lobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4857 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-27 18:51:27 +00:00
csoler
fe156882ae added keep-alive packet to lobbies to maintain up-to-date list of listenners. Will need to play a bit with delays... 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-23 22:49:47 +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
defnax
fbcc3f2070 Added a Label for Chat Lobby Widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4792 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-12 22:56:12 +00:00
csoler
4700a75557 fixed compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4783 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-12 11:14:50 +00:00
thunder2
6c626e180f Chat lobby: 
- added new notifier to p3ChatService
GUI:
- list all public and private chat lobbies
- added subscribe/unsubscribe
- added new basic widget ChatTabWidget and use it in PopupChatWindow and ChatLobbyDialog
- added a tabbed dialog for every subscribed chat lobby

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-12 00:13:25 +00:00
csoler
6df92753b1 improved gui of chat lobby 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-07 23:03:59 +00:00
csoler
1a191c7f91 commited currentgui state. Not working 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-07 21:37:31 +00:00
csoler
30411659e0 a bit of gui. Not working yet. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-07 21:01:43 +00:00
csoler
485c394e2b added interface methods for public lobby exchange and subscription to public lobbies. Need a GUI now 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-01-07 19:52:58 +00:00