diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index af189f0e4f1c700e5d6c95a1ec2c52e2e5862100..597397cd158aca2073012d600e13cab9c8b6e21f 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -16,185 +16,30 @@ UserSettingsPage,
background-color: #202228;
}
-#chatPage,
-#chatPage > *,
-CommunitiesList,
-CommunitiesList > *,
-RoomList,
-RoomList > *,
-TimelineView,
-TimelineView > *,
-UserMentionsWidget,
-UserMentionsWidget > * {
- background-color: #2d3139;
- border: none;
-}
-
QLineEdit,
-WelcomePage,
-LoginPage,
-RegisterPage,
EditModal,
-emoji--Panel,
-emoji--Panel > *,
-dialogs--Logout,
dialogs--ReCaptcha,
-dialogs--LeaveRoom,
-dialogs--CreateRoom,
-dialogs--RoomSettings,
-dialogs--InviteUsers,
-dialogs--ReadReceipts,
-dialogs--JoinRoom,
-dialogs--MemberList,
-dialogs--PreviewUploadOverlay,
-dialogs--UserProfile,
-dialogs--CreateRoom > QLineEdit,
-dialogs--InviteUsers > QLineEdit,
-dialogs--JoinRoom > QLineEdit {
+dialogs--JoinRoom {
background-color: #202228;
color: #caccd1;
}
-emoji--Panel QWidget { border: none; }
-emoji--Panel QScrollBar:vertical { width: 0px; margin: 0px; }
-emoji--Panel QScrollBar::handle:vertical { min-height: 30px; }
-
-emoji--Category,
-emoji--Category > * {
- background-color: #2d3139;
- color: #727274;
-}
-
-emoji--Category QLabel {
- margin: 20px 0 20px 8px;
-}
-
-TimelineItem {
- qproperty-backgroundColor: #202228;
-}
-
-#sideBar {
- border: none;
- border-right: 1px solid #202228;
- border-left: 1px solid #202228;
-}
-
-UserMentionsWidget > TimelineItem {
- qproperty-backgroundColor: #202228;
- qproperty-hoverColor: rgba(45, 49, 57, 120);
-}
-
-InfoMessage {
- qproperty-textColor: #caccd1;
- qproperty-boxColor: rgba(45, 49, 57, 120);
-}
-
PopupItem {
background-color: #202228;
qproperty-hoverColor: rgba(45, 49, 57, 120);
}
-TypingDisplay {
- qproperty-textColor: #caccd1;
- qproperty-backgroundColor: #202228;
-}
-
-#roomlist_area {
- background-color: #2d3139;
-}
-
FlatButton {
qproperty-foregroundColor: #727274;
qproperty-backgroundColor: #333;
qproperty-disabledForegroundColor: #222;
}
-AudioItem,
-FileItem {
- qproperty-textColor: #caccd1;
- qproperty-backgroundColor: #2d3139;
- qproperty-iconColor: #caccd1;
-}
-
RaisedButton {
qproperty-foregroundColor: #caccd1;
qproperty-backgroundColor: #333;
}
-RoomInfoListItem,
-UserMentionsWidget {
- qproperty-mentionedColor: #a82353;
- qproperty-highlightedBackgroundColor: #4d84c7;
- qproperty-hoverBackgroundColor: rgb(67, 70, 77);
- qproperty-backgroundColor: #2d3139;
-
- qproperty-titleColor: #e4e5e8;
- qproperty-subtitleColor: #caccd1;
-
- qproperty-hoverTitleColor: #f4f5f8;
- qproperty-hoverSubtitleColor: white;
-
- qproperty-highlightedTitleColor: #f4f4f5;
- qproperty-highlightedSubtitleColor: #e4e5e8;
-
- qproperty-btnColor: #414A59;
- qproperty-btnTextColor: white;
-
- qproperty-timestampColor: #727274;
- qproperty-highlightedTimestampColor: #e7e7e9;
- qproperty-hoverTimestampColor: #f4f5f8;
-
- qproperty-bubbleFgColor: white;
- qproperty-bubbleBgColor: #4d84c7;
-}
-
-RoomInfoListItem > Avatar {
- qproperty-backgroundColor: #202228;
- qproperty-textColor: white;
-}
-
-CommunitiesListItem {
- qproperty-highlightedBackgroundColor: #4d84c7;
- qproperty-disabledBackgroundColor: palette(mid);
- qproperty-hoverBackgroundColor: rgb(67, 70, 77);
- qproperty-backgroundColor: #2d3139;
-
- qproperty-avatarBgColor: #202228;
- qproperty-avatarFgColor: black;
-}
-
-LoadingIndicator {
- qproperty-color: #caccd1;
-}
-
-UserInfoWidget, UserInfoWidget > * {
- background-color: #2d3139;
- color: #b0b3ba;
-}
-
-UserInfoWidget {
- border: none;
- border-bottom: 1px solid #202228;
-}
-
-Avatar {
- qproperty-textColor: white;
- qproperty-backgroundColor: #2d3139;
-}
-
-#displayNameLabel,
-#userIdLabel {
- color: #f2f2f2;
-}
-
-TopSection {
- qproperty-textColor: #caccd1;
-}
-
-emoji--Category {
- qproperty-hoverBackgroundColor: rgb(67, 70, 77);
-}
-
FloatingButton {
qproperty-backgroundColor: #2d3139;
qproperty-foregroundColor: white;
@@ -206,12 +51,6 @@ TextField {
qproperty-labelColor: #caccd1;
}
-SideBarActions {
- border: none;
- border-top: 1px solid #202228;
- background-color: #2d3139;
-}
-
TextInputWidget {
border: none;
}
@@ -235,9 +74,4 @@ QListWidget {
background-color: #202228;
}
-SnackBar {
- qproperty-textColor: #caccd1;
- qproperty-bgColor: #202228;
-}
-
QSplitter::handle { image: none; }
diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
index edf3880be3a66ebdbe91d145eb22d14a0f03f099..b4b7d4274e40152bcae2f9eda7d8a1c82acd09a4 100644
--- a/resources/styles/nheko.qss
+++ b/resources/styles/nheko.qss
@@ -8,211 +8,33 @@ TextLabel::a {
}
-QuickSwitcher,
-ReplyPopup,
-SuggestionsPopup,
-UserSettingsPage,
-#scroll_widget,
-#UserSettingScrollWidget {
- background-color: white;
-}
-
-#chatPage,
-#chatPage > *,
-CommunitiesList,
-CommunitiesList > *,
-RoomList,
-RoomList > *,
-TimelineView,
-TimelineView > *,
-UserMentionsWidget,
-UserMentionsWidget > *,
-TimelineView,
-TimelineView > * {
- background-color: white;
- border: none;
-}
-
-TimelineItem {
- qproperty-backgroundColor: white;
-}
-
-#sideBar {
- border: none;
- border-right: 1px solid #dee1f3;
- border-left: 1px solid #dee1f3;
-}
-
-UserMentionsWidget > TimelineItem {
- qproperty-backgroundColor: white;
- qproperty-hoverColor: rgba(192, 193, 195, 120);
-}
-
-InfoMessage {
- qproperty-textColor: #333;
- qproperty-boxColor: rgba(220, 220, 220, 120);
-}
-
-TypingDisplay {
- qproperty-textColor: #333;
- qproperty-backgroundColor: white;
-}
-
PopupItem {
background-color: white;
qproperty-hoverColor: rgba(192, 193, 195, 120);
}
-RoomList,
-RoomList > *,
-CommunitiesList,
-CommunitiesList > * {
- background-color: #2e3649;
- border: none;
-}
-
-#roomlist_area {
- background-color: #2e3649;
-}
-
FlatButton {
qproperty-foregroundColor: #495057;
}
-AudioItem,
-FileItem {
- qproperty-textColor: #333;
- qproperty-backgroundColor: #f2f2f2;
- qproperty-iconColor: white;
-}
-
RaisedButton {
qproperty-foregroundColor: white;
}
-RoomInfoListItem {
- qproperty-mentionedColor: #a82353;
- qproperty-highlightedBackgroundColor: #38A3D8;
- qproperty-hoverBackgroundColor: rgb(70, 77, 93);
- qproperty-hoverTitleColor: #f2f5f8;
- qproperty-hoverSubtitleColor: white;
- qproperty-backgroundColor: #f2f5f8;
-
- qproperty-titleColor: #333;
- qproperty-subtitleColor: #5d6565;
-
- qproperty-highlightedTitleColor: white;
- qproperty-highlightedSubtitleColor: #f4f4f5;
-
- qproperty-btnColor: #ccc;
- qproperty-btnTextColor: #333;
-
- qproperty-timestampColor: #707070;
- qproperty-highlightedTimestampColor: #f4f4f5;
- qproperty-hoverTimestampColor: white;
-
- qproperty-bubbleFgColor: white;
- qproperty-bubbleBgColor: #38A3D8;
-}
-
-RoomInfoListItem > Avatar {
- qproperty-backgroundColor: #eee;
- qproperty-textColor: black;
-}
-
-CommunitiesListItem {
- qproperty-highlightedBackgroundColor: #38A3D8;
- qproperty-disabledBackgroundColor: palette(mid);
- qproperty-hoverBackgroundColor: rgb(70, 77, 93);
- qproperty-backgroundColor: #f2f5f8;
-
- qproperty-avatarBgColor: #eee;
- qproperty-avatarFgColor: palette(buttonText);
-}
-
-#ChatPageLoadSpinner {
- qproperty-color: #acc7dc;
-}
-
-#FileUploadSpinner {
- qproperty-color: #333;
-}
-
-UserInfoWidget, UserInfoWidget > * {
- background-color: #d6dde3;
- color: #ebebeb;
-}
-
-UserInfoWidget {
- border: none;
- border-bottom: 2px solid #ccc;
-}
-
-Avatar {
- qproperty-textColor: black;
- qproperty-backgroundColor: #eee;
-}
-
-#displayNameLabel {
- color: #171919;
-}
-
-#userIdLabel {
- color: #555459;
-}
-
-dialogs--Logout,
dialogs--ReCaptcha,
-dialogs--LeaveRoom,
-dialogs--CreateRoom,
-dialogs--RoomSettings,
-dialogs--InviteUsers,
-dialogs--ReadReceipts,
-dialogs--MemberList,
dialogs--JoinRoom,
-dialogs--PreviewUploadOverlay,
-dialogs--UserProfile,
EditModal,
QListWidget {
background-color: white;
color: #495057;
}
-TopSection {
- qproperty-textColor: #333;
-}
-
-WelcomePage,
-LoginPage,
QComboBox,
-QPushButton,
-RegisterPage {
+QPushButton {
background-color: white;
color: #333;
}
-emoji--Panel,
-emoji--Panel > * {
- background-color: #eee;
- color: #333;
-}
-
-emoji--Panel QWidget { border: none; }
-emoji--Panel QScrollBar:vertical { width: 0px; margin: 0px; }
-emoji--Panel QScrollBar::handle:vertical { min-height: 30px; }
-
-emoji--Category {
- qproperty-hoverBackgroundColor: rgb(70, 77, 93);
-}
-
-emoji--Category,
-emoji--Category > * {
- background-color: white;
- color: #ccc;
-}
-
-emoji--Category QLabel { margin: 20px 0 20px 8px; }
-
FloatingButton {
qproperty-backgroundColor: #efefef;
qproperty-foregroundColor: black;
@@ -236,11 +58,6 @@ TextInputWidget {
border: none;
}
-SideBarActions {
- border: none;
- border-top: 1px solid #dcdcdc;
-}
-
Toggle {
qproperty-activeColor: #38a3d8;
qproperty-disabledColor: gray;
@@ -248,9 +65,4 @@ Toggle {
qproperty-trackColor: rgb(240, 240, 240);
}
-SnackBar {
- qproperty-textColor: white;
- qproperty-bgColor: #495057;
-}
-
QSplitter::handle { image: none; }
diff --git a/resources/styles/system.qss b/resources/styles/system.qss
index bab85126d6caf7059928809f43c7bb515446b247..d2305974ac04c89cc0ea8a4728aeaf5c9ed3e768 100644
--- a/resources/styles/system.qss
+++ b/resources/styles/system.qss
@@ -1,57 +1,7 @@
-#chatPage,
-#chatPage > *,
-CommunitiesList,
-CommunitiesList > *,
-RoomList,
-RoomList > *,
-TimelineView,
-TimelineView > *,
-UserMentionsWidget,
-UserMentionsWidget > * {
- border: none;
-}
-
-TypingDisplay {
- qproperty-textColor: palette(text);
- qproperty-backgroundColor: palette(window);
-}
-
-TimelineItem {
- qproperty-backgroundColor: palette(window);
-}
-
-UserMentionsWidget > TimelineItem {
- qproperty-backgroundColor: palette(window);
- qproperty-hoverColor: palette(base);
-}
-
-SideBarActions,
TextInputWidget {
border: none;
}
-UserInfoWidget {
- border: none;
- border-bottom: 1px solid palette(mid);
-}
-
-RoomList,
-RoomList > * {
- background-color: palette(window);
- border: none;
-}
-
-#sideBar {
- border: none;
- border-right: 1px solid palette(mid);
- border-left: 1px solid palette(mid);
-}
-
-InfoMessage {
- qproperty-textColor: palette(text);
- qproperty-boxColor: palette(base);
-}
-
PopupItem {
qproperty-hoverColor: palette(base);
}
@@ -60,13 +10,6 @@ FlatButton {
qproperty-foregroundColor: palette(text);
}
-AudioItem,
-FileItem {
- qproperty-textColor: palette(text);
- qproperty-backgroundColor: palette(base);
- qproperty-iconColor: palette(window);
-}
-
RaisedButton {
qproperty-foregroundColor: palette(button-text);
}
@@ -76,98 +19,16 @@ TextField {
}
QTextEdit,
-ReceiptItem,
-MemberItem,
QLineEdit,
QListWidget {
background-color: palette(window);
}
-RoomInfoListItem,
-UserMentionsWidget {
- qproperty-mentionedColor: palette(alternate-base);
- qproperty-highlightedBackgroundColor: palette(highlight);
- qproperty-hoverBackgroundColor: palette(light);
- qproperty-backgroundColor: palette(window);
-
- qproperty-titleColor: palette(text);
- qproperty-subtitleColor: palette(text);
-
- qproperty-highlightedTitleColor: palette(highlighted-text);
- qproperty-highlightedSubtitleColor: palette(highlighted-text);
-
- qproperty-hoverTitleColor: palette(dark);
- qproperty-hoverSubtitleColor: palette(dark);
-
- qproperty-btnColor: palette(dark);
- qproperty-btnTextColor: palette(bright-text);
-
- qproperty-timestampColor: palette(text);
- qproperty-highlightedTimestampColor: palette(highlighted-text);
- qproperty-hoverTimestampColor: palette(dark);
-
- qproperty-bubbleBgColor: palette(base);
- qproperty-bubbleFgColor: palette(text);
-}
-
-RoomInfoListItem > Avatar {
- qproperty-backgroundColor: palette(base);
- qproperty-textColor: palette(text);
-}
-
-
-CommunitiesListItem {
- qproperty-highlightedBackgroundColor: palette(highlight);
- qproperty-disabledBackgroundColor: palette(mid);
- qproperty-hoverBackgroundColor: palette(light);
- qproperty-backgroundColor: palette(window);
-
- qproperty-avatarBgColor: palette(base);
- qproperty-avatarFgColor: palette(text);
-}
-
-LoadingIndicator {
- qproperty-color: palette(highlight);
-}
-
-#ChatPageLoadSpinner {
- qproperty-color: palette(light);
-}
-
-emoji--Panel,
-emoji--Panel > * {
- background-color: palette(base);
- color: palette(text);
-}
-
-emoji--Panel QWidget { border: none; }
-emoji--Panel QScrollBar:vertical { width: 0px; margin: 0px; }
-emoji--Panel QScrollBar::handle:vertical { min-height: 30px; }
-
-emoji--Category {
- qproperty-hoverBackgroundColor: palette(highlight);
-}
-
-emoji--Category,
-emoji--Category > * {
- background-color: palette(window);
- color: palette(text);
-}
-
-emoji--Category QLabel {
- margin: 20px 0 20px 8px;
-}
-
FloatingButton {
qproperty-backgroundColor: palette(base);
qproperty-foregroundColor: palette(text);
}
-SnackBar {
- qproperty-textColor: palette(text);
- qproperty-bgColor: palette(base);
-}
-
Toggle {
qproperty-activeColor: palette(highlight);
qproperty-disabledColor: palette(dark);
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index d5c2d42839576fbd5d95a5faada40f7a20ea05aa..f20b272b8334a0a0506ccf266f1554b06742bfa8 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -254,6 +254,7 @@ InputBar::updateState(int selectionStart_,
selectionStart = selectionStart_;
selectionEnd = selectionEnd_;
cursorPosition = cursorPosition_;
+ emit textChanged(text_);
}
QString
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp
index db50b050788e9a000768928018d537390dc54c47..c60eca6f760e4753f349fdcf0226491910775a72 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -53,9 +53,6 @@ UserProfile::UserProfile(QString roomid,
emit verificationStatiChanged();
});
- connect(this, &UserProfile::devicesChanged, [this]() {
- nhlog::net()->critical("Device list: {}", deviceList_.rowCount());
- });
fetchDeviceList(this->userid_);
}