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
13,155 Commits 63 Branches 22 Tags 194 MiB
9102a698e4
Commit Graph

6566 Commits

Author SHA1 Message Date
G10h4ck
9102a698e4
Merge branch 'master' into Fix_ClangWarnings 2019-04-23 12:45:33 +02:00
csoler
bc8adb74c4
Merge pull request #1502 from defnax/added-group-icons-for-posted-links 
Added group icons for posted links
 2019-04-18 21:56:07 +02:00
defnax
7c534d50ea removed posted links related font-size from qss file 
removed posted links related font-size from qss file
 2019-04-16 19:38:13 +02:00
csoler
0bcbe14b2c
fixed wrong display of trash messages in inbox 2019-04-14 16:25:26 +02:00
csoler
64fecf42f4
moved MessagesDialog.* to msgs/ 2019-04-14 15:50:25 +02:00
zapek
e9f341908a Moved the 'Mark as bad' entry in the search result files context menu 
further down away from 'Download' to avoid accidental clicks
 2019-04-11 11:27:43 +02:00
G10h4ck
276328dd91
Merge pull request #1512 from G10h4ck/csoler-jsonapi-channel 
Improve GxsChannels API
 2019-04-11 10:13:52 +02:00
csoler
43a5312194
Merge pull request #1509 from RetroPooh/trafcount 
display session traffic
 2019-04-10 21:04:53 +02:00
csoler
b128407159 fixed rare bug in chat notify that appeared when your nickname is happenned at the end of the text 2019-04-08 14:33:14 +02:00
csoler
61aeae67ea
disable auto-ban identities for own IDs 2019-04-04 22:52:25 +02:00
csoler
db9d202ab7
fixed missign read-only flag on identity info display 2019-04-04 22:41:02 +02:00
Phenom
5cb5954882 Fix clang warning for 
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
1266:13: warning: function 'recursPrintModel' is not needed and will not
be emitted [-Wunneeded-internal-declaration]
static void recursPrintModel(const std::vector<ForumModelPostEntry>&
entries,ForumModelIndex index,int depth)
            ^
 2019-04-04 21:20:25 +02:00
Phenom
d96b9b054b Fix clang warnings for 
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
106:53: warning: unused parameter 'parent' [-Wunused-parameter]
int RsGxsForumModel::columnCount(const QModelIndex &parent) const
                                                    ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:245:3:
warning: add explicit braces to avoid dangling else [-Wdangling-else]
                else
                ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
248:12: warning: comparison of integers of different signs: 'int' and
'std::vector::size_type' (aka 'unsigned long') [-Wsign-compare]
    if(row >= mPosts[entry].mChildren.size())
       ~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
299:67: warning: unused parameter 'orientation' [-Wunused-parameter]
QVariant RsGxsForumModel::headerData(int section, Qt::Orientation
orientation, int role) const
                                                                  ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
398:77: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::textColorRole(const ForumModelPostEntry&
fmpe,int column) const
                                                                            ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
419:74: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::filterRole(const ForumModelPostEntry& fmpe,int
column) const
                                                                         ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
498:75: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::missingRole(const ForumModelPostEntry&
fmpe,int column) const
                                                                          ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
540:74: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::pinnedRole(const ForumModelPostEntry& fmpe,int
column) const
                                                                         ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
548:78: warning: unused parameter 'column' [-Wunused-parameter]
QVariant RsGxsForumModel::backgroundRole(const ForumModelPostEntry&
fmpe,int column) const
                                                                             ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
806:111: warning: unused parameter 'useChildTS' [-Wunused-parameter]
void RsGxsForumModel::convertMsgToPostEntry(const RsGxsForumGroup&
mForumGroup,const RsMsgMetaData& msg, bool useChildTS,
ForumModelPostEntry& fentry)
                                                                                                              ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:828:7:
warning: unused variable 'redacted' [-Wunused-variable]
        bool redacted = false;
             ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:880:6:
warning: unused variable 'pos' [-Wunused-variable]
        int pos = 0;
            ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:879:6:
