Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 10:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to KMessageWidget changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-04-16 03:24:54 +03:00
parent d1b853636f
commit 32097dc723
4 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kate/part/search/katesearchbar.cpp
View file

@ -302,7 +302,7 @@ void KateSearchBar::updateMessage(QPointer<KTextEditor::Message>& message, bool
void KateSearchBar::showInfoMessage(const QString& text) void KateSearchBar::showInfoMessage(const QString& text)
{ {
typedef KTextEditor::Message KTEM; typedef KTextEditor::Message KTEM;
updateMessage(m_infoMessage, true, text, KTEM::Positive, KTEM::BottomInView, KTEM::AfterUserInteraction, 3000, false); updateMessage(m_infoMessage, true, text, KTEM::Information, KTEM::BottomInView, KTEM::AfterUserInteraction, 3000, false);
} }
void KateSearchBar::highlightMatch(const Range & range) { void KateSearchBar::highlightMatch(const Range & range) {

3
kate/part/view/katemessagewidget.cpp
View file

@ -99,9 +99,6 @@ void KateMessageWidget::showNextMessage()
// the enums values do not necessarily match, hence translate with switch // the enums values do not necessarily match, hence translate with switch
switch (m_currentMessage->messageType()) { switch (m_currentMessage->messageType()) {
case KTextEditor::Message::Positive:
m_messageWidget->setMessageType(KMessageWidget::Positive);
break;
case KTextEditor::Message::Information: case KTextEditor::Message::Information:
m_messageWidget->setMessageType(KMessageWidget::Information); m_messageWidget->setMessageType(KMessageWidget::Information);
break; break;

4
kate/tests/messagetest.cpp
View file

@ -217,7 +217,7 @@ void MessageTest::testPriority()
// - m1 should be hidden in favour of m2 // - m1 should be hidden in favour of m2
// - changing text of m1 while m2 is displayed should not change the displayed text // - changing text of m1 while m2 is displayed should not change the displayed text
// //
QPointer<Message> m1 = new Message("m1", Message::Positive); QPointer<Message> m1 = new Message("m1", Message::Information);
m1->setPosition(Message::TopInView); m1->setPosition(Message::TopInView);
QVERIFY(m1->priority() == 0); QVERIFY(m1->priority() == 0);
@ -273,7 +273,7 @@ void MessageTest::testCreateView()
// - verify that both views get the message // - verify that both views get the message
// - verify that, once the message is deleted, both views hide the message // - verify that, once the message is deleted, both views hide the message
// //
QPointer<Message> m1 = new Message("message", Message::Positive); QPointer<Message> m1 = new Message("message", Message::Information);
m1->setPosition(Message::TopInView); m1->setPosition(Message::TopInView);
QVERIFY(m1->priority() == 0); QVERIFY(m1->priority() == 0);

6
kwin/kcmkwin/kwincompositing/main.ui
View file

@ -13,12 +13,6 @@
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="KMessageWidget" name="messageBox"> <widget class="KMessageWidget" name="messageBox">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget> </widget>
</item> </item>
<item> <item>