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
96edc0bb
Commit
96edc0bb
authored
3 years ago
by
Loren Burkholder
Browse files
Options
Downloads
Patches
Plain Diff
Use correct form of roomId
parent
87bff349
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
resources/qml/CommunitiesList.qml
+1
-1
1 addition, 1 deletion
resources/qml/CommunitiesList.qml
resources/qml/TimelineView.qml
+2
-2
2 additions, 2 deletions
resources/qml/TimelineView.qml
resources/qml/TopBar.qml
+9
-6
9 additions, 6 deletions
resources/qml/TopBar.qml
with
12 additions
and
9 deletions
resources/qml/CommunitiesList.qml
+
1
−
1
View file @
96edc0bb
...
...
@@ -130,7 +130,7 @@ Page {
else
return
"
image://colorimage/
"
+
model
.
avatarUrl
+
"
?
"
+
communityItem
.
unimportantText
;
}
roomid
:
model
.
room
id
roomid
:
model
.
id
displayName
:
model
.
displayName
color
:
communityItem
.
background
}
...
...
This diff is collapsed.
Click to expand it.
resources/qml/TimelineView.qml
+
2
−
2
View file @
96edc0bb
...
...
@@ -137,7 +137,7 @@ Item {
ColumnLayout
{
id
:
preview
property
string
room
i
d
:
room
?
room
.
room
i
d
:
(
roomPreview
?
roomPreview
.
room
i
d
:
""
)
property
string
room
I
d
:
room
?
room
.
room
I
d
:
(
roomPreview
?
roomPreview
.
room
I
d
:
""
)
property
string
roomName
:
room
?
room
.
roomName
:
(
roomPreview
?
roomPreview
.
roomName
:
""
)
property
string
roomTopic
:
room
?
room
.
roomTopic
:
(
roomPreview
?
roomPreview
.
roomTopic
:
""
)
property
string
avatarUrl
:
room
?
room
.
roomAvatarUrl
:
(
roomPreview
?
roomPreview
.
roomAvatarUrl
:
""
)
...
...
@@ -154,7 +154,7 @@ Item {
Avatar
{
url
:
parent
.
avatarUrl
.
replace
(
"
mxc://
"
,
"
image://MxcImage/
"
)
roomid
:
parent
.
room
i
d
roomid
:
parent
.
room
I
d
displayName
:
parent
.
roomName
height
:
130
width
:
130
...
...
This diff is collapsed.
Click to expand it.
resources/qml/TopBar.qml
+
9
−
6
View file @
96edc0bb
...
...
@@ -13,10 +13,13 @@ Rectangle {
property
bool
showBackButton
:
false
property
string
roomName
:
room
?
room
.
roomName
:
qsTr
(
"
No room selected
"
)
property
string
roomId
:
room
?
room
.
roomId
:
""
property
string
avatarUrl
:
room
?
room
.
roomAvatarUrl
:
""
property
string
roomTopic
:
room
?
room
.
roomTopic
:
""
property
bool
isEncrypted
:
room
?
room
.
isEncrypted
:
false
property
int
trustlevel
:
room
?
room
.
trustlevel
:
Crypto
.
Unverified
property
bool
isDirect
:
room
?
room
.
isDirect
:
false
property
string
directChatOtherUserId
:
room
?
room
.
directChatOtherUserId
:
""
Layout.fillWidth
:
true
implicitHeight
:
topLayout
.
height
+
Nheko
.
paddingMedium
*
2
...
...
@@ -65,12 +68,12 @@ Rectangle {
width
:
Nheko
.
avatarSize
height
:
Nheko
.
avatarSize
url
:
avatarUrl
.
replace
(
"
mxc://
"
,
"
image://MxcImage/
"
)
roomid
:
room
.
roomId
userid
:
room
.
isDirect
?
room
.
directChatOtherUserId
:
""
roomid
:
roomId
userid
:
isDirect
?
directChatOtherUserId
:
""
displayName
:
roomName
onClicked
:
{
if
(
room
)
TimelineManager
.
openRoomSettings
(
room
.
roomId
);
TimelineManager
.
openRoomSettings
(
roomId
);
}
}
...
...
@@ -137,7 +140,7 @@ Rectangle {
Platform.MenuItem
{
visible
:
room
?
room
.
permissions
.
canInvite
()
:
false
text
:
qsTr
(
"
Invite users
"
)
onTriggered
:
TimelineManager
.
openInviteUsers
(
room
.
roomId
)
onTriggered
:
TimelineManager
.
openInviteUsers
(
roomId
)
}
Platform.MenuItem
{
...
...
@@ -147,12 +150,12 @@ Rectangle {
Platform.MenuItem
{
text
:
qsTr
(
"
Leave room
"
)
onTriggered
:
TimelineManager
.
openLeaveRoomDialog
(
room
.
roomId
)
onTriggered
:
TimelineManager
.
openLeaveRoomDialog
(
roomId
)
}
Platform.MenuItem
{
text
:
qsTr
(
"
Settings
"
)
onTriggered
:
TimelineManager
.
openRoomSettings
(
room
.
roomId
)
onTriggered
:
TimelineManager
.
openRoomSettings
(
roomId
)
}
}
...
...
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