warning: unused variable 'count' [-Wunused-variable]
        int count = msgs.size();
            ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:882:6:
warning: unused variable 'step' [-Wunused-variable]
        int step = 0;
            ^
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
949:26: warning: comparison of integers of different signs: 'int32_t'
(aka 'int') and 'std::vector::size_type' (aka 'unsigned long') [-Wsign-
compare]
        for(int32_t i=0;i<v.size();++i)
                        ~^~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
959:23: warning: comparison of integers of different signs: 'int32_t'
(aka 'int') and 'std::vector::size_type' (aka 'unsigned long') [-Wsign-
compare]
                                        for(int32_t j=0;j<it2-
>second.size();++j)
                                                        ~^~~~~~~~~~~~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
991:26: warning: comparison of integers of different signs: 'int32_t'
(aka 'int') and 'std::vector::size_type' (aka 'unsigned long') [-Wsign-
compare]
        for(int32_t i=1;i<it->second.size();++i)
                        ~^~~~~~~~~~~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/GxsForumModel.cpp:
1005:22: warning: comparison of integers of different signs: 'int' and
'std::vector::size_type' (aka 'unsigned long') [-Wsign-compare]
        for(int i=1;i<it->second.size();++i)
                    ~^~~~~~~~~~~~~~~~~~
../../../trunk/retroshare-gui/src/gui/gxsforums/
GxsForumThreadWidget.cpp:1038:13: warning: unused function
'cleanupItems' [-Wunused-function]
static void cleanupItems (QList<QTreeWidgetItem *> &items)
            ^
 2019-04-04 21:20:25 +02:00
Phenom
07a31ee5f5 Fix clang warning for 
../../../trunk/retroshare-gui/src/gui/People/IdentityWidget.cpp:111:10:
warning: explicitly assigning value of variable of type 'QImage' to
itself [-Wself-assign-overloaded]
                        image = image;
                        ~~~~~ ^ ~~~~~
 2019-04-04 21:20:25 +02:00
Phenom
9310be075d Fix clang warning for 
../../../trunk/retroshare-gui/src/gui/Posted/PostedDialog.cpp:99:10:
warning: enumeration value 'ICON_SEARCH' not handled in switch [-
Wswitch]
        switch (type) {
                ^
 2019-04-04 21:20:25 +02:00
Phenom
e2d64c912e Fix clang warning for 
../../../trunk/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp:
1104:9: warning: enumeration value 'DownloadTab' not handled in switch
[-Wswitch]
        switch(page)
               ^
 2019-04-04 21:20:25 +02:00
Phenom
4bf5bc1274 Fix clang warnings for 
../../../trunk/libretroshare/src/services/autoproxy/
rsautoproxymonitor.cc:263:24: warning: pragma diagnostic pop could not
pop, no matching push [-Wunknown-pragmas]
                       ^
../../../trunk/libretroshare/src/services/autoproxy/
rsautoproxymonitor.cc:295:24: warning: pragma diagnostic pop could not
pop, no matching push [-Wunknown-pragmas]
                       ^
./../../trunk/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp:
723: warning: pragma diagnostic pop could not pop, no matching push [-
Wunknown-pragmas]
                       ^
 2019-04-04 21:06:01 +02:00
RetroPooh
7504964899 display session traffic 2019-04-03 17:29:13 +03:00
csoler
e0af46eb85
added new method to create a channel with more explicit parameters and JSon API for it 2019-03-30 22:53:14 +01:00
csoler
ef1755d97f
Merge pull request #1493 from csoler/v0.6-Messaging 
V0.6 messaging
 2019-03-29 22:27:27 +01:00
csoler
5ee86262aa fixed compilation 2019-03-29 09:17:32 +01:00
defnax
a1ca31afa0 fixes from cyril & removed stylesheets from some buttons 
fixed size of thumbnail on all screens
fixed aspect ratio
removede the stylsheet for comments,share, notes
 2019-03-29 02:00:13 +01:00
csoler
031a717de0
moved column resize after procesSettings() 2019-03-28 20:06:32 +01:00
csoler
da57f80095
Merge pull request #1506 from defnax/subscribe-button-with-count 
Count subscribers on the channels subscribe button like Youtube
 2019-03-28 20:04:52 +01:00
csoler
8b3f3fe717
Merge pull request #1487 from defnax2k/People-V2-improvements 
Added more actions to People V2 Thumbed View
 2019-03-28 19:59:59 +01:00
defnax
94997bd0d3 Added infoframe for Posted List Widget 
* Added infoframe for Posted List Widget
* Fixed channels infoframe look both same
 2019-03-28 02:00:42 +01:00
defnax
c2ebd10aa6 Count subscribers on the channels subscribe button like Youtube 2019-03-27 19:33:10 +01:00
defnax
b658839214 Removed the dummy buttons & added sorting the comments treewidget via combobox 2019-03-26 18:35:10 +01:00
csoler
f404962b51
fixed notification display for msgs 2019-03-26 11:47:11 +01:00
csoler
1d4934b71e
fixed QuickView filtering 2019-03-26 11:32:43 +01:00
csoler
5820364b0d
fixed sorting 2019-03-26 11:21:31 +01:00
csoler
90995f16ce
fixed filter/sort by author name 2019-03-26 10:25:54 +01:00
csoler
d38ad97911
changed order of operation between init and processSettngs because it was messing up the msg list 2019-03-26 10:05:54 +01:00
defnax
1f6589e68e attempting to fix layout isssues 
Attempting to fix issues, layout and spacing
 2019-03-26 00:01:52 +01:00
csoler
d2c15c2d9e
fixed merge upstream/master 2019-03-24 20:59:23 +01:00
csoler
c7e65a0111
Merge pull request #1504 from csoler/v0.6-ImprovedGUI 
removed explicit size on channel feed buttons that causes unbalanced …
 2019-03-24 20:42:11 +01:00
csoler
e76ad99f3b
removed explicit size on channel feed buttons that causes unbalanced items in high DPI screens 2019-03-24 19:59:43 +01:00
csoler
ec66ad5b80
Merge pull request #1501 from csoler/v0.6-ImprovedGUI 
created a cache for default icons to avoid allocating them everytime …
 2019-03-24 19:49:36 +01:00
csoler
2ad641d908
added a test for QImage::isDetached() in cache to solve the problem of whether a cache image is still used or not 2019-03-23 22:59:37 +01:00
G10h4ck
f4e13975b0
Merge pull request #1478 from G10h4ck/jsonapi 
extend JSON API to identities, circles and reputation
 2019-03-23 09:11:05 -03:00
defnax
8ee86ea0da Fixed stylesheet color when its a new posted message 2019-03-22 22:31:06 +01:00
defnax
b6c7afe989 Added for posted links group icons 2019-03-22 11:13:07 +01:00
csoler
ae3f81a0c3
created a cache for default icons to avoid allocating them everytime we need them. Should save a lot of memory 2019-03-21 23:36:18 +01:00
csoler
b4ab766da9
factored some duplicate code in MessagesDialog.cpp 2019-03-21 22:39:32 +01:00
csoler
dc24bb6f03
added save/restore current selection 2019-03-21 10:14:50 +01:00
csoler
431fbf4124
fixed bug causing ipossibility to pin/unpin forum posts 2019-03-20 23:23:13 +01:00
defnax
2233af4702
Merge branch 'Attach-picture-for-Posted-links' into master 2019-03-20 11:01:21 +01:00
defnax
f12491cc89 attempting to fix stlysheet file 2019-03-20 00:49:38 +01:00
csoler
450fcbb0e7
Merge pull request #1459 from defnax/master 
Improved Posted Links & Subscribe button look like Youtube/Reddit style
 2019-03-19 23:44:14 +01:00
csoler
3419b44ec1
fixed a few bugs in msg model and cleaned up dead code 2019-03-19 10:22:20 +01:00