mirror of https://github.com/qTox/qTox
Compare commits
4 Commits
95da5c6364
...
3ecf2e03c4
Author | SHA1 | Date |
---|---|---|
fancyfarmer | 3ecf2e03c4 | |
Anthony Bilinski | a6d15140b1 | |
fancyfarmer | 4006d9b5e8 | |
fancyfarmer | 0681614ecc |
|
@ -147,12 +147,8 @@ endif()
|
|||
# Try to find cmake toxcore libraries
|
||||
if(WIN32)
|
||||
search_dependency(TOXCORE PACKAGE toxcore OPTIONAL STATIC_PACKAGE)
|
||||
search_dependency(TOXAV PACKAGE toxav OPTIONAL STATIC_PACKAGE)
|
||||
search_dependency(TOXENCRYPTSAVE PACKAGE toxencryptsave OPTIONAL STATIC_PACKAGE)
|
||||
else()
|
||||
search_dependency(TOXCORE PACKAGE toxcore OPTIONAL)
|
||||
search_dependency(TOXAV PACKAGE toxav OPTIONAL)
|
||||
search_dependency(TOXENCRYPTSAVE PACKAGE toxencryptsave OPTIONAL)
|
||||
endif()
|
||||
|
||||
# If not found, use automake toxcore libraries
|
||||
|
|
|
@ -58,6 +58,7 @@
|
|||
#include <QScrollBar>
|
||||
#include <QSplitter>
|
||||
#include <QStringBuilder>
|
||||
#include <QShortcut>
|
||||
|
||||
#include <cassert>
|
||||
|
||||
|
@ -221,6 +222,9 @@ ChatForm::ChatForm(Profile& profile_, Friend* chatFriend, IChatLog& chatLog_,
|
|||
setAcceptDrops(true);
|
||||
retranslateUi();
|
||||
Translator::registerHandler(std::bind(&ChatForm::retranslateUi, this), this);
|
||||
|
||||
// shortcut for mute (SHIFT+ `), (SHIFT + grave accent, gives tilde)
|
||||
new QShortcut(Qt::SHIFT | 0x60, this, SLOT(onMicMuteShortcutToggle()));
|
||||
}
|
||||
|
||||
ChatForm::~ChatForm()
|
||||
|
@ -458,6 +462,15 @@ void ChatForm::onMicMuteToggle()
|
|||
updateMuteMicButton();
|
||||
}
|
||||
|
||||
void ChatForm::onMicMuteShortcutToggle()
|
||||
{
|
||||
CoreAV* av = core.getAv();
|
||||
if (av->isCallActive(f))
|
||||
{
|
||||
onMicMuteToggle();
|
||||
}
|
||||
}
|
||||
|
||||
void ChatForm::onVolMuteToggle()
|
||||
{
|
||||
CoreAV* av = core.getAv();
|
||||
|
|
|
@ -102,6 +102,7 @@ private slots:
|
|||
void onAnswerCallTriggered(bool video);
|
||||
void onRejectCallTriggered();
|
||||
void onMicMuteToggle();
|
||||
void onMicMuteShortcutToggle();
|
||||
void onVolMuteToggle();
|
||||
|
||||
void onFriendStatusChanged(const ToxPk& friendPk, Status::Status status);
|
||||
|
|
Loading…
Reference in New Issue