Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-27 00:15:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1526 from csoler/v0.6-ImprovedGUI

Browse source 
V0.6 improved gui
This commit is contained in:
csoler 2019-04-14 20:52:04 +02:00 • committed by GitHub
commit c33a265ebd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/retroshare/rsmsgs.h
View file

@ -563,8 +563,8 @@ public:
/** /**
* @brief MessageToTrash * @brief MessageToTrash
* @jsonapi{development} * @jsonapi{development}
* @param[in] msgId * @param[in] msgId Id of the message to mode to trash box
* @param[in] bTrash * @param[in] bTrash Move to trash if true, otherwise remove from trash
* @return true on success * @return true on success
*/ */
virtual bool MessageToTrash(const std::string &msgId, bool bTrash) = 0; virtual bool MessageToTrash(const std::string &msgId, bool bTrash) = 0;

2
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -40,7 +40,7 @@
#include "gui/FileTransfer/SearchDialog.h" #include "gui/FileTransfer/SearchDialog.h"
#include "gui/FileTransfer/SharedFilesDialog.h" #include "gui/FileTransfer/SharedFilesDialog.h"
#include "gui/FileTransfer/TransfersDialog.h" #include "gui/FileTransfer/TransfersDialog.h"
#include "MessagesDialog.h" #include "gui/msgs/MessagesDialog.h"
#include "PluginsPage.h" #include "PluginsPage.h"
#include "NewsFeed.h" #include "NewsFeed.h"
#include "ShareManager.h" #include "ShareManager.h"

14
retroshare-gui/src/gui/msgs/MessageModel.cpp
View file

