pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-02-10 18:05:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win-nix] refactoring (#89)

Browse Source
This commit is contained in:
maxkadushkin
2020-02-20 17:04:36 +03:00
committed by GitHub
parent 18dd80b81e
commit 8d92e6fd48
4 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win-linux/ASCDocumentEditor.pro
View File

@ -12,7 +12,7 @@ HEADERS += \
src/prop/version_p.h
SOURCES += \
src/prop/csplash.cpp \
src/prop/csplash_p.cpp \
src/prop/cmainpanelimpl.cpp \
src/prop/cascapplicationmanagerwrapper_private.h \
src/prop/utils.cpp

1
win-linux/defaults.pri
View File

@ -73,6 +73,7 @@ HEADERS += \
# src/casclabel.h
SOURCES += \
$$PWD/src/csplash.cpp \
$$PWD/src/main.cpp \
$$PWD/src/asctabwidget.cpp\
$$PWD/src/cdownloadwidget.cpp \

6
win-linux/src/prop/csplash.cpp → win-linux/src/csplash.cpp
View File

@ -38,12 +38,13 @@
#include <QSettings>
#include <QStyle>
#include "utils.h"
#include "csplash_p.cpp"
CSplash * _splash;
auto screenAt(const QPoint& pt) -> QScreen * {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
return QApplication::screenAt(reg_user.value("position").toRect().topLeft());
return QApplication::screenAt(pt);
#else
QVarLengthArray<const QScreen *, 8> _cached_screens;
for (const QScreen *screen : QApplication::screens()) {
@ -93,7 +94,8 @@ void CSplash::showSplash()
uchar _dpi_ratio = Utils::getScreenDpiRatioByHWND(_splash->winId());
_splash->setPixmap(_dpi_ratio > 1 ? QPixmap(":/res/icons/splash_2x.png") : QPixmap(":/res/icons/splash.png"));
// _splash->setPixmap(_dpi_ratio > 1 ? QPixmap(":/res/icons/splash_2x.png") : QPixmap(":/res/icons/splash.png"));
_splash->setPixmap(getSplashImage(_dpi_ratio));
_splash->show(_scr_num);
}
}

37
win-linux/src/prop/csplash_p.cpp Normal file
View File

@ -0,0 +1,37 @@
/*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#include <QPixmap>
auto getSplashImage(int ratio) -> QPixmap {
return ratio > 1 ? QPixmap(":/res/icons/splash_2x.png") : QPixmap(":/res/icons/splash.png");
}