New upstream version 2.9.28

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76d369edb7d6e158182144fb796909a97cdc40c8..02440377289be6293c424c71bc4515473a65022a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,13 +160,15 @@ add_custom_target(make-translations-directory ALL
 add_dependencies(vym make-translations-directory)
 
 install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
-install(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.pdf")
 install(FILES doc/vym.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR})
 install(FILES README.md LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(DIRECTORY exports flags icons macros ${CMAKE_BINARY_DIR}/translations scripts styles DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
 
 if(UNIX)
     install(FILES icons/vym.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
+    file(CREATE_LINK ../apps/vym.png application-x-vym.png SYMBOLIC)
+    install(FILES ${CMAKE_BINARY_DIR}/application-x-vym.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/mimetypes)
     install(FILES config/vym.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/packages)
     install(FILES config/vym.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
 endif()

diff --git a/README.md b/README.md
index ae34760b09219fecd39a6e907a2bfb2cac001664..acaf9e663f7f609d98191013c7e5f240c0fdd745 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-VYM - View Your Mind (c) 2004-2023 by Uwe Drechsel
+VYM - View Your Mind (c) 2004-2024 by Uwe Drechsel
 ==================================================
 
 Documentation

diff --git a/config/vym.desktop b/config/vym.desktop
index d0960feba8c1051dc4ac115f9261c982744a4239..5427e451a74f538eccc75dc92c8f3ff0d0ca5da3 100644 (file)
--- a/config/vym.desktop
+++ b/config/vym.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=vym
+Exec=vym %F
 Name=VYM - View Your Mind
 Name[de]=VYM - View Your Mind
 Name[zh_TW]=心智檢視
@@ -36,5 +36,5 @@ X-AppInstall-Popcon=430
 X-AppInstall-Section=universe
 X-Ubuntu-Gettext-Domain=app-install-data
 Categories=Qt;KDE;Office;
-
+Keywords=mindmap;taskmanager;brainstorming;
 

diff --git a/doc/vym.1.gz b/doc/vym.1.gz
index c7bb5645826ec9e3c433e6c8bc694780bb05c6cf..7198bdd1428b019b5ecf5966edd98e01261ee4e0 100644 (file)
Binary files a/doc/vym.1.gz and b/doc/vym.1.gz differ

diff --git a/release-notes-2.9.md b/release-notes-2.9.md
index ce03d5399d03a294a53d8b51368df2adf8ca0367..5ab5127589053303c64b2e67f8b63ebf86f29a0c 100644 (file)
--- a/release-notes-2.9.md
+++ b/release-notes-2.9.md
@@ -9,7 +9,14 @@ Feel free to report any bugs or feature requests on
 
 Thanks for using vym!
 
-Uwe Drechsel - November 2023
+Uwe Drechsel - May 2024
+
+## Version 2.9.27
+### Bugfixes
+ * Bugfix: Markdown improvements by Markus Seilnacht
+ * Bugfix: Allow saving of readonly maps
+ * Bugfix: Use vymBaseDir when setting up libreoffice export
+ * Bugfix: Resetting task delta prio not limited to visible tasks
 
 
 ## Version 2.9.26

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index 7f97a148fbd56772d9398d3827c16566f0aef7cf..5662d434c9e5b51dcec480e108c84cab0e0aa02d 100644 (file)
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -85,6 +85,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
             "</li>"
             "<li> Patches"
             "  <ul>"
+            "    <li>Sven H&ouml;xter: Various patches to fix typos and especiall for Debian packaging</li>"
             "    <li>Edward Wang: adding close tab buttons</li>"
             "    <li>p0llox (Pierre): various patches for Debian packaging</li>"
             "    <li>Markus Seilnacht: Markdown improvements</li>"
@@ -92,8 +93,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
             "</li>"
             "<li> Patches in previous vym versions"
             "  <ul>"
-            "    <li>Łukasz Pietrzak, Scott Dillman and Patrick Spendrin, "
-            "Andrew Ng, "
+            "    <li>Łukasz Pietrzak, Scott Dillman and Patrick Spendrin, Andrew Ng, "
             "Juha Ruotsalainen and Thomas Kriener: windows patches</li>"
             "    <li>Thomas Schraitle for the stylesheet"
             "        formerly used for XHTML-export and help with XML "

diff --git a/src/confluence-agent.cpp b/src/confluence-agent.cpp
index 44a5f0c087f93c20b1a3cf7556465a56a92d298b..25b3012136532a8e81f25d7e509ebe6957341152 100644 (file)
--- a/src/confluence-agent.cpp
+++ b/src/confluence-agent.cpp
@@ -433,7 +433,7 @@ void ConfluenceAgent::finishJob()
 
 void ConfluenceAgent::unknownStepWarningFinishJob()
 {
-    qWarning() << "CA::contJob  unknow step in jobType = " 
+    qWarning() << "CA::contJob  unknown step in jobType = " 
         << jobType 
         << "jobStep = " << jobStep;
     finishJob();

diff --git a/src/jira-agent.cpp b/src/jira-agent.cpp
index c4d0e04eb3f3869b1a1517903110561d057445e3..9bf49279849443356fe24001db77da40a564dd9b 100644 (file)
--- a/src/jira-agent.cpp
+++ b/src/jira-agent.cpp
@@ -208,7 +208,7 @@ void JiraAgent::finishJob()
 
 void JiraAgent::unknownStepWarning()
 {
-    qWarning() << "JA::contJob  unknow step in jobType = " 
+    qWarning() << "JA::contJob  unknown step in jobType = " 
         << jobType 
         << "jobStep = " << jobStep;
 }

diff --git a/src/linkablemapobj.cpp b/src/linkablemapobj.cpp
index ee9bd7c541b919c20b0acd9e40b27667dbc9e2f4..dd5adfaab67925b6f6327c5b33b1792cbd26c9d8 100644 (file)
--- a/src/linkablemapobj.cpp
+++ b/src/linkablemapobj.cpp
@@ -544,7 +544,7 @@ void LinkableMapObj::requestReposition()
 
 void LinkableMapObj::forceReposition()
 {
-    // Sometimes a reposition has to be done immediatly: For example
+    // Sometimes a reposition has to be done immediately: For example
     // if the note editor flag changes, there is no user event in mapeditor
     // which could collect requests for a reposition.
     // Then we have to call forceReposition()

diff --git a/src/main.cpp b/src/main.cpp
index aad67561d49fb5d10ef2831eec7e88b33785b188..f59363c66ccf7ee04a4b16c6994415ca2d0e5149 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -207,11 +207,11 @@ int main(int argc, char *argv[])
         "-d           debug         Show debugging output\n"
         "-h           help          Show this help text\n"
         "-L           load          Load script\n"
-        "-l           local         Run with ressources in current directory\n"
+        "-l           local         Run with resources in current directory\n"
         "--locale     locale        Override system locale setting to select\n"
         "                           language\n"
         "-n  STRING   name          Set name of instance for DBus access\n"
-        "-q           quit          Quit immediatly after start for benchmarking\n"
+        "-q           quit          Quit immediately after start for benchmarking\n"
         "-R  FILE     run           Run script\n"
         "-r           restore       Restore last session\n"
         "--recover    recover       Delete lockfiles during initial loading of\n"

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3e85ff5a8e1196c8b14ebc832dd4f41bd690dc55..f999dd6cd62ca513bd3aad1798e085a00bb6bd6d 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -7009,6 +7009,8 @@ void Main::helpDoc()
     QString docname;
     if (locale.left(2) == "es")
         docname = "vym_es.pdf";
+    else if (locale.left(2) == "fr")
+        docname = "vym_fr.pdf";
     else
         docname = "vym.pdf";
 

diff --git a/src/version.h b/src/version.h
index aca1528561159128103bd91db80e6686e7492c94..2b89fd56ad49a76b07775e2135577a7c907e948f 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,8 +1,8 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define __VYM_VERSION "2.9.27"
-#define __VYM_BUILD_DATE "2024-05-01"
+#define __VYM_VERSION "2.9.28"
+#define __VYM_BUILD_DATE "2024-05-10"
 
 #define __VYM_CODE_QUALITY "Production"
 #define __VYM_CODENAME ""

diff --git a/tex/help.tex b/tex/help.tex
index aa2bfe69cdee5820e333146c502416742c717bd2..d76b5df9d72a817c402c3230b2e30b8b114b052c 100644 (file)
--- a/tex/help.tex
+++ b/tex/help.tex
@@ -7,11 +7,11 @@ Open FILEs with vym
 -d           debug         Show debugging output
 -h           help          Show this help text
 -L           load          Load script
--l           local         Run with ressources in current directory
+-l           local         Run with resources in current directory
 --locale     locale        Override system locale setting to select
                            language
 -n  STRING   name          Set name of instance for DBus access
--q           quit          Quit immediatly after start for benchmarking
+-q           quit          Quit immediately after start for benchmarking
 -R  FILE     run           Run script
 -r           restore       Restore last session
 --recover    recover       Delete lockfiles during initial loading of

diff --git a/tex/vym.tex b/tex/vym.tex
index 035640da8a0704336e24f984377320b40b0b29a6..e16f2e83e1d696391edc0d72d704000e62376f73 100644 (file)
--- a/tex/vym.tex
+++ b/tex/vym.tex
@@ -262,7 +262,7 @@ editors represent the same data and share their selection: Both show the
 {\em heading} "Get valentine surprise".
 
 More windows, each having a special purpose, can be opened and arranged
-around or even in the mainwindow. These extra windows are called
+around or even in the mainwindow. These extra windows are
 called {\em satellites}\footnote{
     The advantage of having separate window instead of integrating them
     in a combined workspace is flexibility in arranging the windows. For
@@ -1584,11 +1584,11 @@ opens the right browser.
     example.vym} itself.
 
 \subsubsection*{Edit branch after adding it}
-    If set, the heading of a new branch will be edited immediatly after
+    If set, the heading of a new branch will be edited immediately after
     adding the branch.
 
 \subsubsection*{Select branch after adding it}
-    If set, a new branch will be selected immediatly after adding it.
+    If set, a new branch will be selected immediately after adding it.
     When you "brainstorm" on a given keyword, you don't want to go
     deeper and deeper into details, but keep the focus on the keyword.
     So the default setting here is to {\em not} select the freshly added
@@ -1642,8 +1642,8 @@ directory. The exact position depends on the platform:
 The file can be edited manually, or on Mac~OS~X with Property List
 Editor (installed with xtools). On windows you can use {\tt regedit.exe}.
 
-\subsection{Path to ressources}
-\vym will try to find its ressources (images, stylesheets, filters,
+\subsection{Path to resources}
+\vym will try to find its resources (images, stylesheets, filters,
 etc.) in the following places:
 \begin{enumerate}
     \item Path given by the environment variable {\tt VYMHOME}.