Commit Graph

6534 Commits

Author SHA1 Message Date
Phenom
52e4a3cd00 Fix Warnings for 'RsGxsChanges' defined as a struct here but previously
declared as a class

In file included from ../../../trunk/retroshare-gui/src/main.cpp:66:
In file included from ../../../trunk/libretroshare/src/retroshare/
rsidentity.h:31:
In file included from ../../../trunk/libretroshare/src/retroshare/
rsgxsifacehelper.h:30:
../../../trunk/libretroshare/src/retroshare/rsgxsiface.h:76:1: warning:
'RsGxsChanges' defined as a struct here but previously declared as a
class [-Wmismatched-tags]
struct RsGxsChanges
^
../../../trunk/retroshare-gui/src/util/RsGxsUpdateBroadcast.h:29:1:
note: did you mean struct here?
class RsGxsChanges;
^~~~~
struct
2019-02-14 22:47:57 +01:00
Phenom
8806840989 Fix Warnings for 'RsGxsChannels::createComment' and
'RsGxsChannels::createVote' hides overloaded virtual function

In file included from temp/moc/moc_GxsChannelGroupItem.cpp:9:
In file included from temp/moc/../../../../../trunk/retroshare-gui/src/
gui/feeds/GxsChannelGroupItem.h:24:
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:116:15:
warning: 'RsGxsChannels::createComment' hides overloaded virtual
function [-Woverloaded-virtual]
        virtual bool createComment(RsGxsComment& comment) = 0;
                     ^
../../../trunk/libretroshare/src/retroshare/rsgxscommon.h:172:15: note:
hidden overloaded virtual function 'RsGxsCommentService::createComment'
declared here: different number of parameters (2 vs 1)
        virtual bool createComment(uint32_t &token, RsGxsComment
&comment) = 0;
                     ^
In file included from temp/moc/moc_GxsChannelGroupItem.cpp:9:
In file included from temp/moc/../../../../../trunk/retroshare-gui/src/
gui/feeds/GxsChannelGroupItem.h:24:
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:132:15:
warning: 'RsGxsChannels::createVote' hides overloaded virtual function
[-Woverloaded-virtual]
        virtual bool createVote(RsGxsVote& vote) = 0;
                     ^
../../../trunk/libretroshare/src/retroshare/rsgxscommon.h:173:15: note:
hidden overloaded virtual function 'RsGxsCommentService::createVote'
declared here: different number of parameters (2 vs 1)
        virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0;
                     ^
In file included from temp/moc/moc_GxsChannelPostItem.cpp:9:
In file included from temp/moc/../../../../../trunk/retroshare-gui/src/
gui/feeds/GxsChannelPostItem.h:26:
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:116:15:
warning: 'RsGxsChannels::createComment' hides overloaded virtual
function [-Woverloaded-virtual]
        virtual bool createComment(RsGxsComment& comment) = 0;
                     ^
../../../trunk/libretroshare/src/retroshare/rsgxscommon.h:172:15: note:
hidden overloaded virtual function 'RsGxsCommentService::createComment'
declared here: different number of parameters (2 vs 1)
        virtual bool createComment(uint32_t &token, RsGxsComment
&comment) = 0;
                     ^
In file included from temp/moc/moc_GxsChannelPostItem.cpp:9:
In file included from temp/moc/../../../../../trunk/retroshare-gui/src/
gui/feeds/GxsChannelPostItem.h:26:
../../../trunk/libretroshare/src/retroshare/rsgxschannels.h:132:15:
warning: 'RsGxsChannels::createVote' hides overloaded virtual function
[-Woverloaded-virtual]
        virtual bool createVote(RsGxsVote& vote) = 0;
                     ^
../../../trunk/libretroshare/src/retroshare/rsgxscommon.h:173:15: note:
hidden overloaded virtual function 'RsGxsCommentService::createVote'
declared here: different number of parameters (2 vs 1)
        virtual bool createVote(uint32_t &token, RsGxsVote &vote) = 0;
                     ^
