Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
psemiletov committed Apr 6, 2021
1 parent bcc2ffa commit 6bb1fb8
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ add_definitions(${Qt${QT_VERSION_MAJOR}Widgets_COMPILE_DEFINITIONS})


set(PROJECT "tea-qt")
project ($PROJECT VERSION 60.0.0 LANGUAGES CXX C)
project ($PROJECT VERSION 60.0.1 LANGUAGES CXX C)
add_definitions(-DVERSION_NUMBER="\\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\\"")
add_definitions(-DNOCRYPT=1)
add_definitions(-DNOUNCRYPT=1)
Expand Down Expand Up @@ -177,7 +177,7 @@ if(USE_PDF)
find_package(PkgConfig)
if(Qt${QT_VERSION_MAJOR} STREQUAL "Qt5")
pkg_check_modules(QUIET popplerqt5 poppler-qt5)
pkg_check_modules(popplerqt5 QUIET poppler-qt5)
if(popplerqt5_FOUND)
add_definitions(-DPOPPLER_ENABLE)
target_link_libraries(tea ${popplerqt5_LIBRARIES})
Expand All @@ -187,7 +187,7 @@ endif()
endif()
if(Qt${QT_VERSION_MAJOR} STREQUAL "Qt6")
pkg_check_modules(QUIET popplerqt6 poppler-qt6)
pkg_check_modules(popplerqt6 QUIET poppler-qt6)
if(popplerqt5_FOUND)
add_definitions(-DPOPPLER_ENABLE)
target_link_libraries(tea ${popplerqt6_LIBRARIES})
Expand Down
6 changes: 4 additions & 2 deletions manuals/en.html
Original file line number Diff line number Diff line change
Expand Up @@ -652,8 +652,10 @@ <h3>Functions &gt; Morse code</h3>

<p>You can also apply the snippets (from the TEA's snippets directory). To do such thing, use the <i>@@snippetname</i> at the FIF. For example, if you have the snipped named "myitalic", use <i>@@myitalic</i>. As you remember, snippets can contain the %s macro to substitute the selected text. In the case of "Apply to each line" function, %s will mean the text of each selected line.</p>

<p><b>Text &gt; Escape regexp</b> useful to escape regexp special characters such as $, *, +, [, ],
etc .</p>
<p><b>Text &gt; Escape regexp</b> useful to escape regexp special characters such as $, *, +, [, ], etc .</p>


<p><b>Text &gt; Check regexp match</b> check the selected text against the regexp (put the regexp to FIF).</p>


<br><br>
Expand Down
4 changes: 3 additions & 1 deletion manuals/ru.html
Original file line number Diff line number Diff line change
Expand Up @@ -635,9 +635,11 @@ <h3>Функции &gt; Азбука Морзе</h3>

<p>Можно использовать и сниппеты. Чтобы применить сниппет к каждой строке, надо ЗПВ до использования <b>Применить к каждой строке</b> поместить <i>@@имя_сниппета</i>. Например, если у вас сниппет (файл в каталоге сниппетов) называется hello, то надо будет написать: <i>@@hello</i>. Поскольку в сниппете используется макрос %s для подстановки выделенного текста, то в случае <b>Применить к каждой строке</b> роль выделенного текста будет играть каждая выделенная строка.</p>


<p><b>Текст &gt; Перевернуть</b> - просто переворачивает строку. Было "носоглотка", станет "актолгосон".</p>

<p><b>Текст &gt; Проверить совпадение по регэкспу</b> - загоняем регэксп в ЗПВ, выделяем в файле текст, применяем, смотрим ответ в логе.</p>


<br>
<a name="mni_run"></a>
<h2>Запуск</h2>
Expand Down
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
project('tea', ['cpp','c'],
default_options : ['cpp_std=c++11'],
version : '60.0.0',
version : '60.0.1',
license : 'GPLv3')

add_global_arguments('-DVERSION_NUMBER="60.0.0"', language : 'cpp')
add_global_arguments('-DVERSION_NUMBER="60.0.1"', language : 'cpp')
add_global_arguments('-DNOCRYPT="1"', language : 'cpp')
add_global_arguments('-DNOUNCRYPT="1"', language : 'cpp')
add_global_arguments('-DQUAZIP_STATIC="1"', language : 'cpp')
Expand Down
4 changes: 2 additions & 2 deletions tea-qmake.pro
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 60.0.0
VERSION = 60.0.1

os2: {
DEFINES += 'VERSION_NUMBER=\'"60.0.0"\''
DEFINES += 'VERSION_NUMBER=\'"60.0.1"\''
} else: {
DEFINES += 'VERSION_NUMBER=\\\"$${VERSION}\\\"'
}
Expand Down

0 comments on commit 6bb1fb8

Please sign in to comment.