diff -Nru focuswriter-1.6.0/ChangeLog focuswriter-1.6.1/ChangeLog --- focuswriter-1.6.0/ChangeLog 2016-08-27 15:33:52.000000000 +0000 +++ focuswriter-1.6.1/ChangeLog 2016-09-19 09:56:24.000000000 +0000 @@ -1,3 +1,87 @@ +commit 0ab6a38091356f99cb0634c1d8171bed03d36bde +Author: Graeme Gott +Date: 2016-09-19 + + Bump version number. + +commit 2b2d43d09bd756f341e10ab65ba28a8efad5bf64 +Author: Graeme Gott +Date: 2016-09-18 + + Support native Windows builds. + +commit 7a3d6848560a063f0cd1faa3b73dd6beecb1e3c9 +Author: Graeme Gott +Date: 2016-09-18 + + Update dictionaries. + +commit 4ec4d0de81e323ec23d72908bbce3c860e903d1b +Author: Graeme Gott +Date: 2016-09-18 + + FIXED: Incorrectly handled non-heading text in OOXML. + +commit 1c598d3c7e35ed4d14d7c6f03cd42e14907dd453 +Author: Graeme Gott +Date: 2016-09-18 + + FIXED: Misspelled words did not following heading style. + +commit ad6fa1130ba0917f4ae2e716296bf387b2c47041 +Author: Graeme Gott +Date: 2016-09-18 + + Do not write default paragraph alignment. + +commit 09b455a0e9aa7460eceabbc3c2ae49fe37a9b019 +Author: Graeme Gott +Date: 2016-09-18 + + FIXED: Did not always close OOXML paragraph properties correctly. + +commit ca1a46b775e8951edcf22e790fca8eacb7082fce +Author: Graeme Gott +Date: 2016-09-18 + + FIXED: Did not correctly store RTL in OOXML. + +commit 02d12d40ce19f6b2e4df0a970aeab924ebfed386 +Author: Graeme Gott +Date: 2016-09-15 + + Update AppData file. + +commit 66b3cad892080c2db85c436f6ebc1faaaafb5856 +Author: Graeme Gott +Date: 2016-09-13 + + Sync translations with Transifex. + +commit fb72945c341126ad66578e53e6d63d03693c7cc7 +Author: Graeme Gott +Date: 2016-09-13 + + FIXED: Reported conflicts for empty shortcuts. + +commit f7892c4b29374a3f9773de69d6aeb8986ea6b449 +Author: Graeme Gott +Date: 2016-09-12 + + FIXED: Switched to incorrect tab to show conflicting shortcuts. + +commit b1e71ef46e73a4a44490115a5956f549c5dddaaa +Author: Graeme Gott +Date: 2016-09-04 + + Sync translations with Transifex. + +commit dd94b3f18e90d0f475b5128e73962dfe1b745490 +Author: Graeme Gott +Date: 2016-09-04 + + Tweak NEWS file. + commit 1637211d3db3c862d6f0e5eb5ca97293f906a2aa Author: Graeme Gott Date: 2016-08-27 diff -Nru focuswriter-1.6.0/debian/changelog focuswriter-1.6.1/debian/changelog --- focuswriter-1.6.0/debian/changelog 2016-08-27 16:07:07.000000000 +0000 +++ focuswriter-1.6.1/debian/changelog 2016-09-19 11:24:05.000000000 +0000 @@ -1,3 +1,16 @@ +focuswriter (1.6.1-0ppa1~xenial1) xenial; urgency=low + + * New upstream release + - FIXED: Incorrectly handled non-heading text in OOXML. + - FIXED: Misspelled words did not follow heading style. + - FIXED: Did not always close OOXML paragraph properties correctly. + - FIXED: Did not correctly store RTL in OOXML. + - FIXED: Reported conflicts for empty shortcuts. + - FIXED: Switched to incorrect tab to show conflicting shortcuts. + - Translation updates: German, Romanian. + + -- Graeme Gott Mon, 19 Sep 2016 09:58:44 +0000 + focuswriter (1.6.0-0ppa1~xenial1) xenial; urgency=low * New upstream release diff -Nru focuswriter-1.6.0/focuswriter.pro focuswriter-1.6.1/focuswriter.pro --- focuswriter-1.6.0/focuswriter.pro 2016-08-27 15:32:05.000000000 +0000 +++ focuswriter-1.6.1/focuswriter.pro 2016-09-19 09:55:07.000000000 +0000 @@ -26,7 +26,7 @@ } # Set program version -VERSION = 1.6.0 +VERSION = 1.6.1 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name diff -Nru focuswriter-1.6.0/INSTALL focuswriter-1.6.1/INSTALL --- focuswriter-1.6.0/INSTALL 2016-07-26 15:56:33.000000000 +0000 +++ focuswriter-1.6.1/INSTALL 2016-09-18 21:20:23.000000000 +0000 @@ -19,13 +19,14 @@ 3.) Type './mac_deploy.sh' to create a disk image of the program. -Windows (cross compile from Linux): - 1.) Type 'mingw32-qt5-qmake' to configure the program. +Windows: + 1.) Type 'qmake' to configure the program. 2.) Type 'make' to compile the program. - 3.) Type './windows_deploy.sh' to create a compressed image of the program. - Note that you must have p7zip installed for this to work. + 3.) Type 'windows_deploy' to create a compressed image of the program. Note + that you must have the 7z executable from 7-zip.org in your %PATH% for + this to work. 4.) Browse to resources/windows/ and type 'makensis installer.nsi' to create an installer of the program. diff -Nru focuswriter-1.6.0/mac_deploy.sh focuswriter-1.6.1/mac_deploy.sh --- focuswriter-1.6.0/mac_deploy.sh 2016-08-27 15:32:17.000000000 +0000 +++ focuswriter-1.6.1/mac_deploy.sh 2016-09-19 09:55:19.000000000 +0000 @@ -2,7 +2,7 @@ APP='FocusWriter' BUNDLE="$APP.app" -VERSION='1.6.0' +VERSION='1.6.1' # Remove any previous disk folder or DMG echo -n 'Preparing... ' diff -Nru focuswriter-1.6.0/NEWS focuswriter-1.6.1/NEWS --- focuswriter-1.6.0/NEWS 2016-08-27 15:31:21.000000000 +0000 +++ focuswriter-1.6.1/NEWS 2016-09-19 09:55:45.000000000 +0000 @@ -1,19 +1,29 @@ +1.6.1 +----- +* FIXED: Incorrectly handled non-heading text in OOXML. +* FIXED: Misspelled words did not follow heading style. +* FIXED: Did not always close OOXML paragraph properties correctly. +* FIXED: Did not correctly store RTL in OOXML. +* FIXED: Reported conflicts for empty shortcuts. +* FIXED: Switched to incorrect tab to show conflicting shortcuts. +* Translation updates: German, Romanian. + 1.6.0 ----- -Added always showing interface. -Added headings. -Added new default themes. -Added removing user-installed dictionaries. -Added shortcut for typographical apostrophe. -Added support for ODT Flat XML files. -Added support for high DPI displays. -Switched to QSoundEffect. -Updated dictionaries. -FIXED: Daily progress did not reset when run longer than a day. -FIXED: Printer margins were too big. -FIXED: Was replacing session files with command-line files. -FIXED: Did not add new default symbol shortcuts. -Translation updates: Arabic, Armenian, Catalan, Chinese (China), Dutch, English (United Kingdom), French, German, Hebrew, Hungarian, Italian, Lithuanian, Polish, Portuguese (Brazil), Romanian, Russian, Slovak, Spanish, Spanish (Mexico), Turkish, Vietnamese. +* Added always showing interface. +* Added headings. +* Added new default themes. +* Added removing user-installed dictionaries. +* Added shortcut for typographical apostrophe. +* Added support for ODT Flat XML files. +* Added support for high DPI displays. +* Switched to QSoundEffect. +* Updated dictionaries. +* FIXED: Daily progress did not reset when run longer than a day. +* FIXED: Printer margins were too big. +* FIXED: Was replacing session files with command-line files. +* FIXED: Did not add new default symbol shortcuts. +* Translation updates: Arabic, Armenian, Catalan, Chinese (China), Dutch, English (United Kingdom), French, German, Hebrew, Hungarian, Italian, Lithuanian, Polish, Portuguese (Brazil), Romanian, Russian, Slovak, Spanish, Spanish (Mexico), Turkish, Vietnamese. 1.5.7 ----- diff -Nru focuswriter-1.6.0/resources/unix/focuswriter.appdata.xml focuswriter-1.6.1/resources/unix/focuswriter.appdata.xml --- focuswriter-1.6.0/resources/unix/focuswriter.appdata.xml 2016-08-19 16:03:14.000000000 +0000 +++ focuswriter-1.6.1/resources/unix/focuswriter.appdata.xml 2016-09-16 12:47:55.000000000 +0000 @@ -66,6 +66,7 @@ Повноекранний текстовий редактор 全屏文字编辑器 全螢幕文字處理器 +

FocusWriter is a simple, distraction-free word processor. It utilizes a hide-away interface that you access by moving your mouse to the edges of the screen, allowing the program to have a familiar look and feel to it while still getting out of the way so that you can immerse yourself in your work.

FocusWriter is 'n eenvoudige woordverwerker sonder enige afleidings. Dit maak gebruik van 'n wegsteek-koppelvlak wat jy kan gebruik deur jou muis na die kante van die skerm te beweeg en verskaf sodoende 'n bekende en gebruiklike voorkoms en gevoel, terwyl die program uit jou pad bly dat jy jou in jou werk kan verdiep.

@@ -152,16 +153,29 @@

另外，打开软件后会自动跳到上次编辑的位置，让您立刻继续投入工作

另外，打開您正在撰寫的文件會自動跳至您最後一次編輯的位置，讓您可以繼續進行工作。

 + https://gottcode.org/focuswriter/screenshots/appdata.png + https://gottcode.org/focuswriter/ + https://gottcode.org/focuswriter/bugs/ https://gottcode.org/tip/ + https://www.transifex.com/projects/p/focuswriter/ + Graeme Gott - graeme@gottcode.org + graeme@gottcode.org + + focuswriter + focuswriter + + + HiDpiIcon + ModernToolkit + diff -Nru focuswriter-1.6.0/resources/windows/dictionaries.sh focuswriter-1.6.1/resources/windows/dictionaries.sh --- focuswriter-1.6.0/resources/windows/dictionaries.sh 2016-07-29 19:52:17.000000000 +0000 +++ focuswriter-1.6.1/resources/windows/dictionaries.sh 2016-09-18 19:37:55.000000000 +0000 @@ -11,11 +11,11 @@ # Download echo -n 'Downloading LibreOffice dictionaries...' -loversion='5.2.0.3' +loversion='5.2.1.2' lodict="libreoffice-dictionaries-${loversion}" lofiles="libreoffice-${loversion}/dictionaries" if [ ! -e "${lodict}.tar.xz" ]; then - curl -s -O -L "http://download.documentfoundation.org/libreoffice/src/5.2.0/${lodict}.tar.xz" + curl -s -O -L "http://download.documentfoundation.org/libreoffice/src/5.2.1/${lodict}.tar.xz" echo ' DONE' else echo ' SKIPPED' diff -Nru focuswriter-1.6.0/resources/windows/installer.nsi focuswriter-1.6.1/resources/windows/installer.nsi --- focuswriter-1.6.0/resources/windows/installer.nsi 2016-08-27 15:32:43.000000000 +0000 +++ focuswriter-1.6.1/resources/windows/installer.nsi 2016-09-19 09:55:28.000000000 +0000 @@ -4,7 +4,7 @@ !define APPNAME "FocusWriter" !define VERSIONMAJOR 1 !define VERSIONMINOR 6 -!define VERSIONPATCH 0 +!define VERSIONPATCH 1 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" !define ABOUTURL "https://gottcode.org/focuswriter/" @@ -138,6 +138,7 @@ !insertmacro MUI_LANGUAGE "Afrikaans" !insertmacro MUI_LANGUAGE "Catalan" !insertmacro MUI_LANGUAGE "Esperanto" +!insertmacro MUI_LANGUAGE "Asturian" ;-------------------------------- ;Reserve Files @@ -153,53 +154,6 @@ FunctionEnd -Function ConvertUnixNewLines - - Exch $R0 ;file #1 path - Push $R1 ;file #1 handle - Push $R2 ;file #2 path - Push $R3 ;file #2 handle - Push $R4 ;data - Push $R5 - - FileOpen $R1 $R0 r - GetTempFileName $R2 - FileOpen $R3 $R2 w - - loopRead: - ClearErrors - FileRead $R1 $R4 - IfErrors doneRead - - StrCpy $R5 $R4 1 -1 - StrCmp $R5 $\n 0 +4 - StrCpy $R5 $R4 1 -2 - StrCmp $R5 $\r +3 - StrCpy $R4 $R4 -1 - StrCpy $R4 "$R4$\r$\n" - - FileWrite $R3 $R4 - - Goto loopRead - doneRead: - - FileClose $R3 - FileClose $R1 - - SetDetailsPrint none - Delete $R0 - Rename $R2 $R0 - SetDetailsPrint both - - Pop $R5 - Pop $R4 - Pop $R3 - Pop $R2 - Pop $R1 - Pop $R0 - -FunctionEnd - ;-------------------------------- ;Installer Section @@ -209,21 +163,9 @@ SetOutPath $INSTDIR File ..\..\release\FocusWriter.exe File ..\symbols\symbols900.dat - File $%QTDIR%\bin\iconv.dll - File $%QTDIR%\bin\libgcc_s_sjlj-1.dll - File $%QTDIR%\bin\libGLESv2.dll - File $%QTDIR%\bin\libglib-2.0-0.dll - File $%QTDIR%\bin\libharfbuzz-0.dll - File $%QTDIR%\bin\libintl-8.dll - File $%QTDIR%\bin\libpcre-1.dll - File $%QTDIR%\bin\libpcre16-0.dll - File $%QTDIR%\bin\libpng16-16.dll - File $%QTDIR%\bin\libjpeg-62.dll + File $%QTDIR%\bin\libgcc_s_dw2-1.dll File $%QTDIR%\bin\libstdc++-6.dll - File $%QTDIR%\bin\libtiff-5.dll - File $%QTDIR%\bin\libwebp-6.dll File $%QTDIR%\bin\libwinpthread-1.dll - File $%QTDIR%\bin\zlib1.dll File $%QTDIR%\bin\Qt5Core.dll File $%QTDIR%\bin\Qt5Gui.dll File $%QTDIR%\bin\Qt5Multimedia.dll @@ -234,22 +176,33 @@ File $%QTDIR%\bin\Qt5WinExtras.dll SetOutPath $INSTDIR\audio - File $%QTDIR%\lib\qt5\plugins\audio\*.dll + File $%QTDIR%\plugins\audio\qtaudio_windows.dll SetOutPath $INSTDIR\bearer - File $%QTDIR%\lib\qt5\plugins\bearer\*.dll + File $%QTDIR%\plugins\bearer\qgenericbearer.dll + File $%QTDIR%\plugins\bearer\qnativewifibearer.dll SetOutPath $INSTDIR\imageformats - File $%QTDIR%\lib\qt5\plugins\imageformats\*.dll + File $%QTDIR%\plugins\imageformats\qdds.dll + File $%QTDIR%\plugins\imageformats\qgif.dll + File $%QTDIR%\plugins\imageformats\qicns.dll + File $%QTDIR%\plugins\imageformats\qico.dll + File $%QTDIR%\plugins\imageformats\qjpeg.dll + File $%QTDIR%\plugins\imageformats\qsvg.dll + File $%QTDIR%\plugins\imageformats\qtga.dll + File $%QTDIR%\plugins\imageformats\qtiff.dll + File $%QTDIR%\plugins\imageformats\qwbmp.dll + File $%QTDIR%\plugins\imageformats\qwebp.dll SetOutPath $INSTDIR\mediaservice - File $%QTDIR%\lib\qt5\plugins\mediaservice\*.dll + File $%QTDIR%\plugins\mediaservice\dsengine.dll + File $%QTDIR%\plugins\mediaservice\qtmedia_audioengine.dll SetOutPath $INSTDIR\platforms - File $%QTDIR%\lib\qt5\plugins\platforms\*.dll + File $%QTDIR%\plugins\platforms\qwindows.dll SetOutPath $INSTDIR\printsupport - File $%QTDIR%\lib\qt5\plugins\printsupport\*.dll + File $%QTDIR%\plugins\printsupport\windowsprintersupport.dll SetOutPath $INSTDIR\dictionaries File dicts\*.aff @@ -281,29 +234,27 @@ SetOutPath $INSTDIR\translations File ..\..\translations\*.qm - File $%QTDIR%\share\qt5\translations\qt_*.qm - File $%QTDIR%\share\qt5\translations\qtbase_*.qm - File $%QTDIR%\share\qt5\translations\qtmultimedia_*.qm + File $%QTDIR%\translations\qt_*.qm + File $%QTDIR%\translations\qtbase_*.qm + File $%QTDIR%\translations\qtmultimedia_*.qm ;Create ReadMe file SetOutPath $INSTDIR File /oname=ReadMe.txt ..\..\README FileOpen $4 "ReadMe.txt" a FileSeek $4 0 END - FileWrite $4 "$\n$\nCredits$\n=======$\n$\n" + FileWrite $4 "$\r$\n$\r$\nCredits$\r$\n=======$\r$\n$\r$\n" FileClose $4 File ..\..\CREDITS ${FileJoin} "ReadMe.txt" "CREDITS" "ReadMe.txt" Delete $INSTDIR\CREDITS FileOpen $4 "ReadMe.txt" a FileSeek $4 0 END - FileWrite $4 "$\n$\nNews$\n====$\n$\n" + FileWrite $4 "$\r$\n$\r$\nNews$\r$\n====$\r$\n$\r$\n" FileClose $4 File ..\..\NEWS ${FileJoin} "ReadMe.txt" "NEWS" "ReadMe.txt" Delete $INSTDIR\NEWS - Push $INSTDIR\ReadMe.txt - Call ConvertUnixNewLines ;Registry information for add/remove programs WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR" diff -Nru focuswriter-1.6.0/src/fileformats/docx_reader.cpp focuswriter-1.6.1/src/fileformats/docx_reader.cpp --- focuswriter-1.6.0/src/fileformats/docx_reader.cpp 2016-07-26 15:57:59.000000000 +0000 +++ focuswriter-1.6.1/src/fileformats/docx_reader.cpp 2016-09-18 17:59:08.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2013, 2014 Graeme Gott + * Copyright (C) 2013, 2014, 2016 Graeme Gott * * 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 @@ -313,14 +313,15 @@ void DocxReader::readParagraphProperties(Style& style, bool allowstyles) { int left_indent = 0, right_indent = 0, indent = 0; + bool textdir = false; while (m_xml.readNextStartElement()) { QStringRef value = m_xml.attributes().value("w:val"); if (m_xml.qualifiedName() == "w:jc") { // ECMA-376 1st edition, ECMA-376 2nd edition transitional, ISO/IEC 29500 transitional if (value == "left") { - style.block_format.setAlignment(Qt::AlignLeft | Qt::AlignAbsolute); + style.block_format.setAlignment(!textdir ? Qt::AlignLeading : (Qt::AlignLeft | Qt::AlignAbsolute)); } else if (value == "right") { - style.block_format.setAlignment(Qt::AlignRight | Qt::AlignAbsolute); + style.block_format.setAlignment(!textdir ? Qt::AlignTrailing : (Qt::AlignRight | Qt::AlignAbsolute)); // ECMA-376, ISO/IEC 29500 strict } else if (value == "center") { style.block_format.setAlignment(Qt::AlignCenter); @@ -328,9 +329,9 @@ style.block_format.setAlignment(Qt::AlignJustify); // ECMA-376 2nd edition, ISO/IEC 29500 strict } else if (value == "start") { - style.block_format.setAlignment(Qt::AlignLeft); + style.block_format.setAlignment(Qt::AlignLeading); } else if (value == "end") { - style.block_format.setAlignment(Qt::AlignRight); + style.block_format.setAlignment(Qt::AlignTrailing); } } else if (m_xml.qualifiedName() == "w:ind") { // ECMA-376 1st edition, ECMA-376 2nd edition transitional, ISO/IEC 29500 transitional @@ -342,15 +343,22 @@ style.block_format.setIndent(indent); left_indent = right_indent = 0; } + } else if (m_xml.qualifiedName() == "w:bidi") { + if (readBool(m_xml.attributes().value("w:val"))) { + style.block_format.setLayoutDirection(Qt::RightToLeft); + } } else if (m_xml.qualifiedName() == "w:textDirection") { if (value == "rl") { + textdir = true; style.block_format.setLayoutDirection(Qt::RightToLeft); } else if (value == "lr") { style.block_format.setLayoutDirection(Qt::LeftToRight); } } else if (m_xml.qualifiedName() == "w:outlineLvl") { - int heading = qBound(1, m_xml.attributes().value("w:val").toString().toInt() + 1, 6); - style.block_format.setProperty(QTextFormat::UserProperty, heading); + int heading = m_xml.attributes().value("w:val").toString().toInt(); + if (heading != 9) { + style.block_format.setProperty(QTextFormat::UserProperty, qBound(1, heading + 1, 6)); + } } else if ((m_xml.qualifiedName() == "w:pStyle") && allowstyles) { Style pstyle = m_styles.value(value.toString()); pstyle.merge(style); diff -Nru focuswriter-1.6.0/src/fileformats/docx_writer.cpp focuswriter-1.6.1/src/fileformats/docx_writer.cpp --- focuswriter-1.6.0/src/fileformats/docx_writer.cpp 2016-07-26 15:57:59.000000000 +0000 +++ focuswriter-1.6.1/src/fileformats/docx_writer.cpp 2016-09-18 16:51:43.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2013, 2014 Graeme Gott + * Copyright (C) 2013, 2014, 2016 Graeme Gott * * 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 @@ -256,16 +256,16 @@ bool rtl = block_format.layoutDirection() == Qt::RightToLeft; if (rtl) { writePropertyElement(QString::fromLatin1("w:pPr"), empty); - m_xml.writeEmptyElement(QString::fromLatin1("w:textDirection")); - m_xml.writeAttribute(QString::fromLatin1("w:val"), QString::fromLatin1("rl")); + m_xml.writeEmptyElement(QString::fromLatin1("w:bidi")); + m_xml.writeAttribute(QString::fromLatin1("w:val"), QString::fromLatin1("1")); } Qt::Alignment align = block_format.alignment(); - if (rtl && (align & Qt::AlignLeft)) { + if (rtl && (align & Qt::AlignRight)) { writePropertyElement(QString::fromLatin1("w:pPr"), empty); m_xml.writeEmptyElement(QString::fromLatin1("w:jc")); m_xml.writeAttribute(QString::fromLatin1("w:val"), m_strict ? QString::fromLatin1("start") : QString::fromLatin1("left")); - } else if (align & Qt::AlignRight) { + } else if ((align & Qt::AlignRight) || (rtl && (align & Qt::AlignLeft))) { writePropertyElement(QString::fromLatin1("w:pPr"), empty); m_xml.writeEmptyElement(QString::fromLatin1("w:jc")); m_xml.writeAttribute(QString::fromLatin1("w:val"), m_strict ? QString::fromLatin1("end") : QString::fromLatin1("right")); @@ -292,7 +292,11 @@ } } - empty &= writeRunProperties(char_format, QString::fromLatin1("w:pPr")); + if (!empty) { + writeRunProperties(char_format); + } else { + empty = writeRunProperties(char_format, QString::fromLatin1("w:pPr")); + } if (!empty) { m_xml.writeEndElement(); diff -Nru focuswriter-1.6.0/src/preferences_dialog.cpp focuswriter-1.6.1/src/preferences_dialog.cpp --- focuswriter-1.6.0/src/preferences_dialog.cpp 2016-07-26 15:57:59.000000000 +0000 +++ focuswriter-1.6.1/src/preferences_dialog.cpp 2016-09-13 13:06:12.000000000 +0000 @@ -227,7 +227,7 @@ { // Confirm close even with shortcut conflicts if (m_shortcut_conflicts) { - m_tabs->setCurrentIndex(4); + m_tabs->setCurrentIndex(5); if (QMessageBox::question(this, tr("Question"), tr("One or more shortcuts conflict. Do you wish to proceed?"), @@ -653,7 +653,7 @@ // Find shortcut QString name = item->text(2); QKeySequence shortcut = m_new_shortcuts.value(name, ActionManager::instance()->shortcut(name)); - if (shortcut.isEmpty()) { + if (shortcut.isEmpty() || (shortcut == Qt::Key_unknown)) { continue; } diff -Nru focuswriter-1.6.0/src/spelling/highlighter.cpp focuswriter-1.6.1/src/spelling/highlighter.cpp --- focuswriter-1.6.0/src/spelling/highlighter.cpp 2016-07-26 15:57:59.000000000 +0000 +++ focuswriter-1.6.1/src/spelling/highlighter.cpp 2016-09-18 17:38:19.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Graeme Gott + * Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2016 Graeme Gott * * 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 @@ -148,9 +148,9 @@ void Highlighter::highlightBlock(const QString& text) { + QTextCharFormat style; int heading = currentBlock().blockFormat().property(QTextFormat::UserProperty).toInt(); if (heading) { - QTextCharFormat style; style.setProperty(QTextFormat::FontSizeAdjustment, 4 - heading); style.setFontWeight(QFont::Bold); setFormat(0, text.length(), style); @@ -164,9 +164,8 @@ stats->checkSpelling(text, m_dictionary); } - QTextCharFormat error; - error.setUnderlineColor(m_misspelled); - error.setUnderlineStyle((QTextCharFormat::UnderlineStyle)QApplication::style()->styleHint(QStyle::SH_SpellCheckUnderlineStyle)); + style.setUnderlineColor(m_misspelled); + style.setUnderlineStyle((QTextCharFormat::UnderlineStyle)QApplication::style()->styleHint(QStyle::SH_SpellCheckUnderlineStyle)); int cursor = m_text->textCursor().position() - currentBlock().position(); QVector words = stats->misspelled(); @@ -174,7 +173,7 @@ const QStringRef& word = words.at(i); int delta = cursor - word.position(); if (!m_changed || (delta < 0 || delta > word.length())) { - setFormat(word.position(), word.length(), error); + setFormat(word.position(), word.length(), style); } } diff -Nru focuswriter-1.6.0/translations/focuswriter_af_ZA.ts focuswriter-1.6.1/translations/focuswriter_af_ZA.ts --- focuswriter-1.6.0/translations/focuswriter_af_ZA.ts 2016-08-24 12:35:45.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_af_ZA.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Sisteemtaal> - + Note Nota - + Please restart this application for the change in language to take effect. Herlaai asseblief hierdie toepassing vir die taalwysiging om pos te vat. diff -Nru focuswriter-1.6.0/translations/focuswriter_ar.ts focuswriter-1.6.1/translations/focuswriter_ar.ts --- focuswriter-1.6.0/translations/focuswriter_ar.ts 2016-08-24 12:35:45.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_ar.ts 2016-09-13 13:04:02.000000000 +0000 @@ -452,12 +452,12 @@ <لغة النظام> - + Note ملاحظة - + Please restart this application for the change in language to take effect. من فضلك، أعد تشغيل البرنامج ليتم تفعيل اللغة المختارة. diff -Nru focuswriter-1.6.0/translations/focuswriter_ca.ts focuswriter-1.6.1/translations/focuswriter_ca.ts --- focuswriter-1.6.0/translations/focuswriter_ca.ts 2016-08-24 12:35:45.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_ca.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Idioma del sistema> - + Note Nota - + Please restart this application for the change in language to take effect. Call que reinicieu l'aplicació perquè tingui efecte el canvi d'idioma diff -Nru focuswriter-1.6.0/translations/focuswriter_cs.ts focuswriter-1.6.1/translations/focuswriter_cs.ts --- focuswriter-1.6.0/translations/focuswriter_cs.ts 2016-08-24 12:35:45.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_cs.ts 2016-09-13 13:04:02.000000000 +0000 @@ -434,12 +434,12 @@ <Jazyk systému> - + Note Poznámka - + Please restart this application for the change in language to take effect. Spusťte program znovu, aby se změna jazyka projevila. diff -Nru focuswriter-1.6.0/translations/focuswriter_da.ts focuswriter-1.6.1/translations/focuswriter_da.ts --- focuswriter-1.6.0/translations/focuswriter_da.ts 2016-08-24 12:35:45.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_da.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Systemsprog> - + Note Note - + Please restart this application for the change in language to take effect. Genstart programmet for at skifte til det valgte sprog. Binary files /tmp/tmprdcBDo/AI48xTmfop/focuswriter-1.6.0/translations/focuswriter_de.qm and /tmp/tmprdcBDo/NrIqNaSSgT/focuswriter-1.6.1/translations/focuswriter_de.qm differ diff -Nru focuswriter-1.6.0/translations/focuswriter_de.ts focuswriter-1.6.1/translations/focuswriter_de.ts --- focuswriter-1.6.0/translations/focuswriter_de.ts 2016-08-24 12:35:45.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_de.ts 2016-09-13 13:06:18.000000000 +0000 @@ -428,12 +428,12 @@ <Systemsprache> - + Note Beachte - + Please restart this application for the change in language to take effect. Damit Änderungen an der Programmsprache in Kraft treten können, muss das Programm neu gestartet werden. @@ -510,7 +510,7 @@ One or more shortcuts conflict. Do you wish to proceed? - Eine oder mehrere Verknüpfungen Konflikte. Möchten Sie fortfahren? + Eine oder mehrere Verknüpfungen verursachen Konflikte. Möchten Sie fortfahren? diff -Nru focuswriter-1.6.0/translations/focuswriter_el.ts focuswriter-1.6.1/translations/focuswriter_el.ts --- focuswriter-1.6.0/translations/focuswriter_el.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_el.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Γλώσσα Συστήματος> - + Note Σημείωση - + Please restart this application for the change in language to take effect. Επανεκκινήστε την εφαρμογή για να ισχύσει η αλλαγή γλώσσας. diff -Nru focuswriter-1.6.0/translations/focuswriter_en_GB.ts focuswriter-1.6.1/translations/focuswriter_en_GB.ts --- focuswriter-1.6.0/translations/focuswriter_en_GB.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_en_GB.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <System Language> - + Note Note - + Please restart this application for the change in language to take effect. Please restart the application for the language change to take effect. diff -Nru focuswriter-1.6.0/translations/focuswriter_en.ts focuswriter-1.6.1/translations/focuswriter_en.ts --- focuswriter-1.6.0/translations/focuswriter_en.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_en.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ - + Note - + Please restart this application for the change in language to take effect. diff -Nru focuswriter-1.6.0/translations/focuswriter_eo.ts focuswriter-1.6.1/translations/focuswriter_eo.ts --- focuswriter-1.6.0/translations/focuswriter_eo.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_eo.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Lingvo de Sistemo> - + Note Noto - + Please restart this application for the change in language to take effect. Bonvolu relanĉi ĉi tiun aplikaĵon por la lingva ŝanĝo efiki. diff -Nru focuswriter-1.6.0/translations/focuswriter_es_MX.ts focuswriter-1.6.1/translations/focuswriter_es_MX.ts --- focuswriter-1.6.0/translations/focuswriter_es_MX.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_es_MX.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Idioma del sistema> - + Note Nota - + Please restart this application for the change in language to take effect. Por favor reinicie esta aplicación para que los cambios de idioma se realicen. diff -Nru focuswriter-1.6.0/translations/focuswriter_es.ts focuswriter-1.6.1/translations/focuswriter_es.ts --- focuswriter-1.6.0/translations/focuswriter_es.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_es.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Idioma del sistema> - + Note Nota - + Please restart this application for the change in language to take effect. Reinicie la aplicación para que el cambio de idioma tenga efecto. diff -Nru focuswriter-1.6.0/translations/focuswriter_fi.ts focuswriter-1.6.1/translations/focuswriter_fi.ts --- focuswriter-1.6.0/translations/focuswriter_fi.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_fi.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Järjestelmän kieli> - + Note Huomaa - + Please restart this application for the change in language to take effect. Ole hyvä ja käynnistä ohjelma uudelleen, jotta kielen muutos tulee voimaan. diff -Nru focuswriter-1.6.0/translations/focuswriter_fr.ts focuswriter-1.6.1/translations/focuswriter_fr.ts --- focuswriter-1.6.0/translations/focuswriter_fr.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_fr.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Langue du système> - + Note Note - + Please restart this application for the change in language to take effect. Veuillez redémarrer le programme pour que le changement de langue prenne effet. diff -Nru focuswriter-1.6.0/translations/focuswriter_he.ts focuswriter-1.6.1/translations/focuswriter_he.ts --- focuswriter-1.6.0/translations/focuswriter_he.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_he.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <שפת מערכת> - + Note הערה - + Please restart this application for the change in language to take effect. נא לאתחל את יישום זה כדי להחיל את השינוי בשפה. diff -Nru focuswriter-1.6.0/translations/focuswriter_hu.ts focuswriter-1.6.1/translations/focuswriter_hu.ts --- focuswriter-1.6.0/translations/focuswriter_hu.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_hu.ts 2016-09-13 13:04:02.000000000 +0000 @@ -422,12 +422,12 @@ <A rendszer nyelve> - + Note Megjegyzés - + Please restart this application for the change in language to take effect. Indítsd újra az alkalmazást, hogy a változtatások érvénybe lépjenek. diff -Nru focuswriter-1.6.0/translations/focuswriter_hy.ts focuswriter-1.6.1/translations/focuswriter_hy.ts --- focuswriter-1.6.0/translations/focuswriter_hy.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_hy.ts 2016-09-13 13:04:02.000000000 +0000 @@ -422,12 +422,12 @@ <Համակարգի լեզուն> - + Note Նշում - + Please restart this application for the change in language to take effect. Լեզվի փոփոխության կայացման համար ծրագիրը վերագործարկել diff -Nru focuswriter-1.6.0/translations/focuswriter_id.ts focuswriter-1.6.1/translations/focuswriter_id.ts --- focuswriter-1.6.0/translations/focuswriter_id.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_id.ts 2016-09-13 13:04:02.000000000 +0000 @@ -422,12 +422,12 @@ <System Language> - + Note Catatan - + Please restart this application for the change in language to take effect. Silakan tutup dan buka kembali aplikasi ini untuk menerapkan perubahan bahasa. diff -Nru focuswriter-1.6.0/translations/focuswriter_it.ts focuswriter-1.6.1/translations/focuswriter_it.ts --- focuswriter-1.6.0/translations/focuswriter_it.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_it.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Lingua di sistema> - + Note Nota - + Please restart this application for the change in language to take effect. Per modificare la lingua riavviare l'applicazione. diff -Nru focuswriter-1.6.0/translations/focuswriter_ja.ts focuswriter-1.6.1/translations/focuswriter_ja.ts --- focuswriter-1.6.0/translations/focuswriter_ja.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_ja.ts 2016-09-13 13:04:02.000000000 +0000 @@ -422,12 +422,12 @@ <システムの言語> - + Note 注意 - + Please restart this application for the change in language to take effect. 言語の変更を反映させるためにアプリケーションを再起動してください。 diff -Nru focuswriter-1.6.0/translations/focuswriter_ko.ts focuswriter-1.6.1/translations/focuswriter_ko.ts --- focuswriter-1.6.0/translations/focuswriter_ko.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_ko.ts 2016-09-13 13:04:02.000000000 +0000 @@ -422,12 +422,12 @@ < 시스템 언어 > - + Note 노트 - + Please restart this application for the change in language to take effect. 바뀐 언어로 적용하기 위해 프로그램을 다시 시작 해주세요. diff -Nru focuswriter-1.6.0/translations/focuswriter_lt.ts focuswriter-1.6.1/translations/focuswriter_lt.ts --- focuswriter-1.6.0/translations/focuswriter_lt.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_lt.ts 2016-09-13 13:04:02.000000000 +0000 @@ -434,12 +434,12 @@ <Sistemos kalba> - + Note Pastaba - + Please restart this application for the change in language to take effect. Kad įsigaliotų kalbos pakeitimai, prašome paleisti programą iš naujo. diff -Nru focuswriter-1.6.0/translations/focuswriter_nl.ts focuswriter-1.6.1/translations/focuswriter_nl.ts --- focuswriter-1.6.0/translations/focuswriter_nl.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_nl.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Systeemtaal> - + Note Let op - + Please restart this application for the change in language to take effect. Graag de applicatie herstarten om de taalverandering door te voeren. diff -Nru focuswriter-1.6.0/translations/focuswriter_pl.ts focuswriter-1.6.1/translations/focuswriter_pl.ts --- focuswriter-1.6.0/translations/focuswriter_pl.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_pl.ts 2016-09-13 13:04:02.000000000 +0000 @@ -434,12 +434,12 @@ <Język systemowy> - + Note Informacja - + Please restart this application for the change in language to take effect. Zmiany zostaną uwzględnione przy następnym uruchomieniu programu. diff -Nru focuswriter-1.6.0/translations/focuswriter_pt_BR.ts focuswriter-1.6.1/translations/focuswriter_pt_BR.ts --- focuswriter-1.6.0/translations/focuswriter_pt_BR.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_pt_BR.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Linguagem do sistema> - + Note Nota - + Please restart this application for the change in language to take effect. Por favor, reinicie o programa para que as alterações no idioma tenham efeito. diff -Nru focuswriter-1.6.0/translations/focuswriter_pt.ts focuswriter-1.6.1/translations/focuswriter_pt.ts --- focuswriter-1.6.0/translations/focuswriter_pt.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_pt.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Língua do sistema> - + Note Nota - + Please restart this application for the change in language to take effect. Por favor reinicie o programa para a mudança da língua do programa ser aplicada. Binary files /tmp/tmprdcBDo/AI48xTmfop/focuswriter-1.6.0/translations/focuswriter_ro.qm and /tmp/tmprdcBDo/NrIqNaSSgT/focuswriter-1.6.1/translations/focuswriter_ro.qm differ diff -Nru focuswriter-1.6.0/translations/focuswriter_ro.ts focuswriter-1.6.1/translations/focuswriter_ro.ts --- focuswriter-1.6.0/translations/focuswriter_ro.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_ro.ts 2016-09-13 13:04:02.000000000 +0000 @@ -434,12 +434,12 @@ <Limbaj Sistem> - + Note Notă - + Please restart this application for the change in language to take effect. Vă rugăm reporniţi această aplicaţie pentru ca schimbarea limbii să aibă efect. @@ -1417,12 +1417,12 @@ Bitter Skies - + Cer morocănos Enchantment - + Încîntare @@ -1442,12 +1442,12 @@ Spy Games - + Jocuri spion Tranquility - + Linişte diff -Nru focuswriter-1.6.0/translations/focuswriter_ru.ts focuswriter-1.6.1/translations/focuswriter_ru.ts --- focuswriter-1.6.0/translations/focuswriter_ru.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_ru.ts 2016-09-13 13:04:02.000000000 +0000 @@ -434,12 +434,12 @@ <Язык системы> - + Note Информация - + Please restart this application for the change in language to take effect. Перезапустите программу, чтобы применить изменение языка. diff -Nru focuswriter-1.6.0/translations/focuswriter_sk.ts focuswriter-1.6.1/translations/focuswriter_sk.ts --- focuswriter-1.6.0/translations/focuswriter_sk.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_sk.ts 2016-09-13 13:04:02.000000000 +0000 @@ -434,12 +434,12 @@ <Predvolený jazyk systému> - + Note Poznámka - + Please restart this application for the change in language to take effect. K zmene jazyka dôjde po reštarte programu. diff -Nru focuswriter-1.6.0/translations/focuswriter_sr.ts focuswriter-1.6.1/translations/focuswriter_sr.ts --- focuswriter-1.6.0/translations/focuswriter_sr.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_sr.ts 2016-09-13 13:04:02.000000000 +0000 @@ -434,12 +434,12 @@ <Системски језик> - + Note Напомена - + Please restart this application for the change in language to take effect. Молимо рестартујте програм да би се видела промена језика. diff -Nru focuswriter-1.6.0/translations/focuswriter_sv.ts focuswriter-1.6.1/translations/focuswriter_sv.ts --- focuswriter-1.6.0/translations/focuswriter_sv.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_sv.ts 2016-09-13 13:04:02.000000000 +0000 @@ -428,12 +428,12 @@ <Systemspråk> - + Note Observera - + Please restart this application for the change in language to take effect. Starta om programmet för att språkändringen ska aktiveras. diff -Nru focuswriter-1.6.0/translations/focuswriter_tr.ts focuswriter-1.6.1/translations/focuswriter_tr.ts --- focuswriter-1.6.0/translations/focuswriter_tr.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_tr.ts 2016-09-13 13:04:02.000000000 +0000 @@ -422,12 +422,12 @@ <Sistem Dili> - + Note Not - + Please restart this application for the change in language to take effect. Dil değişikliğinin etkin olması için lütfen bu uygulamayı yeniden başlatın. diff -Nru focuswriter-1.6.0/translations/focuswriter_uk.ts focuswriter-1.6.1/translations/focuswriter_uk.ts --- focuswriter-1.6.0/translations/focuswriter_uk.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_uk.ts 2016-09-13 13:04:02.000000000 +0000 @@ -434,12 +434,12 @@ <System Language> - + Note Примітка - + Please restart this application for the change in language to take effect. Перезапустіть програму, щоб зміна мови набрала чинності. diff -Nru focuswriter-1.6.0/translations/focuswriter_vi.ts focuswriter-1.6.1/translations/focuswriter_vi.ts --- focuswriter-1.6.0/translations/focuswriter_vi.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_vi.ts 2016-09-13 13:04:02.000000000 +0000 @@ -422,12 +422,12 @@ <Ngôn ngữ Hệ thống> - + Note Ghi chú - + Please restart this application for the change in language to take effect. Xin vui lòng khởi động lại ứng dụng này để áp dụng thao tác thay đổi ngôn ngữ. diff -Nru focuswriter-1.6.0/translations/focuswriter_zh_CN.ts focuswriter-1.6.1/translations/focuswriter_zh_CN.ts --- focuswriter-1.6.0/translations/focuswriter_zh_CN.ts 2016-08-24 12:35:46.000000000 +0000 +++ focuswriter-1.6.1/translations/focuswriter_zh_CN.ts 2016-09-13 13:04:02.000000000 +0000 @@ -422,12 +422,12 @@ <系统语言> - + Note 注意 - + Please restart this application for the change in language to take effect. 要使语言的变化生效，请重新启动该应用程序。 diff -Nru focuswriter-1.6.0/windows_deploy.bat focuswriter-1.6.1/windows_deploy.bat --- focuswriter-1.6.0/windows_deploy.bat 1970-01-01 00:00:00.000000000 +0000 +++ focuswriter-1.6.1/windows_deploy.bat 2016-09-19 09:54:54.000000000 +0000 @@ -0,0 +1,90 @@ +@ECHO OFF + +SET APP=FocusWriter +SET VERSION=1.6.1 + +ECHO Copying executable +MKDIR %APP% +TYPE COPYING | FIND "" /V > %APP%\COPYING.txt +TYPE CREDITS | FIND "" /V > %APP%\CREDITS.txt +TYPE README | FIND "" /V > %APP%\README.txt +COPY release\%APP%.exe %APP% >nul +strip %APP%\%APP%.exe + +ECHO Copying translations +SET TRANSLATIONS=%APP%\translations +MKDIR %TRANSLATIONS% +COPY translations\*.qm %TRANSLATIONS% >nul +COPY %QTDIR%\translations\qt_*.qm %TRANSLATIONS% >nul +COPY %QTDIR%\translations\qtbase_*.qm %TRANSLATIONS% >nul +COPY %QTDIR%\translations\qtmultimedia_*.qm %TRANSLATIONS% >nul + +ECHO Copying icons +SET ICONS=%APP%\icons\hicolor +MKDIR %ICONS% +XCOPY /Q /S /Y resources\images\icons\oxygen\hicolor %ICONS% >nul + +ECHO Copying dictionaries +SET DICTIONARIES=%APP%\dictionaries +MKDIR %DICTIONARIES% +XCOPY /Q /S /Y resources\windows\dicts %DICTIONARIES% >nul + +ECHO Copying sounds +SET SOUNDS=%APP%\sounds +MKDIR %SOUNDS% +COPY resources\sounds\* %SOUNDS% >nul + +ECHO Copying symbols +COPY resources\symbols\symbols900.dat %APP% >nul + +ECHO Copying themes +SET THEMES=%APP%\themes +MKDIR %THEMES% +XCOPY /Q /S /Y resources\themes\* %THEMES% >nul + +ECHO Copying Qt libraries +COPY %QTDIR%\bin\libgcc_s_dw2-1.dll %APP% >nul +COPY "%QTDIR%\bin\libstdc++-6.dll" %APP% >nul +COPY %QTDIR%\bin\libwinpthread-1.dll %APP% >nul +COPY %QTDIR%\bin\Qt5Core.dll %APP% >nul +COPY %QTDIR%\bin\Qt5Gui.dll %APP% >nul +COPY %QTDIR%\bin\Qt5Multimedia.dll %APP% >nul +COPY %QTDIR%\bin\Qt5Network.dll %APP% >nul +COPY %QTDIR%\bin\Qt5PrintSupport.dll %APP% >nul +COPY %QTDIR%\bin\Qt5Svg.dll %APP% >nul +COPY %QTDIR%\bin\Qt5Widgets.dll %APP% >nul +COPY %QTDIR%\bin\Qt5WinExtras.dll %APP% >nul + +ECHO Copying Qt plugins +MKDIR %APP%\audio +COPY %QTDIR%\plugins\audio\qtaudio_windows.dll %APP%\audio >nul + +MKDIR %APP%\bearer +XCOPY /Q /S /Y %QTDIR%\plugins\bearer %APP%\bearer >nul +DEL %APP%\bearer\*d.dll >nul + +MKDIR %APP%\platforms +COPY %QTDIR%\plugins\platforms\qwindows.dll %APP%\platforms >nul + +MKDIR %APP%\imageformats +XCOPY /Q /S /Y %QTDIR%\plugins\imageformats %APP%\imageformats >nul +DEL %APP%\imageformats\*d.dll >nul + +MKDIR %APP%\mediaservice +XCOPY /Q /S /Y %QTDIR%\plugins\mediaservice %APP%\mediaservice >nul +DEL %APP%\mediaservice\*d.dll >nul + +MKDIR %APP%\printsupport +COPY %QTDIR%\plugins\printsupport\windowsprintersupport.dll %APP%\printsupport >nul + +ECHO Making portable +MKDIR %APP%\Data + +ECHO Creating compressed file +CD %APP% +7z a -mx=9 %APP%_%VERSION%.zip * >nul +CD .. +MOVE %APP%\%APP%_%VERSION%.zip . >nul + +ECHO Cleaning up +RMDIR /S /Q %APP% diff -Nru focuswriter-1.6.0/windows_deploy.sh focuswriter-1.6.1/windows_deploy.sh --- focuswriter-1.6.0/windows_deploy.sh 2016-08-27 15:32:34.000000000 +0000 +++ focuswriter-1.6.1/windows_deploy.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -#!/bin/bash - -APP='FocusWriter' -VERSION='1.6.0' - -echo -n 'Preparing... ' -QTDIR=$(mingw32-qmake-qt5 -query QT_INSTALL_PREFIX) -rm -f ${APP}_${VERSION}.zip -rm -rf $APP -echo 'Done' - -echo -n 'Copying executable... ' -mkdir $APP -cp release/$APP.exe $APP -echo 'Done' - -echo -n 'Copying translations... ' -mkdir $APP/translations -cp translations/*.qm $APP/translations -cp $QTDIR/share/qt5/translations/qt_*.qm $APP/translations -cp $QTDIR/share/qt5/translations/qtbase_*.qm $APP/translations -cp $QTDIR/share/qt5/translations/qtmultimedia_*.qm $APP/translations -echo 'Done' - -echo -n 'Copying icons... ' -mkdir $APP/icons -cp -r resources/images/icons/oxygen/hicolor/ $APP/icons -echo 'Done' - -echo -n 'Copying dictionaries... ' -mkdir $APP/dictionaries -cp -r resources/windows/dicts/* $APP/dictionaries -echo 'Done' - -echo -n 'Copying sounds... ' -cp -r resources/sounds/ $APP -echo 'Done' - -echo -n 'Copying symbols... ' -cp resources/symbols/symbols900.dat $APP -echo 'Done' - -echo -n 'Copying themes... ' -cp -r resources/themes/ $APP -echo 'Done' - -echo -n 'Copying Qt libraries... ' -cp $QTDIR/bin/iconv.dll $APP -cp $QTDIR/bin/libgcc_s_sjlj-1.dll $APP -cp $QTDIR/bin/libGLESv2.dll $APP -cp $QTDIR/bin/libglib-2.0-0.dll $APP -cp $QTDIR/bin/libharfbuzz-0.dll $APP -cp $QTDIR/bin/libintl-8.dll $APP -cp $QTDIR/bin/libpcre-1.dll $APP -cp $QTDIR/bin/libpcre16-0.dll $APP -cp $QTDIR/bin/libpng16-16.dll $APP -cp $QTDIR/bin/libjpeg-62.dll $APP -cp $QTDIR/bin/libstdc++-6.dll $APP -cp $QTDIR/bin/libtiff-5.dll $APP -cp $QTDIR/bin/libwebp-6.dll $APP -cp $QTDIR/bin/libwinpthread-1.dll $APP -cp $QTDIR/bin/zlib1.dll $APP -cp $QTDIR/bin/Qt5Core.dll $APP -cp $QTDIR/bin/Qt5Gui.dll $APP -cp $QTDIR/bin/Qt5Multimedia.dll $APP -cp $QTDIR/bin/Qt5Network.dll $APP -cp $QTDIR/bin/Qt5PrintSupport.dll $APP -cp $QTDIR/bin/Qt5Svg.dll $APP -cp $QTDIR/bin/Qt5Widgets.dll $APP -cp $QTDIR/bin/Qt5WinExtras.dll $APP -echo 'Done' - -echo -n 'Copying Qt plugins... ' -cp -r $QTDIR/lib/qt5/plugins/audio/ $APP -cp -r $QTDIR/lib/qt5/plugins/bearer/ $APP -cp -r $QTDIR/lib/qt5/plugins/platforms/ $APP -cp -r $QTDIR/lib/qt5/plugins/imageformats/ $APP -cp -r $QTDIR/lib/qt5/plugins/mediaservice/ $APP -cp -r $QTDIR/lib/qt5/plugins/printsupport/ $APP -echo 'Done' - -echo -n 'Create ReadMe... ' -cp README $APP/ReadMe.txt -echo -e '\n\nCredits\n=======\n\n' >> $APP/ReadMe.txt -cat CREDITS >> $APP/ReadMe.txt -echo -e '\n\nNews\n====\n\n' >> $APP/ReadMe.txt -cat NEWS >> $APP/ReadMe.txt -unix2dos -q -o $APP/ReadMe.txt -unix2dos -q -n COPYING $APP/Copying.txt -echo 'Done' - -echo -n 'Stripping files... ' -mingw-strip --strip-unneeded -p $APP/$APP.exe $APP/*.dll $APP/*/*.dll -echo 'Done' - -echo -n 'Making portable... ' -mkdir $APP/Data -echo 'Done' - -echo -n 'Compressing... ' -cd $APP -7za a -mx=9 ../${APP}_${VERSION}.zip * -cd .. -echo 'Done' - -echo -n 'Cleaning up... ' -rm -rf $APP -echo 'Done'