procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Try to use Ctrl+1..Ctrl+8 for folders.

This commit is contained in:
John Preston 2020-03-30 23:34:07 +04:00
parent 2f7563767d
commit c2ff27793a
3 changed files with 87 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Telegram/SourceFiles/core/shortcuts.cpp
View File

@ -113,7 +113,7 @@ public:
void fill(); void fill();
void clear(); void clear();
std::optional<Command> lookup(int shortcutId) const; [[nodiscard]] std::vector<Command> lookup(int shortcutId) const;
void toggleMedia(bool toggled); void toggleMedia(bool toggled);
void toggleSupport(bool toggled); void toggleSupport(bool toggled);
@ -124,14 +124,14 @@ private:
void writeDefaultFile(); void writeDefaultFile();
bool readCustomFile(); bool readCustomFile();
void set(const QString &keys, Command command); void set(const QString &keys, Command command, bool replace = false);
void remove(const QString &keys); void remove(const QString &keys);
void unregister(base::unique_qptr<QShortcut> shortcut); void unregister(base::unique_qptr<QShortcut> shortcut);
QStringList _errors; QStringList _errors;
base::flat_map<QKeySequence, base::unique_qptr<QShortcut>> _shortcuts; base::flat_map<QKeySequence, base::unique_qptr<QShortcut>> _shortcuts;
base::flat_map<int, Command> _commandByShortcutId; base::flat_multi_map<int, Command> _commandByShortcutId;
base::flat_set<QShortcut*> _mediaShortcuts; base::flat_set<QShortcut*> _mediaShortcuts;
base::flat_set<QShortcut*> _supportShortcuts; base::flat_set<QShortcut*> _supportShortcuts;
@ -206,11 +206,14 @@ const QStringList &Manager::errors() const {
return _errors; return _errors;
} }
std::optional<Command> Manager::lookup(int shortcutId) const { std::vector<Command> Manager::lookup(int shortcutId) const {
const auto i = _commandByShortcutId.find(shortcutId); auto result = std::vector<Command>();
return (i != end(_commandByShortcutId)) auto i = _commandByShortcutId.findFirst(shortcutId);
? base::make_optional(i->second) const auto end = _commandByShortcutId.end();
: std::nullopt; for (; i != end && (i->first == shortcutId); ++i) {
result.push_back(i->second);
}
return result;
} }
void Manager::toggleMedia(bool toggled) { void Manager::toggleMedia(bool toggled) {
@ -278,7 +281,7 @@ bool Manager::readCustomFile() {
const auto name = (*command).toString(); const auto name = (*command).toString();
const auto i = CommandByName.find(name); const auto i = CommandByName.find(name);
if (i != end(CommandByName)) { if (i != end(CommandByName)) {
set((*keys).toString(), i->second); set((*keys).toString(), i->second, true);
} else { } else {
LOG(("Shortcut Warning: " LOG(("Shortcut Warning: "
"could not find shortcut command handler '%1'" "could not find shortcut command handler '%1'"
@ -343,7 +346,7 @@ void Manager::fillDefaults() {
ranges::view::ints(1, ranges::unreachable)); ranges::view::ints(1, ranges::unreachable));
for (const auto [command, index] : folders) { for (const auto [command, index] : folders) {
set(qsl("%1+shift+%2").arg(ctrl).arg(index > 9 ? 0 : index), command); set(qsl("%1+%2").arg(ctrl).arg(index), command);
} }
set(qsl("%1+shift+down").arg(ctrl), Command::FolderNext); set(qsl("%1+shift+down").arg(ctrl), Command::FolderNext);
@ -373,10 +376,12 @@ void Manager::writeDefaultFile() {
shortcuts.push_back(version); shortcuts.push_back(version);
for (const auto &[sequence, shortcut] : _shortcuts) { for (const auto &[sequence, shortcut] : _shortcuts) {
const auto i = _commandByShortcutId.find(shortcut->id()); const auto shortcutId = shortcut->id();
if (i != end(_commandByShortcutId)) { auto i = _commandByShortcutId.findFirst(shortcutId);
const auto end = _commandByShortcutId.end();
for (; i != end && i->first == shortcutId; ++i) {
const auto j = CommandNames.find(i->second); const auto j = CommandNames.find(i->second);
if (j != end(CommandNames)) { if (j != CommandNames.end()) {
QJsonObject entry; QJsonObject entry;
entry.insert(qsl("keys"), sequence.toString().toLower()); entry.insert(qsl("keys"), sequence.toString().toLower());
entry.insert(qsl("command"), j->second); entry.insert(qsl("command"), j->second);
@ -390,7 +395,7 @@ void Manager::writeDefaultFile() {
file.write(document.toJson(QJsonDocument::Indented)); file.write(document.toJson(QJsonDocument::Indented));
} }
void Manager::set(const QString &keys, Command command) { void Manager::set(const QString &keys, Command command, bool replace) {
if (keys.isEmpty()) { if (keys.isEmpty()) {
return; return;
} }
@ -415,22 +420,25 @@ void Manager::set(const QString &keys, Command command) {
if (isMediaShortcut || isSupportShortcut) { if (isMediaShortcut || isSupportShortcut) {
shortcut->setEnabled(false); shortcut->setEnabled(false);
} }
const auto id = shortcut->id(); auto id = shortcut->id();
auto i = _shortcuts.find(result);
if (i == end(_shortcuts)) {
i = _shortcuts.emplace(result, std::move(shortcut)).first;
} else if (replace) {
unregister(std::exchange(i->second, std::move(shortcut)));
} else {
shortcut = nullptr;
id = i->second->id();
}
if (!id) { if (!id) {
_errors.push_back(qsl("Could not create shortcut '%1'!").arg(keys)); _errors.push_back(qsl("Could not create shortcut '%1'!").arg(keys));
return; return;
} }
auto i = _shortcuts.find(result);
if (i == end(_shortcuts)) {
i = _shortcuts.emplace(result, std::move(shortcut)).first;
} else {
unregister(std::exchange(i->second, std::move(shortcut)));
}
_commandByShortcutId.emplace(id, command); _commandByShortcutId.emplace(id, command);
if (isMediaShortcut) { if (shortcut && isMediaShortcut) {
_mediaShortcuts.emplace(i->second.get()); _mediaShortcuts.emplace(i->second.get());
} }
if (isSupportShortcut) { if (shortcut && isSupportShortcut) {
_supportShortcuts.emplace(i->second.get()); _supportShortcuts.emplace(i->second.get());
} }
} }
@ -465,11 +473,13 @@ Manager Data;
} // namespace } // namespace
Request::Request(Command command) : _command(command) { Request::Request(std::vector<Command> commands)
: _commands(std::move(commands)) {
} }
bool Request::check(Command command, int priority) { bool Request::check(Command command, int priority) {
if (_command == command && priority > _handlerPriority) { if (ranges::contains(_commands, command)
&& priority > _handlerPriority) {
_handlerPriority = priority; _handlerPriority = priority;
return true; return true;
} }
@ -481,12 +491,16 @@ bool Request::handle(FnMut<bool()> handler) {
return true; return true;
} }
FnMut<bool()> RequestHandler(Command command) { FnMut<bool()> RequestHandler(std::vector<Command> commands) {
auto request = Request(command); auto request = Request(std::move(commands));
RequestsStream.fire(&request); RequestsStream.fire(&request);
return std::move(request._handler); return std::move(request._handler);
} }
FnMut<bool()> RequestHandler(Command command) {
return RequestHandler(std::vector<Command>{ command });
}
bool Launch(Command command) { bool Launch(Command command) {
if (auto handler = RequestHandler(command)) { if (auto handler = RequestHandler(command)) {
return handler(); return handler();
@ -494,6 +508,13 @@ bool Launch(Command command) {
return false; return false;
} }
bool Launch(std::vector<Command> commands) {
if (auto handler = RequestHandler(std::move(commands))) {
return handler();
}
return false;
}
rpl::producer<not_null<Request*>> Requests() { rpl::producer<not_null<Request*>> Requests() {
return RequestsStream.events(); return RequestsStream.events();
} }
@ -509,10 +530,7 @@ const QStringList &Errors() {
} }
bool HandleEvent(not_null<QShortcutEvent*> event) { bool HandleEvent(not_null<QShortcutEvent*> event) {
if (const auto command = Data.lookup(event->shortcutId())) { return Launch(Data.lookup(event->shortcutId()));
return Launch(*command);
}
return false;
} }
void ToggleMediaShortcuts(bool toggled) { void ToggleMediaShortcuts(bool toggled) {

18
Telegram/SourceFiles/core/shortcuts.h
View File

@ -35,16 +35,14 @@ enum class Command {
ChatPinned4, ChatPinned4,
ChatPinned5, ChatPinned5,
ShowAllChats,
ShowFolder1, ShowFolder1,
ShowFolder2, ShowFolder2,
ShowFolder3, ShowFolder3,
ShowFolder4, ShowFolder4,
ShowFolder5, ShowFolder5,
ShowFolder6, ShowFolder6,
ShowFolder7, ShowFolderLast,
ShowFolder8,
ShowFolder9,
ShowFolder10,
FolderNext, FolderNext,
FolderPrevious, FolderPrevious,
@ -63,16 +61,14 @@ enum class Command {
}; };
constexpr auto kShowFolder = { constexpr auto kShowFolder = {
Command::ShowAllChats,
Command::ShowFolder1, Command::ShowFolder1,
Command::ShowFolder2, Command::ShowFolder2,
Command::ShowFolder3, Command::ShowFolder3,
Command::ShowFolder4, Command::ShowFolder4,
Command::ShowFolder5, Command::ShowFolder5,
Command::ShowFolder6, Command::ShowFolder6,
Command::ShowFolder7, Command::ShowFolderLast,
Command::ShowFolder8,
Command::ShowFolder9,
Command::ShowFolder10,
}; };
[[nodiscard]] FnMut<bool()> RequestHandler(Command command); [[nodiscard]] FnMut<bool()> RequestHandler(Command command);
@ -83,13 +79,13 @@ public:
bool handle(FnMut<bool()> handler); bool handle(FnMut<bool()> handler);
private: private:
explicit Request(Command command); explicit Request(std::vector<Command> commands);
Command _command; std::vector<Command> _commands;
int _handlerPriority = -1; int _handlerPriority = -1;
FnMut<bool()> _handler; FnMut<bool()> _handler;
friend FnMut<bool()> RequestHandler(Command command); friend FnMut<bool()> RequestHandler(std::vector<Command> commands);
}; };

60
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@ -3008,6 +3008,27 @@ void InnerWidget::setupShortcuts() {
return false; return false;
}); });
const auto filters = &session().data().chatsFilters().list();
if (const auto filtersCount = int(filters->size())) {
auto &&folders = ranges::view::zip(
Shortcuts::kShowFolder,
ranges::view::ints(0, ranges::unreachable));
for (const auto [command, index] : folders) {
const auto select = (command == Command::ShowFolderLast)
? filtersCount
: std::clamp(index, 0, filtersCount);
request->check(command) && request->handle([=] {
if (select <= filtersCount) {
_controller->setActiveChatsFilter((select > 0)
? (*filters)[select - 1].id()
: 0);
}
return true;
});
}
}
static const auto kPinned = { static const auto kPinned = {
Command::ChatPinned1, Command::ChatPinned1,
Command::ChatPinned2, Command::ChatPinned2,
@ -3036,42 +3057,23 @@ void InnerWidget::setupShortcuts() {
}); });
} }
auto &&folders = ranges::view::zip(
Shortcuts::kShowFolder,
ranges::view::ints(0, ranges::unreachable));
for (const auto [command, index] : folders) {
request->check(command) && request->handle([=, index = index] {
const auto list = &session().data().chatsFilters().list();
if (index >= list->size()) {
return false;
}
const auto filterId = list->at(index).id();
_controller->setActiveChatsFilter((filterId == _filterId)
? 0
: filterId);
return true;
});
}
const auto nearFolder = [=](bool isNext) { const auto nearFolder = [=](bool isNext) {
const auto id = _controller->activeChatsFilterCurrent(); const auto id = _controller->activeChatsFilterCurrent();
const auto list = &session().data().chatsFilters().list(); const auto list = &session().data().chatsFilters().list();
const auto it = (id == 0) const auto index = (id != 0)
? begin(*list) - 1 ? int(ranges::find(*list, id, &Data::ChatFilter::id)
: ranges::find(*list, id, &Data::ChatFilter::id); - begin(*list))
if (it == end(*list) && id != 0) { : -1;
if (index == list->size() && id != 0) {
return false; return false;
} }
const auto i = isNext ? 1 : -1; const auto changed = index + (isNext ? 1 : -1);
const auto index = it - begin(*list) + i; if (changed >= int(list->size()) || changed < -1) {
if (index >= (int)list->size() || index < -1) {
return false; return false;
} }
const auto filterId = (index == -1) _controller->setActiveChatsFilter((changed >= 0)
? 0 ? (*list)[changed].id()
: list->at(index).id(); : 0);
_controller->setActiveChatsFilter(filterId);
return true; return true;
}; };