Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
ef928f2e
Unverified
Commit
ef928f2e
authored
4 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
chatview: avoid multiple definitions
Change-Id: I4e17f13b3b4594779a3c2d66f18f482e8478d8cd
parent
ecca4dc2
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-0
1 addition, 0 deletions
CMakeLists.txt
src/api/chatview.h
+1
-43
1 addition, 43 deletions
src/api/chatview.h
src/chatview.cpp
+67
-0
67 additions, 0 deletions
src/chatview.cpp
with
69 additions
and
43 deletions
CMakeLists.txt
+
1
−
0
View file @
ef928f2e
...
...
@@ -326,6 +326,7 @@ SET( libringclient_LIB_SRCS
src/pluginmodel.cpp
src/namedirectory.cpp
src/smartinfohub.cpp
src/chatview.cpp
)
# Public API
...
...
This diff is collapsed.
Click to expand it.
src/api/chatview.h
+
1
−
43
View file @
ef928f2e
...
...
@@ -28,49 +28,7 @@ namespace api {
namespace
chatview
{
QVariantMap
getTranslatedStrings
()
{
return
{
{
"Hide chat view"
,
QObject
::
tr
(
"Hide chat view"
)},
{
"Place video call"
,
QObject
::
tr
(
"Place video call"
)},
{
"Place audio call"
,
QObject
::
tr
(
"Place audio call"
)},
{
"Add to conversations"
,
QObject
::
tr
(
"Add to conversations"
)},
{
"Unban contact"
,
QObject
::
tr
(
"Unban contact"
)},
{
"Send"
,
QObject
::
tr
(
"Send"
)},
{
"Options"
,
QObject
::
tr
(
"Options"
)},
{
"Jump to latest"
,
QObject
::
tr
(
"Jump to latest"
)},
{
"Send file"
,
QObject
::
tr
(
"Send file"
)},
{
"Leave video message"
,
QObject
::
tr
(
"Leave video message"
)},
{
"Leave audio message"
,
QObject
::
tr
(
"Leave audio message"
)},
{
"Accept"
,
QObject
::
tr
(
"Accept"
)},
{
"Refuse"
,
QObject
::
tr
(
"Refuse"
)},
{
"Block"
,
QObject
::
tr
(
"Block"
)},
{
"Type a message"
,
QObject
::
tr
(
"Type a message"
)},
{
"Note: an interaction will create a new contact."
,
QObject
::
tr
(
"Note: an interaction will create a new contact."
)},
{
"is not in your contacts"
,
QObject
::
tr
(
"is not in your contacts"
)},
{
"Note: you can automatically accept this invitation by sending a message."
,
QObject
::
tr
(
"Note: you can automatically accept this invitation by sending a message."
)},
#if defined(WIN32)
{
"%d days ago"
,
QObject
::
tr
(
"{0} days ago"
)},
{
"%d hours ago"
,
QObject
::
tr
(
"{0} hours ago"
)},
{
"%d minutes ago"
,
QObject
::
tr
(
"{0} minutes ago"
)},
#else
{
"%d days ago"
,
QObject
::
tr
(
"%d days ago"
)},
{
"%d hours ago"
,
QObject
::
tr
(
"%d hours ago"
)},
{
"%d minutes ago"
,
QObject
::
tr
(
"%d minutes ago"
)},
#endif
{
"one day ago"
,
QObject
::
tr
(
"one day ago"
)},
{
"one hour ago"
,
QObject
::
tr
(
"one hour ago"
)},
{
"just now"
,
QObject
::
tr
(
"just now"
)},
{
"Failure"
,
QObject
::
tr
(
"Failure"
)},
{
"Accept"
,
QObject
::
tr
(
"Accept"
)},
{
"Refuse"
,
QObject
::
tr
(
"Refuse"
)},
{
"Delete"
,
QObject
::
tr
(
"Delete"
)},
{
"Retry"
,
QObject
::
tr
(
"Retry"
)},
};
}
QVariantMap
getTranslatedStrings
();
}
// namespace chatview
}
// namespace api
...
...
This diff is collapsed.
Click to expand it.
src/chatview.cpp
0 → 100644
+
67
−
0
View file @
ef928f2e
/****************************************************************************
* Copyright (C) 2020 Savoir-faire Linux Inc. *
* Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com> *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#include
"api/chatview.h"
namespace
lrc
{
namespace
api
{
namespace
chatview
{
QVariantMap
getTranslatedStrings
()
{
return
{
{
"Hide chat view"
,
QObject
::
tr
(
"Hide chat view"
)},
{
"Place video call"
,
QObject
::
tr
(
"Place video call"
)},
{
"Place audio call"
,
QObject
::
tr
(
"Place audio call"
)},
{
"Add to conversations"
,
QObject
::
tr
(
"Add to conversations"
)},
{
"Unban contact"
,
QObject
::
tr
(
"Unban contact"
)},
{
"Send"
,
QObject
::
tr
(
"Send"
)},
{
"Options"
,
QObject
::
tr
(
"Options"
)},
{
"Jump to latest"
,
QObject
::
tr
(
"Jump to latest"
)},
{
"Send file"
,
QObject
::
tr
(
"Send file"
)},
{
"Leave video message"
,
QObject
::
tr
(
"Leave video message"
)},
{
"Leave audio message"
,
QObject
::
tr
(
"Leave audio message"
)},
{
"Accept"
,
QObject
::
tr
(
"Accept"
)},
{
"Refuse"
,
QObject
::
tr
(
"Refuse"
)},
{
"Block"
,
QObject
::
tr
(
"Block"
)},
{
"Type a message"
,
QObject
::
tr
(
"Type a message"
)},
{
"Note: an interaction will create a new contact."
,
QObject
::
tr
(
"Note: an interaction will create a new contact."
)},
{
"is not in your contacts"
,
QObject
::
tr
(
"is not in your contacts"
)},
{
"Note: you can automatically accept this invitation by sending a message."
,
QObject
::
tr
(
"Note: you can automatically accept this invitation by sending a message."
)},
#if defined(WIN32)
{
"%d days ago"
,
QObject
::
tr
(
"{0} days ago"
)},
{
"%d hours ago"
,
QObject
::
tr
(
"{0} hours ago"
)},
{
"%d minutes ago"
,
QObject
::
tr
(
"{0} minutes ago"
)},
#else
{
"%d days ago"
,
QObject
::
tr
(
"%d days ago"
)},
{
"%d hours ago"
,
QObject
::
tr
(
"%d hours ago"
)},
{
"%d minutes ago"
,
QObject
::
tr
(
"%d minutes ago"
)},
#endif
{
"one day ago"
,
QObject
::
tr
(
"one day ago"
)},
{
"one hour ago"
,
QObject
::
tr
(
"one hour ago"
)},
{
"just now"
,
QObject
::
tr
(
"just now"
)},
{
"Failure"
,
QObject
::
tr
(
"Failure"
)},
{
"Accept"
,
QObject
::
tr
(
"Accept"
)},
{
"Refuse"
,
QObject
::
tr
(
"Refuse"
)},
{
"Delete"
,
QObject
::
tr
(
"Delete"
)},
{
"Retry"
,
QObject
::
tr
(
"Retry"
)},
};
}
}
// namespace chatview
}
// namespace api
}
// namespace lrc
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment