void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved DBIWorkMode to Core::Settings.

Browse source
This commit is contained in:
23rd 2021-05-28 01:11:16 +03:00
parent da3e140069
commit 707b36dc12
16 changed files with 63 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Telegram/SourceFiles/core/core_settings.cpp
View file

@ -525,11 +525,11 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
|| Ui::Integration::Instance().openglLastCheckFailed()); || Ui::Integration::Instance().openglLastCheckFailed());
} }
_groupCallNoiseSuppression = (groupCallNoiseSuppression == 1); _groupCallNoiseSuppression = (groupCallNoiseSuppression == 1);
const auto uncheckedWorkMode = static_cast<DBIWorkMode>(workMode); const auto uncheckedWorkMode = static_cast<WorkMode>(workMode);
switch (uncheckedWorkMode) { switch (uncheckedWorkMode) {
case dbiwmWindowAndTray: case WorkMode::WindowAndTray:
case dbiwmTrayOnly: case WorkMode::TrayOnly:
case dbiwmWindowOnly: _workMode = uncheckedWorkMode; break; case WorkMode::WindowOnly: _workMode = uncheckedWorkMode; break;
} }
} }
@ -791,7 +791,7 @@ void Settings::resetOnLastLogout() {
_recentEmoji.clear(); _recentEmoji.clear();
_emojiVariants.clear(); _emojiVariants.clear();
_workMode = dbiwmWindowAndTray; _workMode = WorkMode::WindowAndTray;
} }
bool Settings::ThirdColumnByDefault() { bool Settings::ThirdColumnByDefault() {

15
Telegram/SourceFiles/core/core_settings.h
View file

@ -53,6 +53,11 @@ public:
ShowName = 1, ShowName = 1,
ShowNothing = 2, ShowNothing = 2,
}; };
enum class WorkMode {
WindowAndTray = 0,
TrayOnly = 1,
WindowOnly = 2,
};
static constexpr auto kDefaultVolume = 0.9; static constexpr auto kDefaultVolume = 0.9;
@ -526,16 +531,16 @@ public:
void setWindowPosition(const WindowPosition &position) { void setWindowPosition(const WindowPosition &position) {
_windowPosition = position; _windowPosition = position;
} }
void setWorkMode(DBIWorkMode value) { void setWorkMode(WorkMode value) {
_workMode = value; _workMode = value;
} }
[[nodiscard]] DBIWorkMode workMode() const { [[nodiscard]] WorkMode workMode() const {
return _workMode.current(); return _workMode.current();
} }
[[nodiscard]] rpl::producer<DBIWorkMode> workModeValue() const { [[nodiscard]] rpl::producer<WorkMode> workModeValue() const {
return _workMode.value(); return _workMode.value();
} }
[[nodiscard]] rpl::producer<DBIWorkMode> workModeChanges() const { [[nodiscard]] rpl::producer<WorkMode> workModeChanges() const {
return _workMode.changes(); return _workMode.changes();
} }
@ -658,7 +663,7 @@ private:
rpl::variable<bool> _systemDarkModeEnabled = false; rpl::variable<bool> _systemDarkModeEnabled = false;
WindowPosition _windowPosition; // per-window WindowPosition _windowPosition; // per-window
bool _disableOpenGL = false; bool _disableOpenGL = false;
rpl::variable<DBIWorkMode> _workMode = dbiwmWindowAndTray; rpl::variable<WorkMode> _workMode = WorkMode::WindowAndTray;
bool _tabbedReplacedWithInfo = false; // per-window bool _tabbedReplacedWithInfo = false; // per-window
rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window rpl::event_stream<bool> _tabbedReplacedWithInfoValue; // per-window

6
Telegram/SourceFiles/core/utils.h
View file

@ -121,12 +121,6 @@ void memset_rand(void *data, uint32 len);
QString translitRusEng(const QString &rus); QString translitRusEng(const QString &rus);
QString rusKeyboardLayoutSwitch(const QString &from); QString rusKeyboardLayoutSwitch(const QString &from);
enum DBIWorkMode {
dbiwmWindowAndTray = 0,
dbiwmTrayOnly = 1,
dbiwmWindowOnly = 2,
};
static const int MatrixRowShift = 40000; static const int MatrixRowShift = 40000;
inline int rowscount(int fullCount, int countPerRow) { inline int rowscount(int fullCount, int countPerRow) {

3
Telegram/SourceFiles/mainwindow.cpp
View file

@ -188,7 +188,8 @@ void MainWindow::applyInitialWorkMode() {
const auto minimizeAndHide = [=] { const auto minimizeAndHide = [=] {
DEBUG_LOG(("Window Pos: First show, setting minimized after.")); DEBUG_LOG(("Window Pos: First show, setting minimized after."));
setWindowState(windowState() | Qt::WindowMinimized); setWindowState(windowState() | Qt::WindowMinimized);
if (workMode == dbiwmTrayOnly || workMode == dbiwmWindowAndTray) { if (workMode == Core::Settings::WorkMode::TrayOnly
|| workMode == Core::Settings::WorkMode::WindowAndTray) {
hide(); hide();
} }
}; };

17
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View file

@ -61,6 +61,7 @@ namespace Platform {
namespace { namespace {
using internal::WaylandIntegration; using internal::WaylandIntegration;
using WorkMode = Core::Settings::WorkMode;
constexpr auto kPanelTrayIconName = "telegram-panel"_cs; constexpr auto kPanelTrayIconName = "telegram-panel"_cs;
constexpr auto kMutePanelTrayIconName = "telegram-mute-panel"_cs; constexpr auto kMutePanelTrayIconName = "telegram-mute-panel"_cs;
@ -809,7 +810,7 @@ void MainWindow::handleSNIHostRegistered() {
_sniAvailable = true; _sniAvailable = true;
if (Core::App().settings().workMode() == dbiwmWindowOnly) { if (Core::App().settings().workMode() == WorkMode::WindowOnly) {
return; return;
} }
@ -825,7 +826,7 @@ void MainWindow::handleSNIHostRegistered() {
SkipTaskbar( SkipTaskbar(
windowHandle(), windowHandle(),
Core::App().settings().workMode() == dbiwmTrayOnly); Core::App().settings().workMode() == WorkMode::TrayOnly);
} }
void MainWindow::handleSNIOwnerChanged( void MainWindow::handleSNIOwnerChanged(
@ -834,7 +835,7 @@ void MainWindow::handleSNIOwnerChanged(
const QString &newOwner) { const QString &newOwner) {
_sniAvailable = IsSNIAvailable(); _sniAvailable = IsSNIAvailable();
if (Core::App().settings().workMode() == dbiwmWindowOnly) { if (Core::App().settings().workMode() == WorkMode::WindowOnly) {
return; return;
} }
@ -860,7 +861,7 @@ void MainWindow::handleSNIOwnerChanged(
SkipTaskbar( SkipTaskbar(
windowHandle(), windowHandle(),
(Core::App().settings().workMode() == dbiwmTrayOnly) (Core::App().settings().workMode() == WorkMode::TrayOnly)
&& trayAvailable()); && trayAvailable());
} }
@ -918,10 +919,10 @@ void MainWindow::psSetupTrayIcon() {
} }
} }
void MainWindow::workmodeUpdated(DBIWorkMode mode) { void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
if (!trayAvailable()) { if (!trayAvailable()) {
return; return;
} else if (mode == dbiwmWindowOnly) { } else if (mode == WorkMode::WindowOnly) {
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
if (_sniTrayIcon) { if (_sniTrayIcon) {
_sniTrayIcon->setContextMenu(0); _sniTrayIcon->setContextMenu(0);
@ -939,7 +940,7 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
psSetupTrayIcon(); psSetupTrayIcon();
} }
SkipTaskbar(windowHandle(), mode == dbiwmTrayOnly); SkipTaskbar(windowHandle(), mode == WorkMode::TrayOnly);
} }
void MainWindow::unreadCounterChangedHook() { void MainWindow::unreadCounterChangedHook() {
@ -1331,7 +1332,7 @@ void MainWindow::handleNativeSurfaceChanged(bool exist) {
if (exist) { if (exist) {
SkipTaskbar( SkipTaskbar(
windowHandle(), windowHandle(),
(Core::App().settings().workMode() == dbiwmTrayOnly) (Core::App().settings().workMode() == WorkMode::TrayOnly)
&& trayAvailable()); && trayAvailable());
} }

2
Telegram/SourceFiles/platform/linux/main_window_linux.h
View file

@ -51,7 +51,7 @@ protected:
void initTrayMenuHook() override; void initTrayMenuHook() override;
bool hasTrayIcon() const override; bool hasTrayIcon() const override;
void workmodeUpdated(DBIWorkMode mode) override; void workmodeUpdated(Core::Settings::WorkMode mode) override;
void createGlobalMenu() override; void createGlobalMenu() override;
QSystemTrayIcon *trayIcon = nullptr; QSystemTrayIcon *trayIcon = nullptr;

2
Telegram/SourceFiles/platform/mac/main_window_mac.h
View file

@ -71,7 +71,7 @@ protected:
void updateGlobalMenuHook() override; void updateGlobalMenuHook() override;
void workmodeUpdated(DBIWorkMode mode) override; void workmodeUpdated(Core::Settings::WorkMode mode) override;
QSystemTrayIcon *trayIcon = nullptr; QSystemTrayIcon *trayIcon = nullptr;
QMenu *trayIconMenu = nullptr; QMenu *trayIconMenu = nullptr;

4
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View file

@ -541,9 +541,9 @@ void MainWindow::psSetupTrayIcon() {
trayIcon->show(); trayIcon->show();
} }
void MainWindow::workmodeUpdated(DBIWorkMode mode) { void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
psSetupTrayIcon(); psSetupTrayIcon();
if (mode == dbiwmWindowOnly) { if (mode == Core::Settings::WorkMode::WindowOnly) {
if (trayIcon) { if (trayIcon) {
trayIcon->setContextMenu(0); trayIcon->setContextMenu(0);
delete trayIcon; delete trayIcon;

2
Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
View file

@ -234,7 +234,7 @@ Manager::Private::Private(Manager *manager)
, _managerIdString(QString::number(_managerId)) , _managerIdString(QString::number(_managerId))
, _delegate([[NotificationDelegate alloc] initWithManager:manager managerId:_managerId]) { , _delegate([[NotificationDelegate alloc] initWithManager:manager managerId:_managerId]) {
Core::App().settings().workModeValue( Core::App().settings().workModeValue(
) | rpl::start_with_next([=](DBIWorkMode mode) { ) | rpl::start_with_next([=](Core::Settings::WorkMode mode) {
// We need to update the delegate _after_ the tray icon change was done in Qt. // We need to update the delegate _after_ the tray icon change was done in Qt.
// Because Qt resets the delegate. // Because Qt resets the delegate.
crl::on_main(this, [=] { crl::on_main(this, [=] {

10
Telegram/SourceFiles/platform/win/main_window_win.cpp
View file

@ -268,9 +268,11 @@ void MainWindow::showTrayTooltip() {
} }
} }
void MainWindow::workmodeUpdated(DBIWorkMode mode) { void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
using WorkMode = Core::Settings::WorkMode;
switch (mode) { switch (mode) {
case dbiwmWindowAndTray: { case WorkMode::WindowAndTray: {
psSetupTrayIcon(); psSetupTrayIcon();
HWND psOwner = (HWND)GetWindowLongPtr(ps_hWnd, GWLP_HWNDPARENT); HWND psOwner = (HWND)GetWindowLongPtr(ps_hWnd, GWLP_HWNDPARENT);
if (psOwner) { if (psOwner) {
@ -279,7 +281,7 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
} }
} break; } break;
case dbiwmTrayOnly: { case WorkMode::TrayOnly: {
psSetupTrayIcon(); psSetupTrayIcon();
HWND psOwner = (HWND)GetWindowLongPtr(ps_hWnd, GWLP_HWNDPARENT); HWND psOwner = (HWND)GetWindowLongPtr(ps_hWnd, GWLP_HWNDPARENT);
if (!psOwner) { if (!psOwner) {
@ -287,7 +289,7 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
} }
} break; } break;
case dbiwmWindowOnly: { case WorkMode::WindowOnly: {
if (trayIcon) { if (trayIcon) {
trayIcon->setContextMenu(0); trayIcon->setContextMenu(0);
trayIcon->deleteLater(); trayIcon->deleteLater();

2
Telegram/SourceFiles/platform/win/main_window_win.h
View file

@ -85,7 +85,7 @@ protected:
void showTrayTooltip() override; void showTrayTooltip() override;
void workmodeUpdated(DBIWorkMode mode) override; void workmodeUpdated(Core::Settings::WorkMode mode) override;
bool initSizeFromSystem() override; bool initSizeFromSystem() override;

19
Telegram/SourceFiles/settings/settings_advanced.cpp
View file

@ -318,6 +318,8 @@ void SetupSpellchecker(
void SetupSystemIntegrationContent( void SetupSystemIntegrationContent(
Window::SessionController *controller, Window::SessionController *controller,
not_null<Ui::VerticalLayout*> container) { not_null<Ui::VerticalLayout*> container) {
using WorkMode = Core::Settings::WorkMode;
const auto checkbox = [&](rpl::producer<QString> &&label, bool checked) { const auto checkbox = [&](rpl::producer<QString> &&label, bool checked) {
return object_ptr<Ui::Checkbox>( return object_ptr<Ui::Checkbox>(
container, container,
@ -344,8 +346,8 @@ void SetupSystemIntegrationContent(
if (Platform::TrayIconSupported()) { if (Platform::TrayIconSupported()) {
const auto trayEnabled = [] { const auto trayEnabled = [] {
const auto workMode = Core::App().settings().workMode(); const auto workMode = Core::App().settings().workMode();
return (workMode == dbiwmTrayOnly) return (workMode == WorkMode::TrayOnly)
|| (workMode == dbiwmWindowAndTray); || (workMode == WorkMode::WindowAndTray);
}; };
const auto tray = addCheckbox( const auto tray = addCheckbox(
tr::lng_settings_workmode_tray(), tr::lng_settings_workmode_tray(),
@ -353,8 +355,8 @@ void SetupSystemIntegrationContent(
const auto taskbarEnabled = [] { const auto taskbarEnabled = [] {
const auto workMode = Core::App().settings().workMode(); const auto workMode = Core::App().settings().workMode();
return (workMode == dbiwmWindowOnly) return (workMode == WorkMode::WindowOnly)
|| (workMode == dbiwmWindowAndTray); || (workMode == WorkMode::WindowAndTray);
}; };
const auto taskbar = Platform::SkipTaskbarSupported() const auto taskbar = Platform::SkipTaskbarSupported()
? addCheckbox( ? addCheckbox(
@ -365,10 +367,11 @@ void SetupSystemIntegrationContent(
const auto updateWorkmode = [=] { const auto updateWorkmode = [=] {
const auto newMode = tray->checked() const auto newMode = tray->checked()
? ((!taskbar || taskbar->checked()) ? ((!taskbar || taskbar->checked())
? dbiwmWindowAndTray ? WorkMode::WindowAndTray
: dbiwmTrayOnly) : WorkMode::TrayOnly)
: dbiwmWindowOnly; : WorkMode::WindowOnly;
if ((newMode == dbiwmWindowAndTray || newMode == dbiwmTrayOnly) if ((newMode == WorkMode::WindowAndTray
|| newMode == WorkMode::TrayOnly)
&& Core::App().settings().workMode() != newMode) { && Core::App().settings().workMode() != newMode) {
cSetSeenTrayTooltip(false); cSetSeenTrayTooltip(false);
} }

9
Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
View file

@ -428,11 +428,12 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
const auto newMode = [v] { const auto newMode = [v] {
switch (v) { using WorkMode = Core::Settings::WorkMode;
case dbiwmTrayOnly: return dbiwmTrayOnly; switch (static_cast<WorkMode>(v)) {
case dbiwmWindowOnly: return dbiwmWindowOnly; case WorkMode::TrayOnly: return WorkMode::TrayOnly;
case WorkMode::WindowOnly: return WorkMode::WindowOnly;
}; };
return dbiwmWindowAndTray; return WorkMode::WindowAndTray;
}(); }();
Core::App().settings().setWorkMode(newMode); Core::App().settings().setWorkMode(newMode);

8
Telegram/SourceFiles/window/main_window.cpp
View file

@ -179,7 +179,7 @@ MainWindow::MainWindow(not_null<Controller*> controller)
}, lifetime()); }, lifetime());
Core::App().settings().workModeChanges( Core::App().settings().workModeChanges(
) | rpl::start_with_next([=](DBIWorkMode mode) { ) | rpl::start_with_next([=](Core::Settings::WorkMode mode) {
workmodeUpdated(mode); workmodeUpdated(mode);
}, lifetime()); }, lifetime());
@ -211,7 +211,8 @@ bool MainWindow::hideNoQuit() {
return false; return false;
} }
const auto workMode = Core::App().settings().workMode(); const auto workMode = Core::App().settings().workMode();
if (workMode == dbiwmTrayOnly || workMode == dbiwmWindowAndTray) { if (workMode == Core::Settings::WorkMode::TrayOnly
|| workMode == Core::Settings::WorkMode::WindowAndTray) {
if (minimizeToTray()) { if (minimizeToTray()) {
if (const auto controller = sessionController()) { if (const auto controller = sessionController()) {
Ui::showChatsList(&controller->session()); Ui::showChatsList(&controller->session());
@ -316,8 +317,9 @@ void MainWindow::handleStateChanged(Qt::WindowState state) {
controller().updateIsActiveFocus(); controller().updateIsActiveFocus();
} }
Core::App().updateNonIdle(); Core::App().updateNonIdle();
using WorkMode = Core::Settings::WorkMode;
if (state == Qt::WindowMinimized if (state == Qt::WindowMinimized
&& (Core::App().settings().workMode() == dbiwmTrayOnly)) { && (Core::App().settings().workMode() == WorkMode::TrayOnly)) {
minimizeToTray(); minimizeToTray();
} }
savePosition(state); savePosition(state);

3
Telegram/SourceFiles/window/main_window.h
View file

@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/rp_widget.h" #include "ui/rp_widget.h"
#include "base/timer.h" #include "base/timer.h"
#include "base/object_ptr.h" #include "base/object_ptr.h"
#include "core/core_settings.h"
#include <QtWidgets/QSystemTrayIcon> #include <QtWidgets/QSystemTrayIcon>
@ -174,7 +175,7 @@ protected:
virtual void showTrayTooltip() { virtual void showTrayTooltip() {
} }
virtual void workmodeUpdated(DBIWorkMode mode) { virtual void workmodeUpdated(Core::Settings::WorkMode mode) {
} }
virtual void createGlobalMenu() { virtual void createGlobalMenu() {

3
Telegram/SourceFiles/window/window_controller.cpp
View file

@ -316,7 +316,8 @@ void Controller::updateIsActive() {
} }
void Controller::minimize() { void Controller::minimize() {
if (Core::App().settings().workMode() == dbiwmTrayOnly) { if (Core::App().settings().workMode()
== Core::Settings::WorkMode::TrayOnly) {
_widget.minimizeToTray(); _widget.minimizeToTray();
} else { } else {
_widget.setWindowState(_widget.windowState() | Qt::WindowMinimized); _widget.setWindowState(_widget.windowState() | Qt::WindowMinimized);