pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win-nix] refactoring

Browse Source
This commit is contained in:
Maxim Kadushkin
2018-08-08 11:41:31 +03:00
parent 6c9e6b977f
commit 199fa0f791
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
win-linux/src/cmainpanel.cpp
View File

@ -64,7 +64,6 @@
#ifdef _WIN32
#include "win/cprintdialog.h"
#include "shlobj.h"
#include "lmcons.h"
#else
#define VK_F4 0x73
@ -228,7 +227,7 @@ CMainPanel::CMainPanel(QWidget *parent, bool isCustomWindow, uchar dpi_ratio)
QString params = QString("lang=%1&username=%3&location=%2")
.arg(CLangater::getLanguageName(), Utils::systemLocationCode());
wstring wparams = params.toStdWString();
wstring user_name = readSystemUserName();
wstring user_name = Utils::systemUserName();
wparams.replace(wparams.find(L"%3"), 2, user_name);
AscAppManager::getInstance().InitAdditionalEditorParams(wparams);
@ -1326,27 +1325,6 @@ void CMainPanel::onOutsideAuth(QString json)
}
}
wstring CMainPanel::readSystemUserName()
{
#ifdef Q_OS_WIN
WCHAR _env_name[UNLEN + 1]{0};
DWORD _size = UNLEN + 1;
return GetUserName(_env_name, &_size) ?
wstring(_env_name) : L"Unknown.User";
#else
QString _env_name = qgetenv("USER");
if ( _env_name.isEmpty() ) {
_env_name = qgetenv("USERNAME");
if (_env_name.isEmpty())
_env_name = "Unknown.User";
}
return _env_name.toStdWString();
#endif
}
void CMainPanel::setInputFiles(QStringList * list)
{
RELEASEOBJECT(m_inFiles)

1
win-linux/src/cmainpanel.h
View File

@ -92,7 +92,6 @@ private:
int trySaveDocument(int);
void RecalculatePlaces();
wstring readSystemUserName();
signals:
// void downloadEvent(NSEditorApi::CAscDownloadFileInfo *);
void mainWindowChangeState(Qt::WindowState);

2
win-linux/src/main.cpp
View File

@ -155,7 +155,7 @@ int main( int argc, char *argv[] )
application_cef->Init_CEF(&AscAppManager::getInstance(), argc, argv);
/* ********************** */
GET_REGISTRY_SYSTEM(reg_system)
// GET_REGISTRY_SYSTEM(reg_system)
GET_REGISTRY_USER(reg_user)
reg_user.setFallbacksEnabled(false);

22
win-linux/src/utils.cpp
View File

@ -51,6 +51,7 @@
#ifdef _WIN32
#include "shlobj.h"
#include "lmcons.h"
typedef HRESULT (__stdcall *SetCurrentProcessExplicitAppUserModelIDProc)(PCWSTR AppID);
#else
#include <sys/stat.h>
@ -428,3 +429,24 @@ bool Utils::setAppUserModelId(const QString& modelid)
return _result;
}
wstring Utils::systemUserName()
{
#ifdef Q_OS_WIN
WCHAR _env_name[UNLEN + 1]{0};
DWORD _size = UNLEN + 1;
return GetUserName(_env_name, &_size) ?
wstring(_env_name) : L"Unknown.User";
#else
QString _env_name = qgetenv("USER");
if ( _env_name.isEmpty() ) {
_env_name = qgetenv("USERNAME");
if (_env_name.isEmpty())
_env_name = "Unknown.User";
}
return _env_name.toStdWString();
#endif
}

1
win-linux/src/utils.h
View File

@ -44,6 +44,7 @@ public:
static QString lastPath(int type);
static void keepLastPath(int type, const QString&);
static QString getUserPath();
static wstring systemUserName();
static QString getAppCommonPath();
static QRect getScreenGeometry(const QPoint&);
static void openUrl(const QString&);