mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Added missed date detailed info in tooltips to admin log and sections.
This commit is contained in:
parent
3d1f21bd05
commit
2616659116
5 changed files with 40 additions and 37 deletions
|
@ -512,7 +512,7 @@ QString InnerWidget::tooltipText() const {
|
||||||
if (const auto view = App::hoveredItem()) {
|
if (const auto view = App::hoveredItem()) {
|
||||||
const auto format = QLocale::system().dateTimeFormat(
|
const auto format = QLocale::system().dateTimeFormat(
|
||||||
QLocale::LongFormat);
|
QLocale::LongFormat);
|
||||||
auto dateText = view->dateTime().toString(format);
|
auto dateText = HistoryView::DateTooltipText(view);
|
||||||
|
|
||||||
const auto sentIt = _itemDates.find(view->data());
|
const auto sentIt = _itemDates.find(view->data());
|
||||||
if (sentIt != end(_itemDates)) {
|
if (sentIt != end(_itemDates)) {
|
||||||
|
|
|
@ -3313,40 +3313,7 @@ QString HistoryInner::tooltipText() const {
|
||||||
if (_mouseCursorState == CursorState::Date
|
if (_mouseCursorState == CursorState::Date
|
||||||
&& _mouseAction == MouseAction::None) {
|
&& _mouseAction == MouseAction::None) {
|
||||||
if (const auto view = App::hoveredItem()) {
|
if (const auto view = App::hoveredItem()) {
|
||||||
auto dateText = view->dateTime().toString(
|
return HistoryView::DateTooltipText(view);
|
||||||
QLocale::system().dateTimeFormat(QLocale::LongFormat));
|
|
||||||
if (const auto editedDate = view->displayedEditDate()) {
|
|
||||||
dateText += '\n' + tr::lng_edited_date(
|
|
||||||
tr::now,
|
|
||||||
lt_date,
|
|
||||||
base::unixtime::parse(editedDate).toString(
|
|
||||||
QLocale::system().dateTimeFormat(
|
|
||||||
QLocale::LongFormat)));
|
|
||||||
}
|
|
||||||
if (const auto forwarded = view->data()->Get<HistoryMessageForwarded>()) {
|
|
||||||
dateText += '\n' + tr::lng_forwarded_date(
|
|
||||||
tr::now,
|
|
||||||
lt_date,
|
|
||||||
base::unixtime::parse(forwarded->originalDate).toString(
|
|
||||||
QLocale::system().dateTimeFormat(
|
|
||||||
QLocale::LongFormat)));
|
|
||||||
if (const auto media = view->media()) {
|
|
||||||
if (media->hidesForwardedInfo()) {
|
|
||||||
dateText += "\n" + tr::lng_forwarded(
|
|
||||||
tr::now,
|
|
||||||
lt_user,
|
|
||||||
(forwarded->originalSender
|
|
||||||
? forwarded->originalSender->shortName()
|
|
||||||
: forwarded->hiddenSenderInfo->firstName));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (const auto msgsigned = view->data()->Get<HistoryMessageSigned>()) {
|
|
||||||
if (msgsigned->isElided && !msgsigned->isAnonymousRank) {
|
|
||||||
dateText += '\n' + tr::lng_signed_author(tr::now, lt_user, msgsigned->author);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dateText;
|
|
||||||
}
|
}
|
||||||
} else if (_mouseCursorState == CursorState::Forwarded
|
} else if (_mouseCursorState == CursorState::Forwarded
|
||||||
&& _mouseAction == MouseAction::None) {
|
&& _mouseAction == MouseAction::None) {
|
||||||
|
|
|
@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
#include "history/view/media/history_view_sticker.h"
|
#include "history/view/media/history_view_sticker.h"
|
||||||
#include "history/view/media/history_view_large_emoji.h"
|
#include "history/view/media/history_view_large_emoji.h"
|
||||||
#include "history/history.h"
|
#include "history/history.h"
|
||||||
|
#include "base/unixtime.h"
|
||||||
#include "core/application.h"
|
#include "core/application.h"
|
||||||
#include "core/core_settings.h"
|
#include "core/core_settings.h"
|
||||||
#include "main/main_session.h"
|
#include "main/main_session.h"
|
||||||
|
@ -157,6 +158,40 @@ TextSelection ShiftItemSelection(
|
||||||
return ShiftItemSelection(selection, byText.length());
|
return ShiftItemSelection(selection, byText.length());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString DateTooltipText(not_null<Element*> view) {
|
||||||
|
const auto format = QLocale::system().dateTimeFormat(QLocale::LongFormat);
|
||||||
|
auto dateText = view->dateTime().toString(format);
|
||||||
|
if (const auto editedDate = view->displayedEditDate()) {
|
||||||
|
dateText += '\n' + tr::lng_edited_date(
|
||||||
|
tr::now,
|
||||||
|
lt_date,
|
||||||
|
base::unixtime::parse(editedDate).toString(format));
|
||||||
|
}
|
||||||
|
if (const auto forwarded = view->data()->Get<HistoryMessageForwarded>()) {
|
||||||
|
dateText += '\n' + tr::lng_forwarded_date(
|
||||||
|
tr::now,
|
||||||
|
lt_date,
|
||||||
|
base::unixtime::parse(forwarded->originalDate).toString(format));
|
||||||
|
if (const auto media = view->media()) {
|
||||||
|
if (media->hidesForwardedInfo()) {
|
||||||
|
dateText += '\n' + tr::lng_forwarded(
|
||||||
|
tr::now,
|
||||||
|
lt_user,
|
||||||
|
(forwarded->originalSender
|
||||||
|
? forwarded->originalSender->shortName()
|
||||||
|
: forwarded->hiddenSenderInfo->firstName));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (const auto msgsigned = view->data()->Get<HistoryMessageSigned>()) {
|
||||||
|
if (msgsigned->isElided && !msgsigned->isAnonymousRank) {
|
||||||
|
dateText += '\n'
|
||||||
|
+ tr::lng_signed_author(tr::now, lt_user, msgsigned->author);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return dateText;
|
||||||
|
}
|
||||||
|
|
||||||
void UnreadBar::init(const QString &string) {
|
void UnreadBar::init(const QString &string) {
|
||||||
text = string;
|
text = string;
|
||||||
width = st::semiboldFont->width(text);
|
width = st::semiboldFont->width(text);
|
||||||
|
|
|
@ -126,6 +126,8 @@ TextSelection ShiftItemSelection(
|
||||||
TextSelection selection,
|
TextSelection selection,
|
||||||
const Ui::Text::String &byText);
|
const Ui::Text::String &byText);
|
||||||
|
|
||||||
|
QString DateTooltipText(not_null<Element*> view);
|
||||||
|
|
||||||
// Any HistoryView::Element can have this Component for
|
// Any HistoryView::Element can have this Component for
|
||||||
// displaying the unread messages bar above the message.
|
// displaying the unread messages bar above the message.
|
||||||
struct UnreadBar : public RuntimeComponent<UnreadBar, Element> {
|
struct UnreadBar : public RuntimeComponent<UnreadBar, Element> {
|
||||||
|
|
|
@ -1216,8 +1216,7 @@ QString ListWidget::tooltipText() const {
|
||||||
? _overElement->data().get()
|
? _overElement->data().get()
|
||||||
: nullptr;
|
: nullptr;
|
||||||
if (_mouseCursorState == CursorState::Date && item) {
|
if (_mouseCursorState == CursorState::Date && item) {
|
||||||
return _overElement->dateTime().toString(
|
return HistoryView::DateTooltipText(_overElement);
|
||||||
QLocale::system().dateTimeFormat(QLocale::LongFormat));
|
|
||||||
} else if (_mouseCursorState == CursorState::Forwarded && item) {
|
} else if (_mouseCursorState == CursorState::Forwarded && item) {
|
||||||
if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
|
if (const auto forwarded = item->Get<HistoryMessageForwarded>()) {
|
||||||
return forwarded->text.toString();
|
return forwarded->text.toString();
|
||||||
|
|
Loading…
Add table
Reference in a new issue