encrypted messages now are displayed in the feed
This commit is contained in:
parent
637eb702a8
commit
0a530bfa93
34 changed files with 439 additions and 245 deletions
|
@ -16,8 +16,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef SHARED_GLOBAL_H
|
||||
#define SHARED_GLOBAL_H
|
||||
#pragma once
|
||||
|
||||
#include "enums.h"
|
||||
#include "message.h"
|
||||
|
@ -48,7 +47,6 @@
|
|||
namespace Shared {
|
||||
|
||||
class Global {
|
||||
Q_DECLARE_TR_FUNCTIONS(Global)
|
||||
public:
|
||||
struct FileInfo {
|
||||
enum class Preview {
|
||||
|
@ -75,6 +73,7 @@ namespace Shared {
|
|||
static QString getName(Message::State rl);
|
||||
static QString getName(AccountPassword ap);
|
||||
static QString getName(TrustLevel tl);
|
||||
static QString getName(EncryptionProtocol ep);
|
||||
|
||||
static QString getDescription(AccountPassword ap);
|
||||
|
||||
|
@ -86,6 +85,7 @@ namespace Shared {
|
|||
const std::deque<QString> messageState;
|
||||
const std::deque<QString> accountPassword;
|
||||
const std::deque<QString> trustLevel;
|
||||
const std::deque<QString> encryptionProtocols;
|
||||
|
||||
const std::deque<QString> accountPasswordDescription;
|
||||
|
||||
|
@ -124,7 +124,7 @@ namespace Shared {
|
|||
class EnumOutOfRange: public Utils::Exception {
|
||||
public:
|
||||
EnumOutOfRange(const std::string& p_name):Exception(), name(p_name) {}
|
||||
|
||||
|
||||
std::string getMessage() const{
|
||||
return "An attempt to get enum " + name + " from integer out of range of that enum";
|
||||
}
|
||||
|
@ -161,5 +161,3 @@ namespace Shared {
|
|||
#endif
|
||||
};
|
||||
}
|
||||
|
||||
#endif // SHARED_GLOBAL_H
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue