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] fix bug 33748

Browse Source
This commit is contained in:
Maxim Kadushkin
2017-01-16 16:32:06 +03:00
parent 121a668e97
commit 24e1510fbb
3 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,17 +259,13 @@ CMainPanel::CMainPanel(QWidget *parent, CAscApplicationManager *manager, bool is
m_pButtonDownload->setVisible(false, false);
wstring first_name, last_name;
readSystemUserName(first_name, last_name);
QString params = QString("lang=%1&userfname=%3&userlname=%4&location=%2")
QString params = QString("lang=%1&username=%3&location=%2")
.arg(g_lang, Utils::systemLocationCode());
wstring wparams = params.toStdWString();
wparams.replace(wparams.find(L"%3"), 2, first_name);
wparams.replace(wparams.find(L"%4"), 2, last_name);
m_pManager->InitAdditionalEditorParams(wparams);
wstring user_name = readSystemUserName();
wparams.replace(wparams.find(L"%3"), 2, user_name);
m_pManager->InitAdditionalEditorParams(wparams);
}
void CMainPanel::RecalculatePlaces()
@ -1195,34 +1191,25 @@ void CMainPanel::onPortalCreate()
});
}
void CMainPanel::readSystemUserName(wstring& first, wstring& last)
wstring CMainPanel::readSystemUserName()
{
#ifdef Q_OS_WIN
WCHAR _env_name[UNLEN + 1]{0};
DWORD _size = UNLEN + 1;
wstring _full_name = GetUserName(_env_name, &_size) ?
return GetUserName(_env_name, &_size) ?
wstring(_env_name) : L"Unknown.User";
#else
QString _env_name = qgetenv("USER");
if (_env_name.isEmpty())
if ( _env_name.isEmpty() ) {
_env_name = qgetenv("USERNAME");
if (_env_name.isEmpty())
_env_name = "Unknown.User";
if (_env_name.isEmpty())
_env_name = "Unknown.User";
}
wstring _full_name = _env_name.toStdWString();
return _env_name.toStdWString();
#endif
// std::wregex _rexp(QString(reUserName).toStdWString());
// std::wsmatch _res;
// if (std::regex_search(_full_name, _res, _rexp)) {
// first = _res.str(1),
// last = _res.str(2);
// }
auto i = _full_name.find('.');
i == wstring::npos ? first.assign(_full_name) :
(first.assign(_full_name.substr(0, i)), last.assign(_full_name.substr(++i)));
}
void CMainPanel::onMainPageReady()

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

@ -90,7 +90,7 @@ private:
void doLogout(const QString&, bool);
int trySaveDocument(int);
void readSystemUserName(wstring& first, wstring& last);
wstring readSystemUserName();
signals:
// void downloadEvent(NSEditorApi::CAscDownloadFileInfo *);
void mainWindowChangeState(Qt::WindowState);

4
win-linux/src/version.h
View File

@ -33,8 +33,8 @@
#ifndef VERSION_H
#define VERSION_H
#define VER_FILEVERSION 4,2,3,296
#define VER_FILEVERSION_STR "4.2.3.296\0"
#define VER_FILEVERSION 4,2,3,302
#define VER_FILEVERSION_STR "4.2.3.302\0"
#define VER_PRODUCTVERSION VER_FILEVERSION
#define VER_PRODUCTVERSION_STR "4.2\0"