kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Removed obsolete ability to fill menu with slots.

Browse source
This commit is contained in:
23rd 2021-01-11 23:53:32 +03:00
parent e6b66158e6
commit 6f097fc571
7 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/widgets/dropdown_menu.cpp
View file

@ -50,10 +50,6 @@ void DropdownMenu::init() {
hide();
}
not_null<QAction*> DropdownMenu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) {
return _menu->addAction(text, receiver, member, icon, iconOver);
}
not_null<QAction*> DropdownMenu::addAction(const QString &text, Fn<void()> callback, const style::icon *icon, const style::icon *iconOver) {
return _menu->addAction(text, std::move(callback), icon, iconOver);
}

1
ui/widgets/dropdown_menu.h
View file

@ -18,7 +18,6 @@ class DropdownMenu : public InnerDropdown {
public:
DropdownMenu(QWidget *parent, const style::DropdownMenu &st = st::defaultDropdownMenu);
not_null<QAction*> addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
not_null<QAction*> addAction(const QString &text, Fn<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
not_null<QAction*> addSeparator();
void clearActions();

13
ui/widgets/labels.cpp
View file

@ -637,12 +637,17 @@ void FlatLabel::showContextMenu(QContextMenuEvent *e, ContextMenuReason reason)
_contextMenu = new PopupMenu(this);
if (fullSelection && !_contextCopyText.isEmpty()) {
_contextMenu->addAction(_contextCopyText, this, SLOT(onCopyContextText()));
_contextMenu->addAction(
_contextCopyText,
[=] { onCopyContextText(); });
} else if (uponSelection && !fullSelection) {
const auto text = Integration::Instance().phraseContextCopySelected();
_contextMenu->addAction(text, this, SLOT(onCopySelectedText()));
_contextMenu->addAction(
Integration::Instance().phraseContextCopySelected(),
[=] { onCopySelectedText(); });
} else if (_selectable && !hasSelection && !_contextCopyText.isEmpty()) {
_contextMenu->addAction(_contextCopyText, this, SLOT(onCopyContextText()));
_contextMenu->addAction(
_contextCopyText,
[=] { onCopyContextText(); });
}
if (const auto link = ClickHandler::getActive()) {

6
ui/widgets/menu.cpp
View file

@ -95,12 +95,6 @@ void Menu::init() {
}
}
not_null<QAction*> Menu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) {
const auto action = addAction(new QAction(text, this), icon, iconOver);
connect(action, SIGNAL(triggered(bool)), receiver, member, Qt::QueuedConnection);
return action;
}
not_null<QAction*> Menu::addAction(const QString &text, Fn<void()> callback, const style::icon *icon, const style::icon *iconOver) {
const auto action = addAction(new QAction(text, this), icon, iconOver);
connect(action, &QAction::triggered, action, std::move(callback), Qt::QueuedConnection);

1
ui/widgets/menu.h
View file

@ -22,7 +22,6 @@ public:
Menu(QWidget *parent, QMenu *menu, const style::Menu &st = st::defaultMenu);
~Menu();
not_null<QAction*> addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
not_null<QAction*> addAction(const QString &text, Fn<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
not_null<QAction*> addAction(const QString &text, std::unique_ptr<QMenu> submenu);
not_null<QAction*> addSeparator();

4
ui/widgets/popup_menu.cpp
View file

@ -88,10 +88,6 @@ void PopupMenu::handleMenuResize() {
_inner = rect().marginsRemoved(_padding);
}
not_null<QAction*> PopupMenu::addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon, const style::icon *iconOver) {
return _menu->addAction(text, receiver, member, icon, iconOver);
}
not_null<QAction*> PopupMenu::addAction(const QString &text, Fn<void()> callback, const style::icon *icon, const style::icon *iconOver) {
return _menu->addAction(text, std::move(callback), icon, iconOver);
}

1
ui/widgets/popup_menu.h
View file

@ -21,7 +21,6 @@ public:
PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu);
PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu);
not_null<QAction*> addAction(const QString &text, const QObject *receiver, const char* member, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
not_null<QAction*> addAction(const QString &text, Fn<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
not_null<QAction*> addAction(const QString &text, std::unique_ptr<PopupMenu> submenu);
not_null<QAction*> addSeparator();