@ -336,11 +336,11 @@ bool RsMessageModel::passesFilter(const Rs::Msgs::MsgInfoSummary& fmpe,int colum
|| (std::find(fmpe.msgtags.begin(),fmpe.msgtags.end(),mQuickViewFilter) != fmpe.msgtags.end()) || (std::find(fmpe.msgtags.begin(),fmpe.msgtags.end(),mQuickViewFilter) != fmpe.msgtags.end())
|| (mQuickViewFilter==QUICK_VIEW_STARRED && (fmpe.msgflags & RS_MSG_STAR)) || (mQuickViewFilter==QUICK_VIEW_STARRED && (fmpe.msgflags & RS_MSG_STAR))
|| (mQuickViewFilter==QUICK_VIEW_SYSTEM && (fmpe.msgflags & RS_MSG_SYSTEM)); || (mQuickViewFilter==QUICK_VIEW_SYSTEM && (fmpe.msgflags & RS_MSG_SYSTEM));
#ifdef DEBUG_MESSAGE_MODEL
std::cerr << "Passes filter: type=" << mFilterType << " s=\"" << s.toStdString() std::cerr << "Passes filter: type=" << mFilterType << " s=\"" << s.toStdString() << "MsgFlags=" << fmpe.msgflags << " msgtags=" ;
<< "MsgFlags=" << fmpe.msgflags << " msgtags=" ;
foreach(uint32_t i,fmpe.msgtags) std::cerr << i << " " ; foreach(uint32_t i,fmpe.msgtags) std::cerr << i << " " ;
std::cerr << "\" strings:" << passes_strings << " quick_view:" << passes_quick_view << std::endl; std::cerr << "\" strings:" << passes_strings << " quick_view:" << passes_quick_view << std::endl;
#endif
return passes_quick_view && passes_strings; return passes_quick_view && passes_strings;
} }
@ -621,10 +621,10 @@ void RsMessageModel::getMessageSummaries(BoxName box,std::list<Rs::Msgs::MsgInfo
switch(box) switch(box)
{ {
case BOX_INBOX : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_INBOX ; break ; case BOX_INBOX : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_INBOX && !(it->msgflags & RS_MSG_TRASH); break ;
case BOX_SENT : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_SENTBOX; break ; case BOX_SENT : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_SENTBOX && !(it->msgflags & RS_MSG_TRASH); break ;
case BOX_OUTBOX : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_OUTBOX ; break ; case BOX_OUTBOX : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_OUTBOX && !(it->msgflags & RS_MSG_TRASH); break ;
case BOX_DRAFTS : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_DRAFTBOX ; break ; case BOX_DRAFTS : ok = (it->msgflags & RS_MSG_BOXMASK) == RS_MSG_DRAFTBOX && !(it->msgflags & RS_MSG_TRASH); break ;
case BOX_TRASH : ok = (it->msgflags & RS_MSG_TRASH) ; break ; case BOX_TRASH : ok = (it->msgflags & RS_MSG_TRASH) ; break ;
default: default:
++it; ++it;

26
retroshare-gui/src/gui/MessagesDialog.cpp → retroshare-gui/src/gui/msgs/MessagesDialog.cpp
View file

@ -27,21 +27,21 @@
#include "MessagesDialog.h" #include "MessagesDialog.h"
#include "notifyqt.h" #include "gui/notifyqt.h"
#include "common/TagDefs.h" #include "gui/common/TagDefs.h"
#include "common/PeerDefs.h" #include "gui/common/PeerDefs.h"
#include "common/RSElidedItemDelegate.h" #include "gui/common/RSElidedItemDelegate.h"
#include "gxs/GxsIdTreeWidgetItem.h" #include "gui/gxs/GxsIdTreeWidgetItem.h"
#include "gxs/GxsIdDetails.h" #include "gui/gxs/GxsIdDetails.h"
#include "gui/Identity/IdDialog.h" #include "gui/Identity/IdDialog.h"
#include "gui/MainWindow.h" #include "gui/MainWindow.h"
#include "msgs/MessageComposer.h" #include "gui/msgs/MessageComposer.h"
#include "msgs/MessageInterface.h" #include "gui/msgs/MessageInterface.h"
#include "msgs/MessageUserNotify.h" #include "gui/msgs/MessageUserNotify.h"
#include "msgs/MessageWidget.h" #include "gui/msgs/MessageWidget.h"
#include "msgs/TagsMenu.h" #include "gui/msgs/TagsMenu.h"
#include "msgs/MessageModel.h" #include "gui/msgs/MessageModel.h"
#include "settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"
#include "util/DateTime.h" #include "util/DateTime.h"
#include "util/RsProtectedTimer.h" #include "util/RsProtectedTimer.h"

0
retroshare-gui/src/gui/MessagesDialog.h → retroshare-gui/src/gui/msgs/MessagesDialog.h
View file

0
retroshare-gui/src/gui/MessagesDialog.ui → retroshare-gui/src/gui/msgs/MessagesDialog.ui
View file

6
retroshare-gui/src/retroshare-gui.pro
View file

@ -443,6 +443,7 @@ HEADERS += rshare.h \
gui/connect/ConfCertDialog.h \ gui/connect/ConfCertDialog.h \
gui/connect/PGPKeyDialog.h \ gui/connect/PGPKeyDialog.h \
gui/connect/FriendRecommendDialog.h \ gui/connect/FriendRecommendDialog.h \
gui/msgs/MessagesDialog.h \
gui/msgs/MessageInterface.h \ gui/msgs/MessageInterface.h \
gui/msgs/MessageComposer.h \ gui/msgs/MessageComposer.h \
gui/msgs/MessageWindow.h \ gui/msgs/MessageWindow.h \
@ -541,7 +542,6 @@ HEADERS += rshare.h \
gui/common/ToasterNotify.h \ gui/common/ToasterNotify.h \
gui/style/RSStyle.h \ gui/style/RSStyle.h \
gui/style/StyleDialog.h \ gui/style/StyleDialog.h \
gui/MessagesDialog.h \
gui/help/browser/helpbrowser.h \ gui/help/browser/helpbrowser.h \
gui/help/browser/helptextbrowser.h \ gui/help/browser/helptextbrowser.h \
gui/statusbar/peerstatus.h \ gui/statusbar/peerstatus.h \
@ -621,7 +621,6 @@ FORMS += gui/StartDialog.ui \
gui/FriendsDialog.ui \ gui/FriendsDialog.ui \
gui/ShareManager.ui \ gui/ShareManager.ui \
# gui/ShareDialog.ui \ # gui/ShareDialog.ui \
gui/MessagesDialog.ui \
gui/help/browser/helpbrowser.ui \ gui/help/browser/helpbrowser.ui \
gui/HelpDialog.ui \ gui/HelpDialog.ui \
gui/ServicePermissionDialog.ui \ gui/ServicePermissionDialog.ui \
@ -640,6 +639,7 @@ FORMS += gui/StartDialog.ui \
gui/connect/ConnectFriendWizard.ui \ gui/connect/ConnectFriendWizard.ui \
gui/connect/ConnectProgressDialog.ui \ gui/connect/ConnectProgressDialog.ui \
gui/connect/FriendRecommendDialog.ui \ gui/connect/FriendRecommendDialog.ui \
gui/msgs/MessagesDialog.ui \
gui/msgs/MessageComposer.ui \ gui/msgs/MessageComposer.ui \
gui/msgs/MessageWindow.ui\ gui/msgs/MessageWindow.ui\
gui/msgs/MessageWidget.ui\ gui/msgs/MessageWidget.ui\
@ -745,7 +745,6 @@ SOURCES += main.cpp \
# gui/ShareDialog.cpp \ # gui/ShareDialog.cpp \
# gui/SFListDelegate.cpp \ # gui/SFListDelegate.cpp \
gui/SoundManager.cpp \ gui/SoundManager.cpp \
gui/MessagesDialog.cpp \
gui/im_history/ImHistoryBrowser.cpp \ gui/im_history/ImHistoryBrowser.cpp \
gui/im_history/IMHistoryItemDelegate.cpp \ gui/im_history/IMHistoryItemDelegate.cpp \
gui/im_history/IMHistoryItemPainter.cpp \ gui/im_history/IMHistoryItemPainter.cpp \
@ -800,6 +799,7 @@ SOURCES += main.cpp \
gui/chat/ChatLobbyUserNotify.cpp \ gui/chat/ChatLobbyUserNotify.cpp \
gui/connect/ConfCertDialog.cpp \ gui/connect/ConfCertDialog.cpp \
gui/connect/PGPKeyDialog.cpp \ gui/connect/PGPKeyDialog.cpp \
gui/msgs/MessagesDialog.cpp \
gui/msgs/MessageComposer.cpp \ gui/msgs/MessageComposer.cpp \
gui/msgs/MessageWidget.cpp \ gui/msgs/MessageWidget.cpp \
gui/msgs/MessageWindow.cpp \ gui/msgs/MessageWindow.cpp \