[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ruqola] /: Add room_changed_announcement + clean up
From:       Montel Laurent <null () kde ! org>
Date:       2017-11-30 21:58:19
Message-ID: E1eKWqZ-0000XB-HX () code ! kde ! org
[Download RAW message or body]

Git commit 3ac05836d0e2c468464220119243454f2f0fe884 by Montel Laurent.
Committed on 30/11/2017 at 21:58.
Pushed by mlaurent into branch 'master'.

Add room_changed_announcement + clean up

M  +12   -2    src/qml/ChannelInfoDialog.qml
M  +2    -2    src/qml/RoomDelegate.qml
M  +1    -0    src/qml/messages/NewDateLabel.qml
M  +3    -1    src/qml/messages/SystemMessage.qml
M  +1    -0    src/rocketchatmessage.cpp
M  +11   -0    tests/messagemodelgui.cpp

https://commits.kde.org/ruqola/3ac05836d0e2c468464220119243454f2f0fe884

diff --git a/src/qml/ChannelInfoDialog.qml b/src/qml/ChannelInfoDialog.qml
index 86dc9da..0aa9405 100644
--- a/src/qml/ChannelInfoDialog.qml
+++ b/src/qml/ChannelInfoDialog.qml
@@ -35,7 +35,17 @@ Dialog {
     x: parent.width / 2 - width / 2
     y: parent.height / 2 - height / 2
 
-    width: 300
-    height: 400
+    //TODO
+    GridLayout {
+        columns: 2
+        Label {
+            text: i18n("Comment:");
+        }
+        TextField {
+            id: channelName
+            //placeholderText: i18n("Channel Name")
+            //TODO
+        }
+    }
     modal: true
 }
diff --git a/src/qml/RoomDelegate.qml b/src/qml/RoomDelegate.qml
index c78613d..03b2eaf 100644
--- a/src/qml/RoomDelegate.qml
+++ b/src/qml/RoomDelegate.qml
@@ -49,6 +49,7 @@ Kirigami.BasicListItem {
     
     function iconFromType(type)
     {
+        //TODO add info about user status
         if (type === "c") {
             return "irc-channel-active"
         } else if (type === "p") {
@@ -60,7 +61,6 @@ Kirigami.BasicListItem {
         return "";
     }
 
-    //icon: Ruqola.usersModel().user(d_name) ?  \
((Ruqola.usersModel().user(d_name).iconFromStatus() !== "") ? \
Ruqola.usersModel().user(d_name).iconFromStatus() : (d_type == "c" ? \
"irc-channel-active" : "user-avaliable")) : "user-avaliable"  icon: \
iconFromType(d_type)  
     visible: !d_name.empty && d_open
@@ -124,4 +124,4 @@ Kirigami.BasicListItem {
             Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
         }
     }
-} // Item closed
+}
diff --git a/src/qml/messages/NewDateLabel.qml b/src/qml/messages/NewDateLabel.qml
index 3285ee1..f2a511e 100644
--- a/src/qml/messages/NewDateLabel.qml
+++ b/src/qml/messages/NewDateLabel.qml
@@ -35,6 +35,7 @@ Rectangle {
     
     implicitHeight: date !== "" ? dateLabel.font.pixelSize : 0
     
+    //TODO fix color
     color: RuqolaSingleton.backgroundColor;
     QQC2.Label {
         id: dateLabel
diff --git a/src/qml/messages/SystemMessage.qml b/src/qml/messages/SystemMessage.qml
index 638b54f..2a24b76 100644
--- a/src/qml/messages/SystemMessage.qml
+++ b/src/qml/messages/SystemMessage.qml
@@ -57,6 +57,8 @@ ColumnLayout {
             return i18n("%2 removed user %1", i_messageText, i_username)
         } else if (type === "room_changed_description") {
             return i18n("%2 changed room description to %1", i_messageText, \
i_username) +        } else if (type === "room_changed_announcement") {
+            return i18n("%2 changed room announcement to %1", i_messageText, \
i_username)  } else if (type === "room_changed_privacy") {
             return i18n("%2 changed room privacy to %1", i_messageText, i_username)
         } else if (type === "jitsi_call_started") {
@@ -94,7 +96,7 @@ ColumnLayout {
 
             width: Math.min(implicitWidth, parent.width - \
Kirigami.Units.largeSpacing)  
-            text: i_username + " " + getTextFor(i_systemMessageType)
+            text: getTextFor(i_systemMessageType)
 
             wrapMode: Label.Wrap
 
diff --git a/src/rocketchatmessage.cpp b/src/rocketchatmessage.cpp
index b37e6bf..1418bf5 100644
--- a/src/rocketchatmessage.cpp
+++ b/src/rocketchatmessage.cpp
@@ -346,6 +346,7 @@ RocketChatMessage::RocketChatMessageResult \
RocketChatMessage::getUsersOfRoom(con  
 RocketChatMessage::RocketChatMessageResult RocketChatMessage::logout(const QString \
&name, quint64 id)  {
+    Q_UNUSED(name);
     //TODO add name
     const QJsonArray params{{}};
     return generateMethod(QStringLiteral("logout"), QJsonDocument(params), id);
diff --git a/tests/messagemodelgui.cpp b/tests/messagemodelgui.cpp
index cb50526..3b2a5b3 100644
--- a/tests/messagemodelgui.cpp
+++ b/tests/messagemodelgui.cpp
@@ -190,6 +190,17 @@ void MessageModelGui::fillModel()
         m4.setSystemMessageType(QStringLiteral("room_changed_privacy"));
         mModel->addMessage(m4);
     }
+    {
+        Message m4;
+        m4.setMessageType(Message::MessageType::System);
+        m4.setMessageId(QString::number(mIndexMessage++));
+        m4.setText(QStringLiteral("room_changed_announcement"));
+        m4.setTimeStamp(QDateTime(QDate(2017, 3, 5), QTime(11, 31, \
0)).toMSecsSinceEpoch()); +        m4.setUsername(QStringLiteral("blo"));
+        m4.setAlias(QStringLiteral("bla"));
+        m4.setSystemMessageType(QStringLiteral("room_changed_announcement"));
+        mModel->addMessage(m4);
+    }
     {
         Message m4;
         m4.setMessageType(Message::MessageType::System);


[prev in list] [next in list] [prev in thread] [next in thread]