diff --git a/src/libraries/wyedit/Editor.cpp b/src/libraries/wyedit/Editor.cpp index 86b8d3d74..3084f49e5 100644 --- a/src/libraries/wyedit/Editor.cpp +++ b/src/libraries/wyedit/Editor.cpp @@ -237,33 +237,33 @@ void Editor::setupFormatters(void) void Editor::setupSignals(void) { // Создание сигналов, генерируемых кнопками форматирования текста - connect(editorToolBarAssistant->bold, SIGNAL(clicked()), - typefaceFormatter, SLOT (onBoldClicked()), + connect( &(editorToolBarAssistant->bold), SIGNAL(clicked()), + typefaceFormatter, SLOT (onBoldClicked()), + Qt::DirectConnection); + connect( &(editorToolBarAssistant->italic), SIGNAL(clicked()), + typefaceFormatter, SLOT (onItalicClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->italic, SIGNAL(clicked()), - typefaceFormatter, SLOT (onItalicClicked()), + connect( &(editorToolBarAssistant->underline), SIGNAL(clicked()), + typefaceFormatter, SLOT (onUnderlineClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->underline, SIGNAL(clicked()), - typefaceFormatter, SLOT (onUnderlineClicked()), + connect( &(editorToolBarAssistant->monospace), SIGNAL(clicked()), + typefaceFormatter, SLOT (onMonospaceClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->monospace, SIGNAL(clicked()), - typefaceFormatter, SLOT (onMonospaceClicked()), + connect( &(editorToolBarAssistant)->code, SIGNAL(clicked()), + typefaceFormatter, SLOT (onCodeClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->code, SIGNAL(clicked()), - typefaceFormatter, SLOT (onCodeClicked()), - Qt::DirectConnection); - connect(editorToolBarAssistant->clear, SIGNAL(clicked()), - typefaceFormatter, SLOT (onClearClicked()), + connect( &(editorToolBarAssistant->clear), SIGNAL(clicked()), + typefaceFormatter, SLOT (onClearClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->fontSelect, SIGNAL(currentFontChanged(const QFont &)), - typefaceFormatter, SLOT (onFontselectChanged(const QFont &)), + connect( &(editorToolBarAssistant->fontSelect), SIGNAL(currentFontChanged(const QFont &)), + typefaceFormatter, SLOT (onFontselectChanged(const QFont &)), Qt::DirectConnection); - connect(editorToolBarAssistant->fontSize, SIGNAL(currentIndexChanged(int)), - typefaceFormatter, SLOT (onFontsizeChanged(int)), + connect( &(editorToolBarAssistant->fontSize), SIGNAL(currentIndexChanged(int)), + typefaceFormatter, SLOT (onFontsizeChanged(int)), Qt::DirectConnection); - connect(editorToolBarAssistant->fontColor, SIGNAL(clicked()), - typefaceFormatter, SLOT (onFontcolorClicked()), + connect( &(editorToolBarAssistant->fontColor), SIGNAL(clicked()), + typefaceFormatter, SLOT (onFontcolorClicked()), Qt::DirectConnection); @@ -305,11 +305,11 @@ void Editor::setupSignals(void) Qt::DirectConnection); - connect(editorToolBarAssistant->indentPlus, SIGNAL(clicked()), - placementFormatter, SLOT (onIndentplusClicked()), + connect( &(editorToolBarAssistant->indentPlus), SIGNAL(clicked()), + placementFormatter, SLOT (onIndentplusClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->indentMinus, SIGNAL(clicked()), - placementFormatter, SLOT (onIndentminusClicked()), + connect( &(editorToolBarAssistant->indentMinus), SIGNAL(clicked()), + placementFormatter, SLOT (onIndentminusClicked()), Qt::DirectConnection); @@ -320,68 +320,68 @@ void Editor::setupSignals(void) indentSliderAssistant, SLOT (updateToActualFormat()), Qt::DirectConnection); - connect(editorToolBarAssistant->alignLeft, SIGNAL(clicked()), - placementFormatter, SLOT (onAlignleftClicked()), + connect( &(editorToolBarAssistant->alignLeft), SIGNAL(clicked()), + placementFormatter, SLOT (onAlignleftClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->alignCenter, SIGNAL(clicked()), - placementFormatter, SLOT (onAligncenterClicked()), + connect( &(editorToolBarAssistant->alignCenter), SIGNAL(clicked()), + placementFormatter, SLOT (onAligncenterClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->alignRight, SIGNAL(clicked()), - placementFormatter, SLOT (onAlignrightClicked()), + connect( &(editorToolBarAssistant->alignRight), SIGNAL(clicked()), + placementFormatter, SLOT (onAlignrightClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->alignWidth, SIGNAL(clicked()), - placementFormatter, SLOT (onAlignwidthClicked()), + connect( &(editorToolBarAssistant->alignWidth), SIGNAL(clicked()), + placementFormatter, SLOT (onAlignwidthClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->numericList, SIGNAL(clicked()), - listFormatter, SLOT (onNumericlistClicked()), + connect( &(editorToolBarAssistant->numericList), SIGNAL(clicked()), + listFormatter, SLOT (onNumericlistClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->dotList, SIGNAL(clicked()), - listFormatter, SLOT (onDotlistClicked()), + connect( &(editorToolBarAssistant->dotList), SIGNAL(clicked()), + listFormatter, SLOT (onDotlistClicked()), Qt::DirectConnection); // Кнопки работы с таблицами - connect(editorToolBarAssistant->createTable, SIGNAL(clicked()), - tableFormatter, SLOT (onCreatetableClicked()), + connect( &(editorToolBarAssistant->createTable), SIGNAL(clicked()), + tableFormatter, SLOT (onCreatetableClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->tableRemoveRow, SIGNAL(clicked()), - tableFormatter, SLOT (onTableRemoveRowClicked()), + connect( &(editorToolBarAssistant->tableRemoveRow), SIGNAL(clicked()), + tableFormatter, SLOT (onTableRemoveRowClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->tableRemoveCol, SIGNAL(clicked()), - tableFormatter, SLOT (onTableRemoveColClicked()), + connect( &(editorToolBarAssistant->tableRemoveCol), SIGNAL(clicked()), + tableFormatter, SLOT (onTableRemoveColClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->tableAddRow, SIGNAL(clicked()), - tableFormatter, SLOT (onTableAddRowClicked()), + connect( &(editorToolBarAssistant->tableAddRow), SIGNAL(clicked()), + tableFormatter, SLOT (onTableAddRowClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->tableAddCol, SIGNAL(clicked()), - tableFormatter, SLOT (onTableAddColClicked()), + connect( &(editorToolBarAssistant->tableAddCol), SIGNAL(clicked()), + tableFormatter, SLOT (onTableAddColClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->tableMergeCells, SIGNAL(clicked()), - tableFormatter, SLOT (onTableMergeCellsClicked()), + connect( &(editorToolBarAssistant->tableMergeCells), SIGNAL(clicked()), + tableFormatter, SLOT (onTableMergeCellsClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->tableSplitCell, SIGNAL(clicked()), - tableFormatter, SLOT (onTableSplitCellClicked()), + connect( &(editorToolBarAssistant->tableSplitCell), SIGNAL(clicked()), + tableFormatter, SLOT (onTableSplitCellClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->tableProperties, SIGNAL(clicked()), - tableFormatter, SLOT (onTablePropertiesClicked()), + connect( &(editorToolBarAssistant->tableProperties), SIGNAL(clicked()), + tableFormatter, SLOT (onTablePropertiesClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->reference, SIGNAL(clicked()), - referenceFormatter, SLOT (onReferenceClicked()), + connect( &(editorToolBarAssistant->reference), SIGNAL(clicked()), + referenceFormatter, SLOT (onReferenceClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->showHtml, SIGNAL(clicked()), - this, SLOT (onShowhtmlClicked()), + connect( &(editorToolBarAssistant->showHtml), SIGNAL(clicked()), + this, SLOT (onShowhtmlClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->findText, SIGNAL(clicked()), - this, SLOT (onFindtextClicked()), + connect( &(editorToolBarAssistant->findText), SIGNAL(clicked()), + this, SLOT (onFindtextClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->settings, SIGNAL(clicked()), - this, SLOT (onSettingsClicked()), + connect( &(editorToolBarAssistant->settings), SIGNAL(clicked()), + this, SLOT (onSettingsClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->showFormatting, SIGNAL(toggled(bool)), - this, SLOT (onShowformattingClicked(bool)), + connect( &(editorToolBarAssistant->showFormatting), SIGNAL(toggled(bool)), + this, SLOT (onShowformattingClicked(bool)), Qt::DirectConnection); @@ -394,26 +394,26 @@ void Editor::setupSignals(void) // Прочие кнопки - connect(editorToolBarAssistant->insertImageFromFile, SIGNAL(clicked()), - imageFormatter, SLOT (onInsertImageFromFileClicked()), + connect( &(editorToolBarAssistant->insertImageFromFile), SIGNAL(clicked()), + imageFormatter, SLOT (onInsertImageFromFileClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->expandEditArea, SIGNAL(clicked()), - this, SLOT (onExpandEditAreaClicked()), + connect( &(editorToolBarAssistant->expandEditArea), SIGNAL(clicked()), + this, SLOT (onExpandEditAreaClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->save, SIGNAL(clicked()), - this, SLOT (onSaveClicked()), + connect( &(editorToolBarAssistant->save), SIGNAL(clicked()), + this, SLOT (onSaveClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->back, SIGNAL(clicked()), - this, SLOT (onBackClicked()), + connect( &(editorToolBarAssistant->back), SIGNAL(clicked()), + this, SLOT (onBackClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->findInBase, SIGNAL(clicked()), - this, SLOT (onFindInBaseClicked()), + connect( &(editorToolBarAssistant->findInBase), SIGNAL(clicked()), + this, SLOT (onFindInBaseClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->showText, SIGNAL(clicked()), - this, SLOT (onShowTextClicked()), + connect( &(editorToolBarAssistant->showText), SIGNAL(clicked()), + this, SLOT (onShowTextClicked()), Qt::DirectConnection); - connect(editorToolBarAssistant->toAttach, SIGNAL(clicked()), - this, SLOT (onToAttachClicked()), + connect( &(editorToolBarAssistant->toAttach), SIGNAL(clicked()), + this, SLOT (onToAttachClicked()), Qt::DirectConnection); // Область редактирования текста @@ -512,8 +512,6 @@ void Editor::setupSignals(void) } - - // Сборка редактора и его активизация void Editor::assembly(void) { diff --git a/src/libraries/wyedit/EditorToolBar.cpp b/src/libraries/wyedit/EditorToolBar.cpp index 523b09321..b9670eb2d 100644 --- a/src/libraries/wyedit/EditorToolBar.cpp +++ b/src/libraries/wyedit/EditorToolBar.cpp @@ -13,46 +13,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) : QWidget(parent) EditorToolBar::~EditorToolBar() { - delete bold; - delete italic; - delete underline; - delete monospace; - delete code; - delete clear; - delete numericList; - delete dotList; - delete indentPlus; - delete indentMinus; - delete alignLeft; - delete alignCenter; - delete alignRight; - delete alignWidth; - delete settings; - delete fontSelect; - delete fontSize; - delete fontColor; - delete reference; - delete showHtml; - delete findText; - delete createTable; - delete tableRemoveRow; - delete tableRemoveCol; - delete tableAddRow; - delete tableAddCol; - delete tableMergeCells; - delete tableSplitCell; - delete tableProperties; - delete insertImageFromFile; - delete expandEditArea; - delete expandToolsLines; - delete save; - delete back; - delete findInBase; - delete showText; - delete toAttach; - delete textformatButtonsLayout; - delete toolsLine1; - delete toolsLine2; + } @@ -102,265 +63,265 @@ void EditorToolBar::setupButtons(void) // имена объектов кнопок должны начинаться на "editor_tb" // Кнопка Bold - bold = new QToolButton(this); - bold->setCheckable(true); - bold->setShortcut(QKeySequence(QKeySequence::Bold)); - bold->setStatusTip(tr("Bold (Ctrl+B)")); - bold->setIcon(QIcon(":/resource/pic/edit_bold.svg")); - bold->setObjectName("editor_tb_bold"); + bold.setParent(this); + bold.setCheckable(true); + bold.setShortcut(QKeySequence(QKeySequence::Bold)); + bold.setStatusTip(tr("Bold (Ctrl+B)")); + bold.setIcon(QIcon(":/resource/pic/edit_bold.svg")); + bold.setObjectName("editor_tb_bold"); // Кнопка Italic - italic = new QToolButton(this); - italic->setCheckable(true); - italic->setShortcut(QKeySequence(QKeySequence::Italic)); - italic->setStatusTip(tr("Italic (Ctrl+I)")); - italic->setIcon(QIcon(":/resource/pic/edit_italic.svg")); - italic->setObjectName("editor_tb_italic"); + italic.setParent(this); + italic.setCheckable(true); + italic.setShortcut(QKeySequence(QKeySequence::Italic)); + italic.setStatusTip(tr("Italic (Ctrl+I)")); + italic.setIcon(QIcon(":/resource/pic/edit_italic.svg")); + italic.setObjectName("editor_tb_italic"); // Кнопка Underline - underline = new QToolButton(this); - underline->setCheckable(true); - underline->setShortcut(QKeySequence(QKeySequence::Underline)); - underline->setStatusTip(tr("Underline (Ctrl+U)")); - underline->setIcon(QIcon(":/resource/pic/edit_underline.svg")); - underline->setObjectName("editor_tb_underline"); + underline.setParent(this); + underline.setCheckable(true); + underline.setShortcut(QKeySequence(QKeySequence::Underline)); + underline.setStatusTip(tr("Underline (Ctrl+U)")); + underline.setIcon(QIcon(":/resource/pic/edit_underline.svg")); + underline.setObjectName("editor_tb_underline"); // Кнопка Monospace - monospace = new QToolButton(this); - monospace->setShortcut(QKeySequence(tr("Ctrl+T"))); - monospace->setStatusTip(tr("Monospace (Ctrl+T)")); - monospace->setIcon(QIcon(":/resource/pic/edit_monospace.svg")); - monospace->setObjectName("editor_tb_monospace"); + monospace.setParent(this); + monospace.setShortcut(QKeySequence(tr("Ctrl+T"))); + monospace.setStatusTip(tr("Monospace (Ctrl+T)")); + monospace.setIcon(QIcon(":/resource/pic/edit_monospace.svg")); + monospace.setObjectName("editor_tb_monospace"); // Кнопка Code - code = new QToolButton(this); - code->setShortcut(QKeySequence(tr("Ctrl+M"))); - code->setStatusTip(tr("Code (Ctrl+M). Select a whole paragraphs to format text as code.")); - code->setIcon(QIcon(":/resource/pic/edit_code.svg")); - code->setObjectName("editor_tb_code"); + code.setParent(this); + code.setShortcut(QKeySequence(tr("Ctrl+M"))); + code.setStatusTip(tr("Code (Ctrl+M). Select a whole paragraphs to format text as code.")); + code.setIcon(QIcon(":/resource/pic/edit_code.svg")); + code.setObjectName("editor_tb_code"); // Кнопка Clear - clear = new QToolButton(this); - clear->setShortcut(QKeySequence(tr("Ctrl+K"))); - clear->setStatusTip(tr("Reset format (Ctrl+K). When selected whole paragraph both text and paragraph format is reset to default or just text format in other case.")); - clear->setIcon(QIcon(":/resource/pic/edit_clear.svg")); - clear->setObjectName("editor_tb_clear"); + clear.setParent(this); + clear.setShortcut(QKeySequence(tr("Ctrl+K"))); + clear.setStatusTip(tr("Reset format (Ctrl+K). When selected whole paragraph both text and paragraph format is reset to default or just text format in other case.")); + clear.setIcon(QIcon(":/resource/pic/edit_clear.svg")); + clear.setObjectName("editor_tb_clear"); // Кнопка нумерованного списка - numericList = new QToolButton(this); - numericList->setStatusTip(tr("Numeric list")); - numericList->setIcon(QIcon(":/resource/pic/edit_listnumeric.svg")); - numericList->setObjectName("editor_tb_numericlist"); + numericList.setParent(this); + numericList.setStatusTip(tr("Numeric list")); + numericList.setIcon(QIcon(":/resource/pic/edit_listnumeric.svg")); + numericList.setObjectName("editor_tb_numericlist"); // Кнопка списка с точками - dotList = new QToolButton(this); - dotList->setStatusTip(tr("Marked list")); - dotList->setIcon(QIcon(":/resource/pic/edit_listdot.svg")); - dotList->setObjectName("editor_tb_dotlist"); + dotList.setParent(this); + dotList.setStatusTip(tr("Marked list")); + dotList.setIcon(QIcon(":/resource/pic/edit_listdot.svg")); + dotList.setObjectName("editor_tb_dotlist"); // Кнопка увеличения отступа - indentPlus = new QToolButton(this); - indentPlus->setStatusTip(tr("Increase indent")); - indentPlus->setIcon(QIcon(":/resource/pic/edit_indentplus.svg")); - indentPlus->setObjectName("editor_tb_indentplus"); + indentPlus.setParent(this); + indentPlus.setStatusTip(tr("Increase indent")); + indentPlus.setIcon(QIcon(":/resource/pic/edit_indentplus.svg")); + indentPlus.setObjectName("editor_tb_indentplus"); // Кнопка уменьшения отступа - indentMinus = new QToolButton(this); - indentMinus->setStatusTip(tr("Decrease indent")); - indentMinus->setIcon(QIcon(":/resource/pic/edit_indentminus.svg")); - indentMinus->setObjectName("editor_tb_indentminus"); + indentMinus.setParent(this); + indentMinus.setStatusTip(tr("Decrease indent")); + indentMinus.setIcon(QIcon(":/resource/pic/edit_indentminus.svg")); + indentMinus.setObjectName("editor_tb_indentminus"); // Кнопка выравнивания по левому краю - alignLeft = new QToolButton(this); - alignLeft->setCheckable(true); - alignLeft->setShortcut(QKeySequence(tr("Ctrl+L"))); - alignLeft->setStatusTip(tr("Align left (Ctrl+L)")); - alignLeft->setIcon(QIcon(":/resource/pic/edit_alignleft.svg")); - alignLeft->setObjectName("editor_tb_alignleft"); + alignLeft.setParent(this); + alignLeft.setCheckable(true); + alignLeft.setShortcut(QKeySequence(tr("Ctrl+L"))); + alignLeft.setStatusTip(tr("Align left (Ctrl+L)")); + alignLeft.setIcon(QIcon(":/resource/pic/edit_alignleft.svg")); + alignLeft.setObjectName("editor_tb_alignleft"); // Кнопка выравнивания по центру - alignCenter = new QToolButton(this); - alignCenter->setCheckable(true); - alignCenter->setShortcut(QKeySequence(tr("Ctrl+E"))); - alignCenter->setStatusTip(tr("Align center (Ctrl+E)")); - alignCenter->setIcon(QIcon(":/resource/pic/edit_aligncenter.svg")); - alignCenter->setObjectName("editor_tb_aligncenter"); + alignCenter.setParent(this); + alignCenter.setCheckable(true); + alignCenter.setShortcut(QKeySequence(tr("Ctrl+E"))); + alignCenter.setStatusTip(tr("Align center (Ctrl+E)")); + alignCenter.setIcon(QIcon(":/resource/pic/edit_aligncenter.svg")); + alignCenter.setObjectName("editor_tb_aligncenter"); // Кнопка выравнивания по правому краю - alignRight = new QToolButton(this); - alignRight->setCheckable(true); - alignRight->setShortcut(QKeySequence(tr("Ctrl+R"))); - alignRight->setStatusTip(tr("Align right (Ctrl+R)")); - alignRight->setIcon(QIcon(":/resource/pic/edit_alignright.svg")); - alignRight->setObjectName("editor_tb_alignright"); + alignRight.setParent(this); + alignRight.setCheckable(true); + alignRight.setShortcut(QKeySequence(tr("Ctrl+R"))); + alignRight.setStatusTip(tr("Align right (Ctrl+R)")); + alignRight.setIcon(QIcon(":/resource/pic/edit_alignright.svg")); + alignRight.setObjectName("editor_tb_alignright"); // Кнопка выравнивания по ширине - alignWidth = new QToolButton(this); - alignWidth->setCheckable(true); - alignWidth->setShortcut(QKeySequence(tr("Ctrl+J"))); - alignWidth->setStatusTip(tr("Align width (Ctrl+J)")); - alignWidth->setIcon(QIcon(":/resource/pic/edit_alignwidth.svg")); - alignWidth->setObjectName("editor_tb_alignwidth"); + alignWidth.setParent(this); + alignWidth.setCheckable(true); + alignWidth.setShortcut(QKeySequence(tr("Ctrl+J"))); + alignWidth.setStatusTip(tr("Align width (Ctrl+J)")); + alignWidth.setIcon(QIcon(":/resource/pic/edit_alignwidth.svg")); + alignWidth.setObjectName("editor_tb_alignwidth"); // Выбор шрифта - fontSelect = new QFontComboBox(this); - fontSelect->setObjectName("editor_tb_fontselect"); + fontSelect.setParent(this); + fontSelect.setObjectName("editor_tb_fontselect"); // Пустой пункт в конце списка шрифтов, используется для обозначения что в // выделенном тексте несколько шрифтов - fontSelect->addItem(" "); - fontSelect->setItemIcon((fontSelect->count())-1,QIcon(":/resource/pic/edit_font_many.svg")); + fontSelect.addItem(" "); + fontSelect.setItemIcon((fontSelect.count())-1,QIcon(":/resource/pic/edit_font_many.svg")); // Выбор размера шрифта - fontSize=new MtComboBox(this); + fontSize.setParent(this); for(int i=MINIMUM_ALLOWED_FONT_SIZE; i<=MAXIMUM_ALLOWED_FONT_SIZE; i++) - fontSize->addItem(QString("%1").arg(i),i); - fontSize->setCurrentIndex(fontSize->findData(10)); - fontSize->setMinimumContentsLength(3); - fontSize->setEditable(true); + fontSize.addItem(QString("%1").arg(i),i); + fontSize.setCurrentIndex(fontSize.findData(10)); + fontSize.setMinimumContentsLength(3); + fontSize.setEditable(true); QValidator *fontsizeValidator = new QIntValidator(MINIMUM_ALLOWED_FONT_SIZE, MAXIMUM_ALLOWED_FONT_SIZE, this); - fontSize->setValidator(fontsizeValidator); - fontSize->setObjectName("editor_tb_fontsize"); + fontSize.setValidator(fontsizeValidator); + fontSize.setObjectName("editor_tb_fontsize"); // Пустой пункт в конце списка размеров шрифтов, используется для обозначения // что в выделенном тексте несколько размеров - fontSize->addItem(" ",0); + fontSize.addItem(" ",0); // Кнопка выбора цвета шрифта - fontColor=new QToolButton(this); - // fontColor->setShortcut(QKeySequence(tr("Ctrl+F"))); - fontColor->setStatusTip(tr("Text color")); - fontColor->setIcon(QIcon(":/resource/pic/edit_fontcolor.svg")); - fontColor->setObjectName("editor_tb_fontcolor"); + // fontColor.setShortcut(QKeySequence(tr("Ctrl+F"))); + fontColor.setParent(this); + fontColor.setStatusTip(tr("Text color")); + fontColor.setIcon(QIcon(":/resource/pic/edit_fontcolor.svg")); + fontColor.setObjectName("editor_tb_fontcolor"); // Кнопка вызова виджета поиска текста - findText=new QToolButton(this); - findText->setShortcut(QKeySequence(tr("Ctrl+F"))); - findText->setStatusTip(tr("Find text (Ctrl+F)")); - findText->setIcon(QIcon(":/resource/pic/edit_findtext.svg")); - findText->setObjectName("editor_tb_findtext"); + findText.setParent(this); + findText.setShortcut(QKeySequence(tr("Ctrl+F"))); + findText.setStatusTip(tr("Find text (Ctrl+F)")); + findText.setIcon(QIcon(":/resource/pic/edit_findtext.svg")); + findText.setObjectName("editor_tb_findtext"); // Кнопка вызова виджета конфигурирования редактора - settings = new QToolButton(this); - settings->setStatusTip(tr("Editor settings")); - settings->setIcon(QIcon(":/resource/pic/edit_settings.svg")); - settings->setObjectName("editor_tb_settings"); + settings.setParent(this); + settings.setStatusTip(tr("Editor settings")); + settings.setIcon(QIcon(":/resource/pic/edit_settings.svg")); + settings.setObjectName("editor_tb_settings"); // Кнопка редактирования ссылки (URL) - reference = new QToolButton(this); - reference->setStatusTip(tr("Edit reference (URL)")); - reference->setIcon(QIcon(":/resource/pic/edit_reference.svg")); - reference->setObjectName("editor_tb_reference"); + reference.setParent(this); + reference.setStatusTip(tr("Edit reference (URL)")); + reference.setIcon(QIcon(":/resource/pic/edit_reference.svg")); + reference.setObjectName("editor_tb_reference"); // Кнопка просмотра HTML кода - showHtml = new QToolButton(this); - showHtml->setStatusTip(tr("Edit HTML code")); - showHtml->setIcon(QIcon(":/resource/pic/edit_showhtml.svg")); - showHtml->setObjectName("editor_tb_showhtml"); + showHtml.setParent(this); + showHtml.setStatusTip(tr("Edit HTML code")); + showHtml.setIcon(QIcon(":/resource/pic/edit_showhtml.svg")); + showHtml.setObjectName("editor_tb_showhtml"); // Кнопка включения отображения символов фарматирования - showFormatting = new QToolButton(this); - showFormatting->setCheckable(true); - showFormatting->setStatusTip(tr("Show special chars")); - showFormatting->setIcon(QIcon(":/resource/pic/edit_showformatting.svg")); - showFormatting->setObjectName("editor_tb_showformatting"); + showFormatting.setParent(this); + showFormatting.setCheckable(true); + showFormatting.setStatusTip(tr("Show special chars")); + showFormatting.setIcon(QIcon(":/resource/pic/edit_showformatting.svg")); + showFormatting.setObjectName("editor_tb_showformatting"); // Кнопка добавления новой таблицы - createTable = new QToolButton(this); - createTable->setStatusTip(tr("Create a new table")); - createTable->setIcon(QIcon(":/resource/pic/edit_createtable.svg")); - createTable->setObjectName("editor_tb_createtable"); - - tableRemoveRow = new QToolButton(this); - tableRemoveRow->setStatusTip(tr("Remove row(s)")); - tableRemoveRow->setIcon(QIcon(":/resource/pic/edit_table_remove_row.svg")); - tableRemoveRow->setObjectName("editor_tb_table_remove_row"); - - tableRemoveCol = new QToolButton(this); - tableRemoveCol->setStatusTip(tr("Remove column(s)")); - tableRemoveCol->setIcon(QIcon(":/resource/pic/edit_table_remove_col.svg")); - tableRemoveCol->setObjectName("editor_tb_table_remove_col"); - - tableAddRow = new QToolButton(this); - tableAddRow->setStatusTip(tr("Add row(s)")); - tableAddRow->setIcon(QIcon(":/resource/pic/edit_table_add_row.svg")); - tableAddRow->setObjectName("editor_tb_table_add_row"); - - tableAddCol = new QToolButton(this); - tableAddCol->setStatusTip(tr("Add column(s)")); - tableAddCol->setIcon(QIcon(":/resource/pic/edit_table_add_col.svg")); - tableAddCol->setObjectName("editor_tb_table_add_col"); - - tableMergeCells = new QToolButton(this); - tableMergeCells->setStatusTip(tr("Merge cells")); - tableMergeCells->setIcon(QIcon(":/resource/pic/edit_table_merge_cells.svg")); - tableMergeCells->setObjectName("editor_tb_table_merge_cells"); - - tableSplitCell = new QToolButton(this); - tableSplitCell->setStatusTip(tr("Split cell")); - tableSplitCell->setIcon(QIcon(":/resource/pic/edit_table_split_cell.svg")); - tableSplitCell->setObjectName("editor_tb_table_split_cell"); - - tableProperties = new QToolButton(this); - tableProperties->setStatusTip(tr("Table properties")); - tableProperties->setIcon(QIcon(":/resource/pic/edit_table_properties.svg")); - tableProperties->setObjectName("editor_tb_table_properties"); - - insertImageFromFile = new QToolButton(this); - insertImageFromFile->setStatusTip(tr("Insert image from file / edit image properties of selected image")); - insertImageFromFile->setIcon(QIcon(":/resource/pic/edit_insert_image_from_file.svg")); - insertImageFromFile->setObjectName("editor_tb_insert_image_from_file"); - - expandEditArea = new QToolButton(this); - expandEditArea->setStatusTip(tr("Expand edit area")); - expandEditArea->setIcon(QIcon(":/resource/pic/edit_expand_text_area.svg")); - expandEditArea->setObjectName("editor_tb_expand_edit_area"); - - expandToolsLines = new QToolButton(this); - expandToolsLines->setStatusTip(tr("Expand tools")); - expandToolsLines->setIcon(QIcon(":/resource/pic/edit_expand_tools_lines.svg")); - expandToolsLines->setObjectName("editor_tb_expand_tools_lines"); - - save = new QToolButton(this); - save->setStatusTip(tr("Save (Ctrl+S)")); - save->setShortcut(QKeySequence(tr("Ctrl+S"))); - save->setIcon(QIcon(":/resource/pic/edit_save.svg")); - save->setObjectName("editor_tb_save"); + createTable.setParent(this); + createTable.setStatusTip(tr("Create a new table")); + createTable.setIcon(QIcon(":/resource/pic/edit_createtable.svg")); + createTable.setObjectName("editor_tb_createtable"); + + tableRemoveRow.setParent(this); + tableRemoveRow.setStatusTip(tr("Remove row(s)")); + tableRemoveRow.setIcon(QIcon(":/resource/pic/edit_table_remove_row.svg")); + tableRemoveRow.setObjectName("editor_tb_table_remove_row"); + + tableRemoveCol.setParent(this); + tableRemoveCol.setStatusTip(tr("Remove column(s)")); + tableRemoveCol.setIcon(QIcon(":/resource/pic/edit_table_remove_col.svg")); + tableRemoveCol.setObjectName("editor_tb_table_remove_col"); + + tableAddRow.setParent(this); + tableAddRow.setStatusTip(tr("Add row(s)")); + tableAddRow.setIcon(QIcon(":/resource/pic/edit_table_add_row.svg")); + tableAddRow.setObjectName("editor_tb_table_add_row"); + + tableAddCol.setParent(this); + tableAddCol.setStatusTip(tr("Add column(s)")); + tableAddCol.setIcon(QIcon(":/resource/pic/edit_table_add_col.svg")); + tableAddCol.setObjectName("editor_tb_table_add_col"); + + tableMergeCells.setParent(this); + tableMergeCells.setStatusTip(tr("Merge cells")); + tableMergeCells.setIcon(QIcon(":/resource/pic/edit_table_merge_cells.svg")); + tableMergeCells.setObjectName("editor_tb_table_merge_cells"); + + tableSplitCell.setParent(this); + tableSplitCell.setStatusTip(tr("Split cell")); + tableSplitCell.setIcon(QIcon(":/resource/pic/edit_table_split_cell.svg")); + tableSplitCell.setObjectName("editor_tb_table_split_cell"); + + tableProperties.setParent(this); + tableProperties.setStatusTip(tr("Table properties")); + tableProperties.setIcon(QIcon(":/resource/pic/edit_table_properties.svg")); + tableProperties.setObjectName("editor_tb_table_properties"); + + insertImageFromFile.setParent(this); + insertImageFromFile.setStatusTip(tr("Insert image from file / edit image properties of selected image")); + insertImageFromFile.setIcon(QIcon(":/resource/pic/edit_insert_image_from_file.svg")); + insertImageFromFile.setObjectName("editor_tb_insert_image_from_file"); + + expandEditArea.setParent(this); + expandEditArea.setStatusTip(tr("Expand edit area")); + expandEditArea.setIcon(QIcon(":/resource/pic/edit_expand_text_area.svg")); + expandEditArea.setObjectName("editor_tb_expand_edit_area"); + + expandToolsLines.setParent(this); + expandToolsLines.setStatusTip(tr("Expand tools")); + expandToolsLines.setIcon(QIcon(":/resource/pic/edit_expand_tools_lines.svg")); + expandToolsLines.setObjectName("editor_tb_expand_tools_lines"); + + save.setParent(this); + save.setStatusTip(tr("Save (Ctrl+S)")); + save.setShortcut(QKeySequence(tr("Ctrl+S"))); + save.setIcon(QIcon(":/resource/pic/edit_save.svg")); + save.setObjectName("editor_tb_save"); // Кнопка "назад", используется в мобильном интерфейсе - back = new QToolButton(this); - back->setStatusTip(tr("Back")); - back->setIcon(QIcon(":/resource/pic/mobile_back.svg")); - back->setObjectName("editor_tb_back"); + back.setParent(this); + back.setStatusTip(tr("Back")); + back.setIcon(QIcon(":/resource/pic/mobile_back.svg")); + back.setObjectName("editor_tb_back"); // Кнопка "поиск по базе", используется в мобильном интерфейсе - findInBase = new QToolButton(this); - findInBase->setStatusTip(tr("Find in base")); - findInBase->setIcon(QIcon(":/resource/pic/find_in_base.svg")); - findInBase->setObjectName("editor_tb_find_in_base"); + findInBase.setParent(this); + findInBase.setStatusTip(tr("Find in base")); + findInBase.setIcon(QIcon(":/resource/pic/find_in_base.svg")); + findInBase.setObjectName("editor_tb_find_in_base"); // Кнопка "показать текст" для просмотра текста в отдельном окне - showText = new QToolButton(this); - showText->setStatusTip(tr("Show text in detached window")); - showText->setIcon(QIcon(":/resource/pic/edit_show_text.svg")); - showText->setObjectName("editor_tb_show_text"); + showText.setParent(this); + showText.setStatusTip(tr("Show text in detached window")); + showText.setIcon(QIcon(":/resource/pic/edit_show_text.svg")); + showText.setObjectName("editor_tb_show_text"); // Кнопка переключения на аттачи iconAttachNotExists = QIcon(":/resource/pic/attach.svg"); iconAttachExists = QIcon(":/resource/pic/attach_exists.svg"); - toAttach = new QToolButton(this); - toAttach->setStatusTip(tr("Show attach files")); - toAttach->setIcon(iconAttachNotExists); - toAttach->setObjectName("editor_tb_attach"); + toAttach.setParent(this); + toAttach.setStatusTip(tr("Show attach files")); + toAttach.setIcon(iconAttachNotExists); + toAttach.setObjectName("editor_tb_attach"); // Все только что созданные элементы скрываются hideAllToolsElements(); @@ -412,9 +373,6 @@ void EditorToolBar::setEnableModifyTextButton(bool state) void EditorToolBar::assemblyButtons(void) { // Заполнение горизонтальных линеек с кнопками форматирования текста - toolsLine1=new QToolBar(); - toolsLine2=new QToolBar(); - updateToolsLines(); /* @@ -424,12 +382,11 @@ void EditorToolBar::assemblyButtons(void) */ // Горизонтальные линейки собираются - textformatButtonsLayout=new QVBoxLayout(); - textformatButtonsLayout->addWidget(toolsLine1); - textformatButtonsLayout->addWidget(toolsLine2); + textformatButtonsLayout.addWidget( &toolsLine1 ); + textformatButtonsLayout.addWidget( &toolsLine2 ); // Полученый набор элементов устанавливается для текущего виджета - setLayout(textformatButtonsLayout); + setLayout( &textformatButtonsLayout ); // Границы убираются, так как данный объект будет использоваться как виджет QLayout *lt; @@ -457,18 +414,25 @@ void EditorToolBar::updateToolsLines(void) // В линейку кнопок вставляется нужный инструмент // Метод принимает имя инструмента // и указатель на линейку -void EditorToolBar::insertButtonToToolsLine(QString toolName, QToolBar *line) +void EditorToolBar::insertButtonToToolsLine(QString toolName, QToolBar &line) { // qDebug() << "EditorToolBar::insert_button_to_tools_line() disableToolList : " << disableToolList; if(toolName=="separator") { - line->addSeparator(); + line.addSeparator(); } else { QString name("editor_tb_"+toolName); - QWidget *tool=this->findChild(name); + + // QWidget *tool=this->findChild(name); // Исходная команда, когда в классе содержались указатели на виджеты кнопок + // QWidget *tool=&( qobject_cast( this->findChild(name) ) ); + // QWidget *tool=&( qobject_cast( &(this->findChild(name)) ) ); + // QWidget *tool=this->findChild(name); + // QWidget *tool=qobject_cast( &(this->findChild(name)) ); + // QWidget *tool=qobject_cast( this->findChild(name) ); // Компилится, но не находит объекта + QWidget *tool=qobject_cast(this->findChild(name)); if(tool!=NULL) { @@ -477,10 +441,11 @@ void EditorToolBar::insertButtonToToolsLine(QString toolName, QToolBar *line) { tool->setVisible(true); - line->addWidget(tool); // Инструмент добавляется на панель инструментов + line.addWidget(tool); // Инструмент добавляется на панель инструментов QToolButton *tb=qobject_cast(tool); - if(tb!=0) tb->setAutoRaise(false); + if(tb!=0) + tb->setAutoRaise(false); } else { @@ -498,7 +463,7 @@ void EditorToolBar::insertButtonToToolsLine(QString toolName, QToolBar *line) void EditorToolBar::switchAttachIconExists(bool isExists) { if(isExists) - toAttach->setIcon( iconAttachExists ); + toAttach.setIcon( iconAttachExists ); else - toAttach->setIcon( iconAttachNotExists ); + toAttach.setIcon( iconAttachNotExists ); } diff --git a/src/libraries/wyedit/EditorToolBar.h b/src/libraries/wyedit/EditorToolBar.h index 661607e51..ae1a1df1f 100644 --- a/src/libraries/wyedit/EditorToolBar.h +++ b/src/libraries/wyedit/EditorToolBar.h @@ -25,68 +25,68 @@ class EditorToolBar : public QWidget virtual ~EditorToolBar(); // Кнопки форматирования текста - QToolButton *bold=NULL; - QToolButton *italic=NULL; - QToolButton *underline=NULL; - QToolButton *monospace=NULL; - QToolButton *code=NULL; - QToolButton *clear=NULL; + QToolButton bold; + QToolButton italic; + QToolButton underline; + QToolButton monospace; + QToolButton code; + QToolButton clear; - QToolButton *numericList=NULL; - QToolButton *dotList=NULL; + QToolButton numericList; + QToolButton dotList; - QToolButton *indentPlus=NULL; - QToolButton *indentMinus=NULL; + QToolButton indentPlus; + QToolButton indentMinus; - QToolButton *alignLeft=NULL; - QToolButton *alignCenter=NULL; - QToolButton *alignRight=NULL; - QToolButton *alignWidth=NULL; + QToolButton alignLeft; + QToolButton alignCenter; + QToolButton alignRight; + QToolButton alignWidth; - QToolButton *settings=NULL; + QToolButton settings; - QFontComboBox *fontSelect=NULL; - MtComboBox *fontSize=NULL; - QToolButton *fontColor=NULL; + QFontComboBox fontSelect; + MtComboBox fontSize; + QToolButton fontColor; - QToolButton *reference=NULL; + QToolButton reference; - QToolButton *showHtml=NULL; + QToolButton showHtml; - QToolButton *findText=NULL; + QToolButton findText; - QToolButton *showFormatting=NULL; + QToolButton showFormatting; - QToolButton *createTable=NULL; - QToolButton *tableRemoveRow=NULL; - QToolButton *tableRemoveCol=NULL; - QToolButton *tableAddRow=NULL; - QToolButton *tableAddCol=NULL; - QToolButton *tableMergeCells=NULL; - QToolButton *tableSplitCell=NULL; - QToolButton *tableProperties=NULL; + QToolButton createTable; + QToolButton tableRemoveRow; + QToolButton tableRemoveCol; + QToolButton tableAddRow; + QToolButton tableAddCol; + QToolButton tableMergeCells; + QToolButton tableSplitCell; + QToolButton tableProperties; - QToolButton *insertImageFromFile=NULL; - QToolButton *expandEditArea=NULL; - QToolButton *expandToolsLines=NULL; - QToolButton *save=NULL; + QToolButton insertImageFromFile; + QToolButton expandEditArea; + QToolButton expandToolsLines; + QToolButton save; - QToolButton *back=NULL; - QToolButton *findInBase=NULL; + QToolButton back; + QToolButton findInBase; - QToolButton *showText=NULL; + QToolButton showText; - QToolButton *toAttach=NULL; + QToolButton toAttach; QIcon iconAttachExists; // Иконка, когда аттачи есть QIcon iconAttachNotExists; // Иконка, когда аттачей нет // Линейки с кнопками форматирования текста - QToolBar *toolsLine1=NULL; - QToolBar *toolsLine2=NULL; + QToolBar toolsLine1; + QToolBar toolsLine2; // Область, содержащая линейки с кнопками форматирования - QVBoxLayout *textformatButtonsLayout=NULL; + QVBoxLayout textformatButtonsLayout; void init(); @@ -116,7 +116,7 @@ public slots: void setupButtons(void); void assemblyButtons(void); - void insertButtonToToolsLine(QString toolName, QToolBar *line); + void insertButtonToToolsLine(QString toolName, QToolBar &line); QList getButtonWidgetList(void); void hideAllToolsElements(void); diff --git a/src/libraries/wyedit/EditorToolBarAssistant.cpp b/src/libraries/wyedit/EditorToolBarAssistant.cpp index b648d63cb..bf60fcffa 100644 --- a/src/libraries/wyedit/EditorToolBarAssistant.cpp +++ b/src/libraries/wyedit/EditorToolBarAssistant.cpp @@ -71,7 +71,7 @@ EditorToolBarAssistant::~EditorToolBarAssistant() void EditorToolBarAssistant::setupSignals() { - connect(expandToolsLines, SIGNAL(clicked()), this, SLOT(onExpandToolsLinesClicked())); + connect( &expandToolsLines, SIGNAL(clicked()), this, SLOT(onExpandToolsLinesClicked())); } @@ -86,9 +86,9 @@ void EditorToolBarAssistant::onChangeFontselectOnDisplay(QString fontName) flagSetFontParametersEnabled=false; if(fontName.size()>0) - fontSelect->setCurrentIndex(fontSelect->findText(fontName)); + fontSelect.setCurrentIndex(fontSelect.findText(fontName)); else - fontSelect->setCurrentIndex(fontSelect->count()-1); + fontSelect.setCurrentIndex(fontSelect.count()-1); currentFontFamily=fontName; @@ -112,7 +112,7 @@ void EditorToolBarAssistant::onChangeFontsizeOnDisplay(int n) flagSetFontParametersEnabled=false; - fontSize->setCurrentIndex(fontSize->findData(n)); + fontSize.setCurrentIndex(fontSize.findData(n)); currentFontSize=n; flagSetFontParametersEnabled=true; @@ -142,7 +142,7 @@ void EditorToolBarAssistant::onChangeFontcolor(QColor color) // Если цвет правильный if(color.isValid()) { - fontColor->setPalette(QPalette(color)); // Меняется цвет кнопки, отвечающей за цвет шрифта + fontColor.setPalette(QPalette(color)); // Меняется цвет кнопки, отвечающей за цвет шрифта currentFontColor=color.name(); // todo: подумать, а нужна ли эта переменна } @@ -156,18 +156,18 @@ void EditorToolBarAssistant::onUpdateAlignButtonHiglight(bool activate) { // TRACELOG - alignLeft->setChecked(false); - alignCenter->setChecked(false); - alignRight->setChecked(false); - alignWidth->setChecked(false); + alignLeft.setChecked(false); + alignCenter.setChecked(false); + alignRight.setChecked(false); + alignWidth.setChecked(false); if(activate==false) return; - if(textArea->alignment()==Qt::AlignLeft) alignLeft->setChecked(true); - else if(textArea->alignment()==Qt::AlignHCenter) alignCenter->setChecked(true); - else if(textArea->alignment()==Qt::AlignRight) alignRight->setChecked(true); - else if(textArea->alignment()==Qt::AlignJustify) alignWidth->setChecked(true); + if(textArea->alignment()==Qt::AlignLeft) alignLeft.setChecked(true); + else if(textArea->alignment()==Qt::AlignHCenter) alignCenter.setChecked(true); + else if(textArea->alignment()==Qt::AlignRight) alignRight.setChecked(true); + else if(textArea->alignment()==Qt::AlignJustify) alignWidth.setChecked(true); } @@ -176,13 +176,13 @@ void EditorToolBarAssistant::onUpdateOutlineButtonHiglight(void) { // TRACELOG - bold->setChecked(false); - italic->setChecked(false); - underline->setChecked(false); + bold.setChecked(false); + italic.setChecked(false); + underline.setChecked(false); - if(textArea->fontWeight()==QFont::Bold) bold->setChecked(true); - if(textArea->fontItalic()==true) italic->setChecked(true); - if(textArea->fontUnderline()==true) underline->setChecked(true); + if(textArea->fontWeight()==QFont::Bold) bold.setChecked(true); + if(textArea->fontItalic()==true) italic.setChecked(true); + if(textArea->fontUnderline()==true) underline.setChecked(true); } @@ -190,22 +190,22 @@ void EditorToolBarAssistant::setOutlineButtonHiglight(int button, bool active) { if(button==BT_BOLD) { - if(active==false) bold->setChecked(false); - else bold->setChecked(true); + if(active==false) bold.setChecked(false); + else bold.setChecked(true); return; } if(button==BT_ITALIC) { - if(active==false) italic->setChecked(false); - else italic->setChecked(true); + if(active==false) italic.setChecked(false); + else italic.setChecked(true); return; } if(button==BT_UNDERLINE) { - if(active==false) underline->setChecked(false); - else underline->setChecked(true); + if(active==false) underline.setChecked(false); + else underline.setChecked(true); return; } } @@ -262,7 +262,7 @@ void EditorToolBarAssistant::switchExpandToolsLines(int flag) // Панели распахиваются/смыкаются (кроме первой линии инструментов) - toolsLine2->setVisible(setFlag); + toolsLine2.setVisible(setFlag); if(viewMode==Editor::WYEDIT_DESKTOP_MODE) editor->indentSliderAssistant->setVisible(setFlag); @@ -302,5 +302,5 @@ bool EditorToolBarAssistant::isKeyForToolLineUpdate(QKeyEvent *event) int EditorToolBarAssistant::getFontSizeByNum(int n) { - return fontSize->itemData(n).toInt(); + return fontSize.itemData(n).toInt(); } diff --git a/src/libraries/wyedit/formatters/ReferenceFormatter.cpp b/src/libraries/wyedit/formatters/ReferenceFormatter.cpp index 51dae8ccc..7f626611b 100644 --- a/src/libraries/wyedit/formatters/ReferenceFormatter.cpp +++ b/src/libraries/wyedit/formatters/ReferenceFormatter.cpp @@ -37,7 +37,7 @@ void ReferenceFormatter::onReferenceClicked(void) // Создание виджета запроса URL с указанием редактора как родительского виджета QInputDialog inputDialog(editor); - // Установка ширины + // Установка ширины виджета запроса URL int dialogWidth=int(0.8*(float)textArea->width()); inputDialog.setMinimumWidth( dialogWidth ); inputDialog.resize(inputDialog.size()); diff --git a/src/main.h b/src/main.h index d018fb12f..aaa94b47b 100644 --- a/src/main.h +++ b/src/main.h @@ -34,7 +34,7 @@ using namespace std; // Версия программы #define APPLICATION_RELEASE_VERSION 1 #define APPLICATION_RELEASE_SUBVERSION 32 -#define APPLICATION_RELEASE_MICROVERSION 261 +#define APPLICATION_RELEASE_MICROVERSION 262 // Поддерживаемая версия формата базы (хранилища) #define CURRENT_FORMAT_VERSION 1