2019-02-14 21:58:33 +01:00
G10h4ck
164a28eb32
Merge pull request #1261 from PhenomRetroShare/Add_RsCollAutoDownload
Add RsCollection's content automatically download option.
2019-02-13 22:22:56 -03:00
defnax
019233e840 fixed subscribe buttons stylesheet 2019-02-10 20:52:25 +01:00
defnax
5bb0fc48b0 removed hide label seems get concflicts on github check 2019-02-10 19:59:43 +01:00
defnax
54e3ca3485 Hide Site labels when theres is no link 2019-02-10 18:50:48 +01:00
csoler
7a7ebed9d2
improved Mail model 2019-02-10 15:13:39 +01:00
csoler
a2ed69f01c
Merge pull request #1474 from defnax2k/fix-ui-width/height-small-as-possible
fix ui width & height back to normal size
2019-02-10 14:19:32 +01:00
defnax
8502b7d8ff fix ui width & height back to normal size 2019-02-10 14:14:59 +01:00
csoler
b7c8c16e29
inserted the model into the widget 2019-02-08 15:41:20 +01:00
csoler
6e1e3f3832
fixed accept rich text in HelpDialog 2019-02-07 23:53:14 +01:00
Gioacchino Mazzurco
4b953a3d76
Fix warning in retroshare-gui JSON API page 2019-02-05 14:54:15 +01:00
defnax
f0a99fbe98 update standard.qss 2019-02-05 00:05:53 +01:00
defnax
63d346f63d Added Notes button to view notes 2019-02-04 23:59:31 +01:00
thunder2
fb005f0419 Added workaround for Qt 5.10.0+ (Windows only?) in UserNotify.
QSystemTrayIcon is initially not visible but the icon gets visible after the call to ::setIcon
2019-02-03 19:44:27 +01:00
csoler
4fce5d61cc
added basic model file for Mail message tree 2019-02-03 19:39:19 +01:00
defnax
4f3920a33a Added share button for copy retroshare message link 2019-02-01 00:16:06 +01:00
defnax
7cf17569c5 Added attach picture for posted links 2019-01-30 14:33:50 +01:00
csoler
d63655c9b6
Merge pull request #1470 from csoler/v0.6-ImprovedGUI
V0.6 improved gui
2019-01-30 00:01:16 +01:00
csoler
b44d2c8772
fixed default path for Tor on MacOS 2019-01-29 13:37:06 +01:00
csoler
0a67212e0e
updated translations 2019-01-28 22:08:48 +01:00
defnax
405535750a
Merge pull request #6 from RetroShare/master
merge with master
2019-01-28 12:09:17 +01:00
csoler
d2f94078e7 fixed compilation for Qt<5.8 in IDDialog 2019-01-28 11:26:30 +01:00
csoler
b401026914
removed debug info from forum thread handling 2019-01-27 20:34:22 +01:00
csoler
0816c44d10
fixed bug causing link to forum post not to load the post on click if another forum is currently loaed 2019-01-27 20:03:23 +01:00
defnax
ef451b9b92
Merge pull request #5 from RetroShare/master
update to latest master
2019-01-23 15:28:26 +01:00
csoler
bf1c433849
manual merge with upstream/master 2019-01-22 21:32:18 +01:00
csoler
9c24f5c718
Revert "removed HeaderFrame where it's not needed" 2019-01-19 22:36:19 +01:00
defnax
36022edbc1
Merge pull request #4 from RetroShare/master
update fork
2019-01-19 17:19:34 +01:00
csoler
e34b8e109f
merged with upstream/master 2019-01-19 15:56:33 +01:00
csoler
9017db4797
added identity creation time in IdDetails 2019-01-19 15:54:07 +01:00
zapek
bb038ab3e0 removed HeaderFrame where it's not needed; changed the font of top
tooltips to be the same
2019-01-18 23:30:52 +01:00
defnax
97299347f0 Restored back the changes
Removed attach image button
2019-01-18 15:14:42 +01:00
defnax
933087d944 Removed Sort Label and set tooltip for the Sort Combobox * Removed absolute size for the Lineedit 2019-01-17 22:12:37 +01:00
defnax
c25d222d86 fixed stylsheet and spacing 2019-01-15 21:26:50 +01:00
csoler
d143f761cf
Merge pull request #1462 from csoler/v0.6-ImprovedGUI
fixed not working setAsReadOnActivate preferences/forum button
2019-01-14 23:53:04 +01:00
csoler
104e122102
fixed not working setAsReadOnActivate preferences/forum button 2019-01-14 23:51:53 +01:00
csoler
05313a5364
Merge pull request #1460 from csoler/v0.6-ImprovedGUI
V0.6 improved gui
2019-01-13 23:24:28 +01:00
csoler
2de7ac26d5
set minimize to tray icon default to false because some systems do not support it 2019-01-13 23:23:41 +01:00
defnax
c210a8d734 Fixed Subscriber count label when blank is selected 2019-01-13 18:12:30 +01:00
defnax
6042bdd575 Fixed stylsheet for disabled subscribe button 2019-01-13 17:41:13 +01:00
defnax
0f9ee609e2 Enabled back Subscribe button on Channels
*Enabled back Subscribe Button on Channels
*Set stylesheet for the Channel subscribe button too.
*Fixed spacing on PostedListwidget
2019-01-13 15:38:26 +01:00
csoler
fd74123b45
fixed indentation 2019-01-13 15:28:03 +01:00
csoler
c04821d91c
fixed ghost unread forum posts problems by setting read status of all versions of the same post at once. WARNING: this will not remove ghost posts that are already here unless the user reads them again 2019-01-13 15:19:07 +01:00
defnax
6c0c42c8ad Improved Subscribe Button look and feel
* Improved Subscribe Button look and feel with stylsheet
* Removed icons from Subscribe button
* Subcribe button hided on posted too when subscribed
2019-01-12 22:20:00 +01:00
defnax
6750e6140f Added for Channel Message composer a Image Attach button
Added for Channel Message composer a Image Attach button
Added a Combobox for Sort in Posted links easyer with new icons
Messengerwindow changed the button icons & display on status the status icon too.
2019-01-12 15:46:47 +01:00
csoler
8721cb3ab1
Merge pull request #1456 from defnax/master
*Improved Create comment dialog for channel/posted comment replies
2019-01-12 15:05:43 +01:00
csoler
b3ecfe1504
Merge pull request #1458 from csoler/v0.6-ImprovedGUI
V0.6 improved gui
2019-01-12 15:02:06 +01:00
csoler
957435acc7
fixed inconsistent storage/sync values in GxsGroupDialog that caused 1y storage period to not show up 2019-01-12 14:59:58 +01:00
csoler
4eea4ef687
removed Subscribed column in chat room list since it duplicates information. WARNING: RS UI will get confused about previously saved config. Needs 2 restarts to get right 2019-01-12 14:44:46 +01:00
defnax
2fc0c643ef Improved again reply comment dialog
Added frame for better see reply field with white background
Set strings for "Reply as" and for window title
2019-01-12 14:08:31 +01:00
csoler
f6999accf3
fixed wrong denied/accepted label on own key in keyring 2019-01-11 23:46:24 +01:00
csoler
fdf6a32236
disable send Msg to own id in chat rooms 2019-01-11 23:17:09 +01:00
csoler
396d58da58
fixed auto-switching bug in GxsIdChooser 2019-01-11 22:13:48 +01:00
csoler
3c4d4e37e9
Merge pull request #1320 from hunbernd/feature/native-dialogs
Added switch to enable native dialogs at compile time
2019-01-11 15:24:21 +01:00
csoler
343ccaa1c5
Merge pull request #1457 from csoler/v0.6-ImprovedGUI
fixed sorting of last time used in keyring
2019-01-10 23:45:06 +01:00
csoler
266edf06aa
fixed sorting of last time used in keyring 2019-01-10 23:43:19 +01:00
defnax
2d096e3179 Improved Create comment dialog for channel/posted comments replies
*Improved Create comment dialog for channel/posted comment replies
*Update forum icons use the new flat one green/black
*Changed the context menu icon for Pin post
*Fixed for "new thread" dialog the title icon
*Added new circle icons for later to use
2019-01-10 00:12:38 +01:00
defnax
993f1e8ada
Merge pull request #1455 from defnax/master
*Improved Display of Moderator selection box on a useable place
*Restored back changes from circles & profile gen dialog
2019-01-09 23:41:09 +01:00
defnax
868a2a30b6 restored back changes from circles & profile gen dialog
*Restored back changes from circles & profile gen dialog
*Fixed channel frame stylesheet
2019-01-09 22:35:07 +01:00
csoler
b74520cb30
Merge pull request #1454 from csoler/v0.6-ImprovedGUI
added some debug info to GxsIdChooser and fixed a typo (possibly caus…
2019-01-07 13:21:22 +01:00
csoler
b7340ef7ee
fixed case insensitive sorting in Keyring, and cleanup dead code 2019-01-06 20:58:32 +01:00
csoler
2d06aa3eb0
use case insensitive sorting in People 2019-01-06 20:29:45 +01:00
defnax
ef4a29d4d4 Improved Display of Moderator selection box on a useable place
* Improved Author & Moderator labels display as link
* Improved display of moderator selection box display on right side
* Added own tree item "My Circles" to see your own circles easyer then before when you are admin.
* Profile generation dialog moved node type box to advanced section.
2019-01-06 15:56:39 +01:00
csoler
9e63467aba
added some debug info to GxsIdChooser and fixed a typo (possibly causing a bug?) 2019-01-06 13:18:59 +01:00
csoler
a3ad5f7707
Merge pull request #1443 from defnax/master
* Fixed icon size of the group tree to display icon complete.
2019-01-03 22:42:32 +01:00
csoler
3b6bac2d9b
added a "show author in People" function in mails 2019-01-03 22:20:00 +01:00
csoler
ca50944ddf
make only default opinion to be changed to positive for contacts (optionally) 2019-01-03 18:32:08 +01:00
hunbernd
50ee33b229 RS_ prefix 2018-12-31 22:36:30 +01:00
hunbernd
584b9039c9 Added switch to enable native dialogs at build time
CONFIG+=use_native_dialogs
2018-12-31 22:36:30 +01:00
csoler
e88a7075d9
Merge pull request #1445 from csoler/v0.6.5-DebianPackaging
V0.6.5 debian packaging
2018-12-27 17:31:05 +01:00
csoler
6502bdd1b3
fixed up license in html files for help/ 2018-12-27 17:28:52 +01:00
csoler
01c40d2593
removed some dead files and finished license cleaning 2018-12-27 16:56:28 +01:00
csoler
45a2d22b45
firther license cleaning/fixing 2018-12-27 16:35:21 +01:00
csoler
bc3a71d3f5
fixed license in util/ lang/ and idle/ 2018-12-27 14:39:10 +01:00
csoler
b9a182cb53
fixed licenses in gui/ 2018-12-25 21:34:59 +01:00
csoler
f85ca95a87
fixed license in TheWire, WikiPoos, style and toaster 2018-12-25 21:10:15 +01:00
csoler
ef45a8225a
fixed license in statusbar/ 2018-12-25 20:54:48 +01:00
csoler
bcea548d83
Merge pull request #1440 from csoler/v0.6-Identity
added button (enabled by default) to automatically add IDs signed by …
2018-12-25 20:35:21 +01:00
defnax
e7085eeb75 Fexed Icon size of the group tree
* Fixed icon size of the group tree to display icon complete.
Added for channel adminstrator clickable  to contact easy.
* Format Channel Description when contains links or emote
* Added setting for disable Emoteicon
2018-12-25 19:14:48 +01:00
csoler
e09b416674
automatically add moderator rights to the owner of a forum 2018-12-24 11:47:33 +01:00
csoler
3770810238
added button (enabled by default) to automatically add IDs signed by friends as contacts 2018-12-24 10:13:27 +01:00
defnax
ac146c6808
Merge branch 'master' into master 2018-12-23 21:13:06 +01:00
defnax
6aefce4974 restore 2018-12-23 21:04:33 +01:00
csoler
66887db369
fixed licenses in statistics 2018-12-23 20:09:23 +01:00
defnax
3d66d84112 fixed conflicts for pr 1438 2018-12-23 18:45:07 +01:00
csoler
4375698d1d
fixed licenses in settings 2018-12-23 18:03:08 +01:00
defnax
1c998e4f8e Fixed the size problem of the group tree
* Fixed the size problem of the group tree
* Added to format the Administrator as rs link for easyer contact admin.
* Format the Channel Description on the Channel posts widget for clickable links
2018-12-23 17:58:37 +01:00
csoler
e99c718be9
half-fixed licenses in settings 2018-12-23 17:49:01 +01:00
G10h4ck
93fed48b05
Merge pull request #1413 from G10h4ck/disable_deprecated_messaging
0.6.5 Disable deprecated messaging
2018-12-23 12:10:55 +01:00
Gioacchino Mazzurco
5e4006b7e6
Merge branch 'v0.6.5' 2018-12-23 11:48:35 +01:00
defnax
3f59cfc7ea Imroved Emoji Tabs for a fixed size and display tabs at bottom.
Imroved Emoji Tabs for a fixed size and display tabs at bottom.
Enabled to attach *.webp and *.gif pictures.
2018-12-22 23:05:01 +01:00
csoler
bc7249e4b9
Merge pull request #1435 from defnax/master
Added new flat icons for the forums & posted group tree
2018-12-22 21:44:54 +01:00
defnax
f63ae7efbb Added new flat icons for the forums & posted group tree
Added new icons for the forums & posted group tree
2018-12-20 18:42:51 +01:00
csoler
901a9af74a
Merge pull request #1430 from defnax/master
Added new home icon
2018-12-19 22:22:43 +01:00
Gioacchino Mazzurco
d19531cfcc
Fix compilation of forum API 2018-12-16 17:40:47 +01:00
csoler
fd1e7074c8
Merge pull request #1432 from RetroShare/v0.6.5
V0.6.5
2018-12-16 14:35:30 +01:00
defnax
d67462751b Added new Channel icons for the group tree
Added new Channel icons
2018-12-14 22:55:32 +01:00
csoler
117c19b104
fixed a few problems in jumping to next unread post 2018-12-14 22:09:02 +01:00
defnax
9252a4110c Added new home icon 2018-12-13 22:44:04 +01:00