Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review 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
Show more breadcrumbs
Nheko Reborn
nheko
Commits
a176de5f
Commit
a176de5f
authored
3 years ago
by
Loren Burkholder
Browse files
Options
Downloads
Patches
Plain Diff
Make sure to use the default room id if none is specified
parent
f0c88fc4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
resources/qml/InviteDialog.qml
+2
-1
2 additions, 1 deletion
resources/qml/InviteDialog.qml
src/timeline/TimelineModel.cpp
+3
-3
3 additions, 3 deletions
src/timeline/TimelineModel.cpp
src/timeline/TimelineModel.h
+1
-1
1 addition, 1 deletion
src/timeline/TimelineModel.h
with
6 additions
and
5 deletions
resources/qml/InviteDialog.qml
+
2
−
1
View file @
a176de5f
...
...
@@ -43,10 +43,11 @@ ApplicationWindow {
RowLayout
{
spacing
:
10
TextField
{
Matrix
TextField
{
id
:
inviteeEntry
placeholderText
:
qsTr
(
"
@joe:matrix.org
"
,
"
Example user id. The name 'joe' can be localized however you want.
"
)
backgroundColor
:
colors
.
window
Layout.fillWidth
:
true
onAccepted
:
if
(
text
!==
""
)
addInvite
()
}
...
...
This diff is collapsed.
Click to expand it.
src/timeline/TimelineModel.cpp
+
3
−
3
View file @
a176de5f
...
...
@@ -1077,11 +1077,11 @@ TimelineModel::openRoomSettings(QString room_id)
}
void
TimelineModel
::
openInviteUsers
(
QString
room
_i
d
)
TimelineModel
::
openInviteUsers
(
QString
room
I
d
)
{
InviteesModel
*
model
=
new
InviteesModel
{
this
};
connect
(
model
,
&
InviteesModel
::
accept
,
this
,
[
this
,
model
,
room
_i
d
]()
{
manager_
->
inviteUsers
(
room
_i
d
,
model
->
mxids
());
connect
(
model
,
&
InviteesModel
::
accept
,
this
,
[
this
,
model
,
room
I
d
]()
{
manager_
->
inviteUsers
(
room
Id
==
QString
()
?
room_id_
:
roomI
d
,
model
->
mxids
());
});
openInviteUsersDialog
(
model
);
}
...
...
This diff is collapsed.
Click to expand it.
src/timeline/TimelineModel.h
+
1
−
1
View file @
a176de5f
...
...
@@ -240,7 +240,7 @@ public:
Q_INVOKABLE
void
openUserProfile
(
QString
userid
);
Q_INVOKABLE
void
openRoomMembers
();
Q_INVOKABLE
void
openRoomSettings
(
QString
room_id
=
QString
());
Q_INVOKABLE
void
openInviteUsers
(
QString
room
_i
d
=
QString
());
Q_INVOKABLE
void
openInviteUsers
(
QString
room
I
d
=
QString
());
Q_INVOKABLE
void
editAction
(
QString
id
);
Q_INVOKABLE
void
replyAction
(
QString
id
);
Q_INVOKABLE
void
readReceiptsAction
(
QString
id
)
const
;
...
...
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