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,430 Commits 63 Branches 22 Tags 194 MiB
6e4fa142d1
Commit Graph

265 Commits

Author SHA1 Message Date
csoler
6e4fa142d1 reverted previous change on MainWindow that caused compilation issues for plugins 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-01 11:46:25 +00:00
defnax
52b3c372a2 Set the Text for the Add Share Button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-29 21:53:29 +00:00
defnax
06fe72e0d8 Removed Left side ToolBar. 
Moved Info, About & Options to the Top ToolBar
Moved Add Friend Button to Friends Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-29 11:52:13 +00:00
csoler
4569c21cb0 Moved Forums and Channels to main window. Renamed Friends->Network. Code simplification in MainWindow. Next step: merge Circles and Identities 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-27 14:23:27 +00:00
csoler
75188fb6f0 moved forums and channels into main window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-26 16:32:33 +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
defnax
a621dcc4d1 clean up old icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-03-06 15:35:34 +00:00
defnax
ddf811f80a added new icons and splash images from Feal, cleaning up old icons, still need more cleanup 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-28 17:01:14 +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
thunder2
c8b8daf110 Code maintenance for Qt 5: 
- Changed qInstallMsgHandler to qInstallMessageHandler
- Changed qt_use_native_dialogs to filedialog_hook (Windows only)

Removed unused method Rshare::winEventFilter and signal Rshare::shutdown (Windows only)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 23:41:23 +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
7ba1827b4c removed potential deadlock in method called from notify 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-16 20:42:34 +00:00
drbob
683e75aeef Removed Forums / Channels / Blogs stuff. 
and made GUI recompile.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-07 04:21:48 +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
defnax
20c35ea27f changed and replaced some icons (needs fresh recompile) 
changed the default headerframe colors

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-15 16:20:14 +00:00
thunder2
c4c5eb5399 - Fixed crash when closing the main window without the setting "Minimize to Tray Icon" 
- Renamed the setting "Do not Minimize to Tray Icon" to "Minimize to Tray Icon" and fixed wrong usage
  Please check your setting!
- Updated english translation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-04 23:53:29 +00:00
csoler
09971a06c6 removed messenger button from mainWindow 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6511 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 21:35:49 +00:00
csoler
2e32892a27 moved all files related to file transfer in gui/FileTransfer/ 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-14 12:53:38 +00:00
thunder2
766bd9c6ae - Fixed fill of news feed. 
- Added display of feed count in main action.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6454 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-22 00:05:02 +00:00
thunder2
533d1f429a Added new icon for news feed from Agurer. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 21:30:50 +00:00
csoler
b913c8ae4f made one additional string translat-able 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6263 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-21 12:00:29 +00:00
csoler
ae130674ba added warnign when openning http/https links using system services 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6226 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-15 23:08:54 +00:00
csoler
3fe1bf78be renamed Transfers tab "File Sharing", as it is more appropriate 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-08 21:22:28 +00:00
defnax
a086fd6d88 fixed to display correct ChatLobby icon on MainWindow 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6155 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-27 12:57:24 +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
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
thunder2
0a499634dd FeedReader: 
- added notify in main window, systray icon and settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 13:30:16 +00:00
drbob
069b72e0b2 Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995) 
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 19:17:11 +00:00
drbob
f127201ae5 Added OperatingMode ComboBox to the status bar. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5896 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-25 22:50:38 +00:00
drbob
4561752c45 associated changes for the GUI. move all datarate reference to use rsConfig. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5890 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-11-25 20:26:32 +00:00
thunder2
9953b3b640 Fixed switching between combined and not combined tray icon notify with available messages. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5719 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-24 08:34:42 +00:00
thunder2
bc41be1f9a Added patch from Henry 
Removed hardcoded fonts

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-14 12:25:12 +00:00
defnax
886f84b929 patch from Henry Morgan to correct spelling mistakes in source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5662 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-10-11 10:28:24 +00:00
csoler
1581f5a96e moved file rsversion.h to rsguiversion.h, since it caused a conflict with libretroshare/src/util/rsversion.h when included as util/rsversion.h. Updated version detail script. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5539 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-12 13:11:04 +00:00
thunder2
32f918c213 Moved some internal stylesheets to the file Standard.qss. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-09-01 11:40:54 +00:00
thunder2
ca1055da90 Reverted the changes of revision 5458. 
The problem with the single click on the systemtray icon only occurs when using the Windows tool Taskbar Shuffle.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5491 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-31 13:29:49 +00:00
thunder2
e00f64450b Fixed problem with single click on a systemtray icon in Qt 4.7 or above running on Windows XP or lower 
- before Qt 4.7.0 the message MYWM_NOTIFYICON/WM_LBUTTONUP was handled to emit activted(QSystemTrayIcon::Trigger)
- after Qt 4.7.0 the message MYWM_NOTIFYICON/NIN_SELECT is handled. This message is not sent in Windows XP

Solution: set an event filter and modify the message from WM_LBUTTONUP to NIN_SELECT

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5458 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-23 00:15:59 +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
09b5d7a8c6 Added the first version of the FeedReader plugin. 
Added a new method to RsPlugInInterfaces to stop the plugins at shutdown of RetroShare.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5372 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-08-02 13:17:53 +00:00
csoler
a2b6b97ef9 added systray notifications for chat lobbies. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5357 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-30 13:27:40 +00:00
thunder2
9389849e53 Fixed crash when starting the help browser from friend details the second time. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-07-15 22:24:03 +00:00
drbob
7501d92882 Added new display window for monitor bandwidth rates with peers. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5242 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-06-21 23:24:53 +00:00
thunder2
c99fa5f342 Added patch from braindead 
- Added empty entry to stylesheet-choice for "no stylesheet" and moved method "loadStyleSheet" from MainWindow to Rshare


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5133 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-05-02 20:19:51 +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
50c8ce261f Fixed hanging notification star in tray icon. 
After reading a message the notifier was not cleared.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5004 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-29 23:03:09 +00:00
thunder2
45ac04e2e7 Count the friends (gpg id's) instead of the locations (ssl id's) in the statusbar. 
Moved update of the friends from QTimer to signals.
Combined p3LinkMgr::getFriendCount and p3LinkMgr::getOnlineCount and moved to p3PeerMgr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-25 01:48:56 +00:00
thunder2
5bacc13eba Renamed "Dht" to "DHT". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-02-15 20:40:41 +00:00