Commit d9eda446 authored by camilo higuita's avatar camilo higuita
Browse files

notify fixes and selectionbar counter right updates

parent 5bd35d26
......@@ -352,7 +352,7 @@ Item
Layout.fillHeight: true
Layout.margins: Maui.Style.space.medium
implicitWidth: height
text: selectionList.count
text: control.count
radius: Maui.Style.radiusV
font.pointSize: Maui.Style.fontSizes.big
Kirigami.Theme.colorSet: control.Kirigami.Theme.colorSet
......@@ -431,8 +431,7 @@ Item
}
}
}
}
}
Maui.Rectangle
{
......
......@@ -137,7 +137,7 @@ Item
Maui.ToolButtonMenu
{
id: _menuButton
icon.name: "view-more-horizontal-symbolic"
icon.name: "overflow-menu"
icon.width: Maui.Style.iconSizes.medium
icon.height: Maui.Style.iconSizes.medium
visible: control.hiddenItems.length > 0
......
......@@ -147,21 +147,18 @@ void Notify::send()
notification->setText (m_message);
notification->setTitle (m_title);
notification->setIconName (m_iconName);
// notification->setUrls (m_urls);
notification->setPixmap (QPixmap(m_imageSource.toString()));
notification->setUrls (m_urls);
qDebug() << notification->eventId ();
// connect(this, &Notify::imageSourceChanged, m_notification, [this](QUrl source)
// {
// m_notification->setPixmap (QPixmap(source.toString ()));
// });
connect(notification, QOverload<unsigned int>::of(&KNotification::activated), this, &Notify::actionActivated);
connect(notification, &KNotification::defaultActivated,[this]()
{
if(m_defaultAction)
emit m_defaultAction->triggered ();
emit m_defaultAction->triggered (this);
});
notification->sendEvent();
......@@ -190,7 +187,7 @@ if(index == 0)
if(index >= 1 && index-1 < m_actions.count ())
{
emit m_actions.at (index-1)->triggered ();
emit m_actions.at (index-1)->triggered (this);
}
}
......
......@@ -24,7 +24,7 @@
#include <QQmlListProperty>
#include <QUrl>
class Notify;
class NotifyAction : public QObject
{
Q_OBJECT
......@@ -39,7 +39,7 @@ private:
QString m_text;
signals:
void triggered();
void triggered(Notify* notify);
void textChanged();
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment