From 0362354ca1df2dbf6a1a8300bb06ddc98d39f22c Mon Sep 17 00:00:00 2001 From: Dmitriy Belyaev Date: Mon, 22 Feb 2016 09:07:47 +0100 Subject: [PATCH 01/10] fixed disappearing links when exporting to PDF format --- app/mainwindow.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index cb967437..06601605 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -304,10 +304,12 @@ void MainWindow::fileExportToHtml() void MainWindow::fileExportToPdf() { - ExportPdfDialog dialog(fileName); - if (dialog.exec() == QDialog::Accepted) { - ui->webView->print(dialog.printer()); - } + ExportPdfDialog dialog(fileName); + if (dialog.exec() == QDialog::Accepted) { + QTextDocument doc; + doc.setHtml(ui->webView->page()->currentFrame()->toHtml()); + doc.print(dialog.printer()); + } } void MainWindow::filePrint() From 52d41c71731dc8bd466ca1fc6c23ba3328700779 Mon Sep 17 00:00:00 2001 From: Dmitriy Belyaev Date: Mon, 22 Feb 2016 17:11:12 +0100 Subject: [PATCH 02/10] added comment explaining workaround with QTextDocument --- app/mainwindow.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index 06601605..f8e31c34 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -304,6 +304,11 @@ void MainWindow::fileExportToHtml() void MainWindow::fileExportToPdf() { + // using temporary QTextDocument instance to get links exported\printed correctly, + // as links will dissappear when printing directly from QWebView in current Qt implementation + // of QWebView::print() method (possible bug in Qt?) + // more info here: http://stackoverflow.com/questions/11629093/add-working-url-into-pdf-using-qt-qprinter + ExportPdfDialog dialog(fileName); if (dialog.exec() == QDialog::Accepted) { QTextDocument doc; From 2269cefcc2e9a2cf58f1685016f97e38a9163e56 Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Thu, 10 Mar 2016 14:21:41 +0100 Subject: [PATCH 03/10] [#273] only initialize model if file explorer dock is visible Only initialize the file system model if the file explorer dock is visible. Should fix #273. --- app/controls/fileexplorerwidget.cpp | 11 +++++++++-- app/controls/fileexplorerwidget.h | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/controls/fileexplorerwidget.cpp b/app/controls/fileexplorerwidget.cpp index 22704ce0..c83439a3 100644 --- a/app/controls/fileexplorerwidget.cpp +++ b/app/controls/fileexplorerwidget.cpp @@ -27,14 +27,13 @@ class FileSortFilterProxyModel : public QSortFilterProxyModel FileExplorerWidget::FileExplorerWidget(QWidget *parent) : QWidget(parent), + initialized(false), ui(new Ui::FileExplorerWidget), model(new QFileSystemModel(this)), sortModel(new FileSortFilterProxyModel(this)) { ui->setupUi(this); - model->setRootPath(""); - sortModel->setDynamicSortFilter(true); sortModel->setSourceModel(model); @@ -51,6 +50,14 @@ FileExplorerWidget::~FileExplorerWidget() delete ui; } +void FileExplorerWidget::showEvent(QShowEvent *event) +{ + if (!initialized) { + model->setRootPath(""); + initialized = true; + } +} + void FileExplorerWidget::fileOpen(const QModelIndex &index) { QFileInfo info = model->fileInfo(sortModel->mapToSource(index)); diff --git a/app/controls/fileexplorerwidget.h b/app/controls/fileexplorerwidget.h index 4d931781..345b04af 100644 --- a/app/controls/fileexplorerwidget.h +++ b/app/controls/fileexplorerwidget.h @@ -21,10 +21,14 @@ class FileExplorerWidget : public QWidget signals: void fileSelected(const QString &filePath); +protected: + void showEvent(QShowEvent *event); + private slots: void fileOpen(const QModelIndex &index); private: + bool initialized; Ui::FileExplorerWidget *ui; QFileSystemModel *model; QSortFilterProxyModel *sortModel; From 432e0484836b146a92b7bd2e5eb39a8894be41c2 Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Fri, 11 Mar 2016 18:21:12 +0100 Subject: [PATCH 04/10] [#97] Use native line ending during file saving Use QUIDevice::Text to enforce the native line ending during the file saving. Fixes #97 --- app/mainwindow.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index f8e31c34..1a4f8adf 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -226,7 +226,12 @@ bool MainWindow::fileSave() return fileSaveAs(); } - QTextDocumentWriter writer(fileName, "plaintext"); + QFile file(fileName); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + return false; + } + + QTextDocumentWriter writer(&file, "plaintext"); bool success = writer.write(ui->plainTextEdit->document()); if (success) { // set status to unmodified @@ -861,7 +866,7 @@ bool MainWindow::load(const QString &fileName) // open file QFile file(fileName); - if (!file.open(QFile::ReadOnly)) { + if (!file.open(QFile::ReadOnly | QIODevice::Text)) { return false; } From ce37b3845b9de8b3c6cade160e08cbb46c427b83 Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Fri, 11 Mar 2016 19:22:33 +0100 Subject: [PATCH 05/10] [#285] safely write files Use QSaveFile to safely write the file to disk. Fixes #285 --- app/app.pro | 3 ++- app/mainwindow.cpp | 5 ++++- app/savefileadapter.h | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 app/savefileadapter.h diff --git a/app/app.pro b/app/app.pro index a6859114..32e6eb70 100644 --- a/app/app.pro +++ b/app/app.pro @@ -96,7 +96,8 @@ HEADERS += \ imagetooldialog.h \ snippetcompleter.h \ snippetstablemodel.h \ - aboutdialog.h + aboutdialog.h \ + savefileadapter.h FORMS += \ mainwindow.ui \ diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index 1a4f8adf..e633a084 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -64,6 +64,7 @@ #include "options.h" #include "optionsdialog.h" #include "revealviewsynchronizer.h" +#include "savefileadapter.h" #include "snippetcompleter.h" #include "tabletooldialog.h" @@ -226,7 +227,7 @@ bool MainWindow::fileSave() return fileSaveAs(); } - QFile file(fileName); + SaveFileAdapter file(fileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { return false; } @@ -234,6 +235,8 @@ bool MainWindow::fileSave() QTextDocumentWriter writer(&file, "plaintext"); bool success = writer.write(ui->plainTextEdit->document()); if (success) { + file.commit(); + // set status to unmodified ui->plainTextEdit->document()->setModified(false); setWindowModified(false); diff --git a/app/savefileadapter.h b/app/savefileadapter.h new file mode 100644 index 00000000..0fbb7e89 --- /dev/null +++ b/app/savefileadapter.h @@ -0,0 +1,38 @@ +/* + * Copyright 2016 Christian Loose + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#ifndef SAVEFILEADAPTER_H +#define SAVEFILEADAPTER_H + +#include + + +class SaveFileAdapter : public QSaveFile +{ +public: + SaveFileAdapter(const QString &name) : + QSaveFile(name) + { + } + + void close() { + // IGNORE - work-around for the problem that QTextDocumentWriter::write() + // calls close() on the device + } + +}; + +#endif // SAVEFILEADAPTER_H From 3d41060993dcdfedbf19e880ceae869795c46c26 Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Mon, 28 Mar 2016 11:02:35 +0200 Subject: [PATCH 06/10] Bump version to v0.11.3 --- CuteMarkEd.wxs | 2 +- app/main.cpp | 2 +- rpm/cutemarked.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CuteMarkEd.wxs b/CuteMarkEd.wxs index 037c3c51..8143ae75 100644 --- a/CuteMarkEd.wxs +++ b/CuteMarkEd.wxs @@ -2,7 +2,7 @@ - + 0.11.3-1 +- New patch version 0.11.3 released + * Fri Jan 01 2016 Christian Loose 0.11.2-1 - New patch version 0.11.2 released From f9faab38bebcfd83085a64f63f58d22a3843d4cd Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 10 Mar 2016 12:05:25 +0100 Subject: [PATCH 07/10] RecentFiles: Always use absolute path Fixes: #256 Signed-off-by: Jason A. Donenfeld --- app/controls/recentfilesmenu.cpp | 8 ++++++-- app/mainwindow.cpp | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controls/recentfilesmenu.cpp b/app/controls/recentfilesmenu.cpp index 32233add..50d79f83 100644 --- a/app/controls/recentfilesmenu.cpp +++ b/app/controls/recentfilesmenu.cpp @@ -17,6 +17,7 @@ #include "recentfilesmenu.h" #include +#include #include RecentFilesMenu::RecentFilesMenu(QWidget *parent) : @@ -52,9 +53,12 @@ void RecentFilesMenu::saveState() const void RecentFilesMenu::addFile(const QString &fileName) { + QFileInfo fileInfo(fileName); + QString absoluteNativeFileName(QDir::toNativeSeparators(fileInfo.absoluteFilePath())); + // add file to top of list - recentFiles.removeAll(fileName); - recentFiles.prepend(fileName); + recentFiles.removeAll(absoluteNativeFileName); + recentFiles.prepend(absoluteNativeFileName); // remove last entry if list contains more than 10 entries if (recentFiles.size() > 10) { diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp index e633a084..3234c968 100644 --- a/app/mainwindow.cpp +++ b/app/mainwindow.cpp @@ -242,7 +242,7 @@ bool MainWindow::fileSave() setWindowModified(false); // add to recent file list - recentFilesMenu->addFile(QDir::toNativeSeparators(fileName)); + recentFilesMenu->addFile(fileName); } return success; @@ -884,7 +884,7 @@ bool MainWindow::load(const QString &fileName) setFileName(fileName); // add to recent files - recentFilesMenu->addFile(QDir::toNativeSeparators(fileName)); + recentFilesMenu->addFile(fileName); return true; } From d091c22e2a2848a5a7110e8d88efeab142f53617 Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Mon, 28 Mar 2016 11:15:05 +0200 Subject: [PATCH 08/10] Update Russian translations --- app/translations/cutemarked_ru.ts | 743 ++++++++++++++++++++---------- 1 file changed, 492 insertions(+), 251 deletions(-) diff --git a/app/translations/cutemarked_ru.ts b/app/translations/cutemarked_ru.ts index 1c4e307d..e55cc45e 100644 --- a/app/translations/cutemarked_ru.ts +++ b/app/translations/cutemarked_ru.ts @@ -1,4 +1,151 @@ + + AboutDialog + + + About CuteMarkEd + О CuteMarkEd + + + + &About + &О программе + + + + A&uthors + &Авторы + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Christian Loose (cloose)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Creator and maintainer</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Jörg Preiß (Slesa)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Code contributor</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Andreas Reischuck (arBmind)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Code contributor</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Aetf (Aetf)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Code contributor</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Pavel Fric (Fri)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Czech translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Hu Junqing (LearnShare)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Chinese translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Γιάννης Ανθυμίδης (Evropi)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Greek translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Etienne Gauvin (Etn)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">French translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Rémi Verschelde (akien-mga)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">French translation and Mageia package</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Kota Ouchi (kOtaOuchi)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Japanese translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Norihide Sugohara (touyou)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Japanese translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Eai</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Japanese translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Javier (moguman)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Spanish translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Cassio Cardoso (cassiocardoso)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Portuguese (Brazil) translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Victor Nogueira (felladrin)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Portuguese (Brazil) translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Maxim Efremov (maxbart)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Russian translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Bedouin</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Indonesian translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Mljjlm</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Danish translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Christian Loose (cloose)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Creator and maintainer</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Jörg Preiß (Slesa)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Code contributor</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Andreas Reischuck (arBmind)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Code contributor</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Aetf (Aetf)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Code contributor</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Pavel Fric (Fri)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Czech translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Hu Junqing (LearnShare)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Chinese translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Γιάννης Ανθυμίδης (Evropi)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Greek translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Etienne Gauvin (Etn)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">French translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Rémi Verschelde (akien-mga)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">French translation and Mageia package</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Kota Ouchi (kOtaOuchi)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Japanese translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Norihide Sugohara (touyou)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Japanese translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Eai</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Japanese translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Javier (moguman)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Spanish translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Cassio Cardoso (cassiocardoso)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Portuguese (Brazil) translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Victor Nogueira (felladrin)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Portuguese (Brazil) translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Maxim Efremov (maxbart)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Russian translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Bedouin</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Indonesian translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Mljjlm</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Danish translation</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><br /></p></body></html> + + + + &Thanks To + &Благодарности + + + + Qt-based, free and open source markdown editor with live HTML preview + Бесплатный редактор синтаксиса Markdown с предпросмотром в HTML, написанный на Qt и с открытым исходным кодом + + ExportHtmlDialog @@ -19,7 +166,7 @@ <html><head/><body><p>embed the current CSS style into the exported HTML</p></body></html> - <html><head/><body><p>вставить текущий стиль CSS в экспортируемый HTML</p></body></html> + <html><head/><body><p>встроить текущий стиль CSS в экспортируемый HTML</p></body></html> @@ -62,12 +209,12 @@ Paper Size: - Размер бумаги + Размер бумаги: Orientation: - Положение + Ориентация: @@ -87,12 +234,12 @@ Letter (8.5 x 11 inches, 215.9 x 279.4 mm) - Письмо (8.5 x 11 дюймов, 215.9 x 279.4 мм) + Letter (8.5 x 11 дюймов, 215.9 x 279.4 мм) Legal (8.5 x 14 inches, 215.9 x 355.6 mm) - Legal (8.5 x 14 дюймов, 215.9 x 355.6 мм) + Legal (8.5 x 14 дюймов, 215.9 x 355.6 mm) @@ -138,45 +285,49 @@ Найти - + Find: Найти: - - - ... - ... - - - + Replace with: Заменить на: - + Replace Заменить - + Replace All Заменить всё - + + ... + ... + + + Case Sensitive С учётом регистра - + Whole Words Only Только слова целиком - + Use Regular Expressions - Использование регулярных выражений + Использовать регулярные выражения + + + + Find Options + Найти опции @@ -204,12 +355,12 @@ Alternate Text: - Другой текст: + Альтернативный текст: Optional Title: - Дополнительное описание: + Дополнительный заголовок: @@ -234,7 +385,7 @@ MainWindow - + about:blank about:blank @@ -250,14 +401,14 @@ - Format - Формат + F&ormat + Verb "to format". sub menu title to choose a formatting like bold, italic. + &Формат - - Find/Replace - Найти/Заменить + &Find/Replace + &Найти/Заменить @@ -272,486 +423,498 @@ E&xtras - Дополнительно + &Дополнительно - Styles - Стили + St&yles + С&тили - Markdown Extensions + Markdown E&xtensions Расширения Markdown - Languages - Языки + &Languages + &Языки - + Table of contents Оглавление - - + Markdown Syntax - Синтаксис Markdown + Markdown синтаксис - - + + qrc:/syntax.html qrc:/syntax.html - + + File Explorer + Навигация по файлам + + + E&xit Вы&ход - + &New &Новый - + &Open... &Открыть... - + &Save &Сохранить - + Save &As... Сохранить &как... - + &Undo &Отменить - + &Redo &Повторить - + Default Стандартный - + Ctrl+1 Ctrl+1 - + Github Гитхаб - + Ctrl+2 Ctrl+2 - + Solarized Light Ясный Светлый - + Ctrl+3 Ctrl+3 - + Solarized Dark Ясный Тёмный - + Ctrl+4 Ctrl+4 - + &About CuteMarkEd... &О CuteMarkEd... - - Export to HTML... - Экспорт в HTML... + + Export to &HTML... + Экспо&рт в HTML... - - Export to PDF... - Экспорт в PDF... + + &Export to PDF... + Экспор&т в PDF... - + Split 1:1 Размер 1:1 - + Split 2:1 Размер 2:1 - + Split 1:2 Размер 1:2 - + Split 3:1 Размер 3:1 - + Split 1:3 Размер 1:3 - - Copy HTML to Clipboard - Копировать HTML в буфер + + Copy &HTML to Clipboard + Коп&ировать HTML код - + Cu&t Вырез&ать - + &Copy &Копировать - + &Paste &Вставить - + Strong - Изысканный + Жирный - + Emphasize - Подчеркнутый + Курсив - + &Print... &Печать - - + + Strikethrough Зачёркнутый - + Inline Code Инлайн код - - Math Support - Поддержка формул + + &Math Support + Поддержка &формул - - Code Highlighting - Подсветка кода + + Code &Highlighting + Подсветка &кода - + Clearness Ясный - + Ctrl+5 Ctrl+5 - + Clearness Dark Ясный Тёмный - + Ctrl+6 Ctrl+6 - - Go to Line + + Find/Replace + Найти/Заменить + + + + Go to &Line Перейти к строке - + Ctrl+L Ctrl+L - + Center Paragraph - Центр параграфа + Центрировать параграф - + Hard Linebreak - Жесткий разрыв линий + Жёсткий разрыв линий - + Ctrl+Return Ctrl+Enter - + Find Next Найти далее - + Find Previous Найти до - - Full Screen Mode + + &Full Screen Mode Полноэкранный режим - + Blockquote - Цитирование + Цитата - - Ctrl+Q - Ctrl+Q + + Ctrl+Shift+Q + Ctrl+Shift+Q - - - - - HTML preview - Предпросмотр HTML + + &Markdown Syntax + Markdown &синтаксис - + + HTML &Preview + &Предпросмотр HTML + + + F5 F5 - - Show Special Characters + + &Show Special Characters Option to show characters like line feed or tabs - Показать специальные символы + &Показывать специальные символы - - Options... - Опции... + + &Options... + &Опции... - + Autolink Автоссылка - + Alphabetic Lists По алфавиту - + Definition Lists По определению - + SmartyPants SmartyPants - + Language Язык - - Check Spelling - Проверка орфографии + + &Check Spelling + Проверка &орфографии - + Increase Header Level Увеличить уровень заголовка - + Alt+Right Alt+Вправо - + Decrease Header Level Понизить уровень заголовка - + Alt+Left Alt+Влево - + Insert Table... Вставить таблицу... - + Ctrl+T Ctrl+T - + Byword Dark Byword Dark - + Ctrl+7 Ctrl+7 - - Insert Image... - Вставить изображение... + + Insert &Image... + Вставить &изображение... - - Ctrl+G - Ctrl+G + + Ctrl+Shift+I + Ctrl+Shift+I - - Horizontal Layout - Горизонтальный слой + + &Horizontal Layout + &Горизонтальный вид - + Footnotes Примечания - + Superscript Верхний индекс - - Word Wrap - Перенос по словам + + &Word Wrap + Перенос по &словам - - :/markdown-snippets.json - path to built-in snippets resource. - :/markdown-snippets.json + + Ignore Y&AML Header + &Игнорировать YAML заголовок - + + &Diagram Support + Поддержка &диаграмм + + + Open File... Открыть файл... - - - Markdown Files (*.markdown *.md);;All Files (*) + + + Markdown Files (*.markdown *.md *.mdown);;All Files (*) Файлы Markdown (*.markdown *.md);;Все файлы (*) - + Save as... Сохранить как... - + Print Document Печать документа - + Go to... Перейти... - + Line: Line number in the Markdown editor Строка: - - About CuteMarkEd - О CuteMarkEd - - - - <p><b>CuteMarkEd %1</b><br>Qt-based, free and open source markdown editor with live HTML preview<br>Copyright 2013 Christian Loose</p><p><a href="http://cloose.github.io/CuteMarkEd">http://cloose.github.io/CuteMarkEd</a></p> - <p><b>CuteMarkEd %1</b><br>Бесплатный редактор с подсветкой исходного кода и с живым просмотром HTML, написанный на QT<br>Авторские права 2013 Christian Loose</p><p><a href="http://cloose.github.io/CuteMarkEd">http://cloose.github.io/CuteMarkEd</a></p> + + + + HTML preview + Предпросмотр HTML - - + + HTML source Исходный код HTML - + %1 words %1 слов - + Lines: %1 Words: %2 Characters: %3 Линий: %1 Слов: %2 Символов: %3 - + Change Preview Style Сменить стиль предпросмотра - + Save Changes Сохранить изменения - + The document has been modified.<br>Do you want to save your changes? Документ был изменён.<br>Вы хотите сохранить изменения? - + untitled.md default file name for new markdown documents untitled.md @@ -760,20 +923,19 @@ MarkdownEditor - - Ctrl+Space - Complete - Ctrl+Пробел + + Snippet Complete + Шаблон завершен - + Suggestions Предложения - + Add to User Dictionary - Добавить в словарь + Добавить в словарь пользователя @@ -785,131 +947,202 @@ - General - Основные + &General + &Основные Markdown Converter - Конвертер Markdown + Markdown конвертер - Converter Library: - Конвертер Библиотеки: + Converter &Library: + &Библиотека конвертера: - + Discount (Default) Name of a Markdown to HTML converter library - Скидка (по умолчанию) + Discount (по-умолчанию) - + Hoedown Name of a Markdown to HTML converter library Hoedown - - Editor - Редактор + + Reveal.js (Presentation) + Reveal.js (Презентация) - + + &Editor + &Редактор + + + Font Шрифт - - Family: + + &Family: Гарнитура: - - Size: - Размер + + Si&ze: + Размер: - + Tabs - Отступ + Отступы - - Tab width: - Ширина отступа: + + &Tab width: + &Ширина отступа: - - Internet - Интернет + + &HTML Preview + &Предпросмотр HTML - + + Fonts + Шрифт + + + + S&tandard Font: + &Стандартный: + + + + + Size: + Размер: + + + + Se&rif Font: + С &засечками: + + + + S&ans Serif Font: + &Без засечек: + + + + &Fixed Font: + &Фиксированный: + + + + &Internet + &Интернет + + + Configure Proxy to Access the Internet - Настроить Прокси для доступа к интернету + Настройки прокси для доступа к интернет - - No proxy - Без прокси + + No prox&y + &Без прокси - - Use system proxy settings - Использвать системные настройки прокси + + &Use system proxy settings + Испо&льзовать системные настройки прокси - - Manual proxy configuration: - Указать прокси вручную: + + &Manual proxy configuration: + &Указать прокси вручную: - - Host: - Хост: + + H&ost: + &Хост: - - Port: - Порт: + + &Port: + П&орт: - - User Name: - Имя пользователя: + + User &Name: + &Имя пользователя: - - Password: - Пароль: + + Pass&word: + &Пароль: - - Snippets - Сниппеты + + &Snippets + &Шаблоны - - Add - Добавить + + &Add + &Добавить - - Remove - Удалить + + &Remove + &Удалить - + + Short&cuts + Сочетания &клавиш + + + + Action + Действие + + + + Shortcut + Сочетание клавиш + + + + Default + По-умолчанию + + + Error Title of error message box Ошибка - + No snippet selected. - Не выбраны сниппеты + Шаблон не выбран + + + + Conflict + Конфликт + + + + This shortcut is already used for "%1" + Это сочетание клавиш уже используется для "%1" @@ -928,23 +1161,23 @@ SnippetsTableModel - + Error Title of error message box Ошибка - + Not a valid trigger. Недопустимый триггер. - + Trigger Триггер - + Description Описание @@ -959,12 +1192,12 @@ Rows: - Строк: + Строки: Columns: - Столбцов: + Столбцы: @@ -997,4 +1230,12 @@ Справа + + main + + + The file to open. + Файл для чтения. + + \ No newline at end of file From 55e7bf1c301e3919ef08ed51ac76f094e6fbc404 Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Mon, 28 Mar 2016 12:20:53 +0200 Subject: [PATCH 09/10] Update README for v0.11.3 --- README.md | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6cd17385..ca2b81c1 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ A Qt-based, free and open source markdown editor with live HTML preview, math ex ### DOWNLOAD -[Sources](https://github.com/cloose/CuteMarkEd/archive/v0.11.2.tar.gz) -[MS Windows (Installer)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.2.msi) -[MS Windows (ZIP file)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.2.zip) +[Sources](https://github.com/cloose/CuteMarkEd/archive/v0.11.3.tar.gz) +[MS Windows (Installer)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.3.msi) +[MS Windows (ZIP file)](http://dl.bintray.com/cloose/CuteMarkEd/cutemarked-0.11.3.zip) [OpenSUSE 13.2 (RPM)](https://build.opensuse.org/project/show?project=home%3Acloose1974) [Fedora 20 (RPM)](https://build.opensuse.org/project/show?project=home%3Acloose1974) [Fedora 21 (RPM)](https://build.opensuse.org/project/show?project=home%3Acloose1974) @@ -19,6 +19,20 @@ A Qt-based, free and open source markdown editor with live HTML preview, math ex ### NEWS +#### Version 0.11.3 + +Improvements: + +* `IMPROVED` Update Russian translation + +Fixes: + +* `FIXED` Missing links in exported PDF file (#275) +* `FIXED` Use of non-native line endings when a file is saved (#97) +* `FIXED` Corrupt files on system crashes or running out of disk space (#285) +* `FIXED` Accessing all drives although the file explorer is not visible (#273) +* `FIXED` Relative paths in recently used files menu (#256) + #### Version 0.11.2 Improvements: @@ -81,7 +95,7 @@ Fixes: ### DEPENDENCIES -* [Qt 5.2](http://qt-project.org) (LGPL v2.1) +* [Qt 5.4](http://qt-project.org) (LGPL v2.1) * [Discount 2.1.7](http://www.pell.portland.or.us/~orc/Code/discount/) (3-clause BSD) * [PEG Markdown Highlight](http://hasseg.org/peg-markdown-highlight/) (MIT License) * [hunspell 1.3.2](http://hunspell.sourceforge.net/) (LGPL v2.1) From a6fa7b0a0f330a6ca79fc3267cd46c96f0401b34 Mon Sep 17 00:00:00 2001 From: Christian Loose Date: Mon, 28 Mar 2016 13:18:15 +0200 Subject: [PATCH 10/10] Update WiX configuration for Qt 5.4 --- CuteMarkEd.wxs | 51 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/CuteMarkEd.wxs b/CuteMarkEd.wxs index 8143ae75..48e2ac3a 100644 --- a/CuteMarkEd.wxs +++ b/CuteMarkEd.wxs @@ -3,22 +3,22 @@ - - @@ -26,11 +26,10 @@ DowngradeErrorMessage="CuteMarkEd is already installed with a higher version." AllowSameVersionUpgrades="yes" /> - - + + - @@ -39,7 +38,7 @@ - + @@ -80,13 +79,14 @@ + - - - + + + @@ -110,12 +110,6 @@ - - - - - - @@ -132,7 +126,7 @@ - + @@ -142,14 +136,17 @@ + + + @@ -168,10 +165,15 @@ + + + + + @@ -179,11 +181,10 @@ - + - @@ -201,7 +202,7 @@ - + 1 - +