Skip to content

Translate Russian comments to English #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jvitkauskas wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −12
Open

Translate Russian comments to English #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions macos/ONLYOFFICE/Code/Utils/ascprinter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,26 +319,26 @@ class ASCPrinterContext : public NSEditorApi::CAscPrinterContextBase

// start print dialog
NSPrintInfo* pPrintInfo = [NSPrintInfo sharedPrintInfo];
// NSString* sKeyPrint = @"prihord"; // Ключ в котором расположен объект NSPrintInfo
// NSString* sKeyPrint = @"prihord"; // Key for the stored NSPrintInfo object

// Пробуем извлечь
// Try to restore saved print settings
// NSUserDefaults* pUserDef = [[NSUserDefaults alloc] init];
// NSData* pDataInfo = [pUserDef dataForKey:sKeyPrint];
// if (pDataInfo)
// {
// Если удачно извлекли
// If saved settings were found
// pPrintInfo = [NSUnarchiver unarchiveObjectWithData:pDataInfo];
// }
// else
{
#if 0
// Иначе выводим панель настройки печати
// Otherwise show the page setup panel
NSPageLayout* pPageLayout = [[NSPageLayout alloc] init];
if ([pPageLayout runModal] == NSModalResponseOK)
{
pPrintInfo = pPageLayout.printInfo;

// сохраним введенные настройки в User Defaults
// Save the entered settings to User Defaults
pDataInfo = [NSArchiver archivedDataWithRootObject:pPrintInfo];
[pUserDef setObject:pDataInfo forKey:sKeyPrint];
}
Expand Down Expand Up @@ -392,7 +392,7 @@ class ASCPrinterContext : public NSEditorApi::CAscPrinterContextBase
else
pro = [NSPrintOperation printOperationWithView:m_pView];

[pro setShowsPrintPanel:YES]; // Выводим на печать или предпросмотр
[pro setShowsPrintPanel:YES]; // Show the print panel for printing or preview
[[pro printPanel] setOptions:options];
//[pro runOperation];
[pro runOperationModalForWindow:pViewParent.window delegate:sender didRunSelector:didRunSelector contextInfo:nil];
Expand Down
2 changes: 1 addition & 1 deletion win-linux/extras/update-daemon/src/classes/csvcmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ void CSvcManager::onCompleteUnzip(const int error)
{
__UNLOCK
if (error == UNZIP_OK) {
// Сreate a file about successful unpacking for use in subsequent launches
// Write a marker for the successful unpack so subsequent launches can continue from it.
const tstring updPath = NS_File::parentPath(NS_File::appPath()) + UPDATE_PATH;
list<tstring> successList{m_newVersion};
if (!NS_File::writeToFile(updPath + SUCCES_UNPACKED, successList)) {
Expand Down
7 changes: 3 additions & 4 deletions win-linux/src/cmyapplicationmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@ class CMyApplicationManager : public CAscApplicationManager

virtual void StartSaveDialog(const std::wstring& sName)
{
// сделал через QMainPanel - чтобы использовать сигналы-слоты.
// если сделать QAscApplicationManager : public QObject, то он будет прокидывать
// слоты родителю. Т.е. классу CAscApplicationManager.
// А в либе я не буду затачиваться на QT
// Route this through QMainPanel so we can use Qt signals/slots.
// Making QAscApplicationManager inherit QObject would expose the slots through
// CAscApplicationManager, but the library should stay independent of Qt.

// ((QMainPanel*)m_pPanel)->sendDialogSave(sName);
QMetaObject::invokeMethod(m_pPanel, "onDialogSave", Qt::QueuedConnection, Q_ARG(std::wstring, sName));
Expand Down
2 changes: 1 addition & 1 deletion win-linux/src/qtcomp/qregexp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ namespace QtComp
#endif
}

// Неявные конверсии — позволяют использовать в QString::contains()
// Implicit conversions let this wrapper be used with QString::contains().
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
operator QRegExp() const { return m_re; }
#else
Expand Down