From d483bd8e6523c23c6f1d8908a2e0611c2bc9ff4f Mon Sep 17 00:00:00 2001
From: Sven Hoexter
Date: Fri, 3 May 2024 14:10:43 +0200
Subject: [PATCH] New upstream version 2.9.22
---
.clang-format | 3 +
CMakeLists.txt | 506 +-
INSTALL.txt | 18 -
LICENSE.txt | 2 +-
README.md | 78 +-
aboutdialog.cpp | 251 -
adaptormodel.cpp | 68 -
adaptorvym.cpp | 41 -
adaptorvym.h | 28 -
animpoint.cpp | 140 -
arrowobj.cpp | 218 -
attribute.cpp | 296 -
attribute.h | 93 -
attributedelegate.cpp | 138 -
attributedelegate.h | 37 -
attributedialog.cpp | 118 -
attributedialog.h | 49 -
attributeitem.cpp | 195 -
attributeitem.h | 48 -
attributewidget.cpp | 39 -
attributewidget.h | 28 -
branchitem.cpp | 575 -
branchitem.h | 89 -
branchobj.cpp | 737 -
branchobj.h | 63 -
branchpropeditor.cpp | 404 -
branchpropeditor.h | 64 -
bugagent.cpp | 206 -
bugagent.h | 48 -
cmake/Findcppcheck.cmake | 160 -
cmake/Findcppcheck.cpp | 16 -
command.cpp | 123 -
command.h | 33 -
config/vym.desktop | 40 +
config/vym.xml | 9 +
demos/default-dark.vym | Bin 0 -> 1228 bytes
demos/default.vym | Bin 0 -> 1835 bytes
demos/frames.vym | Bin 86706 -> 140831 bytes
demos/lifeforms.vym | Bin 25422 -> 26955 bytes
demos/math.vym | Bin 8669 -> 8745 bytes
demos/new-flags.vym | Bin 0 -> 329355 bytes
demos/scripts/examplescript.vys | 16 +
demos/scripts/export-image.vys | 16 +
demos/scripts/iterating-branches.vys | 10 +
demos/scripts/setSelectionBoxDarkTheme.vys | 5 +
demos/scripts/strip-url.vys | 50 +
demos/task-management.vym | Bin 0 -> 203802 bytes
doc/vym.1.gz | Bin 1068 -> 1082 bytes
doc/vym.pdf | Bin 1647796 -> 1902995 bytes
doc/vym_es.pdf | Bin 775187 -> 774886 bytes
doc/vym_fr.pdf | Bin 990791 -> 990732 bytes
dockeditor.cpp | 25 -
dockeditor.h | 25 -
downloadagent.cpp | 205 -
editxlinkdialog.cpp | 132 -
exporthtmldialog.cpp | 343 -
exportoofiledialog.cpp | 90 -
exports.cpp | 1402 -
exports.h | 180 -
extrainfodialog.cpp | 62 -
extrainfodialog.h | 35 -
file.cpp | 558 -
file.h | 53 -
findresultwidget.cpp | 125 -
findresultwidget.h | 47 -
findwidget.cpp | 105 -
findwidget.h | 42 -
flag.cpp | 142 -
flag.h | 56 -
flagobj.cpp | 158 -
flagobj.h | 53 -
flagrow.cpp | 208 -
flagrow.h | 51 -
flagrowobj.cpp | 171 -
flagrowobj.h | 41 -
flags/flag-2arrow-down.png | Bin 972 -> 0 bytes
flags/flag-2arrow-up.png | Bin 1016 -> 0 bytes
flags/flag-arrow-down.png | Bin 722 -> 0 bytes
flags/flag-arrow-up.png | Bin 787 -> 0 bytes
flags/flag-clock.png | Bin 1462 -> 0 bytes
flags/flag-cross-red.png | Bin 784 -> 0 bytes
flags/flag-exclamationmark.png | Bin 705 -> 0 bytes
flags/flag-flash.png | Bin 534 -> 0 bytes
flags/flag-heart.png | Bin 1139 -> 0 bytes
flags/flag-hook-green.png | Bin 660 -> 0 bytes
flags/flag-info.png | Bin 1471 -> 0 bytes
flags/flag-lamp.png | Bin 1689 -> 0 bytes
flags/flag-lifebelt.png | Bin 1533 -> 0 bytes
flags/flag-note.png | Bin 1293 -> 0 bytes
flags/flag-phone.png | Bin 1458 -> 0 bytes
flags/flag-questionmark.png | Bin 971 -> 0 bytes
flags/flag-smiley-good.png | Bin 1394 -> 0 bytes
flags/flag-smiley-omb.png | Bin 1441 -> 0 bytes
flags/flag-smiley-sad.png | Bin 1361 -> 0 bytes
flags/flag-stopsign.png | Bin 1854 -> 0 bytes
flags/flag-target.png | Bin 2206 -> 0 bytes
flags/flag-task-finished.png | Bin 1135 -> 0 bytes
flags/flag-task-new-morning.png | Bin 1319 -> 0 bytes
flags/flag-task-new-sleeping.png | Bin 1247 -> 0 bytes
flags/flag-task-new.png | Bin 1263 -> 0 bytes
flags/flag-task-wip-morning.png | Bin 1328 -> 0 bytes
flags/flag-task-wip-sleeping.png | Bin 1264 -> 0 bytes
flags/flag-task-wip.png | Bin 1317 -> 0 bytes
flags/flag-task.png | Bin 1153 -> 0 bytes
flags/flag-url-16x16.png | Bin 828 -> 0 bytes
flags/flag-url-bugzilla-novell-closed.png | Bin 1490 -> 0 bytes
flags/flag-url-bugzilla-novell.png | Bin 1567 -> 0 bytes
flags/flag-url.png | Bin 1237 -> 0 bytes
flags/flag-urlnew.png | Bin 1545 -> 0 bytes
flags/flag-wip.png | Bin 1355 -> 0 bytes
flags/standard/Dialog-STOP.svg | 187 +
flags/standard/Dialog-information_on.svg | 608 +
flags/standard/arrow-2down-blue.svg | 4516 +++
flags/standard/arrow-2up-blue.svg | 3698 ++
flags/standard/arrow-down-blue.svg | 4249 +++
flags/standard/arrow-up-blue.svg | 3618 ++
flags/standard/dialog-ok-apply.svg | 413 +
flags/standard/dialog-warning.svg | 486 +
flags/standard/edit-delete.svg | 5205 +++
flags/standard/edit-undo.svg | 621 +
flags/standard/emblem-favorite.svg | 253 +
flags/standard/face-plain.svg | 305 +
flags/standard/face-sad.svg | 256 +
flags/standard/face-smile.svg | 256 +
flags/standard/face-surprise.svg | 254 +
flags/standard/flash.svg | 154 +
flags/standard/help-about.svg | 3637 ++
flags/standard/help-contextual.svg | 5817 ++++
flags/standard/internet-telephony.svg | 1763 +
flags/standard/kalarm.svg | 857 +
flags/standard/question-mark.svg | 257 +
flags/system/applications-internet-new.svg | 1084 +
flags/system/applications-internet.svg | 591 +
flags/system/klipper.svg | 3061 ++
flags/system/no-arrow-up.png | Bin 0 -> 1058 bytes
flags/system/stopsign-arrow-2up.png | Bin 0 -> 3713 bytes
flags/system/stopsign-arrow-up.png | Bin 0 -> 3361 bytes
flags/system/target.svg | 112 +
flags/system/task-finished.svg | 2441 ++
flags/system/task-new-morning.svg | 1102 +
flags/system/task-new-sleeping.svg | 1102 +
flags/system/task-new.svg | 661 +
flags/system/task-wip-morning.svg | 1838 +
flags/system/task-wip-sleeping.svg | 1838 +
flags/system/task-wip.svg | 1838 +
floatimageobj.cpp | 125 -
floatimageobj.h | 35 -
floatobj.cpp | 110 -
.../attributedialog.ui | 0
.../attributewidget.ui | 0
.../branchpropeditor.ui | 120 +-
forms/confluence-settings-dialog.ui | 145 +
forms/confluence-userdialog.ui | 40 +
forms/darktheme-settings-dialog.ui | 132 +
forms/default-map-settings-dialog.ui | 112 +
.../editxlinkdialog.ui | 4 +-
forms/export-confluence-dialog.ui | 223 +
.../export-html-dialog.ui | 4 +-
.../exportxhtmldialog.ui | 116 +-
.../extrainfodialog.ui | 59 +-
forms/historywindow.ui | 110 +
forms/jira-settings-dialog.ui | 185 +
lineeditdialog.ui => forms/lineeditdialog.ui | 0
.../lockedfiledialog.ui | 41 +-
forms/scripteditor.ui | 296 +
showtextdialog.ui => forms/showtextdialog.ui | 26 +-
warningdialog.ui => forms/warningdialog.ui | 48 +-
forms/zip-settings-dialog.ui | 114 +
frameobj.cpp | 455 -
frameobj.h | 60 -
geometry.cpp | 385 -
geometry.h | 70 -
headingeditor.cpp | 17 -
headingobj.cpp | 293 -
headingobj.h | 47 -
historywindow.cpp | 174 -
historywindow.ui | 149 -
icons/configure-plus.svg | 5010 +++
icons/cursorcolorpicker16.png | Bin 185 -> 0 bytes
icons/cursorcopy.png | Bin 203 -> 0 bytes
icons/cursorhandopen.png | Bin 223 -> 0 bytes
icons/cursorhandopen16.png | Bin 209 -> 0 bytes
icons/{ => cursors}/cursorcolorpicker.png | Bin
icons/{ => cursors}/cursorxlink.png | Bin
icons/document-save.svg | 29000 ++++++++++++++++
icons/down-diagonal-left.png | Bin 0 -> 14315 bytes
icons/down-diagonal-right.png | Bin 0 -> 14706 bytes
icons/formatcolorpicker.xpm | 29 -
icons/modecopy.png | Bin 553 -> 0 bytes
icons/modifiers/cursorhandopen.png | Bin 0 -> 406 bytes
.../mode-color.png} | Bin
icons/modifiers/mode-move-object.svg | 67 +
icons/modifiers/mode-select.svg | 1127 +
.../mode-xlink.png} | Bin
icons/rotate-ccw.png | Bin 1322 -> 0 bytes
icons/rotate-cw.png | Bin 1332 -> 0 bytes
icons/script-reload.svg | 631 +
icons/script-run.svg | 223 +
icons/system-shutdown.svg | 507 +
icons/taskfilter-activetask.png | Bin 0 -> 742 bytes
icons/taskfilter-currentmap.png | Bin 0 -> 583 bytes
icons/taskfilter-newtask.png | Bin 0 -> 643 bytes
icons/transform-rotate-ccw.svg | 330 +
icons/transform-rotate-cw.svg | 417 +
icons/up-diagonal-left.png | Bin 0 -> 14921 bytes
icons/up-diagonal-right.png | Bin 0 -> 14590 bytes
icons/video-projector.png | Bin 0 -> 11067 bytes
icons/vym-128x128.ico | Bin 0 -> 67646 bytes
icons/vym.ico | Bin 3262 -> 0 bytes
imageitem.cpp | 165 -
imageitem.h | 57 -
imageobj.cpp | 61 -
imageobj.h | 21 -
imports.cpp | 92 -
lang/vym.cs_CZ.ts | 4662 +--
lang/vym.de.ts | 4501 +++
lang/vym.de_DE.ts | 7156 ----
lang/vym.el.ts | 6475 ++--
lang/vym.en.ts | 2754 +-
lang/vym.es.ts | 6303 ++--
lang/vym.fr.ts | 4809 +--
lang/vym.hr_HR.ts | 2984 +-
lang/vym.ia.ts | 3355 +-
lang/vym.it.ts | 6676 ++--
lang/vym.ja.ts | 3061 +-
lang/vym.pt_BR.ts | 3983 +--
lang/vym.ru.ts | 4093 +--
lang/vym.sv.ts | 4735 +--
lang/vym.zh_CN.ts | 5527 ++-
lang/vym.zh_TW.ts | 3431 +-
lineeditdialog.cpp | 42 -
lineeditdialog.h | 26 -
linkablemapobj.cpp | 633 -
linkablemapobj.h | 150 -
lockedfiledialog.h | 25 -
macros.cpp | 49 -
macros.h | 11 -
macros/macro-01.vys | 2 -
macros/macro-02.vys | 2 -
macros/macro-03.vys | 2 -
macros/macro-04.vys | 2 -
macros/macro-05.vys | 2 -
macros/macro-06.vys | 2 -
macros/macro-07.vys | 2 -
macros/macro-08.vys | 3 -
macros/macro-09.vys | 2 -
macros/macro-10.vys | 2 -
macros/macro-11.vys | 2 -
macros/macro-12.vys | 4 -
macros/macro-s01.vys | 3 -
macros/macro-s02.vys | 1 -
macros/macro-s03.vys | 1 -
macros/macro-s04.vys | 1 -
macros/macro-s05.vys | 1 -
macros/macro-s06.vys | 1 -
macros/macro-s07.vys | 1 -
macros/macro-s08.vys | 1 -
macros/macro-s09.vys | 1 -
macros/macro-s10.vys | 1 -
macros/macro-s11.vys | 1 -
macros/macro-s12.vys | 1 -
macros/macros.vys | 339 +
macros/slideeditor-snapshot.vys | 9 +-
main.cpp | 509 -
mainwindow.cpp | 6159 ----
mapeditor.cpp | 2126 --
mapeditor.h | 228 -
mapitem.cpp | 187 -
mapobj.cpp | 170 -
mapobj.h | 77 -
misc.cpp | 230 -
misc.h | 38 -
noteeditor.cpp | 46 -
options.cpp | 142 -
ornamentedobj.cpp | 326 -
ornamentedobj.h | 72 -
parser.cpp | 630 -
parser.h | 67 -
release-notes-2.9.md | 164 +
scripteditor.cpp | 222 -
scripteditor.h | 46 -
scripteditor.ui | 174 -
scriptoutput.cpp | 25 -
scripts/bugger | 17 -
scripts/getbinaries | 58 -
scripts/make-qrc.rb | 29 -
scripts/makedist-vym | 116 -
scripts/screencast | 10 -
scripts/vym-addmail.rb | 108 +-
scripts/vym-ruby.rb | 175 +-
settings.cpp | 250 -
settings.h | 50 -
shortcuts.cpp | 113 -
shortcuts.h | 38 -
showtextdialog.cpp | 45 -
showtextdialog.h | 24 -
slidecontrolwidget.cpp | 99 -
slideeditor.cpp | 116 -
slideitem.cpp | 269 -
src/aboutdialog.cpp | 514 +
aboutdialog.h => src/aboutdialog.h | 47 +-
src/animpoint.cpp | 122 +
animpoint.h => src/animpoint.h | 24 +-
src/arrowobj.cpp | 180 +
arrowobj.h => src/arrowobj.h | 42 +-
src/attributeitem.cpp | 132 +
src/attributeitem.h | 51 +
src/branchitem.cpp | 574 +
src/branchitem.h | 110 +
src/branchobj.cpp | 672 +
src/branchobj.h | 66 +
src/branchpropeditor.cpp | 477 +
src/branchpropeditor.h | 64 +
src/codeeditor.cpp | 118 +
src/codeeditor.h | 57 +
src/command.cpp | 131 +
src/command.h | 49 +
src/confluence-agent.cpp | 1014 +
src/confluence-agent.h | 155 +
src/confluence-settings-dialog.cpp | 101 +
src/confluence-settings-dialog.h | 20 +
src/confluence-user.cpp | 22 +
src/confluence-user.h | 40 +
src/confluence-userdialog.cpp | 83 +
src/confluence-userdialog.h | 34 +
src/darktheme-settings-dialog.cpp | 15 +
src/darktheme-settings-dialog.h | 14 +
src/dbus/adaptormodel.cpp | 65 +
adaptormodel.h => src/dbus/adaptormodel.h | 20 +-
src/dbus/adaptorvym.cpp | 52 +
src/dbus/adaptorvym.h | 29 +
src/debuginfo.cpp | 76 +
src/debuginfo.h | 8 +
src/default-map-settings-dialog.cpp | 74 +
src/default-map-settings-dialog.h | 24 +
src/dockeditor.cpp | 26 +
src/dockeditor.h | 23 +
src/download-agent.cpp | 206 +
downloadagent.h => src/download-agent.h | 25 +-
src/editxlinkdialog.cpp | 153 +
editxlinkdialog.h => src/editxlinkdialog.h | 25 +-
src/export-ao.cpp | 171 +
src/export-ao.h | 13 +
src/export-ascii.cpp | 148 +
src/export-ascii.h | 13 +
src/export-base.cpp | 230 +
src/export-base.h | 68 +
src/export-confluence-dialog.cpp | 236 +
src/export-confluence-dialog.h | 59 +
src/export-confluence.cpp | 435 +
src/export-confluence.h | 36 +
src/export-csv.cpp | 73 +
src/export-csv.h | 12 +
src/export-firefox.cpp | 99 +
src/export-firefox.h | 13 +
src/export-html-dialog.cpp | 352 +
.../export-html-dialog.h | 49 +-
src/export-html.cpp | 462 +
src/export-html.h | 31 +
src/export-impress.cpp | 217 +
src/export-impress.h | 29 +
src/export-latex.cpp | 113 +
src/export-latex.h | 16 +
src/export-markdown.cpp | 155 +
src/export-markdown.h | 13 +
src/export-orgmode.cpp | 55 +
src/export-orgmode.h | 12 +
src/export-taskjuggler.cpp | 21 +
src/export-taskjuggler.h | 11 +
src/exportoofiledialog.cpp | 78 +
.../exportoofiledialog.h | 21 +-
src/extrainfodialog.cpp | 40 +
src/extrainfodialog.h | 35 +
src/file.cpp | 613 +
src/file.h | 57 +
findresultitem.cpp => src/findresultitem.cpp | 65 +-
findresultitem.h => src/findresultitem.h | 15 +-
.../findresultmodel.cpp | 158 +-
findresultmodel.h => src/findresultmodel.h | 22 +-
src/findresultwidget.cpp | 115 +
src/findresultwidget.h | 46 +
src/findwidget.cpp | 121 +
src/findwidget.h | 41 +
src/flag.cpp | 147 +
src/flag.h | 71 +
src/flagobj.cpp | 81 +
src/flagobj.h | 45 +
src/flagrow.cpp | 219 +
src/flagrow.h | 41 +
src/flagrowmaster.cpp | 134 +
src/flagrowmaster.h | 45 +
src/flagrowobj.cpp | 162 +
src/flagrowobj.h | 37 +
src/floatimageobj.cpp | 137 +
src/floatimageobj.h | 42 +
src/floatobj.cpp | 98 +
floatobj.h => src/floatobj.h | 27 +-
src/frameobj.cpp | 399 +
src/frameobj.h | 57 +
src/geometry.cpp | 358 +
src/geometry.h | 71 +
heading.cpp => src/heading.cpp | 12 +-
heading.h => src/heading.h | 8 +-
src/headingeditor.cpp | 18 +
headingeditor.h => src/headingeditor.h | 27 +-
src/headingobj.cpp | 262 +
src/headingobj.h | 50 +
highlighter.cpp => src/highlighter.cpp | 46 +-
highlighter.h => src/highlighter.h | 14 +-
src/historywindow.cpp | 192 +
historywindow.h => src/historywindow.h | 27 +-
src/imageitem.cpp | 164 +
src/imageitem.h | 46 +
src/imageobj.cpp | 318 +
src/imageobj.h | 52 +
src/imports.cpp | 205 +
imports.h => src/imports.h | 42 +-
src/jira-agent.cpp | 293 +
src/jira-agent.h | 78 +
src/jira-settings-dialog.cpp | 219 +
src/jira-settings-dialog.h | 23 +
src/lineeditdialog.cpp | 35 +
src/lineeditdialog.h | 24 +
src/linkablemapobj.cpp | 595 +
src/linkablemapobj.h | 157 +
.../lockedfiledialog.cpp | 10 +-
src/lockedfiledialog.h | 24 +
src/macros.cpp | 59 +
src/macros.h | 17 +
src/main.cpp | 564 +
src/mainwindow.cpp | 7472 ++++
mainwindow.h => src/mainwindow.h | 432 +-
src/mapeditor.cpp | 2366 ++
src/mapeditor.h | 242 +
src/mapitem.cpp | 170 +
mapitem.h => src/mapitem.h | 55 +-
src/mapobj.cpp | 117 +
src/mapobj.h | 77 +
src/misc.cpp | 321 +
src/misc.h | 43 +
mkdtemp.cpp => src/mkdtemp.cpp | 18 +-
mkdtemp.h => src/mkdtemp.h | 0
.../mysortfilterproxymodel.cpp | 11 +-
.../mysortfilterproxymodel.h | 19 +-
src/noteeditor.cpp | 47 +
noteeditor.h => src/noteeditor.h | 5 +-
src/options.cpp | 123 +
options.h => src/options.h | 37 +-
src/ornamentedobj.cpp | 243 +
src/ornamentedobj.h | 70 +
src/scripteditor.cpp | 235 +
src/scripteditor.h | 51 +
src/scripting.cpp | 157 +
src/scripting.h | 65 +
src/scriptoutput.cpp | 23 +
scriptoutput.h => src/scriptoutput.h | 11 +-
src/settings.cpp | 223 +
src/settings.h | 50 +
src/shortcuts.cpp | 106 +
src/shortcuts.h | 39 +
src/showtextdialog.cpp | 36 +
src/showtextdialog.h | 22 +
src/slidecontrolwidget.cpp | 74 +
.../slidecontrolwidget.h | 16 +-
src/slideeditor.cpp | 103 +
slideeditor.h => src/slideeditor.h | 16 +-
src/slideitem.cpp | 206 +
slideitem.h => src/slideitem.h | 44 +-
slidemodel.cpp => src/slidemodel.cpp | 219 +-
slidemodel.h => src/slidemodel.h | 46 +-
src/task.cpp | 326 +
src/task.h | 74 +
src/taskeditor.cpp | 443 +
src/taskeditor.h | 67 +
src/taskfiltermodel.cpp | 79 +
src/taskfiltermodel.h | 32 +
src/taskmodel.cpp | 529 +
src/taskmodel.h | 74 +
src/texteditor.cpp | 1227 +
src/texteditor.h | 147 +
src/treedelegate.cpp | 21 +
src/treedelegate.h | 19 +
src/treeeditor.cpp | 125 +
treeeditor.h => src/treeeditor.h | 17 +-
src/treeitem.cpp | 773 +
src/treeitem.h | 236 +
src/treemodel.cpp | 304 +
treemodel.h => src/treemodel.h | 29 +-
src/version.cpp | 1 +
src/version.h | 17 +
src/vymlock.cpp | 141 +
vymlock.h => src/vymlock.h | 19 +-
src/vymmodel.cpp | 6371 ++++
src/vymmodel.h | 899 +
src/vymmodelwrapper.cpp | 1078 +
src/vymmodelwrapper.h | 175 +
src/vymnote.cpp | 16 +
vymnote.h => src/vymnote.h | 10 +-
src/vymprocess.cpp | 67 +
vymprocess.h => src/vymprocess.h | 15 +-
src/vymtext.cpp | 250 +
src/vymtext.h | 49 +
src/vymview.cpp | 336 +
vymview.h => src/vymview.h | 35 +-
src/warningdialog.cpp | 73 +
src/warningdialog.h | 27 +
src/winter.cpp | 290 +
winter.h => src/winter.h | 41 +-
src/xlink.cpp | 264 +
src/xlink.h | 70 +
src/xlinkitem.cpp | 81 +
src/xlinkitem.h | 35 +
src/xlinkobj.cpp | 491 +
xlinkobj.h => src/xlinkobj.h | 56 +-
src/xml-base.cpp | 69 +
src/xml-base.h | 50 +
src/xml-freemind.cpp | 382 +
src/xml-freemind.h | 63 +
src/xml-vym.cpp | 1147 +
src/xml-vym.h | 95 +
src/xmlobj.cpp | 148 +
src/xmlobj.h | 35 +
src/xsltproc.cpp | 81 +
xsltproc.h => src/xsltproc.h | 16 +-
src/zip-settings-dialog.cpp | 127 +
src/zip-settings-dialog.h | 25 +
task.cpp | 259 -
task.h | 63 -
taskeditor.cpp | 286 -
taskeditor.h | 56 -
taskfiltermodel.cpp | 54 -
taskfiltermodel.h | 22 -
taskmodel.cpp | 323 -
taskmodel.h | 45 -
test/default.vym | Bin 1309 -> 4450 bytes
test/maps/legacy/external-note-plaintext.txt | 1 +
test/maps/legacy/external-note-richtext.html | 5 +
test/maps/legacy/faq-2.5.21.xml | 131 +
test/maps/legacy/legacy-text-2.4.0.xml | 79 +
test/maps/legacy/lifeforms-2.1.11.vym | Bin 0 -> 25422 bytes
test/maps/legacy/notes.xml | 52 +
test/maps/legacy/time-management-1.13.33.vym | Bin 0 -> 34051 bytes
test/maps/test-default.vym | Bin 0 -> 4450 bytes
test/start-internal-tests.sh | 19 +
test/start-ruby-tests-legacy.sh | 21 +
test/{start-test.sh => start-ruby-tests.sh} | 6 +-
test/vym-selftest.vys | 45 +
test/vym-test-legacy.rb | 1313 +
test/vym-test.rb | 1170 +-
tex/commands.tex | 1023 +-
tex/help.tex | 23 +
tex/images/default-flags.png | Bin 8167 -> 17068 bytes
tex/images/flags/add-userflag.png | Bin 0 -> 12386 bytes
tex/images/flags/arrow-up.png | Bin 0 -> 7554 bytes
tex/images/flags/arrow2-up.png | Bin 0 -> 9026 bytes
tex/images/flags/arrows.png | Bin 0 -> 24705 bytes
tex/images/flags/stopsign.png | Bin 0 -> 12003 bytes
tex/images/flags/system/note.png | Bin 0 -> 6491 bytes
tex/images/flags/system/target.png | Bin 0 -> 10340 bytes
tex/images/flags/system/task-finished.png | Bin 0 -> 11371 bytes
tex/images/flags/system/task-new-sleeping.png | Bin 0 -> 9995 bytes
tex/images/flags/system/task-new.png | Bin 0 -> 11987 bytes
tex/images/flags/system/task-not-started.png | Bin 0 -> 9970 bytes
tex/images/flags/system/task-wip-sleeping.png | Bin 0 -> 11957 bytes
tex/images/flags/system/task-wip.png | Bin 0 -> 11449 bytes
tex/images/flags/systemflags.png | Bin 0 -> 155507 bytes
tex/images/modmodes.png | Bin 1902 -> 2595 bytes
tex/images/scripteditor.png | Bin 27832 -> 36352 bytes
tex/images/taskeditor.png | Bin 195124 -> 346773 bytes
tex/vym.tex | 586 +-
texteditor.cpp | 1207 -
texteditor.h | 159 -
treedelegate.cpp | 12 -
treedelegate.h | 19 -
treeeditor.cpp | 81 -
treeitem.cpp | 847 -
treeitem.h | 222 -
treemodel.cpp | 309 -
version.cpp | 65 -
version.h | 17 -
vym.pro | 475 +-
vym.qrc | 113 +-
vym.rc | 2 +-
vymlock.cpp | 147 -
vymmodel.cpp | 6898 ----
vymmodel.h | 828 -
vymnote.cpp | 16 -
vymprocess.cpp | 83 -
vymtext.cpp | 280 -
vymtext.h | 51 -
vymview.cpp | 368 -
warningdialog.cpp | 65 -
warningdialog.h | 28 -
winter.cpp | 229 -
xlink.cpp | 286 -
xlink.h | 74 -
xlinkitem.cpp | 92 -
xlinkitem.h | 35 -
xlinkobj.cpp | 531 -
xml-base.cpp | 86 -
xml-base.h | 50 -
xml-freemind.cpp | 335 -
xml-freemind.h | 57 -
xml-vym.cpp | 972 -
xml-vym.h | 85 -
xmlobj.cpp | 165 -
xmlobj.h | 35 -
xsltproc.cpp | 97 -
608 files changed, 173597 insertions(+), 87600 deletions(-)
create mode 100644 .clang-format
delete mode 100644 INSTALL.txt
delete mode 100644 aboutdialog.cpp
delete mode 100644 adaptormodel.cpp
delete mode 100644 adaptorvym.cpp
delete mode 100644 adaptorvym.h
delete mode 100644 animpoint.cpp
delete mode 100644 arrowobj.cpp
delete mode 100644 attribute.cpp
delete mode 100644 attribute.h
delete mode 100644 attributedelegate.cpp
delete mode 100644 attributedelegate.h
delete mode 100644 attributedialog.cpp
delete mode 100644 attributedialog.h
delete mode 100644 attributeitem.cpp
delete mode 100644 attributeitem.h
delete mode 100644 attributewidget.cpp
delete mode 100644 attributewidget.h
delete mode 100644 branchitem.cpp
delete mode 100644 branchitem.h
delete mode 100644 branchobj.cpp
delete mode 100644 branchobj.h
delete mode 100644 branchpropeditor.cpp
delete mode 100644 branchpropeditor.h
delete mode 100644 bugagent.cpp
delete mode 100644 bugagent.h
delete mode 100644 cmake/Findcppcheck.cmake
delete mode 100644 cmake/Findcppcheck.cpp
delete mode 100644 command.cpp
delete mode 100644 command.h
create mode 100644 config/vym.desktop
create mode 100644 config/vym.xml
create mode 100644 demos/default-dark.vym
create mode 100644 demos/default.vym
create mode 100644 demos/new-flags.vym
create mode 100644 demos/scripts/examplescript.vys
create mode 100644 demos/scripts/export-image.vys
create mode 100644 demos/scripts/iterating-branches.vys
create mode 100644 demos/scripts/setSelectionBoxDarkTheme.vys
create mode 100644 demos/scripts/strip-url.vys
create mode 100644 demos/task-management.vym
delete mode 100644 dockeditor.cpp
delete mode 100644 dockeditor.h
delete mode 100644 downloadagent.cpp
delete mode 100644 editxlinkdialog.cpp
delete mode 100644 exporthtmldialog.cpp
delete mode 100644 exportoofiledialog.cpp
delete mode 100644 exports.cpp
delete mode 100644 exports.h
delete mode 100644 extrainfodialog.cpp
delete mode 100644 extrainfodialog.h
delete mode 100644 file.cpp
delete mode 100644 file.h
delete mode 100644 findresultwidget.cpp
delete mode 100644 findresultwidget.h
delete mode 100644 findwidget.cpp
delete mode 100644 findwidget.h
delete mode 100644 flag.cpp
delete mode 100644 flag.h
delete mode 100644 flagobj.cpp
delete mode 100644 flagobj.h
delete mode 100644 flagrow.cpp
delete mode 100644 flagrow.h
delete mode 100644 flagrowobj.cpp
delete mode 100644 flagrowobj.h
delete mode 100644 flags/flag-2arrow-down.png
delete mode 100644 flags/flag-2arrow-up.png
delete mode 100644 flags/flag-arrow-down.png
delete mode 100644 flags/flag-arrow-up.png
delete mode 100644 flags/flag-clock.png
delete mode 100644 flags/flag-cross-red.png
delete mode 100644 flags/flag-exclamationmark.png
delete mode 100644 flags/flag-flash.png
delete mode 100644 flags/flag-heart.png
delete mode 100644 flags/flag-hook-green.png
delete mode 100644 flags/flag-info.png
delete mode 100644 flags/flag-lamp.png
delete mode 100644 flags/flag-lifebelt.png
delete mode 100644 flags/flag-note.png
delete mode 100644 flags/flag-phone.png
delete mode 100644 flags/flag-questionmark.png
delete mode 100644 flags/flag-smiley-good.png
delete mode 100644 flags/flag-smiley-omb.png
delete mode 100644 flags/flag-smiley-sad.png
delete mode 100644 flags/flag-stopsign.png
delete mode 100644 flags/flag-target.png
delete mode 100644 flags/flag-task-finished.png
delete mode 100644 flags/flag-task-new-morning.png
delete mode 100644 flags/flag-task-new-sleeping.png
delete mode 100644 flags/flag-task-new.png
delete mode 100644 flags/flag-task-wip-morning.png
delete mode 100644 flags/flag-task-wip-sleeping.png
delete mode 100644 flags/flag-task-wip.png
delete mode 100644 flags/flag-task.png
delete mode 100644 flags/flag-url-16x16.png
delete mode 100644 flags/flag-url-bugzilla-novell-closed.png
delete mode 100644 flags/flag-url-bugzilla-novell.png
delete mode 100644 flags/flag-url.png
delete mode 100644 flags/flag-urlnew.png
delete mode 100644 flags/flag-wip.png
create mode 100644 flags/standard/Dialog-STOP.svg
create mode 100644 flags/standard/Dialog-information_on.svg
create mode 100644 flags/standard/arrow-2down-blue.svg
create mode 100644 flags/standard/arrow-2up-blue.svg
create mode 100644 flags/standard/arrow-down-blue.svg
create mode 100644 flags/standard/arrow-up-blue.svg
create mode 100644 flags/standard/dialog-ok-apply.svg
create mode 100644 flags/standard/dialog-warning.svg
create mode 100644 flags/standard/edit-delete.svg
create mode 100644 flags/standard/edit-undo.svg
create mode 100644 flags/standard/emblem-favorite.svg
create mode 100644 flags/standard/face-plain.svg
create mode 100644 flags/standard/face-sad.svg
create mode 100644 flags/standard/face-smile.svg
create mode 100644 flags/standard/face-surprise.svg
create mode 100644 flags/standard/flash.svg
create mode 100644 flags/standard/help-about.svg
create mode 100644 flags/standard/help-contextual.svg
create mode 100644 flags/standard/internet-telephony.svg
create mode 100644 flags/standard/kalarm.svg
create mode 100644 flags/standard/question-mark.svg
create mode 100644 flags/system/applications-internet-new.svg
create mode 100644 flags/system/applications-internet.svg
create mode 100644 flags/system/klipper.svg
create mode 100644 flags/system/no-arrow-up.png
create mode 100644 flags/system/stopsign-arrow-2up.png
create mode 100644 flags/system/stopsign-arrow-up.png
create mode 100644 flags/system/target.svg
create mode 100644 flags/system/task-finished.svg
create mode 100644 flags/system/task-new-morning.svg
create mode 100644 flags/system/task-new-sleeping.svg
create mode 100644 flags/system/task-new.svg
create mode 100644 flags/system/task-wip-morning.svg
create mode 100644 flags/system/task-wip-sleeping.svg
create mode 100644 flags/system/task-wip.svg
delete mode 100644 floatimageobj.cpp
delete mode 100644 floatimageobj.h
delete mode 100644 floatobj.cpp
rename attributedialog.ui => forms/attributedialog.ui (100%)
rename attributewidget.ui => forms/attributewidget.ui (100%)
rename branchpropeditor.ui => forms/branchpropeditor.ui (78%)
create mode 100644 forms/confluence-settings-dialog.ui
create mode 100644 forms/confluence-userdialog.ui
create mode 100644 forms/darktheme-settings-dialog.ui
create mode 100644 forms/default-map-settings-dialog.ui
rename editxlinkdialog.ui => forms/editxlinkdialog.ui (98%)
create mode 100644 forms/export-confluence-dialog.ui
rename exporthtmldialog.ui => forms/export-html-dialog.ui (99%)
rename exportxhtmldialog.ui => forms/exportxhtmldialog.ui (84%)
rename extrainfodialog.ui => forms/extrainfodialog.ui (83%)
create mode 100644 forms/historywindow.ui
create mode 100644 forms/jira-settings-dialog.ui
rename lineeditdialog.ui => forms/lineeditdialog.ui (100%)
rename lockedfiledialog.ui => forms/lockedfiledialog.ui (76%)
create mode 100644 forms/scripteditor.ui
rename showtextdialog.ui => forms/showtextdialog.ui (74%)
rename warningdialog.ui => forms/warningdialog.ui (75%)
create mode 100644 forms/zip-settings-dialog.ui
delete mode 100644 frameobj.cpp
delete mode 100644 frameobj.h
delete mode 100644 geometry.cpp
delete mode 100644 geometry.h
delete mode 100644 headingeditor.cpp
delete mode 100644 headingobj.cpp
delete mode 100644 headingobj.h
delete mode 100644 historywindow.cpp
delete mode 100644 historywindow.ui
create mode 100644 icons/configure-plus.svg
delete mode 100644 icons/cursorcolorpicker16.png
delete mode 100644 icons/cursorcopy.png
delete mode 100644 icons/cursorhandopen.png
delete mode 100644 icons/cursorhandopen16.png
rename icons/{ => cursors}/cursorcolorpicker.png (100%)
rename icons/{ => cursors}/cursorxlink.png (100%)
create mode 100644 icons/document-save.svg
create mode 100644 icons/down-diagonal-left.png
create mode 100644 icons/down-diagonal-right.png
delete mode 100644 icons/formatcolorpicker.xpm
delete mode 100644 icons/modecopy.png
create mode 100644 icons/modifiers/cursorhandopen.png
rename icons/{modecolor.png => modifiers/mode-color.png} (100%)
create mode 100644 icons/modifiers/mode-move-object.svg
create mode 100644 icons/modifiers/mode-select.svg
rename icons/{modelink.png => modifiers/mode-xlink.png} (100%)
delete mode 100644 icons/rotate-ccw.png
delete mode 100644 icons/rotate-cw.png
create mode 100644 icons/script-reload.svg
create mode 100644 icons/script-run.svg
create mode 100644 icons/system-shutdown.svg
create mode 100644 icons/taskfilter-activetask.png
create mode 100644 icons/taskfilter-currentmap.png
create mode 100644 icons/taskfilter-newtask.png
create mode 100644 icons/transform-rotate-ccw.svg
create mode 100644 icons/transform-rotate-cw.svg
create mode 100644 icons/up-diagonal-left.png
create mode 100644 icons/up-diagonal-right.png
create mode 100644 icons/video-projector.png
create mode 100644 icons/vym-128x128.ico
delete mode 100755 icons/vym.ico
delete mode 100644 imageitem.cpp
delete mode 100644 imageitem.h
delete mode 100644 imageobj.cpp
delete mode 100644 imageobj.h
delete mode 100644 imports.cpp
create mode 100644 lang/vym.de.ts
delete mode 100644 lang/vym.de_DE.ts
delete mode 100644 lineeditdialog.cpp
delete mode 100644 lineeditdialog.h
delete mode 100644 linkablemapobj.cpp
delete mode 100644 linkablemapobj.h
delete mode 100644 lockedfiledialog.h
delete mode 100644 macros.cpp
delete mode 100644 macros.h
delete mode 100644 macros/macro-01.vys
delete mode 100644 macros/macro-02.vys
delete mode 100644 macros/macro-03.vys
delete mode 100644 macros/macro-04.vys
delete mode 100644 macros/macro-05.vys
delete mode 100644 macros/macro-06.vys
delete mode 100644 macros/macro-07.vys
delete mode 100644 macros/macro-08.vys
delete mode 100644 macros/macro-09.vys
delete mode 100644 macros/macro-10.vys
delete mode 100644 macros/macro-11.vys
delete mode 100644 macros/macro-12.vys
delete mode 100644 macros/macro-s01.vys
delete mode 100644 macros/macro-s02.vys
delete mode 100644 macros/macro-s03.vys
delete mode 100644 macros/macro-s04.vys
delete mode 100644 macros/macro-s05.vys
delete mode 100644 macros/macro-s06.vys
delete mode 100644 macros/macro-s07.vys
delete mode 100644 macros/macro-s08.vys
delete mode 100644 macros/macro-s09.vys
delete mode 100644 macros/macro-s10.vys
delete mode 100644 macros/macro-s11.vys
delete mode 100644 macros/macro-s12.vys
create mode 100644 macros/macros.vys
delete mode 100644 main.cpp
delete mode 100644 mainwindow.cpp
delete mode 100644 mapeditor.cpp
delete mode 100644 mapeditor.h
delete mode 100644 mapitem.cpp
delete mode 100644 mapobj.cpp
delete mode 100644 mapobj.h
delete mode 100644 misc.cpp
delete mode 100644 misc.h
delete mode 100644 noteeditor.cpp
delete mode 100644 options.cpp
delete mode 100644 ornamentedobj.cpp
delete mode 100644 ornamentedobj.h
delete mode 100644 parser.cpp
delete mode 100644 parser.h
create mode 100644 release-notes-2.9.md
delete mode 100644 scripteditor.cpp
delete mode 100644 scripteditor.h
delete mode 100644 scripteditor.ui
delete mode 100644 scriptoutput.cpp
delete mode 100755 scripts/bugger
delete mode 100755 scripts/getbinaries
delete mode 100755 scripts/make-qrc.rb
delete mode 100755 scripts/makedist-vym
delete mode 100755 scripts/screencast
delete mode 100644 settings.cpp
delete mode 100644 settings.h
delete mode 100644 shortcuts.cpp
delete mode 100644 shortcuts.h
delete mode 100644 showtextdialog.cpp
delete mode 100644 showtextdialog.h
delete mode 100644 slidecontrolwidget.cpp
delete mode 100644 slideeditor.cpp
delete mode 100644 slideitem.cpp
create mode 100644 src/aboutdialog.cpp
rename aboutdialog.h => src/aboutdialog.h (81%)
create mode 100644 src/animpoint.cpp
rename animpoint.h => src/animpoint.h (54%)
create mode 100644 src/arrowobj.cpp
rename arrowobj.h => src/arrowobj.h (51%)
create mode 100644 src/attributeitem.cpp
create mode 100644 src/attributeitem.h
create mode 100644 src/branchitem.cpp
create mode 100644 src/branchitem.h
create mode 100644 src/branchobj.cpp
create mode 100644 src/branchobj.h
create mode 100644 src/branchpropeditor.cpp
create mode 100644 src/branchpropeditor.h
create mode 100644 src/codeeditor.cpp
create mode 100644 src/codeeditor.h
create mode 100644 src/command.cpp
create mode 100644 src/command.h
create mode 100644 src/confluence-agent.cpp
create mode 100644 src/confluence-agent.h
create mode 100644 src/confluence-settings-dialog.cpp
create mode 100644 src/confluence-settings-dialog.h
create mode 100644 src/confluence-user.cpp
create mode 100644 src/confluence-user.h
create mode 100644 src/confluence-userdialog.cpp
create mode 100644 src/confluence-userdialog.h
create mode 100644 src/darktheme-settings-dialog.cpp
create mode 100644 src/darktheme-settings-dialog.h
create mode 100644 src/dbus/adaptormodel.cpp
rename adaptormodel.h => src/dbus/adaptormodel.h (65%)
create mode 100644 src/dbus/adaptorvym.cpp
create mode 100644 src/dbus/adaptorvym.h
create mode 100644 src/debuginfo.cpp
create mode 100644 src/debuginfo.h
create mode 100644 src/default-map-settings-dialog.cpp
create mode 100644 src/default-map-settings-dialog.h
create mode 100644 src/dockeditor.cpp
create mode 100644 src/dockeditor.h
create mode 100644 src/download-agent.cpp
rename downloadagent.h => src/download-agent.h (75%)
create mode 100644 src/editxlinkdialog.cpp
rename editxlinkdialog.h => src/editxlinkdialog.h (61%)
create mode 100644 src/export-ao.cpp
create mode 100644 src/export-ao.h
create mode 100644 src/export-ascii.cpp
create mode 100644 src/export-ascii.h
create mode 100644 src/export-base.cpp
create mode 100644 src/export-base.h
create mode 100644 src/export-confluence-dialog.cpp
create mode 100644 src/export-confluence-dialog.h
create mode 100644 src/export-confluence.cpp
create mode 100644 src/export-confluence.h
create mode 100644 src/export-csv.cpp
create mode 100644 src/export-csv.h
create mode 100644 src/export-firefox.cpp
create mode 100644 src/export-firefox.h
create mode 100644 src/export-html-dialog.cpp
rename exporthtmldialog.h => src/export-html-dialog.h (57%)
create mode 100644 src/export-html.cpp
create mode 100644 src/export-html.h
create mode 100644 src/export-impress.cpp
create mode 100644 src/export-impress.h
create mode 100644 src/export-latex.cpp
create mode 100644 src/export-latex.h
create mode 100644 src/export-markdown.cpp
create mode 100644 src/export-markdown.h
create mode 100644 src/export-orgmode.cpp
create mode 100644 src/export-orgmode.h
create mode 100644 src/export-taskjuggler.cpp
create mode 100644 src/export-taskjuggler.h
create mode 100644 src/exportoofiledialog.cpp
rename exportoofiledialog.h => src/exportoofiledialog.h (66%)
create mode 100644 src/extrainfodialog.cpp
create mode 100644 src/extrainfodialog.h
create mode 100644 src/file.cpp
create mode 100644 src/file.h
rename findresultitem.cpp => src/findresultitem.cpp (66%)
rename findresultitem.h => src/findresultitem.h (83%)
rename findresultmodel.cpp => src/findresultmodel.cpp (54%)
rename findresultmodel.h => src/findresultmodel.h (78%)
create mode 100644 src/findresultwidget.cpp
create mode 100644 src/findresultwidget.h
create mode 100644 src/findwidget.cpp
create mode 100644 src/findwidget.h
create mode 100644 src/flag.cpp
create mode 100644 src/flag.h
create mode 100644 src/flagobj.cpp
create mode 100644 src/flagobj.h
create mode 100644 src/flagrow.cpp
create mode 100644 src/flagrow.h
create mode 100644 src/flagrowmaster.cpp
create mode 100644 src/flagrowmaster.h
create mode 100644 src/flagrowobj.cpp
create mode 100644 src/flagrowobj.h
create mode 100644 src/floatimageobj.cpp
create mode 100644 src/floatimageobj.h
create mode 100644 src/floatobj.cpp
rename floatobj.h => src/floatobj.h (53%)
create mode 100644 src/frameobj.cpp
create mode 100644 src/frameobj.h
create mode 100644 src/geometry.cpp
create mode 100644 src/geometry.h
rename heading.cpp => src/heading.cpp (56%)
rename heading.h => src/heading.h (64%)
create mode 100644 src/headingeditor.cpp
rename headingeditor.h => src/headingeditor.h (58%)
create mode 100644 src/headingobj.cpp
create mode 100644 src/headingobj.h
rename highlighter.cpp => src/highlighter.cpp (77%)
rename highlighter.h => src/highlighter.h (91%)
create mode 100644 src/historywindow.cpp
rename historywindow.h => src/historywindow.h (53%)
create mode 100644 src/imageitem.cpp
create mode 100644 src/imageitem.h
create mode 100644 src/imageobj.cpp
create mode 100644 src/imageobj.h
create mode 100644 src/imports.cpp
rename imports.h => src/imports.h (52%)
create mode 100644 src/jira-agent.cpp
create mode 100644 src/jira-agent.h
create mode 100644 src/jira-settings-dialog.cpp
create mode 100644 src/jira-settings-dialog.h
create mode 100644 src/lineeditdialog.cpp
create mode 100644 src/lineeditdialog.h
create mode 100644 src/linkablemapobj.cpp
create mode 100644 src/linkablemapobj.h
rename lockedfiledialog.cpp => src/lockedfiledialog.cpp (69%)
create mode 100644 src/lockedfiledialog.h
create mode 100644 src/macros.cpp
create mode 100644 src/macros.h
create mode 100644 src/main.cpp
create mode 100644 src/mainwindow.cpp
rename mainwindow.h => src/mainwindow.h (56%)
create mode 100644 src/mapeditor.cpp
create mode 100644 src/mapeditor.h
create mode 100644 src/mapitem.cpp
rename mapitem.h => src/mapitem.h (58%)
create mode 100644 src/mapobj.cpp
create mode 100644 src/mapobj.h
create mode 100644 src/misc.cpp
create mode 100644 src/misc.h
rename mkdtemp.cpp => src/mkdtemp.cpp (84%)
rename mkdtemp.h => src/mkdtemp.h (100%)
rename mysortfilterproxymodel.cpp => src/mysortfilterproxymodel.cpp (68%)
rename mysortfilterproxymodel.h => src/mysortfilterproxymodel.h (58%)
create mode 100644 src/noteeditor.cpp
rename noteeditor.h => src/noteeditor.h (88%)
create mode 100644 src/options.cpp
rename options.h => src/options.h (61%)
create mode 100644 src/ornamentedobj.cpp
create mode 100644 src/ornamentedobj.h
create mode 100644 src/scripteditor.cpp
create mode 100644 src/scripteditor.h
create mode 100644 src/scripting.cpp
create mode 100644 src/scripting.h
create mode 100644 src/scriptoutput.cpp
rename scriptoutput.h => src/scriptoutput.h (68%)
create mode 100644 src/settings.cpp
create mode 100644 src/settings.h
create mode 100644 src/shortcuts.cpp
create mode 100644 src/shortcuts.h
create mode 100644 src/showtextdialog.cpp
create mode 100644 src/showtextdialog.h
create mode 100644 src/slidecontrolwidget.cpp
rename slidecontrolwidget.h => src/slidecontrolwidget.h (81%)
create mode 100644 src/slideeditor.cpp
rename slideeditor.h => src/slideeditor.h (71%)
create mode 100644 src/slideitem.cpp
rename slideitem.h => src/slideitem.h (63%)
rename slidemodel.cpp => src/slidemodel.cpp (50%)
rename slidemodel.h => src/slidemodel.h (71%)
create mode 100644 src/task.cpp
create mode 100644 src/task.h
create mode 100644 src/taskeditor.cpp
create mode 100644 src/taskeditor.h
create mode 100644 src/taskfiltermodel.cpp
create mode 100644 src/taskfiltermodel.h
create mode 100644 src/taskmodel.cpp
create mode 100644 src/taskmodel.h
create mode 100644 src/texteditor.cpp
create mode 100644 src/texteditor.h
create mode 100644 src/treedelegate.cpp
create mode 100644 src/treedelegate.h
create mode 100644 src/treeeditor.cpp
rename treeeditor.h => src/treeeditor.h (62%)
create mode 100644 src/treeitem.cpp
create mode 100644 src/treeitem.h
create mode 100644 src/treemodel.cpp
rename treemodel.h => src/treemodel.h (55%)
create mode 100644 src/version.cpp
create mode 100644 src/version.h
create mode 100644 src/vymlock.cpp
rename vymlock.h => src/vymlock.h (59%)
create mode 100644 src/vymmodel.cpp
create mode 100644 src/vymmodel.h
create mode 100644 src/vymmodelwrapper.cpp
create mode 100644 src/vymmodelwrapper.h
create mode 100644 src/vymnote.cpp
rename vymnote.h => src/vymnote.h (53%)
create mode 100644 src/vymprocess.cpp
rename vymprocess.h => src/vymprocess.h (64%)
create mode 100644 src/vymtext.cpp
create mode 100644 src/vymtext.h
create mode 100644 src/vymview.cpp
rename vymview.h => src/vymview.h (57%)
create mode 100644 src/warningdialog.cpp
create mode 100644 src/warningdialog.h
create mode 100644 src/winter.cpp
rename winter.h => src/winter.h (51%)
create mode 100644 src/xlink.cpp
create mode 100644 src/xlink.h
create mode 100644 src/xlinkitem.cpp
create mode 100644 src/xlinkitem.h
create mode 100644 src/xlinkobj.cpp
rename xlinkobj.h => src/xlinkobj.h (54%)
create mode 100644 src/xml-base.cpp
create mode 100644 src/xml-base.h
create mode 100644 src/xml-freemind.cpp
create mode 100644 src/xml-freemind.h
create mode 100644 src/xml-vym.cpp
create mode 100644 src/xml-vym.h
create mode 100644 src/xmlobj.cpp
create mode 100644 src/xmlobj.h
create mode 100644 src/xsltproc.cpp
rename xsltproc.h => src/xsltproc.h (69%)
create mode 100644 src/zip-settings-dialog.cpp
create mode 100644 src/zip-settings-dialog.h
delete mode 100644 task.cpp
delete mode 100644 task.h
delete mode 100644 taskeditor.cpp
delete mode 100644 taskeditor.h
delete mode 100644 taskfiltermodel.cpp
delete mode 100644 taskfiltermodel.h
delete mode 100644 taskmodel.cpp
delete mode 100644 taskmodel.h
create mode 100644 test/maps/legacy/external-note-plaintext.txt
create mode 100644 test/maps/legacy/external-note-richtext.html
create mode 100644 test/maps/legacy/faq-2.5.21.xml
create mode 100644 test/maps/legacy/legacy-text-2.4.0.xml
create mode 100644 test/maps/legacy/lifeforms-2.1.11.vym
create mode 100644 test/maps/legacy/notes.xml
create mode 100644 test/maps/legacy/time-management-1.13.33.vym
create mode 100644 test/maps/test-default.vym
create mode 100644 test/start-internal-tests.sh
create mode 100644 test/start-ruby-tests-legacy.sh
rename test/{start-test.sh => start-ruby-tests.sh} (69%)
create mode 100644 test/vym-selftest.vys
create mode 100644 test/vym-test-legacy.rb
create mode 100644 tex/help.tex
create mode 100644 tex/images/flags/add-userflag.png
create mode 100644 tex/images/flags/arrow-up.png
create mode 100644 tex/images/flags/arrow2-up.png
create mode 100644 tex/images/flags/arrows.png
create mode 100644 tex/images/flags/stopsign.png
create mode 100644 tex/images/flags/system/note.png
create mode 100644 tex/images/flags/system/target.png
create mode 100644 tex/images/flags/system/task-finished.png
create mode 100644 tex/images/flags/system/task-new-sleeping.png
create mode 100644 tex/images/flags/system/task-new.png
create mode 100644 tex/images/flags/system/task-not-started.png
create mode 100644 tex/images/flags/system/task-wip-sleeping.png
create mode 100644 tex/images/flags/system/task-wip.png
create mode 100644 tex/images/flags/systemflags.png
delete mode 100644 texteditor.cpp
delete mode 100644 texteditor.h
delete mode 100644 treedelegate.cpp
delete mode 100644 treedelegate.h
delete mode 100644 treeeditor.cpp
delete mode 100644 treeitem.cpp
delete mode 100644 treeitem.h
delete mode 100644 treemodel.cpp
delete mode 100644 version.cpp
delete mode 100644 version.h
delete mode 100644 vymlock.cpp
delete mode 100644 vymmodel.cpp
delete mode 100644 vymmodel.h
delete mode 100644 vymnote.cpp
delete mode 100644 vymprocess.cpp
delete mode 100644 vymtext.cpp
delete mode 100644 vymtext.h
delete mode 100644 vymview.cpp
delete mode 100644 warningdialog.cpp
delete mode 100644 warningdialog.h
delete mode 100644 winter.cpp
delete mode 100644 xlink.cpp
delete mode 100644 xlink.h
delete mode 100644 xlinkitem.cpp
delete mode 100644 xlinkitem.h
delete mode 100644 xlinkobj.cpp
delete mode 100644 xml-base.cpp
delete mode 100644 xml-base.h
delete mode 100644 xml-freemind.cpp
delete mode 100644 xml-freemind.h
delete mode 100644 xml-vym.cpp
delete mode 100644 xml-vym.h
delete mode 100644 xmlobj.cpp
delete mode 100644 xmlobj.h
delete mode 100644 xsltproc.cpp
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..5f82f86
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,3 @@
+BreakBeforeBraces: Stroustrup
+IndentWidth: 4
+TabWidth: 4
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81102ba..c730a49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,334 +1,172 @@
-project( vym )
-cmake_minimum_required( VERSION 2.6 )
-
-if( NOT CMAKE_BUILD_TYPE )
- set( CMAKE_BUILD_TYPE Debug )
-endif( NOT CMAKE_BUILD_TYPE )
-
-if( CMAKE_COMPILER_IS_GNUCXX )
- add_definitions ( -Wall )
-endif( CMAKE_COMPILER_IS_GNUCXX )
-
-if( UNIX AND NOT APPLE )
- set( NO_DBUS_DEFAULT OFF )
-else( UNIX AND NOT APPLE )
- set( NO_DBUS_DEFAULT ON )
-endif( UNIX AND NOT APPLE )
-
-option( NO_DBUS "Build vym without dbus support" ${NO_DBUS_DEFAULT} )
-
-find_package ( Qt4 REQUIRED )
-include ( ${QT_USE_FILE} )
-add_definitions( ${QT_DEFINITIONS} )
-
-if( WIN32 )
- add_definitions( -DUNICODE -D_USE_MATH_DEFINES )
- if( MSVC )
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:wchar_t-" )
- endif( MSVC )
-endif( WIN32 )
-
-find_package( cppcheck )
-if(CPPCHECK_FOUND)
- set(_cppcheck_args)
- list(APPEND _cppcheck_args ${CPPCHECK_INCLUDEPATH_ARG} ${CMAKE_SOURCE_DIR})
-# list(APPEND _cppcheck_args ${CPPCHECK_INCLUDEPATH_ARG} ${QT_QTCORE_INCLUDE_DIR})
-# list(APPEND _cppcheck_args ${CPPCHECK_INCLUDEPATH_ARG} ${QT_QTDBUS_INCLUDE_DIR})
-# list(APPEND _cppcheck_args ${CPPCHECK_INCLUDEPATH_ARG} ${QT_QTGUI_INCLUDE_DIR})
-# list(APPEND _cppcheck_args ${CPPCHECK_INCLUDEPATH_ARG} ${QT_QTNETWORK_INCLUDE_DIR})
-# list(APPEND _cppcheck_args ${CPPCHECK_INCLUDEPATH_ARG} ${QT_QTXML_INCLUDE_DIR})
-# list(APPEND _cppcheck_args ${CPPCHECK_INCLUDEPATH_ARG} ${QT_QTSVG_INCLUDE_DIR})
-
- list(APPEND _cppcheck_args "enable" "all")
-
- add_custom_target(
- cppcheck
- COMMAND
- "${CPPCHECK_EXECUTABLE}"
- ${CPPCHECK_TEMPLATE_ARG}
- ${CPPCHECK_QUIET_ARG}
- "--force"
-# "--std=c++11"
- ${_cppcheck_args}
- ${CMAKE_SOURCE_DIR}
- )
-
- message(STATUS "cppcheck target added.")
-endif(CPPCHECK_FOUND)
-
-include_directories (
- ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
- ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTNETWORK_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTSVG_INCLUDE_DIR}
- )
-
-if(NOT NO_DBUS )
- include_directories( ${QT_QTDBUS_INCLUDE_DIR} )
-endif(NOT NO_DBUS )
-
-set ( vym_HDRS
- aboutdialog.h
- taskfiltermodel.h
- animpoint.h
- attribute.h
- attributeitem.h
- # attributedelegate.h
- # attributedialog.h
- # attributewidget.h
- branchitem.h
- branchobj.h
- branchpropeditor.h
- bugagent.h
- command.h
- dockeditor.h
- downloadagent.h
- editxlinkdialog.h
- exportoofiledialog.h
- exporthtmldialog.h
- exports.h
- extrainfodialog.h
- file.h
- findwidget.h
- findresultwidget.h
- findresultitem.h
- findresultmodel.h
- flag.h
- flagobj.h
- flagrowobj.h
- flagrow.h
- floatimageobj.h
- floatobj.h
- frameobj.h
- geometry.h
- headingeditor.h
- headingobj.h
- highlighter.h
- historywindow.h
- imageitem.h
- imageobj.h
- imports.h
- lineeditdialog.h
- linkablemapobj.h
- macros.h
- mainwindow.h
- mapeditor.h
- mapitem.h
- mapobj.h
- misc.h
- mysortfilterproxymodel.h
- noteeditor.h
- noteobj.h
- options.h
- ornamentedobj.h
- parser.h
- process.h
- scripteditor.h
- settings.h
- shortcuts.h
- showtextdialog.h
- slidecontrolwidget.h
- slideeditor.h
- slideitem.h
- slidemodel.h
- task.h
- taskeditor.h
- taskmodel.h
- treedelegate.h
- treeeditor.h
- treeitem.h
- treemodel.h
- texteditor.h
- version.h
- vymmodel.h
- vymview.h
- winter.h
- warningdialog.h
- xlink.h
- xlinkitem.h
- xlinkobj.h
- xml-base.h
- xml-vym.h
- xml-freemind.h
- xmlobj.h
- xsltproc.h
- )
-
-set ( vym_SRCS
- aboutdialog.cpp
- taskfiltermodel.cpp
- animpoint.cpp
- attribute.cpp
- attributeitem.cpp
- # attributedelegate.cpp
- # attributedialog.cpp
- # attributewidget.cpp
- branchitem.cpp
- branchobj.cpp
- branchpropeditor.cpp
- bugagent.cpp
- command.cpp
- dockeditor.cpp
- downloadagent.cpp
- editxlinkdialog.cpp
- exportoofiledialog.cpp
- exports.cpp
- exporthtmldialog.cpp
- extrainfodialog.cpp
- file.cpp
- findwidget.cpp
- findresultwidget.cpp
- findresultitem.cpp
- findresultmodel.cpp
- flag.cpp
- flagobj.cpp
- flagrow.cpp
- flagrowobj.cpp
- floatimageobj.cpp
- floatobj.cpp
- frameobj.cpp
- geometry.cpp
- headingeditor.cpp
- headingobj.cpp
- highlighter.cpp
- historywindow.cpp
- imageitem.cpp
- imageobj.cpp
- imports.cpp
- lineeditdialog.cpp
- linkablemapobj.cpp
- macros.cpp
- main.cpp
- mainwindow.cpp
- mapeditor.cpp
- mapitem.cpp
- mapobj.cpp
- misc.cpp
- mysortfilterproxymodel.cpp
- noteeditor.cpp
- noteobj.cpp
- options.cpp
- ornamentedobj.cpp
- parser.cpp
- process.cpp
- scripteditor.cpp
- settings.cpp
- shortcuts.cpp
- showtextdialog.cpp
- slidecontrolwidget.cpp
- slideeditor.cpp
- slideitem.cpp
- slidemodel.cpp
- task.cpp
- taskeditor.cpp
- taskmodel.cpp
- texteditor.cpp
- treedelegate.cpp
- treeeditor.cpp
- treeitem.cpp
- treemodel.cpp
- version.cpp
- vymmodel.cpp
- vymview.cpp
- winter.cpp
- warningdialog.cpp
- xlink.cpp
- xlinkitem.cpp
- xlinkobj.cpp
- xml-base.cpp
- xml-vym.cpp
- xml-freemind.cpp
- xmlobj.cpp
- xsltproc.cpp
- )
-
-set ( vym_UIS
- attributewidget.ui
- branchpropeditor.ui
- exporthtmldialog.ui
- extrainfodialog.ui
- editxlinkdialog.ui
- historywindow.ui
- lineeditdialog.ui
- scripteditor.ui
- showtextdialog.ui
- warningdialog.ui
- )
-QT4_WRAP_UI(UIS ${vym_UIS})
-
-set ( vym_TRS
- lang/vym_de_DE.ts
- lang/vym_en.ts
- lang/vym_es.ts
- lang/vym_fr.ts
- lang/vym_it.ts
- lang/vym_pt_BR.ts
- lang/vym_ru.ts
- lang/vym_sv.ts
- lang/vym_zh_CN.ts
- lang/vym_zh_TW.ts
- lang/vym_cs_CZ.ts
- )
-QT4_ADD_TRANSLATION(TRS ${vym_TRS})
-
-set ( vym_MOCS
- aboutdialog.h
- branchpropeditor.h
- bugagent.h
- dockeditor.h
- downloadagent.h
- editxlinkdialog.h
- exportoofiledialog.h
- exporthtmldialog.h
- extrainfodialog.h
- findwidget.h
- findresultwidget.h
- findresultmodel.h
- headingeditor.h
- highlighter.h
- historywindow.h
- lineeditdialog.h
- mainwindow.h
- mapeditor.h
- mysortfilterproxymodel.h
- noteeditor.h
- process.h
- scripteditor.h
- showtextdialog.h
- slidecontrolwidget.h
- slideeditor.h
- slidemodel.h
- taskeditor.h
- taskmodel.h
- treedelegate.h
- treeeditor.h
- treemodel.h
- texteditor.h
- vymmodel.h
- vymview.h
- winter.h
- warningdialog.h
- )
-if( NOT NO_DBUS )
- add_definitions(-DVYM_DBUS)
- list(APPEND vym_HDRS adaptormodel.h adaptorvym.h)
- list(APPEND vym_SRCS adaptormodel.cpp adaptorvym.cpp)
- list(APPEND vym_MOCS adaptormodel.h adaptorvym.h)
-endif( NOT NO_DBUS )
-QT4_WRAP_CPP(MOCS ${vym_MOCS})
-
-
-
-if( WIN32 )
- set( vym_SRCS ${vym_SRCS} mkdtemp.cpp vym.rc )
-endif( WIN32 )
-
-add_executable ( vym WIN32 ${vym_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
-target_link_libraries ( vym ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} )
-if( NOT NO_DBUS )
- target_link_libraries( vym ${QT_QTDBUS_LIBRARY} )
-endif( NOT NO_DBUS )
-
-install( TARGETS vym RUNTIME DESTINATION bin )
-
-set( _installfolders demos exports flags icons macros scripts styles )
-install( DIRECTORY ${_installfolders} DESTINATION share/vym )
-install( FILES ${TRS} DESTINATION share/vym/lang )
+cmake_minimum_required(VERSION 3.12)
+
+project(ViewYourMind)
+
+find_package(Qt5 COMPONENTS Widgets LinguistTools REQUIRED)
+
+set(QtComponents
+ LinguistTools
+ Network
+ PrintSupport
+ Script
+ Svg
+ Widgets
+ Xml
+)
+
+set(QtLibraries
+ Qt5::Network
+ Qt5::PrintSupport
+ Qt5::Script
+ Qt5::Svg
+ Qt5::Widgets
+ Qt5::Xml
+)
+
+# Switch on Debug mode with one of below:
+# cmake -DCMAKE_BUILD_TYPE=Debug .
+# set(CMAKE_BUILD_TYPE Debug)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+# On Linux DBUS is used for IPC with vym
+# On openSUSE install it using: zypper install dbus-1-devel
+
+if (UNIX)
+ find_package(DBus1)
+
+ if(DBus1_FOUND)
+ LIST(APPEND QtComponents DBus)
+ LIST(APPEND QtLibraries Qt5::DBus)
+ endif()
+endif()
+
+if(WIN32)
+ set(OPENSSL_ROOT_DIR "C:/OpenSSL-Win64")
+ find_package(OpenSSL)
+
+ if( OPENSSL_FOUND )
+ include_directories(${OPENSSL_INCLUDE_DIRS})
+ link_directories(${OPENSSL_LIBRARIES})
+ message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}")
+ else()
+ message(STATUS "No openSSL found?!")
+ # Error; with REQUIRED, pkg_search_module() will throw an error by it's own
+ endif()
+
+ #target_link_libraries(${YOUR_TARGET_HERE} ${OPENSSL_LIBRARIES})
+ #target_link_libraries(project_name /path/of/libssl.so /path/of/libcrypto.so)
+
+ set(CMAKE_INSTALL_DATAROOTDIR ".")
+ endif()
+
+include(GNUInstallDirs)
+
+find_package(Qt5 COMPONENTS ${QtComponents} REQUIRED)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+list(APPEND CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/forms")
+
+get_target_property(QtLibraryType Qt5::Widgets TYPE)
+
+if(QtLibraryType STREQUAL STATIC_LIBRARY)
+ message(STATUS "Static Qt linkage")
+ list(APPEND QtLibraries Qt5::QSvgPlugin)
+endif()
+
+include_directories(
+ ${CMAKE_SOURCE_DIR}
+)
+
+# Source files
+file(GLOB VymSources RELATIVE ${CMAKE_SOURCE_DIR} "src/*.cpp")
+
+if(WIN32)
+ list(APPEND VymSources
+ src/mkdtemp.cpp
+ vym.rc
+ )
+ ADD_COMPILE_DEFINITIONS(_USE_MATH_DEFINES)
+endif()
+
+
+# Add DBUS interfaces, if DBUS is available on platform
+if(DBus1_FOUND)
+ list(APPEND VymSources src/dbus/adaptormodel.cpp src/dbus/adaptorvym.cpp)
+ include_directories(${CMAKE_SOURCE_DIR}/src/dbus ${CMAKE_SOURCE_DIR}/src)
+ ADD_COMPILE_DEFINITIONS(VYM_DBUS)
+endif()
+
+# Translations (release)
+
+ # To update the translation files based on source code changes
+ # first call manually
+ # lupdate-qt5 src/ -ts lang/*.ts
+ #
+ # Qt6 will have a dedicated macro:
+ # https://doc.qt.io/qt-6/qtlinguist-cmake-qt-add-lrelease.html
+
+#file(GLOB ts_files ABSOLUTE ${CMAKE_BINARY_DIR} "lang/*.ts")
+file(GLOB ts_files RELATIVE ${CMAKE_SOURCE_DIR} "lang/*.ts")
+message(STATUS "Creating ${CMAKE_BINARY_DIR}/translations")
+file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/translations")
+set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION ${CMAKE_BINARY_DIR}/translations)
+#set_source_files_properties(${ts_files} PROPERTIES OUTPUT_LOCATION ${CMAKE_SOURCE_DIR}/translations)
+
+#QT5_create_translation(qm_files ${CMAKE_SOURCE_DIR} ${ts_files})
+#QT5_create_translation(qm_files ${CMAKE_BINARY_DIR} ${ts_files})
+#QT5_create_translation(qm_files ${CMAKE_SOURCE_DIR}/src)
+
+QT5_add_translation(qm_files ${ts_files})
+add_compile_definitions(CMAKE_SOURCE_DIR)
+
+message(STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
+message(STATUS "ts_files: ${ts_files}")
+message(STATUS "qm_files: ${qm_files}")
+
+ADD_COMPILE_DEFINITIONS(VYMBASEDIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
+
+add_executable(vym ${VymSources} vym.qrc ${qm_files})
+target_link_libraries(vym ${QtLibraries})
+
+if(WIN32)
+ set_target_properties(vym PROPERTIES WIN32_EXECUTABLE TRUE)
+ install(TARGETS vym DESTINATION "${CMAKE_INSTALL_PREFIX}")
+else()
+ install(TARGETS vym DESTINATION bin)
+endif()
+
+if(APPLE)
+ message(STATUS "Detected APPLE")
+ set_target_properties(vym PROPERTIES MACOSX_BUNDLE TRUE )
+
+ # Add property to Info.plist
+ set(MACOSX_BUNDLE_ICON_FILE vym.icns)
+
+ # tell CMake where to find and install the file itself
+ set(APP_ICON_MACOSX ${CMAKE_CURRENT_SOURCE_DIR}/icons/vym.icns)
+ set_source_files_properties(${APP_ICON_MACOSX} PROPERTIES
+ MACOSX_PACKAGE_LOCATION "Resources")
+
+#FIXME-0 add_executable(vym MACOSX_BUNDLE main.cpp ${APP_ICON_MACOSX})
+target_sources(vym PUBLIC ${APP_ICON_MACOSX})
+endif()
+
+add_custom_target(make-translations-directory ALL
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/translations)
+add_dependencies(vym make-translations-directory)
+
+install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+install(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_DOCDIR})
+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)
+ 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/INSTALL.txt b/INSTALL.txt
deleted file mode 100644
index ad33349..0000000
--- a/INSTALL.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Installation of vym - view your mind
-====================================
-
-Mac OSX:
-
-Drag the vym application to your desktop, or if you have admin rights,
-directly to your Application folder
-
-
-Please check the vym webpage for installation tipps:
-
- http://www.insilmaril.de/vym
-
-For general questions please contact the vym mailinglist:
-
- vym-forum@lists.sourceforge.net
-
-
diff --git a/LICENSE.txt b/LICENSE.txt
index 586634e..427f9a1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,5 +1,5 @@
VYM - View Your Mind
- Copyright (C) 2004-2016 Uwe Drechsel
+ Copyright (C) 2004-2023 Uwe Drechsel
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as published by
diff --git a/README.md b/README.md
index 6334cde..570a525 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-###VYM - View Your Mind (c) 2004-2017 by Uwe Drechsel###
+VYM - View Your Mind (c) 2004-2023 by Uwe Drechsel
+==================================================
Documentation
-------------
@@ -6,19 +7,18 @@ Documentation
* PDF
The complete documentation of vym is available as PDF document in
- english and spanish. (The spanish version is not really up to date,
- translators are welcome). It can be accessed directly from vym via
- the help section It also can be downloaded from the vym site at
- Sourceforge:
+ English, French and Spanish. (Only the English version is really up
+ to date, translators are welcome). PDFs can be accessed directly from
+ vym via the help section. They also can be downloaded from github at
- https://sourceforge.net/projects/vym/
+ https://github.com/insilmaril/vym/tree/develop/doc
* Screencasts
There are several screencasts available on YouTube, which show some
- feature of vym and how to use them:
+ features of vym and how to use them:
- http://www.youtube.com/user/ViewYourMind
+ http://www.youtube.com/user/ViewYourMind
Download
@@ -27,13 +27,23 @@ Download
The official downloads for all platforms are available at the project
site:
- https://sourceforge.net/projects/vym/
+https://sourceforge.net/projects/vym/
-The latest binaries for Linux (currently mainly openSUSE) are found in the
-Open Build Service project of Uwe Drechsel (aka insilmaril):
+The latest development drops can be found in the Files/Development folder there.
- http://download.opensuse.org/repositories/home%3A//insilmaril/
+The latest binaries for Linux, Debian and Ubuntu are built and available in the authors
+Open Build Service project:
+https://software.opensuse.org/download.html?project=home%3Ainsilmaril&package=vym
+
+
+Source code
+-----------
+
+The source code was hosted on Sourceforge for 16 years, but in
+2021 the development moved to github:
+
+https://github.com/insilmaril/vym
Installation
@@ -41,43 +51,43 @@ Installation
* Binaries
- Installation depends on the platform you use, please check the
- homepage for details:
+ Binaries for all major platforms can be found on:
- http://www.insilmaril.de/vym
+ https://sourceforge.net/projects/vym/
-* Compiling
+ Packages there are: openSUSE rpm, Ubuntu deb, Apple dmg, Windows exe
- Compiling vym from scratch is pretty easy, if you have the
- development packages of the Qt5 toolkit installed. (Check also the
- homepage above for details):
+ More Linux like packages and developer versions are built in
+ Open Build Service:
+
+ https://build.opensuse.org/package/show/home:insilmaril/vym
- qmake
- make
- make install
-* Testing (without installing!)
+* Compiling
+
+ Compiling vym from scratch is pretty easy, if you have the
+ development packages of the Qt5 toolkit installed.
- You can also run vym virtually in your webbrowser: vym is available
- as appliance in SUSE Studio. SUSE Studio is a very easy way to
- create appliances, which are customized Linux operating systems.
+ On the command line you can
- All you need is to quickly create a free account and search for
- "vym" by user "insilmaril" in the gallery:
+ cmake .
+ make
+ make install
- http://susestudio.com
+ or using Qt Creator:
- The appliance can be downloaded as installable iso image, or run in
- the testdrive - in your webbrowser! That's a bit slow, but gives you
- an idea without having to install anything at all on your system.
+ In "File" do "Open file or project" and select the
+ "CMakeLists.txt". This will setup the project.
Questions and feedback
----------------------
-Please direct questions to the mailinglist first:
+Bugs and feature requests will be taken care of in
- vym-forum@lists.sourceforge.net
+ https://github.com/insilmaril/vym/issues
+Please direct support questions to the mailinglist first:
+ vym-forum@lists.sourceforge.net
diff --git a/aboutdialog.cpp b/aboutdialog.cpp
deleted file mode 100644
index 8d3ae05..0000000
--- a/aboutdialog.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-#include
-#include
-#include
-#include
-
-#include "aboutdialog.h"
-#include "settings.h"
-
-
-extern Settings settings;
-extern QString iconPath; // FIXME-4 embed vym logo as ressource?
-extern QString vymVersion;
-extern QString vymBuildDate;
-extern QString vymCodeName;
-
-AboutDialog::AboutDialog( QWidget *parent)
- : QDialog( parent)
-{
-
- mainLayout=new QVBoxLayout( this);
-
- tabs=new QTabWidget (this);
- credits=new AboutTextBrowser (parent);
-
- credits->setHtml( QString(
- " "
- "VYM - View Your Mind "
- " A tool to put the things you have got in your mind into a map.
"
- " (c) 2004-%1 by Uwe Drechsel (vym@InSilmaril.de )
"
- " Version " +vymVersion+" - " +vymBuildDate+"
"
- " " +vymCodeName+"
"
- ""
- " Contact "
- ""
- " Credits "
- ""
- "Documentation"
- " "
- " Peter Adams: documentation proofreading and polishing "
- " "
- " "
- "Translation"
- " "
- " Brasilian: Amadeu Júnior "
- " Chinese (simplified): Moligaloo "
- " Chinese (traditional): Wei-Lun Chao "
- " Croatian: Damir BraÅ¡niÄ "
- " Czech: Pavel Fric "
- " French: Marc Sert, Philippe Caillaud and Claude "
- " Greek: Yannis Kaskamanidis "
- " Interlingua: Giovanni Sora "
- " Italian: Giovanni Sora, Seyed Puria Nafisi Azizi "
- " Japanese: Tsuren Tsuchiya "
- " Russian: Anton Olenev "
- " Spanish: "
- " ACLibre (Academia y Conocimiento Libre) and David Amian "
- " "
- " "
- " Patches"
- " "
- " Darren Lissimore: Windows compiler patch "
- " Konstantin Goudkov: sort branches "
- " Jakob Hilmer: image drag and drop in 1.8.1, "About vym" window patch "
- " Edward Wang: adding close tab buttons "
- " p0llox (Pierre): various patches for Debian packaging "
- " "
- " "
- " Patches in previous vym versions"
- " "
- " Åukasz Pietrzak, Scott Dillman and Patrick Spendrin, Andrew Ng, "
- "Juha Ruotsalainen and Thomas Kriener: windows patches "
- " Thomas Schraitle for the stylesheet"
- " formerly used for XHTML-export and help with XML processing in general "
- " Matt from www.satbp.com : "
- " Taskjuggler export "
- " "
- " "
- " Packaging"
- " "
- " "
- " Jon Ciesla: Sourceforge file releases "
- " Xavier Oswald, Christoph Thielecke, Pierre, and Steffen Joeris: Debian packaging "
- " "
- " General"
- " "
- " CMake setup by Costantino Giuliodori and Patrick Spendrin "
- " All the guys at Trolltech (now Digia) for their Qt toolkit "
- " All the guys at SUSE Linux for openSUSE Linux and support,"
- " e.g. to get Linux running on PowerPC and also Macbooks "
- " "
- " "
- " "
- " ").arg( QDate::currentDate().year() ) );;
- credits->setFrameStyle( QFrame::Panel | QFrame::Plain );
- tabs->addTab (credits, tr("Credits","Help->About vym dialog"));
-
- license=new AboutTextBrowser (parent);
- license->setText ( QString(
- ""
- "VYM - View Your Mind "
- "Copyright (C) 2004-%1 Uwe Drechsel
"
- " "
-
- "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.
"
-
- "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 below for more details.
"
-
- "In addition, as a special exception, Uwe Drechsel gives permission to link the code of this program with the QT libraries from trolltech.com (or with modified versions of QT that use the same license as QT), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than QT. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
"
-
- "Uwe Drechsel can be contacted at vym@insilmaril.de
"
-
- " "
-
- "GNU GENERAL PUBLIC LICENSE "
-"Version 2, June 1991
"
-
-"Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"
-
-" Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
"
-
-"Preamble
"
-
-"The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
"
-
-"When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
"
-
-" To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
"
-
-" For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
"
-
-" We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
"
-
-" Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
"
-
-" Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
"
-
-" The precise terms and conditions for copying, distribution and modification follow.
"
-
-" GNU GENERAL PUBLIC LICENSE
"
-" TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
"
-
-" 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The \"Program\", below, refers to any such program or work, and a \"work based on the Program\" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term \"modification\".) Each licensee is addressed as \"you\".
"
-
-"Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
"
-
-" 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
"
-
-"You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
"
-
-" 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:"
-"
"
- " You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. "
-
- " You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. "
-
- " If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) "
-" "
-"
"
-
-"These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
"
-
-"Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
"
-
-"In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
"
-
-" 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:" "
"
-
-" Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, "
-
-" Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, "
-
-" Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) "
-" "
-
-"The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
"
-
-"If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
"
-
-" 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
"
-
-" 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
"
-
-" 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
"
-
-" 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
"
-
-"If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
"
-
-"It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
"
-
-"This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
"
-
-" 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
"
-
-" 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
"
-
-"Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and \"any later version\", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
"
-
-" 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
"
-
-"NO WARRANTY
"
-
-" 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
"
-
-" 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
"
-
-"END OF TERMS AND CONDITIONS
").arg( QDate::currentDate().year() ) );
-
- credits->setFrameStyle( QFrame::Panel | QFrame::Plain );
- tabs->addTab (license, tr("License","Help->About vym dialog"));
-
- mainLayout->addWidget (tabs);
-
- okbutton =new QPushButton (this);
- okbutton->setText (tr("Ok","Ok Button"));
- okbutton->setMaximumSize (QSize (50,30));
- okbutton->setAutoDefault (true);
- mainLayout->addWidget( okbutton);
-
- connect( okbutton, SIGNAL( clicked() ), this, SLOT( accept() ) );
-}
-
-AboutTextBrowser::AboutTextBrowser(QWidget *parent)
- : QTextBrowser(parent)
-{
-}
-
-void AboutTextBrowser::setSource(const QUrl &url )
-{
- QProcess *proc= new QProcess ();
- proc->start( settings.value("/system/readerURL").toString(),QStringList ()<waitForStarted() &&mainWindow->settingsURL() ) setSource(url);
- if (!proc->waitForStarted() )
- QMessageBox::warning(0,
- tr("Warning","About window"),
- tr("Couldn't find a viewer to open %1.\n","About window").arg(url.toString())+
- tr("Please use Settings->")+tr("Set application to open an URL..."));
-
-}
diff --git a/adaptormodel.cpp b/adaptormodel.cpp
deleted file mode 100644
index 27ddd8f..0000000
--- a/adaptormodel.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "adaptormodel.h"
-#include
-#include
-#include
-
-#include "branchitem.h"
-#include "mainwindow.h"
-#include "vymmodel.h"
-
-extern QString vymInstanceName;
-extern Main *mainWindow;
-
-AdaptorModel::AdaptorModel(QObject *obj)
- : QDBusAbstractAdaptor(obj)
-{
- model=static_cast (obj);
- setAutoRelaySignals (true);
-}
-
-void AdaptorModel::setModel(VymModel *vm)
-{
- model=vm;
-}
-
-QString AdaptorModel::caption()
-{
- return m_caption;
-}
-
-void AdaptorModel::setCaption (const QString &newCaption)
-{
- m_caption=newCaption;
-}
-
-QDBusVariant AdaptorModel::getCurrentModelID()
-{
- return QDBusVariant (mainWindow->currentModelID());
-}
-
-QDBusVariant AdaptorModel::branchCount()
-{
- BranchItem *selbi=model->getSelectedBranch();
- if (selbi)
- return QDBusVariant (selbi->branchCount() );
- else
- return QDBusVariant (-1 );
-}
-
-QDBusVariant AdaptorModel::execute (const QString &s)
-{
- return QDBusVariant (model->execute (s));
-}
-
-QDBusVariant AdaptorModel::errorLevel()
-{
- return QDBusVariant (model->parser.errorLevel() );
-}
-
-QDBusVariant AdaptorModel::errorDescription()
-{
- return QDBusVariant (model->parser.errorDescription() );
-}
-
-QDBusVariant AdaptorModel::listCommands ()
-{
- return QDBusVariant (model->parser.getCommands().join(",") );
-}
-
diff --git a/adaptorvym.cpp b/adaptorvym.cpp
deleted file mode 100644
index 5bff85c..0000000
--- a/adaptorvym.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include
-#include
-#include
-
-#include "adaptorvym.h"
-#include "mainwindow.h"
-
-extern QString vymInstanceName;
-extern QString vymVersion;
-extern Main *mainWindow;
-
-AdaptorVym::AdaptorVym(QObject *obj)
- : QDBusAbstractAdaptor(obj)
-{
- setAutoRelaySignals (true);
-}
-
-QDBusVariant AdaptorVym::modelCount()
-{
- return QDBusVariant (mainWindow->modelCount() );
-}
-
-void AdaptorVym::gotoModel(const int &n)
-{
- mainWindow->gotoWindow (n);
-}
-
-QDBusVariant AdaptorVym::getInstanceName()
-{
- return QDBusVariant (vymInstanceName);
-}
-
-QDBusVariant AdaptorVym::getVersion()
-{
- return QDBusVariant (vymVersion);
-}
-
-QDBusVariant AdaptorVym::execute(const QString &s)
-{
- return QDBusVariant (mainWindow->execute (s) );
-}
diff --git a/adaptorvym.h b/adaptorvym.h
deleted file mode 100644
index 6e867f3..0000000
--- a/adaptorvym.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef ADAPTORVYM_H
-#define ADAPTORVYM_H
-
-#include
-#include
-
-class MainWindow;
-
-class AdaptorVym: public QDBusAbstractAdaptor
-{
- Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "org.insilmaril.vym.main.adaptor")
-
-public:
- AdaptorVym (QObject *obj);
-
-public slots: // METHODS
- QDBusVariant modelCount ();
- void gotoModel (const int &n);
- QDBusVariant getInstanceName();
- QDBusVariant getVersion();
- QDBusVariant execute ( const QString &s);
-
-Q_SIGNALS: // SIGNALS
- void crashed();
-};
-
-#endif
diff --git a/animpoint.cpp b/animpoint.cpp
deleted file mode 100644
index 530b459..0000000
--- a/animpoint.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-#include "animpoint.h"
-
-#include
-
-AnimPoint::AnimPoint()
-{
- init();
-}
-
-void AnimPoint::operator= ( const AnimPoint & other )
-{
- copy (other);
-}
-
-void AnimPoint::operator= ( const QPointF & other )
-{
- init();
- setX (other.x() );
- setY (other.x() );
-}
-
-bool AnimPoint::operator== ( const QPointF& other )
-{
- QPointF p( x(),y());
- return p == other;
-}
-
-bool AnimPoint::operator== ( AnimPoint other )
-{
- if (rx() != other.rx() ) return false;
- if (ry() != other.ry() ) return false;
- if (startPos != other.startPos) return false;
- if (destPos != other.destPos) return false;
- if (animated != other.animated ) return false;
-
- return true;
-}
-
-void AnimPoint::init ()
-{
- animated=false;
- n=0;
- startPos=QPointF(0,0);
- destPos=QPointF(0,0);
- vector=QPointF(0,0);
- animTicks=10;
-}
-
-void AnimPoint::copy (AnimPoint other)
-{
- setX (other.x() );
- setY (other.x() );
- startPos=other.startPos;
- destPos=other.destPos;
- vector=other.vector;
- animated=other.animated;
- n=other.n;
- animTicks=other.animTicks;
-}
-
-void AnimPoint::setStart(const QPointF &p)
-{
- startPos=p;
- initVector();
-}
-
-QPointF AnimPoint::getStart()
-{
- return startPos;
-}
-
-
-void AnimPoint::setDest(const QPointF &p)
-{
- destPos=p;
- initVector();
-}
-
-QPointF AnimPoint::getDest()
-{
- return destPos;
-}
-
-void AnimPoint::setTicks (const uint &t)
-{
- animTicks=t;
-}
-
-uint AnimPoint::getTicks()
-{
- return (uint) animTicks;
-}
-
-void AnimPoint::setAnimated(bool b)
-{
- animated=b;
- if (b) n=0;
-}
-
-bool AnimPoint::isAnimated()
-{
- return animated;
-}
-
-bool AnimPoint::animate()
-{
- if (!animated) return false;
- n++;
- if (n>animTicks)
- {
- vector=QPointF(0,0);
- animated=false;
- setX (destPos.x() );
- setY (destPos.y() );
- return false;
- }
-
- // Some math to slow down the movement in the end
- qreal f=1-n/(qreal)animTicks;
- qreal ff=1-f*f*f;
- setX (startPos.x() + vector.x()*ff );
- setY (startPos.y() + vector.y()*ff );
-
- return animated;
-}
-
-void AnimPoint::stop()
-{
- animated=false;
- setX (destPos.x());
- setY (destPos.y());
-}
-
-void AnimPoint::initVector()
-{
- vector.setX (destPos.x()-startPos.x() );
- vector.setY (destPos.y()-startPos.y() );
-}
-
-
diff --git a/arrowobj.cpp b/arrowobj.cpp
deleted file mode 100644
index 67f6c0e..0000000
--- a/arrowobj.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-#include "arrowobj.h"
-#include "misc.h"
-
-#include
-#include
-
-/////////////////////////////////////////////////////////////////
-// ArrowObj
-/////////////////////////////////////////////////////////////////
-
-ArrowObj::ArrowObj (MapObj* parent):MapObj(parent)
-{
- init();
-}
-
-ArrowObj::~ArrowObj ()
-{
- delete arrowBegin;
- delete arrowEnd;
- delete line;
-}
-
-void ArrowObj::init ()
-{
- QPen pen;
-
- pen.setStyle (Qt::SolidLine);
- arrowBegin=scene()->addPolygon (QPolygonF(), pen );
- arrowBegin->setZValue (dZ_XLINK);
- arrowEnd=scene()->addPolygon (QPolygonF(), pen );
- arrowEnd->setZValue (dZ_XLINK);
-
- line=scene()->addLine ( QLineF(), pen );
- line->setZValue (dZ_XLINK);
-
- arrowSize=4;
- useFixedLength=false;
- setStyleBegin (None);
- setStyleEnd (HeadFull);
-}
-
-void ArrowObj::setPen (QPen p)
-{
- pen = p;
- line->setPen( pen);
-
- // end shall have same style as xlink
- QPen pen_solid = pen;
- pen_solid.setStyle (Qt::SolidLine);
- arrowBegin->setPen( pen_solid );
- arrowEnd->setPen( pen_solid );
-
- setStyleBegin( styleBegin );
- setStyleEnd( styleEnd );
-}
-
-QPen ArrowObj::getPen()
-{
- return pen;
-}
-
-void ArrowObj::setArrowSize(qreal r)
-{
- arrowSize = r;
-}
-
-qreal ArrowObj::getArrowSize()
-{
- return arrowSize;
-}
-
-void ArrowObj::setUseFixedLength( bool b)
-{
- useFixedLength = b;
-}
-
-bool ArrowObj::getUseFixedLength()
-{
- return useFixedLength;
-}
-
-void ArrowObj::setFixedLength(int i)
-{
- fixedLength = i;
-}
-
-int ArrowObj::getFixedLength()
-{
- return fixedLength;
-}
-
-void ArrowObj::show()
-{
- setVisibility( true );
-}
-
-void ArrowObj::hide()
-{
- setVisibility( false );
-}
-
-void ArrowObj::setVisibility (bool b)
-{
- MapObj::setVisibility (b);
- if (b)
- {
- if (styleEnd != None)
- arrowEnd->show();
- else
- arrowEnd->hide();
- if (useFixedLength && fixedLength == 0)
- line->hide();
- else
- line->show();
- }
- else
- {
- arrowEnd->hide();
- line->hide();
- }
-}
-
-void ArrowObj::setEndPoint (QPointF p)
-{
- endPoint = p;
-
- line->setLine(absPos.x(),absPos.y(), p.x(), p.y());
- arrowEnd->setPos(absPos);
-
- qreal a = getAngle( endPoint - absPos );
- arrowEnd->setRotation( -a / 6.28 * 360);
- arrowEnd->setPos( endPoint );
-}
-
-QPointF ArrowObj::getEndPoint ()
-{
- return endPoint;
-}
-
-void ArrowObj::setStyleBegin (const QString &s)
-{
- if (s=="HeadFull")
- setStyleBegin( ArrowObj::HeadFull );
- else
- setStyleBegin( ArrowObj::None );
-}
-
-void ArrowObj::setStyleBegin (OrnamentStyle os)
-{
- styleBegin = os;
- switch (styleBegin)
- {
- case HeadFull:
- arrowEnd->setPolygon( getArrowHead() );
- arrowBegin->setBrush( pen.color() );
- break;
- case Foot: break;
- case None:
- arrowBegin->setPolygon( QPolygonF() );
- break;
- }
-}
-
-ArrowObj::OrnamentStyle ArrowObj::getStyleBegin()
-{
- return styleBegin;
-}
-
-void ArrowObj::setStyleEnd (const QString &s)
-{
- if (s=="HeadFull")
- setStyleEnd( ArrowObj::HeadFull );
- else
- setStyleEnd( ArrowObj::None );
-}
-
-void ArrowObj::setStyleEnd (OrnamentStyle os)
-{
- styleEnd = os;
- switch (styleEnd)
- {
- case HeadFull:
- arrowEnd->setPolygon( getArrowHead() );
- arrowEnd->setBrush( pen.color() );
- break;
- case Foot: break;
- case None:
- arrowEnd->setPolygon( QPolygonF() );
- break;
- }
-}
-
-QPolygonF ArrowObj::getArrowHead()
-{
- QPointF a,b,c;
- QPolygonF pa;
- b = a + QPointF( -arrowSize *2, -arrowSize);
- c = a + QPointF( -arrowSize *2, +arrowSize);
- pa << a << b << c;
- return pa;
-}
-
-ArrowObj::OrnamentStyle ArrowObj::getStyleEnd()
-{
- return styleEnd;
-}
-
-QString ArrowObj::styleToString(const OrnamentStyle &os)
-{
- switch (os)
- {
- case HeadFull: return "HeadFull"; break;
- case None: return "None"; break;
- default: qWarning()<<"ArrowObj::styleToString unknown style "<
-#include
-
-#include "attribute.h"
-
-using namespace std;
-
-extern bool debug;
-
-Attribute::Attribute()
-{
- table=NULL;
- definition=NULL;
-}
-
-void Attribute::setKey (const QString &k, const AttributeType &t)
-{
- if (!table)
- {
- qWarning ()<< QString("Attribute::setKey (%1) No table defined!\n").arg(k).toUtf8();
- return;
- }
-
- if (!definition)
- {
- definition=table->getDef(k);
- if (!definition)
- {
- table->addKey (k,t);
- return;
- }
- }
- qWarning ()<< QString("Attribute::setKey (%1) attribute already defined!\n").arg(k).toUtf8();
-}
-
-QString Attribute::getKey ()
-{
- if (!table)
- {
- qWarning ("Attribute::getKey () No table defined!");
- return QString();
- }
- if (!definition)
- {
- qWarning ("Attribute::getKey () No attribute defined!");
- return QString ();
- }
- return definition->getKey();
-}
-
-void Attribute::setValue(const QString &v)
-{
- if (!table)
- {
- qWarning ()<setValue (v);
-}
-
-QVariant Attribute::getValue()
-{
- if (!table)
- {
- qWarning ("Attribute::getValue No table defined!");
- return QString();
- }
- if (!definition)
- {
- qWarning()<<"Attribute::getValue No attribute defined!";
- return QString();
- }
- QVariant v= definition->getValue();
- return v;
-}
-
-void Attribute::setType (const AttributeType &t)
-{
- if (!table)
- {
- qWarning ()<<"Attribute::setType No table defined!";
- return;
- }
- if (!definition)
- {
- qWarning()<<"Attribute::setType No attribute defined!";
- return;
- }
- definition->setType (t);
-}
-
-AttributeType Attribute::getType()
-{
- if (!table)
- {
- qWarning ()<<"Attribute::getType No table defined!";
- return Undefined;
- }
- if (!definition)
- {
- qWarning ()<<"Attribute::getType No attribute defined!";
- return Undefined;
- }
- return definition->getType();
-}
-
-QString Attribute::getTypeString()
-{
- if (!table)
- {
- qWarning ()<<"Attribute::getTypeString No table defined!";
- return "Undefined";
- }
- if (!definition)
- {
- qWarning ()<<"Attribute::getTypeString No attribute defined!";
- return "Undefined";
- }
- return definition->getTypeString();
-}
-
-void Attribute::setTable (AttributeTable *at)
-{
- if (at)
- table=at;
- else
- qWarning ()<<"Attribute::setTable table==NULL";
-
-}
-
-AttributeTable* Attribute::getTable()
-{
- return table;
-}
-
-QString Attribute::getDataXML()
-{
- QString a=beginElement ("attribute");
- a+=attribut ("key",getKey());
- a+=attribut ("value",getValue().toString() );
- a+=attribut ("type",getTypeString () );
- return a;
-}
-
-
-///////////////////////////////////////////////////////////////
-AttributeDef::AttributeDef()
-{
-}
-
-AttributeDef::~AttributeDef()
-{
-}
-
-void AttributeDef::setType (const AttributeType &t)
-{
- type=t;
-}
-
-AttributeType AttributeDef::getType ()
-{
- return type;
-}
-
-QString AttributeDef::getTypeString ()
-{
- if (type==StringList)
- return "StringList";
- else if (type==FreeString)
- return "FreeString";
- else if (type==UniqueString)
- return "UniqueString";
- return "Undefined";
-}
-
-void AttributeDef::setKey (const QString &k)
-{
- key=k;
-}
-
-void AttributeDef::setValue (const QString &)
-{
-}
-
-void AttributeDef::setValue (const QVariant &v)
-{
- if (type==Undefined)
- qWarning ()<<"AttributeDef::setValue No type defined!";
- else if (type==StringList)
- value=v;
- else if (type==UniqueString)
- value=v;
- else
- qWarning ()<<"AttributeDef::setValue Unknown type???";
-
-}
-
-QVariant AttributeDef::getValue ()
-{
- return QVariant ();
-}
-
-QString AttributeDef::getKey ()
-{
- return key;
-}
-
-///////////////////////////////////////////////////////////////
-AttributeTable::AttributeTable()
-{
- typeList
- << "Undefined"
- << "IntList"
- << "FreeInt"
- << "StringList"
- << "FreeString"
- << "UniqueString";
-}
-
-AttributeTable::~AttributeTable()
-{
- clear();
-}
-
-void AttributeTable::clear ()
-{
- attdefs.clear();
-}
-
-AttributeDef* AttributeTable::addKey (const QString &k, const AttributeType &t)
-{
- for (int i=0; igetKey()==k )
- {
- qWarning () << QString ("AttributeTable::addKey (%1) already in table\n").arg(k).toUtf8();
- return NULL;
- }
- }
- AttributeDef *ad=new AttributeDef;
- ad->setKey (k);
- ad->setType (t);
- attdefs.append (ad);
- return ad;
-}
-
-void AttributeTable::removeKey (const QString &k)
-{
- for (int i=0; igetKey()==k )
- {
-
- delete (attdefs.at(i));
- attdefs.removeAt (i);
- return ;
- }
- }
- qWarning () << QString ("AttributeTable::removeKey (%1) key not in table\n").arg(k).toUtf8();
-}
-
-AttributeDef* AttributeTable::getDef(const QString &key)
-{
- for (int i=0; igetKey()==key ) return attdefs.at(i);
- qWarning () << QString ("AttributeTable::getDef (%1) key not in table\n").arg(key).toUtf8();
- return NULL;
-}
-
-int AttributeTable::countKeys()
-{
- return attdefs.count();
-}
-
-QStringList AttributeTable::getKeys ()
-{
- QStringList kl;
- for (int i=0; igetKey());
- return kl;
-}
-
-QStringList AttributeTable::getTypes ()
-{
- return typeList;
-}
-
-QString AttributeTable::getDataXML()
-{
- return valueElement ("attributeList","key","value");
-}
diff --git a/attribute.h b/attribute.h
deleted file mode 100644
index 636fee3..0000000
--- a/attribute.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef ATTRIBUTE_H
-#define ATTRIBUTE_H
-
-#include
-#include
-
-#include "xmlobj.h"
-
-class AttributeTable; //FIXME-3 remove from CVS
-class AttributeDef; //FIXME-3 remove from CVS
-
-enum AttributeType {
- Undefined, //!< Undefined type
- IntList, //!< Free integer
- FreeInt, //!< Free integer
- StringList, //!< List of strings, one can be attribute value
- FreeString, //!< Any string can be attribute value, not unique
- UniqueString//!< UniqueString, e.g. for IDs
-};
-
-/*! \brief A key and a value
- The data itself is stored in Attribute Definitions (AttributeDef).
- A list of these tables AttributeTable is maintained for every MapEditor.
-*/
-class Attribute:public XMLObj {
-public:
- Attribute();
- void setKey (const QString &k, const AttributeType &t);
- QString getKey ();
- void setValue (const QString &v);
- QVariant getValue ();
- void setType (const AttributeType &t);
- AttributeType getType ();
- QString getTypeString ();
- void setTable (AttributeTable *at);
- AttributeTable* getTable();
- QString getDataXML();
-protected:
- AttributeTable *table;
- AttributeDef *definition;
- QString freeString; //!< String value for type FreeString
-};
-
-
-/*! \brief
- Attribute definition, defines possible values and type of attribute.
-*/
-class AttributeDef {
-public:
- AttributeDef();
- ~AttributeDef();
- void setType (const AttributeType &t);
- AttributeType getType();
- QString getTypeString ();
- void setKey (const QString &k);
- QString getKey ();
- void setValue (const QString &v);
- void setValue (const QVariant &v);
- QVariant getValue ();
-private:
- QString key;
- AttributeType type;
-
- QVariant value; //!< value (except FreeString, FreeInt ...
-};
-
-/*! \brief A table containing a list of keys and each of these keys has
- a list of default values. The keys and the values for each key are
- unique.
-*/
-
-class AttributeTable:public XMLObj{
-public:
- AttributeTable();
- ~AttributeTable();
- void clear();
- AttributeDef* addKey (const QString &k, const AttributeType &t); //!< Adds a key to the table
- void removeKey (const QString &k); //!< Removes key and its default values
- AttributeDef* getDef(const QString &k); //!< Get defintion of attribute
- int countKeys(); //!< Return number of keys
- QStringList getKeys ();
- QStringList getTypes();
- QString getDataXML();
-
-protected:
- QList attdefs;
- QStringList typeList;
-};
-
-
-
-#endif
-
diff --git a/attributedelegate.cpp b/attributedelegate.cpp
deleted file mode 100644
index bd807a7..0000000
--- a/attributedelegate.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include
-
-#include "attributedelegate.h"
-#include
-
-using namespace::std;
-
-AttributeDelegate::AttributeDelegate(QObject *parent)
- : QItemDelegate(parent)
-{
-}
-
-QWidget *AttributeDelegate::createEditor(QWidget *parent,
- const QStyleOptionViewItem &/* option */,
- const QModelIndex & index ) const
-{
- int col=index.column();
- int row=index.row();
-
- if (col==0 && row==index.model()->rowCount() -1 )
- {
- //We are editing a new attribute, starting with attribute name
- QComboBox *editor = new QComboBox(parent);
- editor->insertItems (0,attributeTable->getKeys());
- return editor;
- }
- if (col==1 && row==index.model()->rowCount() -1 )
- {
- qDebug()<< "Edit value now...";
- //We are editing a new attribute, starting with attribute name
- QComboBox *editor = new QComboBox(parent);
- editor->insertItems (0,attributeTable->getKeys());
- return editor;
-
- }
-
- // Is there already an atttribute defined or
- // do we need to create a new one?
-
- QVariant var=index.model()->data(index.model()->index(row,2,QModelIndex()));
- QString typeName=var.toString();
- qDebug()<< "AttrDel::createEditor type="<setMinimum(0);
- editor->setMaximum(5);
- return editor;
- } else if (typeName=="FreeInt")
- {
- QSpinBox *editor = new QSpinBox(parent);
- editor->setMinimum(0);
- editor->setMaximum(100);
- return editor;
- } else if (typeName=="FreeString")
- {
- QComboBox *editor = new QComboBox(parent);
- return editor;
- } else if (typeName=="StringList")
- {
- QComboBox *editor = new QComboBox(parent);
- return editor;
- }
-
- return NULL;
-}
-
-void AttributeDelegate::setEditorData(QWidget *editor,
- const QModelIndex &index) const
-{
- QVariant value= index.model()->data(index, Qt::DisplayRole);
- switch (value.type())
- {
- case QVariant::Int:
- {
- int value = index.model()->data(index, Qt::DisplayRole).toInt();
- QSpinBox *spinBox = static_cast(editor);
- spinBox->setValue(value);
- break;
- }
- /*
- {
- QString value = index.model()->data(index, Qt::DisplayRole).toString();
- QLineEdit *le= static_cast(editor);
- le->setText(value);
- break;
- }
- */
- case QVariant::String:
- {
- QComboBox *cb= static_cast(editor);
- QStringList sl;
- sl<< index.model()->data(index, Qt::DisplayRole).toString();
- cb->insertStringList (sl);
- break;
- }
- default:
- break;
- }
-}
-
-void AttributeDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
- const QModelIndex &index) const
-{
- QVariant value= index.model()->data(index, Qt::DisplayRole);
- switch (value.type())
- {
- case QVariant::Int:
- {
- QSpinBox *spinBox = static_cast(editor);
- spinBox->interpretText();
- model->setData(index, spinBox->value(), Qt::EditRole);
- break;
- }
- case QVariant::String:
- {
- QComboBox *cb = static_cast(editor);
- model->setData(index, cb->currentText(), Qt::EditRole);
- break;
- }
- default:
- break;
- }
-
-}
-
-void AttributeDelegate::updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option, const QModelIndex &/* index */) const
-{
- editor->setGeometry(option.rect);
-}
-
-void AttributeDelegate::setAttributeTable (AttributeTable *table)
-{
- attributeTable=table;
-}
-
diff --git a/attributedelegate.h b/attributedelegate.h
deleted file mode 100644
index 5b15382..0000000
--- a/attributedelegate.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#ifndef ATTRIBUTEDELEGATE_H
-#define ATTRIBUTEDELEGATE_H
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "attribute.h"
-
-class AttributeDelegate : public QItemDelegate
-{
- Q_OBJECT
-
-enum EditorType {Undefined,SpinBox,LineEdit,ComboBox};
-
-public:
- AttributeDelegate(QObject *parent = 0);
-
- QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
- const QModelIndex &index) const;
-
- void setEditorData(QWidget *editor, const QModelIndex &index) const ;
- void setModelData(QWidget *editor, QAbstractItemModel *model,
- const QModelIndex &index) const ;
-
- void updateEditorGeometry(QWidget *editor,
- const QStyleOptionViewItem &option, const QModelIndex &index) const;
- void setAttributeTable(AttributeTable *table);
-private:
- AttributeTable *attributeTable;
-};
-
-#endif
diff --git a/attributedialog.cpp b/attributedialog.cpp
deleted file mode 100644
index c7bd614..0000000
--- a/attributedialog.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "attributedialog.h"
-
-#include "attributewidget.h"
-
-#include
-#include
-
-AttributeDialog::AttributeDialog (QWidget *parent):QDialog (parent)
-{
- if (this->objectName().isEmpty())
- this->setObjectName(QString::fromUtf8("AttributeDialog"));
- QSize size(468, 75);
- size = size.expandedTo(this->minimumSizeHint());
- this->resize(size);
- QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
- sizePolicy.setHorizontalStretch(0);
- sizePolicy.setVerticalStretch(0);
- sizePolicy.setHeightForWidth(this->sizePolicy().hasHeightForWidth());
- this->setSizePolicy(sizePolicy);
-
- vboxLayout = new QVBoxLayout(this);
- vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
-
- tableLayout = new QVBoxLayout();
- tableLayout->setObjectName(QString::fromUtf8("tableLayout"));
-
- hboxLayout = new QHBoxLayout();
- hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
- addButton = new QPushButton(this);
- addButton->setObjectName(QString::fromUtf8("addButton"));
-
- hboxLayout->addWidget(addButton);
-
- spacerItem = new QSpacerItem(111, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
- hboxLayout->addItem(spacerItem);
-
- closeButton = new QPushButton(this);
- closeButton->setObjectName(QString::fromUtf8("closeButton"));
-
- hboxLayout->addWidget(closeButton);
-
- vboxLayout->addLayout(tableLayout);
- vboxLayout->addLayout(hboxLayout);
-
-
-
- setWindowTitle(QApplication::translate("AttributeDialog", "Attributes", 0, QApplication::UnicodeUTF8));
- addButton->setText(QApplication::translate("AttributeDialog", "Add key", 0, QApplication::UnicodeUTF8));
- closeButton->setText(QApplication::translate("AttributeDialog", "Close", 0, QApplication::UnicodeUTF8));
-
- connect (addButton, SIGNAL (clicked()), this, SLOT (addKey()));
- connect (closeButton, SIGNAL (clicked()), this, SLOT (accept()));
-
- table=NULL;
-}
-
-void AttributeDialog::setTable (AttributeTable *t)
-{
- table=t;
-}
-
-void AttributeDialog::setBranch (BranchObj *bo)
-{
- branch=bo;
-}
-
-void AttributeDialog::setMode (const AttributeDialogMode &m)
-{
- mode=m;
-
- QString title;
- if (mode==Definition)
- title= QApplication::translate("Attribute Dialog","AttributeDialog - Edit definitions", 0, QApplication::UnicodeUTF8);
- else
- title= QApplication::translate("Attribute Dialog","AttributeDialog - Edit %1", 0, QApplication::UnicodeUTF8).arg("objname");
- setWindowTitle(title);
-}
-
-void AttributeDialog::updateTable()
-{
- if (table)
- {
- // Update list of keys and values
- QStringList keyList=table->getKeys();
- AttributeWidget *aw;
- for (int i=0; isetKey (keyList.at(i) );
- // TODO aw->setValues (table->getValues (keyList.at(i) ));
- aw->show();
- tableLayout->addWidget (aw);
- }
-
- // Update attributes in dialog from data in selected branch
-
- // TODO
- }
-
-}
-void AttributeDialog::addKey()
-{
- AttributeWidget *aw1=new AttributeWidget (this);
- aw1->show();
- tableLayout->addWidget (aw1);
-
-}
-
-void AttributeDialog::closeEvent( QCloseEvent* ce )
-{
- ce->accept(); // can be reopened with show()
- hide();
- emit (windowClosed() );
- return;
-}
-
-
diff --git a/attributedialog.h b/attributedialog.h
deleted file mode 100644
index b56cf80..0000000
--- a/attributedialog.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef ATTRIBUTEDIALOG_H
-#define ATTRIBUTEDIALOG_H
-
-#include "attribute.h"
-#include "branchobj.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-
-/*! \brief Set the dialog mode */
-enum AttributeDialogMode {
- Definition, //!< Edit attribute definitions (AttributeDef)
- Object //!< Edit attributes of OrnamentedObj
-};
-
-class AttributeDialog:public QDialog
-{
- Q_OBJECT
-public:
- AttributeDialog (QWidget *parent=0 );
- void setTable (AttributeTable *table=0);
- void setBranch (BranchObj *bo);
- void setMode (const AttributeDialogMode &m);
- void updateTable();
-signals:
- void windowClosed();
-private slots:
- void addKey();
-protected:
- void closeEvent(QCloseEvent*);
-private:
- QVBoxLayout *vboxLayout;
- QVBoxLayout *tableLayout;
- QHBoxLayout *hboxLayout;
- QPushButton *addButton;
- QSpacerItem *spacerItem;
- QPushButton *closeButton;
-
- AttributeDialogMode mode;
- AttributeTable *table;
- BranchObj *branch;
-};
-
-#endif
diff --git a/attributeitem.cpp b/attributeitem.cpp
deleted file mode 100644
index af014f2..0000000
--- a/attributeitem.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "attributeitem.h"
-
-
-extern bool debug;
-
-AttributeItem::AttributeItem(const QList &data, TreeItem *parent):BranchItem (data,parent)
-{
- TreeItem::setType (Attribute);
- internal=false;
-}
-
-AttributeItem::~AttributeItem()
-{
-}
-
-void AttributeItem::set (const QString &k, const QString &v, const Type &)
-{
- key=k;
- value=QVariant (v);
- createHeading();
-}
-
-void AttributeItem::get (QString &k, QString &v, Type &t)
-{
- k=key;
- v=value.toString();
- t=attrType;
-}
-
-void AttributeItem::setKey (const QString &k)
-{
-/*
- if (!table)
- {
- qWarning (QString("AttributeItem::setKey (%1) No table defined!\n").arg(k).ascii());
- return;
- }
-
- if (!definition)
- {
- definition=table->getDef(k);
- if (!definition)
- {
- table->addKey (k,t);
- return;
- }
- }
- qWarning (QString("AttributeItem::setKey (%1) attribute already defined!\n").arg(k).ascii());
- */
- key=k;
- createHeading();
-}
-
-QString AttributeItem::getKey ()
-{
-/*
- if (!table)
- {
- qWarning ("AttributeItem::getKey () No table defined!");
- return QString();
- }
- if (!definition)
- {
- qWarning ("AttributeItem::getKey () No attribute defined!");
- return QString ();
- }
- return definition->getKey();
- */
- return key;
-}
-
-void AttributeItem::setValue(const QString &v)
-{
-/*
- if (!table)
- {
- qWarning (QString ("AttributeItem::setValue (%1) No table defined!").arg(v));
- return;
- }
- if (!definition)
- {
- qWarning (QString ("AttributeItem::setValue (%1) No attribute defined!").arg(v));
- return;
- }
- definition->setValue (v);
-*/
- value=v;
- createHeading();
-}
-
-QVariant AttributeItem::getValue()
-{
-/*
- if (!table)
- {
- qWarning ("AttributeItem::getValue No table defined!");
- return QString();
- }
- if (!definition)
- {
- qWarning ("AttributeItem::getValue No attribute defined!");
- return QString();
- }
- QVariant v= definition->getValue();
- return v;
- */
- return value;
-}
-
-void AttributeItem::setType (const Type &t)
-{
-/*
- if (!table)
- {
- qWarning ("AttributeItem::setType No table defined!");
- return;
- }
- if (!definition)
- {
- qWarning ("Attribute::setType No attribute defined!");
- return;
- }
- definition->setType (t);
-*/
- attrType=t;
-}
-
-AttributeItem::Type AttributeItem::getAttributeType()
-{
-/*
- if (!table)
- {
- qWarning ("AttributeItem::getType No table defined!");
- return Undefined;
- }
- if (!definition)
- {
- qWarning ("AttributeItem::getType No attribute defined!");
- return Undefined;
- }
- return definition->getType();
-*/
- return attrType;
-}
-
-QString AttributeItem::getTypeString()
-{
-/*
- if (!table)
- {
- qWarning ("AttributeItem::getTypeString No table defined!");
- return "Undefined";
- }
- if (!definition)
- {
- qWarning ("Attribute::getTypeString No AttributeItem defined!");
- return "Undefined";
- }
- return definition->getTypeString();
-*/
- switch (attrType)
- {
- case IntList: return "IntList";
- case FreeInt: return "FreeInt";
- case StringList:return "StringList";
- case FreeString:return "FreeString";
- case UniqueString: return "UniqueString";
- default: return "Undefined";
- }
-}
-
-void AttributeItem::setInternal(bool b)
-{
- internal=b;
-}
-
-bool AttributeItem::isInternal()
-{
- return internal;
-}
-
-QString AttributeItem::getDataXML()
-{
- QString a;
- a=attribut ("key",getKey());
- a+=attribut ("value",getValue().toString() );
- a+=attribut ("type",getTypeString () );
- return singleElement ("attribute",a);
-}
-
-void AttributeItem::createHeading()
-{
- setHeadingPlainText (QString ("K: %1 | V: %2").arg(key).arg(value.toString()));
-}
-
diff --git a/attributeitem.h b/attributeitem.h
deleted file mode 100644
index a1c4767..0000000
--- a/attributeitem.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef ATTRIBUTEITEM_H
-#define ATTRIBUTEITEM_H
-
-#include
-#include
-
-#include "branchitem.h"
-
-/*! \brief A key and a value
- The data itself is stored in Attribute Definitions (AttributeDef).
- A list of these tables AttributeTable is maintained for every MapEditor.
-*/
-class AttributeItem:public BranchItem {
-public:
-enum Type {
- Undefined, //!< Undefined type
- IntList, //!< Integer
- FreeInt, //!< Integer
- StringList, //!< List of strings
- FreeString, //!< String
- UniqueString//!< String which is unique in a map, e.g. for IDs
-};
-
- AttributeItem(const QList &data, TreeItem *parent = 0);
- virtual ~AttributeItem();
- void set (const QString &k, const QString &v, const Type &t);
- void get (QString &k, QString &v, Type &t);
- void setKey (const QString &k);
- QString getKey ();
- void setValue (const QString &v);
- QVariant getValue ();
- using BranchItem::setType;
- virtual void setType (const Type &t);
- AttributeItem::Type getAttributeType ();
- QString getTypeString ();
- void setInternal (bool b);
- bool isInternal();
- QString getDataXML();
-protected:
- void createHeading();
- bool internal; //!< Internal attributes cannot be edited by user
- QString key;
- QVariant value;
- Type attrType;
-};
-
-#endif
-
diff --git a/attributewidget.cpp b/attributewidget.cpp
deleted file mode 100644
index 65e7a18..0000000
--- a/attributewidget.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "attributewidget.h"
-
-AttributeWidget::AttributeWidget (QWidget *parent):QWidget (parent)
-{
- ui.setupUi (this);
- //ui.keyComboBox->setEditable (true);
- ui.valueComboBox->setEditable (true);
-}
-
-void AttributeWidget::setTable(AttributeTable *at)
-{
- table=at;
-}
-
-void AttributeWidget::setKey (const QString &k)
-{
- key=k;
- ui.keyComboBox->insertItem (ui.keyComboBox->count(), key);
-}
-
-void AttributeWidget::setValues(const QStringList &vl)
-{
- ui.valueComboBox->clear();
- ui.valueComboBox->insertStringList(vl);
-}
-
-/*
-void AttributeWidget::setValue (const QString &v)
-{
-}
-*/
-
-void AttributeWidget::keyTextChanged(const QString &t)
-{
-}
-
-void AttributeWidget::valueTextChanged(const QString &t)
-{
-}
diff --git a/attributewidget.h b/attributewidget.h
deleted file mode 100644
index 065fd78..0000000
--- a/attributewidget.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef ATTRIBUTEWIDGET_H
-#define ATTRIBUTEWIDGET_H
-
-#include "ui_attributewidget.h"
-
-#include "attribute.h"
-
-#include
-
-class AttributeWidget: public QWidget
-{
- Q_OBJECT
-public:
- AttributeWidget (QWidget *parent=0);
- void setTable (AttributeTable *at=0);
- void setKey (const QString &k);
- void setValues (const QStringList &vl);
-
-public slots:
- virtual void keyTextChanged(const QString &t);
- virtual void valueTextChanged(const QString &t);
-
-private:
- Ui::AttributeWidget ui;
- AttributeTable *table;
- QString key;
-};
-#endif
diff --git a/branchitem.cpp b/branchitem.cpp
deleted file mode 100644
index ed97e5d..0000000
--- a/branchitem.cpp
+++ /dev/null
@@ -1,575 +0,0 @@
-#include "branchitem.h"
-
-#include "attributeitem.h"
-#include "branchobj.h"
-#include "task.h"
-#include "taskmodel.h"
-#include "vymmodel.h"
-#include "xlink.h"
-#include "xlinkitem.h"
-
-extern TaskModel *taskModel;
-
-//#include
-
-BranchItem::BranchItem(const QList &data, TreeItem *parent):MapItem (data,parent)
-{
- //qDebug()<< "Constr. BranchItem this="<deleteTask (task);
-}
-
-void BranchItem::copy (BranchItem *other) // TODO lacks most of data...
-{
- scrolled=other->scrolled;
- tmpUnscrolled=other->tmpUnscrolled;
-}
-
-BranchItem* BranchItem::parentBranch ()
-{
- return (BranchItem*) parentItem;
-}
-
-void BranchItem::insertBranch (int pos, BranchItem *branch)
-{
- if (pos<0) pos=0;
- if (pos>branchCounter) pos=branchCounter;
- childItems.insert(pos+branchOffset,branch);
- branch->parentItem=this;
- branch->rootItem=rootItem;
- branch->setModel (model);
- if (parentItem==rootItem)
- setType (MapCenter);
- else
- setType (Branch);
-
-
- if (branchCounter==0)
- branchOffset=childItems.count()-1;
- branchCounter++;
-}
-
-QString BranchItem::saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset, QList &tmpLinks )
-{
- // Cloudy stuff can be hidden during exports
- if (hidden) return QString();
-
- // Save uuid
- QString idAttr=attribut("uuid",uuid.toString());
-
- QString s,a;
-
- // Update of note is usually done while unselecting a branch
-
- QString scrolledAttr;
- if (scrolled)
- scrolledAttr=attribut ("scrolled","yes");
- else
- scrolledAttr="";
-
- // save area, if not scrolled // not needed if HTML is rewritten...
- // also we could check if _any_ of parents is scrolled
- QString areaAttr;
- if (mo && parentItem->isBranchLikeType() && !((BranchItem*)parentItem)->isScrolled() )
- {
- qreal x=mo->getAbsPos().x();
- qreal y=mo->getAbsPos().y();
- areaAttr=
- attribut("x1",QString().setNum(x-offset.x())) +
- attribut("y1",QString().setNum(y-offset.y())) +
- attribut("x2",QString().setNum(x+mo->width()-offset.x())) +
- attribut("y2",QString().setNum(y+mo->height()-offset.y()));
-
- } else
- areaAttr="";
-
- QString elementName;
- if (parentItem==rootItem)
- elementName="mapcenter";
- else
- elementName="branch";
-
- // Free positioning of children
- QString layoutAttr;
- if (childrenLayout == BranchItem::FreePositioning)
- layoutAttr += attribut ("childrenFreePos","true");
-
- // Save rotation
- QString rotAttr;
- if (mo && mo->getRotation() !=0 )
- rotAttr=attribut ("rotation",QString().setNum (mo->getRotation() ) );
-
- s=beginElement (elementName
- + getMapAttr()
- + getGeneralAttr()
- + scrolledAttr
- + getIncludeImageAttr()
- + rotAttr
- + layoutAttr
- + idAttr
- );
- incIndent();
-
- // save heading
- s += heading.saveToDir();
-
- // Save frame // not saved if there is no MO
- if (mo)
- {
- // Avoid saving NoFrame for objects other than MapCenter
- if (depth() == 0 || ((OrnamentedObj*)mo)->getFrame()->getFrameType()!=FrameObj::NoFrame)
- s+=((OrnamentedObj*)mo)->getFrame()->saveToDir ();
- }
-
- // save names of flags set
- s+=standardFlags.saveToDir(tmpdir,prefix,0);
-
- // Save Images
- for (int i=0; isaveToDir (tmpdir,prefix);
-
- // save attributes
- for (int i=0; igetDataXML();
-
- // save note
- if (!note.isEmpty() )
- s+=note.saveToDir();
-
- // save task
- if (task)
- s+=task->saveToDir();
-
- // Save branches
- int i=0;
- TreeItem *ti=getBranchNum(i);
- while (ti)
- {
- s+=getBranchNum(i)->saveToDir(tmpdir,prefix,offset,tmpLinks);
- i++;
- ti=getBranchNum(i);
- }
-
- // Mark Links for save
- for (int i=0; igetLink();
- if (l && !tmpLinks.contains (l)) tmpLinks.append (l);
- }
- decIndent();
- s += endElement (elementName);
- return s;
-}
-
-void BranchItem::updateVisibility()
-{
- // Needed to hide relinked branch, if parent is scrolled
- if (mo)
- {
- if (hasScrolledParent(this) || hidden)
- mo->setVisibility (false);
- else
- mo->setVisibility (true);
- }
-}
-
-void BranchItem::setHeadingColor (QColor color)
-{
- TreeItem::setHeadingColor (color);
- if (mo) ((BranchObj*)mo)->setColor (color);
-}
-
-void BranchItem::updateTaskFlag()
-{
- systemFlags.deactivateGroup ("system-tasks");
- if (task)
- {
- QString s="system-" + task->getIconString();
- systemFlags.activate (s);
- model->emitDataChanged(this);
- }
-}
-
-void BranchItem::setTask(Task *t)
-{
- task=t;
- updateTaskFlag();
-}
-
-Task* BranchItem::getTask()
-{
- return task;
-}
-
-void BranchItem::unScroll()
-{
- if (tmpUnscrolled) resetTmpUnscroll();
- if (scrolled) toggleScroll();
-}
-
-bool BranchItem::toggleScroll()
-{
- // MapCenters are not scrollable
- if (depth()==0) return false;
-
- BranchObj *bo;
- if (scrolled)
- {
- scrolled=false;
- systemFlags.deactivate("system-scrolledright");
- if (branchCounter>0)
- for (int i=0;igetMO());
- if (bo) bo->setVisibility(true);
- }
- } else
- {
- scrolled=true;
- systemFlags.activate("system-scrolledright");
- if (branchCounter>0)
- for (int i=0;igetMO());
- if (bo) bo->setVisibility(false);
- }
- }
- return true;
-}
-
-bool BranchItem::isScrolled()
-{
- return scrolled;
-}
-
-bool BranchItem::hasScrolledParent(BranchItem *start)
-{
- // Calls parents recursivly to
- // find out, if we are scrolled at all.
- // But ignore myself, just look at parents.
-
- if (!start) start=this;
-
- if (this !=start && scrolled) return true;
-
- BranchItem* bi=(BranchItem*)parentItem;
- if (bi && bi!=rootItem )
- return bi->hasScrolledParent(start);
- else
- return false;
-}
-
-bool BranchItem::tmpUnscroll(BranchItem *start)
-{
- bool result=false;
-
- if (!start) start=this;
-
- // Unscroll parent (recursivly)
- BranchItem * pi=(BranchItem*)parentItem;
- if (pi && pi->isBranchLikeType() ) result=pi->tmpUnscroll(start);
-
- // Unscroll myself
- if (start !=this && scrolled)
- {
- tmpUnscrolled=true;
- systemFlags.activate("system-tmpUnscrolledRight");
- toggleScroll();
- model->emitDataChanged (this);
- result=true;
- }
- return result;
-}
-
-bool BranchItem::resetTmpUnscroll()
-{
- bool result=false;
-
- // Unscroll parent (recursivly)
- BranchItem * pi=(BranchItem*)parentItem;
- if (pi && pi->isBranchLikeType() ) result=pi->resetTmpUnscroll();
-
- // Unscroll myself
- if (tmpUnscrolled)
- {
- tmpUnscrolled=false;
- systemFlags.deactivate("system-tmpUnscrolledRight");
- toggleScroll();
- model->emitDataChanged (this);
- result=true;
- }
- return result;
-}
-
-void BranchItem::sortChildren(bool inverse) //FIXME-4 optimize by not using moveUp/Down
-{
- int childCount=branchCounter;
- int curChildIndex;
- bool madeChanges=false;
- do
- {
- madeChanges=false;
- for(curChildIndex=1;curChildIndexgetHeadingPlain().compare(curChild->getHeadingPlain())<0)
- {
- model->moveUp (curChild);
- madeChanges=true;
- }
- } else
- if (prevChild->getHeadingPlain().compare(curChild->getHeadingPlain())>0)
- {
- model->moveUp (curChild);
- madeChanges=true;
- }
- }
- }while(madeChanges);
-}
-
-void BranchItem::setChildrenLayout(BranchItem::LayoutHint layoutHint)
-{
- childrenLayout = layoutHint;
-}
-
-BranchItem::LayoutHint BranchItem::getChildrenLayout()
-{
- return childrenLayout;
-}
-
-void BranchItem::setIncludeImagesVer(bool b)
-{
- includeImagesVer=b;
-}
-
-bool BranchItem::getIncludeImagesVer()
-{
- return includeImagesVer;
-}
-
-void BranchItem::setIncludeImagesHor(bool b)
-{
- includeImagesHor=b;
-}
-
-bool BranchItem::getIncludeImagesHor()
-{
- return includeImagesHor;
-}
-
-QString BranchItem::getIncludeImageAttr()
-{
- QString a;
- if (includeImagesVer)
- a=attribut ("incImgV","true");
- if (includeImagesHor)
- a+=attribut ("incImgH","true");
- return a;
-}
-
-BranchItem* BranchItem::getFramedParentBranch(BranchItem *start)
-{
- BranchObj *bo=getBranchObj();
- if (bo && bo->getFrameType() != FrameObj::NoFrame)
- {
- if (bo->getFrame()->getFrameIncludeChildren() ) return this;
- if (this == start) return this;
- }
- BranchItem* bi=(BranchItem*)parentItem;
- if (bi && bi!=rootItem )
- return bi->getFramedParentBranch(start);
- else
- return NULL;
-}
-
-void BranchItem::setFrameIncludeChildren(bool b)
-{
- includeChildren=b; // FIXME-4 ugly: same information stored in FrameObj
- BranchObj *bo=getBranchObj();
- if (bo) bo->getFrame()->setFrameIncludeChildren(b);
-}
-
-bool BranchItem::getFrameIncludeChildren()
-{
- BranchObj *bo=getBranchObj();
- if (bo)
- return bo->getFrame()->getFrameIncludeChildren();
- else
- return includeChildren;
-}
-
-void BranchItem::setLastSelectedBranch()
-{
- int d=depth();
- if (d>=0)
- {
- if (d==1)
- // Hack to save an additional lastSelected for mapcenters in MapEditor
- // depending on orientation
- // this allows to go both left and right from there
- if (mo && ((BranchObj*)mo)->getOrientation()==LinkableMapObj::LeftOfCenter)
- {
- ((BranchItem*)parentItem)->lastSelectedBranchNumAlt=parentItem->num(this);
- return;
- }
- ((BranchItem*)parentItem)->lastSelectedBranchNum=parentItem->num(this);
- }
-}
-
-void BranchItem::setLastSelectedBranch(int i)
-{
- lastSelectedBranchNum=i;
-}
-
-BranchItem* BranchItem::getLastSelectedBranch()
-{
- if (lastSelectedBranchNum>=branchCounter)
- return getBranchNum (branchCounter-1);
- else
- return getBranchNum (lastSelectedBranchNum);
-}
-
-BranchItem* BranchItem::getLastSelectedBranchAlt()
-{
- return getBranchNum (lastSelectedBranchNumAlt);
-}
-
-
-
-
-TreeItem* BranchItem::findMapItem (QPointF p, TreeItem* excludeTI)
-{
- // Search branches
- TreeItem *ti;
- for (int i=0; ifindMapItem(p, excludeTI);
- if (ti != NULL) return ti;
- }
-
- // Search images
- ImageItem *ii;
- for (int i=0; igetMO();
- if (mo && mo->isInClickBox(p) &&
- (ii != excludeTI) &&
- this!= excludeTI &&
- mo->isVisibleObj()
- ) return ii;
- }
-
- // Search myself
- if (getBranchObj()->isInClickBox (p) && (this != excludeTI) && getBranchObj()->isVisibleObj() )
- return this;
-
-
- // Search attributes
- AttributeItem *ai;
- for (int i=0; igetMO();
- if (mo && mo->isInClickBox(p) &&
- (ai != excludeTI) &&
- this!= excludeTI &&
- mo->isVisibleObj()
- ) return ai;
- }
- return NULL;
-}
-
-void BranchItem::updateStyles(const bool &keepFrame)
-{
- // Update styles when relinking branches
- if (mo)
- {
- BranchObj *bo=getBranchObj();
- if ( parentItem != rootItem)
- bo->setParObj ( (LinkableMapObj*) ( ((MapItem*)parentItem)->getMO() ) );
- else
- bo->setParObj (NULL);
- bo->setDefAttr(BranchObj::MovedBranch,keepFrame);
- }
-}
-
-BranchObj* BranchItem::getBranchObj()
-{
- return (BranchObj*)mo;
-}
-
-BranchObj* BranchItem::createMapObj(QGraphicsScene *scene)
-{
- BranchObj *newbo;
-
- if (parentItem==rootItem)
- {
- newbo=new BranchObj(NULL,this);
- mo=newbo;
- scene->addItem (newbo);
- } else
- {
- newbo=new BranchObj( ((MapItem*)parentItem)->getMO(),this);
- mo=newbo;
- // Set visibility depending on parents
- if (parentItem!=rootItem &&
- ( ((BranchItem*)parentItem)->scrolled || !((MapItem*)parentItem)->getLMO()->isVisibleObj() ) )
- newbo->setVisibility (false);
- if (depth()==1)
- {
- qreal r=190;
- qreal a= -M_PI_4 + M_PI_2 * (num()) + (M_PI_4/2)*(num()/4 % 4);
- QPointF p (r*cos (a), r*sin (a));
- newbo->setRelPos (p);
- }
- }
- newbo->setDefAttr(BranchObj::NewBranch);
- initLMO();
-
- if (!getHeading().isEmpty() )
- {
- newbo->updateData();
- newbo->setColor (heading.getColor());
- }
-
- return newbo;
-}
-
diff --git a/branchitem.h b/branchitem.h
deleted file mode 100644
index 207ab0c..0000000
--- a/branchitem.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef BRANCHITEM_H
-#define BRANCHITEM_H
-
-#include "mapitem.h"
-#include "task.h"
-
-#include
-
-class QString;
-class QGraphicsScene;
-class BranchObj;
-class Link;
-class XLinkItem;
-
-class BranchItem:public MapItem
-{
-public:
- enum LayoutHint {AutoPositioning, FreePositioning};
-
- BranchItem(const QList &data, TreeItem *parent = 0);
- virtual ~BranchItem();
- virtual void clear();
- virtual void copy (BranchItem *item);
- virtual BranchItem* parentBranch();
-
- virtual void insertBranch (int pos,BranchItem *branch);
-
- virtual QString saveToDir (const QString &tmpdir,const QString &prefix, const QPointF& offset,QList &tmpLinks);
-
- virtual void updateVisibility();
-
- virtual void setHeadingColor (QColor color); //!Overloaded from TreeItem to update QGraphicsView
-
-protected:
- bool scrolled; // true if all children are scrolled and thus invisible
- bool tmpUnscrolled; // can only be true (temporary) for a scrolled subtree
-
-public:
- void updateTaskFlag();
- void setTask (Task* t);
- Task* getTask();
-private:
- Task* task;
-
-public:
- virtual void unScroll();
- virtual bool toggleScroll(); // scroll or unscroll
- virtual bool isScrolled(); // returns scroll state
- virtual bool hasScrolledParent(BranchItem* start=NULL); // true, if any of the parents is scrolled
- virtual bool tmpUnscroll(BranchItem* start=NULL); // unscroll scrolled parents temporary e.g. during "find" process
- virtual bool resetTmpUnscroll(); // scroll all tmp scrolled parents again e.g. when unselecting
- virtual void sortChildren(bool inverse=false); //! Sort children
- virtual void setChildrenLayout(BranchItem::LayoutHint layoutHint);
- virtual BranchItem::LayoutHint getChildrenLayout();
-
-protected:
- bool includeImagesVer; //! include floatimages in bbox vertically
- bool includeImagesHor; //! include floatimages in bbox horizontally
- bool includeChildren; //! include children in frame
- LayoutHint childrenLayout; //! should children be positioned freely?
-
-public:
- void setIncludeImagesVer(bool);
- bool getIncludeImagesVer();
- void setIncludeImagesHor(bool);
- bool getIncludeImagesHor();
- QString getIncludeImageAttr();
- BranchItem* getFramedParentBranch(BranchItem *start);
- void setFrameIncludeChildren(bool);
- bool getFrameIncludeChildren();
-
-protected:
- int lastSelectedBranchNum;
- int lastSelectedBranchNumAlt;
-public:
- virtual void setLastSelectedBranch(); //! Set myself as last selected in parent
- virtual void setLastSelectedBranch(int i); //! Set last selected branch directly
- virtual BranchItem* getLastSelectedBranch(); //! Returns last selected branch usually
- virtual BranchItem* getLastSelectedBranchAlt(); //! Used to return last selected branch left of a mapcenter
-
-public:
- TreeItem* findMapItem (QPointF p,TreeItem* excludeTI); //! search map for branches or images. Ignore excludeTI, where search is started
-
- virtual void updateStyles (const bool &keepFrame=false); //! update related fonts, parObjects, links, ...
- virtual BranchObj* getBranchObj();
- virtual BranchObj* createMapObj(QGraphicsScene *scene); //! Create classic object in GraphicsView
-};
-
-#endif
diff --git a/branchobj.cpp b/branchobj.cpp
deleted file mode 100644
index 8615ab8..0000000
--- a/branchobj.cpp
+++ /dev/null
@@ -1,737 +0,0 @@
-#include
-
-#include "branchobj.h"
-
-#include "attributeitem.h"
-#include "branchitem.h"
-#include "geometry.h"
-#include "mapeditor.h"
-#include "mainwindow.h"
-#include "misc.h"
-
-extern FlagRow *standardFlagsMaster;
-extern FlagRow *systemFlagsMaster;
-extern bool debug;
-
-/////////////////////////////////////////////////////////////////
-// BranchObj
-/////////////////////////////////////////////////////////////////
-
-BranchObj::BranchObj (QGraphicsItem *parent,TreeItem *ti):OrnamentedObj (parent,ti)
-{
- //qDebug ()<< "Const BranchObj (s,ti) ti="<parent());
- if (pi && pi!=ti->getModel()->getRootItem() )
- parObj=pi->getLMO();
- else
- parObj=NULL;
- init();
-}
-
-BranchObj::~BranchObj ()
-{
- //qDebug()<< "Destr BranchObj of "<getModel();
- model->stopAnimation (this);
- }
-
- clear();
-}
-
-void BranchObj::init ()
-{
- if (parObj) absPos=parObj->getChildRefPos();
-}
-
-void BranchObj::copy (BranchObj* other)
-{
- OrnamentedObj::copy(other);
-
- setVisibility (other->visible);
-
- positionBBox();
-}
-
-void BranchObj::clear()
-{
-}
-
-void BranchObj::setParObjTmp(LinkableMapObj* dst, QPointF m, int off)
-{
- // Temporary link to dst
- // m is position of mouse pointer
- // offset 0: default 1: below dst -1 above dst (if possible)
-
- BranchItem *dsti=(BranchItem*)(dst->getTreeItem());
-
- BranchItem *pi=(BranchItem*)(dsti->parent());
- int pi_depth=pi->depth();
- BranchObj* bodst=(BranchObj*)dst;
-
- if (!tmpParent)
- {
- tmpParent=true;
- parObjTmpBuf=parObj;
- }
-
- if (pi_depth<1) off=0;
- if (off==0)
- link2ParPos=false;
- else
- link2ParPos=true;
- parObj=bodst;
-
- setLinkStyle (dst->getDefLinkStyle (dsti));
-
- // Move temporary to new position at destination
- // Usually the positioning would be done by reposition(),
- // but then also the destination branch would "Jump" around...
- // Better just do it approximately
- if (dsti->depth()==0)
- { // new parent is a mapcenter
- Vector v= ( m - bodst->getChildRefPos());
- v.normalize();
- v.scale (150);
- move2RelPos (v.toQPointF());
- } else
- {
- qreal y;
- if (off==0)
- {
- // Below is needed e.g. in a freshly loaded map,
- // bboxTotal seems not to be correct yet
- // relinking positions too far below then
- calcBBoxSizeWithChildren();
-
- // new parent is just a branch, link to it
- bodst->calcBBoxSizeWithChildren();
- QRectF t = bodst->getTotalBBox();
- if (dsti->getLastBranch())
- // Move below children of destination
- y = t.y() + t.height() ;
- else
- // Move left or right to destination
- y = t.y() ;
- } else
- {
- if (off < 0)
- // we want to link above dst
- y = bodst->y() - height() + 12;
- else
- // we want to link below dst
- // Bottom of sel should be 5 pixels above
- // the bottom of the branch _below_ the target:
- // Don't try to find that branch, guess 12 pixels
- y = bodst->getChildRefPos().y() -height() + 12;
- }
- if (bodst->getOrientation()==LinkableMapObj::LeftOfCenter)
- move ( bodst->getChildRefPos().x() - linkwidth - bboxTotal.width(), y );
- else
- move ( bodst->getChildRefPos().x() + linkwidth, y );
- }
-
- // updateLinkGeometry is called implicitly in move
- requestReposition();
-}
-
-void BranchObj::unsetParObjTmp()
-{
- if (tmpParent)
- {
- tmpParent=false;
- link2ParPos=false;
- parObj=parObjTmpBuf;
- parObjTmpBuf=NULL;
- setLinkStyle (getDefLinkStyle(treeItem->parent() ) );
- updateLinkGeometry();
- }
-}
-
-void BranchObj::setVisibility(bool v, int toDepth)
-{
- BranchItem *bi=(BranchItem*)treeItem;
- if (bi->depth() <= toDepth)
- {
- frame->setVisibility(v);
- heading->setVisibility(v);
- systemFlags->setVisibility(v);
- standardFlags->setVisibility(v);
- LinkableMapObj::setVisibility (v);
- int i;
- for (i=0; iimageCount(); ++i)
- treeItem->getImageObjNum(i)->setVisibility (v);
- for (i=0; ixlinkCount(); ++i)
- treeItem->getXLinkObjNum(i)->setVisibility ();
-
- // Only change children, if I am not scrolled
- if (! bi->isScrolled() && (bi->depth() < toDepth))
- {
- // Now go recursivly through all children
- for (i=0; ibranchCount(); ++i)
- treeItem->getBranchObjNum(i)->setVisibility (v,toDepth);
- }
- }
-}
-
-void BranchObj::setVisibility(bool v)
-{
- setVisibility (v,MAX_DEPTH);
-}
-
-
-void BranchObj::setLinkColor ()
-{
- // Overloaded from LinkableMapObj
- // BranchObj can use color of heading
-
- VymModel *model=treeItem->getModel();
- if (model)
- {
- if (model->getMapLinkColorHint()==HeadingColor)
- LinkableMapObj::setLinkColor (heading->getColor() );
- else
- LinkableMapObj::setLinkColor ();
- }
-}
-
-void BranchObj::positionContents()
-{
- OrnamentedObj::positionContents();
- updateLinkGeometry();// required before positioning images
- for (int i=0; iimageCount(); ++i)
- treeItem->getImageObjNum(i)->reposition();
-}
-
-void BranchObj::move (double x, double y)
-{
- OrnamentedObj::move (x,y);
-}
-
-void BranchObj::move (QPointF p)
-{
- move (p.x(), p.y());
-}
-
-void BranchObj::moveBy (double x, double y)
-{
- OrnamentedObj::moveBy (x,y);
- for (int i=0; ibranchCount(); ++i)
- treeItem->getBranchObjNum(i)->moveBy (x,y);
- positionBBox();
-}
-
-void BranchObj::moveBy (QPointF p)
-{
- moveBy (p.x(), p.y());
-}
-
-void BranchObj::positionBBox() // FIXME-3 consider dimensions of frame (thickness, geometry, padding...
-{
- QPointF ap=getAbsPos();
- bbox.moveTopLeft (ap);
- positionContents(); // this positions FIOs
-
- //Update links to other branches
- XLinkObj *xlo;
- for (int i=0; ixlinkCount(); ++i)
- {
- xlo=treeItem->getXLinkObjNum(i);
- if (xlo) xlo->updateXLink();
- }
-}
-
-void BranchObj::calcBBoxSize()
-{
- QSizeF heading_r=heading->getSize();
- qreal heading_w=(qreal) heading_r.width() ;
- qreal heading_h=(qreal) heading_r.height() ;
- QSizeF sysflags_r=systemFlags->getSize();
- qreal sysflags_h=sysflags_r.height();
- qreal sysflags_w=sysflags_r.width();
- QSizeF stanflags_r=standardFlags->getSize();
- qreal stanflags_h=stanflags_r.height();
- qreal stanflags_w=stanflags_r.width();
- qreal w;
- qreal h;
-
- // set width to sum of all widths
- w=heading_w + sysflags_w + stanflags_w;
-
- // set height to maximum needed height
- h=max (sysflags_h,stanflags_h);
- h=max (h,heading_h);
-
- // Save the dimension of flags and heading
- ornamentsBBox.setSize ( QSizeF(w,h));
-
- // clickBox includes Flags and Heading
- clickPoly=QPolygonF (ornamentsBBox);
-
- // Floatimages
- QPointF rp;
-
- topPad = botPad = leftPad = rightPad = 0;
- bool incV=((BranchItem*)treeItem)->getIncludeImagesVer();
- bool incH=((BranchItem*)treeItem)->getIncludeImagesHor();
- if (incH || incV)
- {
- FloatImageObj *fio;
- for (int i=0; iimageCount(); ++i )
- {
- fio=treeItem->getImageObjNum(i);
- rp=fio->getRelPos();
- if (incV)
- {
- qreal y;
- if (rp.y() > 0)
- {
- y = rp.y() + fio->height()/2 - ornamentsBBox.height()/2;
- botPad = max(botPad, y);
- } else
- {
- y=-rp.y() + fio->height()/2 - ornamentsBBox.height()/2;
- topPad=max(topPad, y);
- }
- }
- if (incH)
- {
- qreal x;
- if (rp.x() > 0)
- {
- x=rp.x() + fio->width()/2 - ornamentsBBox.width()/2;
- rightPad=max(rightPad, x);
- } else
- {
- x=-rp.x() + fio->width()/2 - ornamentsBBox.width()/2;
- leftPad=max(leftPad, x);
- }
- }
- }
- h += topPad + botPad;
- w += leftPad + rightPad;
- }
-
- // Frame thickness
- w += frame->getTotalPadding() * 2;
- h += frame->getTotalPadding() * 2;
-
- // Finally set size
- bbox.setSize (QSizeF (w,h));
- //if (debug) qDebug()<<"BO: calcBBox "<getHeading()<<" bbox="<getType() == TreeItem::MapCenter)
- {
- // set childRefPos to middle of MapCenterObj
- QRectF r=clickPoly.boundingRect();
- childRefPos.setX( r.topLeft().x() + r.width()/2 );
- childRefPos.setY( r.topLeft().y() + r.height()/2 );
- parPos=childRefPos;
- for (int i=0; ibranchCount(); ++i)
- treeItem->getBranchObjNum(i)->updateLinkGeometry();
- } else
- {
- if (orientation == LinkableMapObj::LeftOfCenter )
- {
- // Left of center
- if ( ((BranchItem*)treeItem)->getFrameIncludeChildren() )
- {
- childRefPos=QPointF (ornamentsBBox.bottomLeft().x() - leftPad, bottomlineY);
- parPos=QPointF (bboxTotal.bottomRight().x()-frame->getPadding()/2, bottomlineY);
- } else
- {
- childRefPos=QPointF (ornamentsBBox.bottomLeft().x() - frame->getPadding(), bottomlineY);
- parPos=QPointF (ornamentsBBox.bottomRight().x(), bottomlineY);
- }
- } else
- {
- // Right of center
- if ( ((BranchItem*)treeItem)->getFrameIncludeChildren() )
- {
- childRefPos=QPointF(ornamentsBBox.bottomRight().x() + rightPad , bottomlineY);
- parPos=QPointF ( bboxTotal.bottomLeft().x()+frame->getPadding()/2, bottomlineY);
- } else
- {
- childRefPos=QPointF(ornamentsBBox.bottomRight().x() + frame->getPadding(), bottomlineY);
- parPos=QPointF ( ornamentsBBox.bottomLeft().x(), bottomlineY);
- }
- }
- }
-}
-
-void BranchObj::updateData()
-{
- if (!treeItem)
- {
- qWarning ("BranchObj::udpateHeading treeItem==NULL");
- return;
- }
- QString s = treeItem->getHeadingText();
- if ( s!=heading->text()) heading->setText (s);
-
- QStringList TIactiveFlags=treeItem->activeStandardFlagNames();
-
- // Add missing standard flags active in TreeItem
- for (int i=0;i<=TIactiveFlags.size()-1;i++)
- {
- if (!standardFlags->isActive (TIactiveFlags.at(i) ))
- {
- Flag *f=standardFlagsMaster->getFlag(TIactiveFlags.at(i));
- if (f) standardFlags->activate (f);
- }
- }
- // Remove standard flags no longer active in TreeItem
- QStringList BOactiveFlags=standardFlags->activeFlagNames();
- for (int i=0;ideactivate (BOactiveFlags.at(i));
-
- // Add missing system flags active in TreeItem
- TIactiveFlags=treeItem->activeSystemFlagNames();
- for (int i=0;iisActive (TIactiveFlags.at(i) ))
- {
- Flag *f=systemFlagsMaster->getFlag(TIactiveFlags.at(i));
- if (f) systemFlags->activate (f);
- }
- }
- // Remove system flags no longer active in TreeItem
- BOactiveFlags=systemFlags->activeFlagNames();
- for (int i=0;ideactivate (BOactiveFlags.at(i));
- }
- calcBBoxSize();
-}
-
-void BranchObj::setDefAttr (BranchModification mod, bool keepFrame)
-{
- QFont font=treeItem->getModel()->getMapDefaultFont();
- qreal fontsize=font.pointSizeF();
- switch (treeItem->depth())
- {
- case 0:
- break;
- case 1:
- fontsize=fontsize-2;
- break;
- case 2:
- fontsize=fontsize-4;
- break;
- default:
- fontsize=fontsize-6;
- break;
- }
- setLinkStyle(getDefLinkStyle(treeItem->parent() ));
- setLinkColor ();
- font.setPointSizeF (fontsize);
- heading->setFont(font );
-
- if (mod==NewBranch && !keepFrame)
- {
- if (treeItem->depth()==0)
- setFrameType (FrameObj::Rectangle);
- else
- setFrameType (FrameObj::NoFrame);
- }
- if (mod==NewBranch)
- setColor (treeItem->getHeadingColor() );
- else
- {
- // Relinked mapcenters
- if (!keepFrame && getFrameType()!=FrameObj::NoFrame)
- setFrameType (FrameObj::NoFrame);
-
- // Also set styles for children
- for (int i=0; ibranchCount(); ++i)
- treeItem->getBranchObjNum(i)->setDefAttr(MovedBranch, keepFrame);
- }
- calcBBoxSize();
-}
-
-void BranchObj::alignRelativeTo (QPointF ref,bool alignSelf)
-{
- // Define some heights
- qreal th = bboxTotal.height();
- qreal ch=0; // Sum of childrens heights
- for (int i=0; ibranchCount(); ++i)
- ch+=treeItem->getBranchObjNum(i)->getTotalBBox().height();
-
- int depth = 0;
- BranchItem::LayoutHint layoutHint = BranchItem::AutoPositioning;
- if (parObj)
- {
- TreeItem *pi = parObj->getTreeItem();
- depth = 1 + pi->depth();
- layoutHint = ((BranchItem*)treeItem)->parentBranch()->getChildrenLayout();
- }
-
- // set useRelPos, depending on layout
- if (depth > 1)
- {
- if (layoutHint == BranchItem::FreePositioning)
- {
- if (!useRelPos)
- {
- useRelPos = true;
- // if we used relPos before, set known positions
- // "known" means any position != (0,0)
- if (relPos == QPointF(0,0) )
- // use current position to get relPos()
- setRelPos();
- }
- }
- else
- useRelPos = false;
- }
-
-// TODO testing
-/*
- if (debug)
- {
- QString o;
- switch (orientation)
- {
- case UndefinedOrientation: o = "UndefOrientation"; break;
- case LeftOfCenter: o = "LeftOfCenter"; break;
- case RightOfCenter: o = "RightOfCenter"; break;
- }
-
- QString h=QString (depth+1,' ');
- h += treeItem->getHeadingPlain();
- h += QString (25,' ');
- h.truncate (25);
- QPointF pp;
- if (parObj) pp = parObj->getChildRefPos();
- qDebug() << "BO::alignRelTo for "<isScrolled() ) return;
-
- // Set reference point for alignment of children
- QPointF ref2;
- if (orientation==LinkableMapObj::LeftOfCenter)
- ref2.setX(childRefPos.x() - linkwidth);
- else
- ref2.setX(childRefPos.x() + linkwidth);
-
- if (depth==1)
- ref2.setY (absPos.y() + (bbox.height() - ch)/2);
- else
- {
- if (ch > th)
- ref2.setY (ref.y() + frame->getPadding());
- else
- // Parent is bigger than all of childs, center childs vertically
- ref2.setY (ref.y() + (th - ch)/2 );
- }
-
- // Align the branch children depending on reference point
- for (int i=0; ibranchCount(); ++i)
- {
- if (!treeItem->getBranchNum(i)->isHidden())
- {
- treeItem->getBranchObjNum(i)->alignRelativeTo (ref2,true);
-
- // append next branch below current one
- ref2.setY(ref2.y() + treeItem->getBranchObjNum(i)->getTotalBBox().height() );
- }
- }
-}
-
-void BranchObj::reposition()
-{
-/* TODO testing only
- if (debug)
- {
- if (!treeItem->getHeading().isEmpty())
- qDebug()<< " BO::reposition a) d="<depth()<<" "<getHeading();
- else
- qDebug()<< " BO::reposition a) d="<depth()<<" ???";
- }
-*/
-
- if (treeItem->depth()==0)
- // only calculate the sizes once. If the deepest LMO
- // changes its height,
- // all upper LMOs have to change, too.
- calcBBoxSizeWithChildren();
-
- alignRelativeTo ( QPointF (absPos.x(),
- absPos.y()-(bboxTotal.height()-bbox.height())/2) );
-}
-
-void BranchObj::unsetAllRepositionRequests()
-{
- repositionRequest=false;
- for (int i=0; ibranchCount(); ++i)
- treeItem->getBranchObjNum(i)->unsetAllRepositionRequests();
-}
-
-QRectF BranchObj::getTotalBBox()
-{
- return bboxTotal;
-}
-
-ConvexPolygon BranchObj::getBoundingPolygon()
-{
- if (treeItem->branchCount()==0 || treeItem->depth()==0)
- {
- if (boundingPolygon)
- boundingPolygon->setPolygon (MapObj::getBoundingPolygon() );
- return MapObj::getBoundingPolygon();
- }
-
- QPolygonF p;
- p<setPolygon (p );
- return p;
-}
-
-void BranchObj::calcBBoxSizeWithChildren()
-{
- // if branch is scrolled, ignore children, but still consider floatimages
- BranchItem *bi=(BranchItem*)treeItem;
- if ( bi->isScrolled() )
- {
- bboxTotal.setWidth (bbox.width());
- bboxTotal.setHeight(bbox.height());
- return;
- }
-
- if (bi->isHidden())
- {
- bboxTotal.setWidth (0);
- bboxTotal.setHeight(0);
- return;
- }
-
- QRectF r(0,0,0,0);
- QRectF br;
-
- // Now calculate
- // sum of heights
- // maximum of widths
- // minimum of y
- for (int i=0; ibranchCount(); i++)
- {
- if (!bi->getBranchNum(i)->isHidden())
- {
- BranchObj *bo=bi->getBranchObjNum(i);
- bo->calcBBoxSizeWithChildren();
- br=bo->getTotalBBox();
- r.setWidth( max (br.width(), r.width() ));
- r.setHeight(br.height() + r.height() );
- }
- }
-
- // Add myself and also
- // add width of link to sum if necessary
- if (bi->branchCount()<1)
- bboxTotal.setWidth (bbox.width() + r.width() );
- else
- bboxTotal.setWidth (bbox.width() + r.width() + linkwidth );
-
- // bbox already contains frame->padding()*2
- bboxTotal.setHeight(max (r.height() + frame->getPadding()*2, bbox.height()) );
-}
-
-void BranchObj::setAnimation(const AnimPoint &ap)
-{
- anim=ap;
-}
-
-void BranchObj::stopAnimation()
-{
- anim.stop();
- if (useRelPos)
- setRelPos (anim);
- else
- move (anim);
-}
-
-bool BranchObj::animate()
-{
- anim.animate ();
- if ( anim.isAnimated() )
- {
- if (useRelPos)
- setRelPos (anim);
- else
- move (anim);
- return true;
- }
- return false;
-}
-
diff --git a/branchobj.h b/branchobj.h
deleted file mode 100644
index 7a1c5d1..0000000
--- a/branchobj.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef BRANCHOBJ_H
-#define BRANCHOBJ_H
-
-#include "floatimageobj.h"
-#include "linkablemapobj.h"
-#include "ornamentedobj.h"
-#include "xlinkobj.h"
-
-/*! \brief A branch visible in the map */
-
-/////////////////////////////////////////////////////////////////////////////
-class BranchObj:public OrnamentedObj {
-public:
- /*! New branches will get use same color for heading as parent */
- enum BranchModification {NewBranch, MovedBranch};
-
- BranchObj (QGraphicsItem *parent=NULL,TreeItem *ti=NULL);
- ~BranchObj ();
- virtual void init ();
- virtual void copy (BranchObj*);
- void clear();
-
- virtual void setParObjTmp (LinkableMapObj*,QPointF,int);// Only for moving Obj around
- virtual void unsetParObjTmp(); // reuse original ParObj
-
- virtual void setVisibility(bool,int); // set visibility
- virtual void setVisibility(bool); // set vis. for w
- virtual void setLinkColor(); // set the color of link
-
- virtual void positionContents();
- virtual void move (double x,double y);
- virtual void move (QPointF);
- virtual void moveBy (double x,double y);
- virtual void moveBy (QPointF);
-
- virtual void positionBBox();
- virtual void calcBBoxSize();
- virtual void setDockPos();
-
- virtual void updateData(); //! Update represantatio of heading, flags, etc.
-
-public:
- virtual void setDefAttr (BranchModification, bool keepFrame=false); // set default attributes (frame, font, size, ...)
-
- virtual void alignRelativeTo(const QPointF, bool alignSelf=false );
- virtual void reposition();
- virtual void unsetAllRepositionRequests();
-
- virtual QRectF getTotalBBox(); // return size of BBox including children
- virtual ConvexPolygon getBoundingPolygon();
- virtual void calcBBoxSizeWithChildren(); // calc size of BBox including children recursivly
-
- virtual void setAnimation(const AnimPoint &ap);
- virtual void stopAnimation();
- virtual bool animate();
-
-protected:
- AnimPoint anim;
-};
-
-
-#endif
-
diff --git a/branchpropeditor.cpp b/branchpropeditor.cpp
deleted file mode 100644
index c5d7a6d..0000000
--- a/branchpropeditor.cpp
+++ /dev/null
@@ -1,404 +0,0 @@
-#include "branchpropeditor.h"
-
-#include
-
-#include "branchitem.h"
-#include "frameobj.h"
-#include "settings.h"
-#include "vymmodel.h"
-
-extern Settings settings;
-extern QString vymName;
-
-
-BranchPropertyEditor::BranchPropertyEditor (QWidget *parent): QDialog (parent) // FIXME-4 not updating when data is set elsewhere (connect to dataCHanged)
-
-{
- ui.setupUi (this);
-
- setWindowTitle (vymName +" - " +tr ("Property Editor","Window caption"));
-
- branchObj=NULL;
- branchItem=NULL;
- model=NULL;
-
- ui.tabWidget->setEnabled(false);
-
- penColor=QColor (Qt::black);
- brushColor=QColor (Qt::black);
- QPixmap pix( 16,16);
- pix.fill (penColor);
- ui.framePenColorButton->setIcon (pix);
- ui.frameBrushColorButton->setIcon (pix);
-
- if (!settings.value( "/mainwindow/showTestMenu",false).toBool() )
- ui.tabWidget->widget (3)->hide();
-
-
- /* Create Model and View to hold attributes
- attributeModel = new QStandardItemModel (1,3,this);
- attributeModel->setHeaderData(0, Qt::Horizontal, tr("Name","Branchprop window: Attribute name"));
- attributeModel->setHeaderData(1, Qt::Horizontal, tr("Value","Branchprop window: Attribute value"));
- attributeModel->setHeaderData(2, Qt::Horizontal, tr("Type","Branchprop window: Attribute type"));
- ui.attributeTableView->setModel (attributeModel);
- */
-
- // Load Settings
- resize (settings.value ( "/satellite/propertywindow/geometry/size", QSize(450,600)).toSize());
- move (settings.value ( "/satellite/propertywindow/geometry/pos", QPoint (250,50)).toPoint());
-
- if (settings.value ( "/satellite/propertywindow/showWithMain",true).toBool())
- show();
- else
- hide();
-}
-
-BranchPropertyEditor::~BranchPropertyEditor ()
-{
- settings.setValue( "/satellite/propertywindow/geometry/size", size() );
- settings.setValue( "/satellite/propertywindow/geometry/pos", pos() );
- settings.setValue( "/satellite/propertywindow/showWithMain",isVisible() );
-}
-
-void BranchPropertyEditor::setItem (TreeItem *ti)
-{
- disconnectSignals();
- if (!ti)
- ui.tabWidget->setEnabled (false);
- else if (ti->isBranchLikeType() )
- {
- branchItem=(BranchItem*)ti;
-
- branchObj=(BranchObj*)(branchItem->getLMO());
- if (branchObj) // FIXME-4 replace by branchItem later, when Frame is ported...
- {
- ui.tabWidget->setEnabled (true);
- for (int i=0; i<3;++i)
- ui.tabWidget->setTabEnabled (i,true);
- ui.tabWidget->setTabEnabled (3,false);
-
- // Frame
- FrameObj::FrameType t=branchObj->getFrameType();
- if (t==FrameObj::NoFrame) // FIXME-3 Check if all below depends on frame type???
- {
- ui.frameTypeCombo->setCurrentIndex (0);
- penColor=Qt::white;
- brushColor=Qt::white;
- ui.colorGroupBox->setEnabled (false);
- ui.framePaddingSpinBox->setEnabled (false);
- ui.frameWidthSpinBox->setEnabled (false);
- ui.framePaddingLabel->setEnabled (false);
- ui.frameBorderLabel->setEnabled (false);
- ui.includeChildrenCheckBox->setEnabled (false);
- ui.includeChildrenCheckBox->setEnabled (false);
- } else
- {
- penColor=branchObj->getFramePenColor();
- brushColor=branchObj->getFrameBrushColor();
- QPixmap pix( 16,16);
- pix.fill (penColor);
- ui.framePenColorButton->setIcon (pix);
- pix.fill (brushColor);
- ui.frameBrushColorButton->setIcon (pix);
- ui.colorGroupBox->setEnabled (true);
- ui.framePaddingSpinBox->setEnabled (true);
- ui.framePaddingSpinBox->setValue (branchObj->getFramePadding());
- ui.frameWidthSpinBox->setEnabled (true);
- ui.frameWidthSpinBox->setValue (branchObj->getFrameBorderWidth());
- ui.framePaddingLabel->setEnabled (true);
- ui.frameBorderLabel->setEnabled (true);
- ui.includeChildrenCheckBox->setEnabled (true);
-
- switch (t)
- {
- case FrameObj::Rectangle:
- ui.frameTypeCombo->setCurrentIndex (1);
- break;
- case FrameObj::RoundedRectangle:
- ui.frameTypeCombo->setCurrentIndex (2);
- break;
- case FrameObj::Ellipse:
- ui.frameTypeCombo->setCurrentIndex (3);
- break;
- case FrameObj::Cloud:
- ui.frameTypeCombo->setCurrentIndex (4);
- break;
- default:
- break;
- }
- if (branchItem->getFrameIncludeChildren())
- ui.includeChildrenCheckBox->setCheckState (Qt::Checked);
- else
- ui.includeChildrenCheckBox->setCheckState (Qt::Unchecked);
- }
- // Link
- if (branchItem->getHideLinkUnselected())
- ui.hideLinkIfUnselected->setCheckState (Qt::Checked);
- else
- ui.hideLinkIfUnselected->setCheckState (Qt::Unchecked);
-
- // Layout
- if (branchItem->getIncludeImagesVer())
- ui.incImgVer->setCheckState (Qt::Checked);
- else
- ui.incImgVer->setCheckState (Qt::Unchecked);
- if (branchItem->getIncludeImagesHor())
- ui.incImgHor->setCheckState (Qt::Checked);
- else
- ui.incImgHor->setCheckState (Qt::Unchecked);
- if (branchItem->getChildrenLayout() == BranchItem::FreePositioning)
- ui.childrenFreePositioning->setCheckState( Qt::Checked);
- else
- ui.childrenFreePositioning->setCheckState( Qt::Unchecked);
-
-
- /*
- // Attributes
- attributeModel->removeRows(0, attributeModel->rowCount(), QModelIndex());
-
- // some samples for attribute testing
- QStringList attrTypes=mapEditor->attributeTable()->getTypes();
- for (int i=0; iinsertRow (i,QModelIndex ());
- attributeModel->setData(attributeModel->index(i, 0, QModelIndex()), QString ("Name %1").arg(i));
- attributeModel->setData(attributeModel->index(i, 1, QModelIndex()), i);
- attributeModel->setData(attributeModel->index(i, 2, QModelIndex()), attrTypes.at(i));
- }
-
-
- ui.attributeTableView->resizeColumnsToContents();
-
- // Initialize Delegate
- delegate.setAttributeTable (mapEditor->attributeTable());
- ui.attributeTableView->setItemDelegate (&delegate);
- */
-
- // Finally activate signals
- connectSignals();
- } // BranchItem
- } else if (ti->getType()==TreeItem::Attribute)
- {
- ui.tabWidget->setEnabled (true);
- for (int i=0; i<3;++i)
- ui.tabWidget->setTabEnabled (i,false);
- ui.tabWidget->setTabEnabled (3,true);
- } else
- {
- ui.tabWidget->setEnabled (false);
- }
-}
-
-void BranchPropertyEditor::setModel (VymModel *m)
-{
- model=m;
- if (model)
- setItem (model->getSelectedItem() );
- else
- ui.tabWidget->setEnabled (false);
-
-}
-
-void BranchPropertyEditor::frameTypeChanged (int i)
-{
- if (model)
- {
- switch (i)
- {
- case 0: model->setFrameType (FrameObj::NoFrame); break;
- case 1:
- model->setFrameType (FrameObj::Rectangle);
- break;
- case 2:
- model->setFrameType (FrameObj::RoundedRectangle);
- break;
- case 3:
- model->setFrameType (FrameObj::Ellipse);
- break;
- case 4:
- model->setFrameType (FrameObj::Cloud);
- break;
- }
- setItem (branchItem);
- }
-}
-
-void BranchPropertyEditor::framePenColorClicked()
-{
- if (model)
- {
- QColor col = QColorDialog::getColor( penColor, this );
- if ( col.isValid() )
- {
- penColor=col;
- model->setFramePenColor (penColor);
- }
- }
-}
-
-void BranchPropertyEditor::frameBrushColorClicked()
-{
- if (model)
- {
- QColor col = QColorDialog::getColor( brushColor, this );
- if ( col.isValid() )
- {
- brushColor=col;
- model->setFrameBrushColor (brushColor);
- }
- }
-}
-
-void BranchPropertyEditor::framePaddingChanged(int i)
-{
- if (model) model->setFramePadding (i);
-}
-
-void BranchPropertyEditor::frameBorderWidthChanged(int i)
-{
- if (model) model->setFrameBorderWidth(i);
-}
-
-void BranchPropertyEditor::frameIncludeChildrenChanged(int i)
-{
- if (model) model->setFrameIncludeChildren(i);
-}
-
-void BranchPropertyEditor::linkHideUnselectedChanged (int i)
-{
- if (!branchItem) return;
- model->setHideLinkUnselected(i);
-}
-
-void BranchPropertyEditor::incImgVerChanged (int i)
-{
- if (model) model->setIncludeImagesVer (i);
-}
-
-void BranchPropertyEditor::incImgHorChanged (int i)
-{
- if (model) model->setIncludeImagesHor (i);
-}
-
-void BranchPropertyEditor::childrenFreePositioningChanged (int i)
-{
- if (model)
- {
- if (i>0)
- model->setChildrenLayout( BranchItem::FreePositioning);
- else
- model->setChildrenLayout( BranchItem::AutoPositioning);
- }
-}
-
-void BranchPropertyEditor::closeEvent( QCloseEvent* ce )
-{
- ce->accept(); // can be reopened with show()
- hide();
- emit (windowClosed() );
- return;
-}
-
-/*
-void BranchPropertyEditor::addAttributeClicked()
-{
- // Add empty line for adding attributes
- attributeModel->insertRow (attributeModel->rowCount (),QModelIndex ());
- attributeModel->setData(attributeModel->index(attributeModel->rowCount()-1, 0, QModelIndex()), "Add new");
- attributeModel->setData(attributeModel->index(attributeModel->rowCount()-1, 2, QModelIndex()), "Undefined");
-
- // Select attribute from list
- ui.attributeTableView->edit (attributeModel->index(attributeModel->rowCount()-1,0, QModelIndex() ));
- ui.attributeTableView->resizeColumnsToContents();
-
-// QString attname=attributeModel->in
-// attributeModel->setData(attributeModel->index(attributeModel->rowCount()-1, 2, QModelIndex()), );
-
-
-
- ui.attributeTableView->edit (attributeModel->index(attributeModel->rowCount()-1,1, QModelIndex() ));
-
-}
-
-void BranchPropertyEditor::deleteAttributeClicked()
-{
- //qDebug() << "BPW::delete";
-}
-*/
-
-void BranchPropertyEditor::connectSignals()
-{
- // Frame
- connect (
- ui.framePenColorButton, SIGNAL (clicked()),
- this, SLOT (framePenColorClicked()));
- connect (
- ui.framePaddingSpinBox, SIGNAL (valueChanged( int)),
- this, SLOT (framePaddingChanged (int)));
- connect (
- ui.frameWidthSpinBox, SIGNAL (valueChanged( int)),
- this, SLOT (frameBorderWidthChanged (int)));
- connect (
- ui.frameBrushColorButton, SIGNAL (clicked()),
- this, SLOT (frameBrushColorClicked()));
- connect (
- ui.frameTypeCombo, SIGNAL (currentIndexChanged( int)),
- this, SLOT (frameTypeChanged (int)));
- connect (
- ui.includeChildrenCheckBox, SIGNAL (stateChanged( int)),
- this, SLOT (frameIncludeChildrenChanged (int)));
-
- // Link
- connect (
- ui.hideLinkIfUnselected, SIGNAL (stateChanged( int)),
- this, SLOT (linkHideUnselectedChanged (int)));
-
- // Layout
- connect (
- ui.incImgVer, SIGNAL (stateChanged( int)),
- this, SLOT (incImgVerChanged (int)));
- connect (
- ui.incImgHor, SIGNAL (stateChanged( int)),
- this, SLOT (incImgHorChanged (int)));
- connect (
- ui.childrenFreePositioning, SIGNAL (stateChanged( int)),
- this, SLOT (childrenFreePositioningChanged (int)));
-
-/*
- // Attributes
- connect (
- ui.addAttributeButton, SIGNAL (clicked()),
- this, SLOT (addAttributeClicked()));
- connect (
- ui.deleteAttributeButton, SIGNAL (clicked()),
- this, SLOT (deleteAttributeClicked()));
-*/
-}
-
-
-void BranchPropertyEditor::disconnectSignals()
-{
- // Frame
- disconnect ( ui.frameTypeCombo, 0,0,0);
- disconnect ( ui.framePenColorButton, 0,0,0);
- disconnect ( ui.framePaddingSpinBox, 0,0,0);
- disconnect ( ui.frameWidthSpinBox, 0,0,0);
- disconnect ( ui.frameBrushColorButton, 0,0,0);
- disconnect ( ui.includeChildrenCheckBox, 0,0,0);
-
- // Link
- disconnect ( ui.hideLinkIfUnselected, 0,0,0);
-
- // Layout
- disconnect ( ui.incImgVer, 0,0,0);
- disconnect ( ui.incImgHor, 0,0,0);
- disconnect ( ui.childrenFreePositioning, 0,0,0);
-
- // Attributes
- /*
- disconnect ( ui.addAttributeButton, 0,0,0);
- disconnect ( ui.deleteAttributeButton, 0,0,0);
- */
-}
-
-
diff --git a/branchpropeditor.h b/branchpropeditor.h
deleted file mode 100644
index 26ca3dc..0000000
--- a/branchpropeditor.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef BRANCHPROPERTYEDITOR_H
-#define BRANCHPROPERTYEDITOR_H
-
-#include "ui_branchpropeditor.h"
-
-#include
-#include
-#include
-
-
-//#include "attributedelegate.h"
-#include "branchobj.h"
-
-class QAbstractItemModel;
-class VymModel;
-
-class BranchPropertyEditor:public QDialog
-{
- Q_OBJECT
-public:
- BranchPropertyEditor (QWidget *parent=0);
- ~BranchPropertyEditor ();
- void setItem (TreeItem *);
- void setModel (VymModel *);
-
-private slots:
- void frameTypeChanged (int);
- void framePenColorClicked ();
- void frameBrushColorClicked ();
- void framePaddingChanged(int);
- void frameBorderWidthChanged(int);
- void frameIncludeChildrenChanged(int);
- void linkHideUnselectedChanged (int);
- void incImgVerChanged (int);
- void incImgHorChanged (int);
- void childrenFreePositioningChanged (int);
-// void addAttributeClicked();
-// void deleteAttributeClicked();
-
-signals:
- void windowClosed();
-
-protected:
- void closeEvent( QCloseEvent* );
-
-private:
- void connectSignals();
- void disconnectSignals();
-
- Ui::BranchPropertyEditor ui;
-
- BranchObj *branchObj;
- BranchItem *branchItem;
- VymModel *model;
-
- QColor penColor;
- QColor brushColor;
-
-// QAbstractItemModel *attributeModel;
-
-// AttributeDelegate delegate;
-};
-
-#endif //
diff --git a/bugagent.cpp b/bugagent.cpp
deleted file mode 100644
index d1677d2..0000000
--- a/bugagent.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-#include "bugagent.h"
-
-#include "branchitem.h"
-#include "mainwindow.h"
-#include "vymmodel.h"
-
-#include
-
-extern Main *mainWindow;
-extern QDir vymBaseDir;
-extern bool debug;
-
-
-BugAgent::BugAgent (BranchItem *bi,const QString &u)
-{
- if (!bi)
- {
- qWarning ("Const BugAgent: bi==NULL");
- delete (this);
- return;
- }
- branchID=bi->getID();
- VymModel *model=bi->getModel();
- modelID=model->getModelID();
-
- //qDebug()<<"Constr. BugAgent for "<start (bugScript,args);
- if (!p->waitForStarted())
- {
- qWarning()<<"BugAgent::getBugzillaData couldn't start "<setHeading ("Updating: "+bi->getHeadingPlain(),bi );//FIXME-4 translation needed?
-
-}
-
-BugAgent::~BugAgent ()
-{
- //qDebug()<<"Destr. BugAgent for "<getStdout().split("\n");
- QString err=p->getErrout();
- if (!err.isEmpty())
- qWarning() << "BugAgent Error: "< "<addNewBranch(missionBI);
- newbi->setURL ("https://bugzilla.novell.com/show_bug.cgi?id="+b);
- if (!newbi)
- qWarning()<<"BugAgent: Couldn't create new branch?!";
- else
- setModelBugzillaData (model, newbi,b);
- }
- }
- } else
- qWarning ()<<"BugAgent: Found model, but not branch #"<setHeadingPlainText ("("+ps+") - " + bugID + " - " + bug_desc[bugID],bi);
- model->colorSubtree (Qt::blue,bi);
- }else
- model->setHeadingPlainText (ps+ " - " + bugID + " - " + bug_desc[bugID],bi);
-}
-
diff --git a/bugagent.h b/bugagent.h
deleted file mode 100644
index aa9a0d8..0000000
--- a/bugagent.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef BUGAGENT_H
-#define BUGAGENT_H
-
-#include
-#include
-
-#include "vymprocess.h"
-
-class BranchItem;
-class VymModel;
-
-class BugAgent:public QObject
-{
- Q_OBJECT
-
-enum MissionType {SingleBug,Query};
-
-public:
- BugAgent (BranchItem *bi,const QString &bug);
- ~BugAgent();
-
-public slots:
- virtual void processFinished(int exitCode, QProcess::ExitStatus exitStatus);
-
-protected:
- virtual void processBugzillaData ();
- virtual void setModelBugzillaData (VymModel *model, BranchItem *bi,const QString &bugID);
-
-private:
- MissionType missionType;
- uint branchID;
- uint modelID;
- QString url;
- QString bugID;
- QString bugScript;
- QStringList result;
- VymProcess *p;
-
- QHash bug_desc;
- QHash bug_prio;
- QHash bug_sev;
- QHash bug_deltats;
- QHash bug_status;
- QHash bug_whiteboard;
-
-};
-#endif
-
diff --git a/cmake/Findcppcheck.cmake b/cmake/Findcppcheck.cmake
deleted file mode 100644
index 7cfdc74..0000000
--- a/cmake/Findcppcheck.cmake
+++ /dev/null
@@ -1,160 +0,0 @@
-# - try to find cppcheck tool
-#
-# Cache Variables:
-# CPPCHECK_EXECUTABLE
-#
-# Non-cache variables you might use in your CMakeLists.txt:
-# CPPCHECK_FOUND
-# CPPCHECK_POSSIBLEERROR_ARG
-# CPPCHECK_UNUSEDFUNC_ARG
-# CPPCHECK_STYLE_ARG
-# CPPCHECK_QUIET_ARG
-# CPPCHECK_INCLUDEPATH_ARG
-# CPPCHECK_FAIL_REGULAR_EXPRESSION
-# CPPCHECK_WARN_REGULAR_EXPRESSION
-# CPPCHECK_MARK_AS_ADVANCED - whether to mark our vars as advanced even
-# if we don't find this program.
-#
-# Requires these CMake modules:
-# FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
-#
-# Original Author:
-# 2009-2010 Ryan Pavlik
-# http://academic.cleardefinition.com
-# Iowa State University HCI Graduate Program/VRAC
-#
-# Copyright Iowa State University 2009-2010.
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-
-file(TO_CMAKE_PATH "${CPPCHECK_ROOT_DIR}" CPPCHECK_ROOT_DIR)
-set(CPPCHECK_ROOT_DIR
- "${CPPCHECK_ROOT_DIR}"
- CACHE
- PATH
- "Path to search for cppcheck")
-
-# cppcheck app bundles on Mac OS X are GUI, we want command line only
-set(_oldappbundlesetting ${CMAKE_FIND_APPBUNDLE})
-set(CMAKE_FIND_APPBUNDLE NEVER)
-
-if(CPPCHECK_EXECUTABLE AND NOT EXISTS "${CPPCHECK_EXECUTABLE}")
- set(CPPCHECK_EXECUTABLE "notfound" CACHE PATH FORCE "")
-endif()
-
-# If we have a custom path, look there first.
-if(CPPCHECK_ROOT_DIR)
- find_program(CPPCHECK_EXECUTABLE
- NAMES
- cppcheck
- cli
- PATHS
- "${CPPCHECK_ROOT_DIR}"
- PATH_SUFFIXES
- cli
- NO_DEFAULT_PATH)
-endif()
-
-find_program(CPPCHECK_EXECUTABLE NAMES cppcheck)
-
-# Restore original setting for appbundle finding
-set(CMAKE_FIND_APPBUNDLE ${_oldappbundlesetting})
-
-# Find out where our test file is
-get_filename_component(_cppcheckmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
-set(_cppcheckdummyfile "${_cppcheckmoddir}/Findcppcheck.cpp")
-
-function(_cppcheck_test_arg _resultvar _arg)
- if(NOT CPPCHECK_EXECUTABLE)
- set(${_resultvar} NO)
- return()
- endif()
- execute_process(COMMAND
- "${CPPCHECK_EXECUTABLE}"
- "${_arg}"
- "--quiet"
- "${_cppcheckdummyfile}"
- RESULT_VARIABLE
- _cppcheck_result
- OUTPUT_QUIET
- ERROR_QUIET)
- if("${_cppcheck_result}" EQUAL 0)
- set(${_resultvar} YES PARENT_SCOPE)
- else()
- set(${_resultvar} NO PARENT_SCOPE)
- endif()
-endfunction()
-
-function(_cppcheck_set_arg_var _argvar _arg)
- if("${${_argvar}}" STREQUAL "")
- _cppcheck_test_arg(_cppcheck_arg "${_arg}")
- if(_cppcheck_arg)
- set(${_argvar} "${_arg}" PARENT_SCOPE)
- endif()
- endif()
-endfunction()
-
-if(CPPCHECK_EXECUTABLE)
-
- # Check for the two types of command line arguments by just trying them
- _cppcheck_set_arg_var(CPPCHECK_STYLE_ARG "--enable=style")
- _cppcheck_set_arg_var(CPPCHECK_STYLE_ARG "--style")
- if("${CPPCHECK_STYLE_ARG}" STREQUAL "--enable=style")
-
- _cppcheck_set_arg_var(CPPCHECK_UNUSEDFUNC_ARG "--enable=unusedFunction")
- _cppcheck_set_arg_var(CPPCHECK_INFORMATION_ARG "--enable=information")
- _cppcheck_set_arg_var(CPPCHECK_INCLUDE_ARG "--enable=missingInclude")
- _cppcheck_set_arg_var(CPPCHECK_POSIX_ARG "--enable=posix")
- _cppcheck_set_arg_var(CPPCHECK_POSSIBLEERROR_ARG "--enable=possibleError")
- _cppcheck_set_arg_var(CPPCHECK_POSSIBLEERROR_ARG "--enable=all")
-
- if(MSVC)
- set(CPPCHECK_TEMPLATE_ARG --template vs)
- set(CPPCHECK_FAIL_REGULAR_EXPRESSION "[(]error[)]")
- set(CPPCHECK_WARN_REGULAR_EXPRESSION "[(]style[)]")
- elseif(CMAKE_COMPILER_IS_GNUCXX)
- set(CPPCHECK_TEMPLATE_ARG --template gcc)
- set(CPPCHECK_FAIL_REGULAR_EXPRESSION " error: ")
- set(CPPCHECK_WARN_REGULAR_EXPRESSION " style: ")
- else()
- set(CPPCHECK_TEMPLATE_ARG --template gcc)
- set(CPPCHECK_FAIL_REGULAR_EXPRESSION " error: ")
- set(CPPCHECK_WARN_REGULAR_EXPRESSION " style: ")
- endif()
- elseif("${CPPCHECK_STYLE_ARG}" STREQUAL "--style")
- # Old arguments
- _cppcheck_set_arg_var(CPPCHECK_UNUSEDFUNC_ARG "--unused-functions")
- _cppcheck_set_arg_var(CPPCHECK_POSSIBLEERROR_ARG "--all")
- set(CPPCHECK_FAIL_REGULAR_EXPRESSION "error:")
- set(CPPCHECK_WARN_REGULAR_EXPRESSION "[(]style[)]")
- else()
- # No idea - some other issue must be getting in the way
- message(STATUS
- "WARNING: Can't detect whether CPPCHECK wants new or old-style arguments!")
- endif()
-
- set(CPPCHECK_QUIET_ARG "--quiet")
- set(CPPCHECK_INCLUDEPATH_ARG "-I")
-
-endif()
-
-set(CPPCHECK_ALL
- "${CPPCHECK_EXECUTABLE} ${CPPCHECK_POSSIBLEERROR_ARG} ${CPPCHECK_UNUSEDFUNC_ARG} ${CPPCHECK_STYLE_ARG} ${CPPCHECK_QUIET_ARG} ${CPPCHECK_INCLUDEPATH_ARG} some/include/path")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(cppcheck
- DEFAULT_MSG
- CPPCHECK_ALL
- CPPCHECK_EXECUTABLE
- CPPCHECK_POSSIBLEERROR_ARG
- CPPCHECK_UNUSEDFUNC_ARG
- CPPCHECK_STYLE_ARG
- CPPCHECK_INCLUDEPATH_ARG
- CPPCHECK_QUIET_ARG)
-
-if(CPPCHECK_FOUND OR CPPCHECK_MARK_AS_ADVANCED)
- mark_as_advanced(CPPCHECK_ROOT_DIR)
-endif()
-
-mark_as_advanced(CPPCHECK_EXECUTABLE)
diff --git a/cmake/Findcppcheck.cpp b/cmake/Findcppcheck.cpp
deleted file mode 100644
index 84350db..0000000
--- a/cmake/Findcppcheck.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * \file Findcppcheck.cpp
- * \brief Dummy C++ source file used by CMake module Findcppcheck.cmake
- *
- * \author
- * Ryan Pavlik, 2009-2010
- *
- * http://academic.cleardefinition.com/
- *
- */
-
-
-
-int main(int argc, char* argv[]) {
- return 0;
-}
diff --git a/command.cpp b/command.cpp
deleted file mode 100644
index bc48489..0000000
--- a/command.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "command.h"
-
-#include
-Command::Command (const QString &n, SelectionType st)
-{
- name=n;
- selectionType=st;
-}
-
-QString Command::getName()
-{
- return name;
-}
-
-QString Command::getDescription()
-{
- QString s;
- s=QString("%1\n").arg(name);
- s+=QString(" Selection: %1\n").arg(getSelectionTypeName());
- //s+=QString(" Parameters: %1\n").arg(parCount() );
- for (int i=0;i=0 && n=0 && n=0 && n
-#include
-
-class Command
-{
-public:
- enum SelectionType {Any, TreeItem, Branch, BranchLike, Image, BranchOrImage, XLink};
- enum ParameterType {Undefined,String, Int, Double, Color, Bool};
- Command (const QString &n, SelectionType st);
- QString getName();
- QString getDescription();
- QString getDescriptionLaTeX();
- void addPar (ParameterType t, bool opt, const QString &c=QString() );
- int parCount();
- ParameterType getParType (int n);
- QString getParTypeName (int n);
- SelectionType getSelectionType ();
- QString getSelectionTypeName ();
- bool isParOptional (int n);
- QString getParComment(int n);
-
-private:
- QString name;
- SelectionType selectionType;
- QList parTypes;
- QList parOpts;
- QStringList parComments;
-};
-
-#endif
diff --git a/config/vym.desktop b/config/vym.desktop
new file mode 100644
index 0000000..d0960fe
--- /dev/null
+++ b/config/vym.desktop
@@ -0,0 +1,40 @@
+[Desktop Entry]
+Type=Application
+Exec=vym
+Name=VYM - View Your Mind
+Name[de]=VYM - View Your Mind
+Name[zh_TW]=å¿æºæª¢è¦
+GenericName=Planning and Brainstorming Tool
+Icon=vym
+MimeType=application/x-vym;
+Comment=Planning and brainstorming
+Comment[af]=View Your Mind (Besigitig jou verstand)
+Comment[sq]=View Your Mind (Shfaq Mendjen Tënde)
+Comment[ast]=View Your Mind (Ve la to miente)
+Comment[bn]=View Your Mind (à¦à¦ªà¦¨à¦¾à¦° à¦à¦¦à§à¦¦à§à¦¶à§à¦¯ পà§à¦°à¦¦à¦°à§à¦¶à¦¨ à¦à¦°à§à¦¨)
+Comment[bs]=View Your Mind (Pogledajte svoje misli)
+Comment[ca@valencia]=View Your Mind (Visualitzeu la vostra ment)
+Comment[ca]=View Your Mind (Visualitzeu la vostra ment)
+Comment[zh_CN]=View Your Mind (æµè§æ¨çæç»´)
+Comment[da]=View Your Mind (Vis dit sind)
+Comment[et]=View Your Mind (Vaata oma mõtteid)
+Comment[fi]=View Your Mind (Näytä mielesi)
+Comment[fr]=View Your Mind (Cartographier vos idées)
+Comment[gl]=View Your Mind (Vexa a súa mente)
+Comment[ky]=View Your Mind (ÐкÑлÑÒ£Ð´Ñ Ð¸ÑÑеÑип көÑ)
+Comment[oc]=View Your Mind (Cartografiar vòstras idèas)
+Comment[pl]=View Your Mind (UzewnÄtrznia myÅli)
+Comment[ro]=View Your Mind (HÄrÈi mentale)
+Comment[ru]=View Your Mind (ÐÑоÑмоÑÑ Ð²Ð°ÑиÑ
мÑÑлей)
+Comment[sl]=View Your Mind (Oglejte si svoje misli)
+Comment[es]=View Your Mind (Vea su mente)
+Comment[vi]=View Your Mind (Xem tư duy của bạn)
+Comment[zh_TW]=VYM è
¦åæ¿çªå·¥å
·
+
+X-AppInstall-Package=vym
+X-AppInstall-Popcon=430
+X-AppInstall-Section=universe
+X-Ubuntu-Gettext-Domain=app-install-data
+Categories=Qt;KDE;Office;
+
+
diff --git a/config/vym.xml b/config/vym.xml
new file mode 100644
index 0000000..1a9ac46
--- /dev/null
+++ b/config/vym.xml
@@ -0,0 +1,9 @@
+
+
+
+ VYM - View Your Mind files
+
+
+
+
+
diff --git a/demos/default-dark.vym b/demos/default-dark.vym
new file mode 100644
index 0000000000000000000000000000000000000000..7df80d7f938ea212567e9607cfab9483362e7192
GIT binary patch
literal 1228
zcmWIWW@h1H0D;@peqmq+lwfC&VaUu)OiwM=4-MgDV3wQxI$5@0ZAxhcHv=Qf3uXoe
zmK31U0GtM}0S!pYNlZu5pFxU#Zn*x^;?yF9BSz*PYVxI9j0_A3K+l4LBR8=?uOc@G92_85U~x%m@a>}61_HI;!&kgo-Ffur52G71
zk998R&vlkPZ}RdsSIb!!j~;ll>G3C>Pt3RSF8Lef@kz;NYWCIz??e~7
ztZ-Sr^OkN#u5r58`so*!-~N5|o8~@c{q{u-MV1mS$IXj6zphL3E#V4VaM~#ArSD!G3n3fz~_?Ykb
zVMFP-dA&ET3h}5;ouIVw#v#qyJ!cO^o><_1^wF8LwT9p3{hhkJ?0#9fTfR^1+yCb^
zi@*L!;1_Do>5n+=%)_>0g8L_tLlO?twmRF^y?(gwd3EidpkFNs_OY$=%k1{IX7#Vw
z@j=h3M;7g^qtY-_BXiTDr_mwRCQB=YGb=cAuT!Em#$-{=o4?!Len0&u_M*<_P&Q
zzn4!_o9kMg!!^BIKs)Yj`P`(ZK~C$oy||?OD{d9vkye5FS=%%vzg|jZ<8t(<&f!;0
zyKORC^%CzYjK
M0V>x5W>5wO044QxN&o-=
literal 0
HcmV?d00001
diff --git a/demos/default.vym b/demos/default.vym
new file mode 100644
index 0000000000000000000000000000000000000000..5722de3b73e155a59468e9c04c3105f08c92a26b
GIT binary patch
literal 1835
zcmWIWW@h1H0DOIN04L)KirVwlEl1}#G({}28jTD#lcX~
z@+|CJ#IcRr85tNDfu02gM{Z()UPW#WI5NC|m5t%R#ewYv+G&D_49zcT4qKzq+eolik-v=|@!7J-Az8
zer9)#yN16FScfQj=F`Yk&QcabD>1%jwP2o->=l?zn4#P#FhI|*Q@76
zPItbb?4G-``XPI$g|6F1W)|Ip5p1WL6jN0X6y{}|OYPPyiETYnKV7FcVvASpnyNSY
zm!F>Um+by)ayCEmTweG`qd)C6DO;8t3EA+wC8Aw_&$DTJH=$dI?dqATc3WdFp1%5e#w`ie4s~`
z^S;UCqtTvj2@?IebJs?0l9&s`>Obv4sTdOP@3Zqme(sIE^#&O4;lOwYr9x=D>m?;-
zgX3PY-5|*Th|#h_Y;bP=Yy*LR^Wq;?#+zxXv|X6uIw8wj`s?AiO(vIb)f)fcSaGbc
z$5Yz(_j_yMOABN?p3VEb*Ur7>bCl;M_TcGJs#oLP
zpS}F5?+t(G(elp+73}IJZq7I8ay!@}bnk}K?3RC3jGq>UR0o7fFDicid!kTu6es6W
zmCK>6X5Te;xN0OczW@0niFf5gEp4$~h2k|=D!=V9UD4G#P4Cz5J)&P)=a^s8+q(N_
zY_zZ3j#cgdN?!aty!xT2^t}0|InuzyVG2wf)9&^kGgz;4^>efB4zAnDOP?kl<@I-z
z>s4oOyR@|alAi2UT7?-tV2*y{%Pv6VuhyADQW!qvOOo4&A&bwg14jBQx(Yi=TEo
z#r=A&P_6W*5ALtCP8z??`VgJ6R<~TXE-ZR_cc4n|f+HEH3*IGg_`jaIPG0y`tKi!$
z%Uk^H1B0e8#q4T%7IQ5k_VSb&pYu;#;+*Xh%+J}m$AEWv+^L8sOEc@v7M0od9(o|Z
zOlj^B*09dqE*-7mzkRuNQq?P0nyt8`d`o`i;{~h}y(=syzW%i^WAEp`0?e|^F+$U|aev@SP
z@wrAF$M63CC?DX>$Rx*%tK^h`mZ1U+ZyiBQcsa@nDM!%~4nD)!7?2GEnFcFUNjHld
z#jHlSSpFP)h>@6aWAK2mm5w;ZV7qT~ugG0RW3l0RR~Q8~|x;VP|D?FKKOIXJsulGcqwU
zHZn9WaBgQ+R0#kBKxq74Kxq74b$AN^0R-p+000DJ0000qdSh^9;nH<%+c>dp+cqZV
z#I|)}f7{8#HYc_-nb@}NZ|=SC_v6&5+O>B--D~yJy}GI+l@+BB;qc%>q{UT1
zK)|#?KtNkyp#D9fP>&+~_Xq1Jt>Xd$0=@K~A1Dv77~emoEm5)c`25p~a;e~Vm?3<{0RZy|@p>F1}*oH8mYN|3>X
z{XpPBOdza?gzyiPd5$mlA6h?_7gI5pe=KXTfPytjBaz`ou*+LGpPc5+Y;r|Z@*Y1+
zZT4(Vo1NqlJ^1Gx^ZRvm+Amggwki3|`fQQt+Q@ddp(Y|njR{37M^hHemy&GCp8Es^
ze=O;G#CQH?0v0`Ayq-2A9d7TL-)<$fq+Ohl0|bvOQKyNr=D
zUXBR5cRL+q{LdF?6i9FsL61Zd;({RjXt3`uXWO{|!_HH2akC-8AHQh?z0O1UUxs+a
z%|e#mq-)%M`g-gC_cPg#OJy|eYY}m?e_9xaG>H$3bDR8htIUA9_kj1O-R6NEhX}Ug>X_Kg2Ag)>i>m64O=aSe})Ph
zH5L###yXh5P-^{v7ha8-SO>BV^0KEuMRdaQI(8Tlt=g$5el}9H{l6o`VbhcPctcT8
zdx0OSp%6C}cdXyL3<`(I$FsFnwDC|Dpx+3-<(;hJ66}tBqrE$yO;Cn;yxzb64>#Fv
z!dXv`g3xFnPMCCW+MvbK?e@2~e;^h8Ph27_>T}M=o80yM<7edRJ+l1Y`T5^FqP_+$
zy|XM1?w320k;SXeX#W?fv@BM&SVVfu5`)m|Oh@(GeQZvBxp_LFg+kSCx=?4vsQ`d~BA0VMNG%qoMeE(|kKO%JR9rA%d
ztpKyYTBA2A1x}$Q;s%Z~$8gp>avHtYKjkcWU$(n-4jDoM{vb?2p9TH=VBar|6k06`aFOA)a0Bq9wfe*l3_#(~_lS$Y=&XJ9!3O2beS
zFHHoJ&p|(cf$Q2>et2_trriDWJ|lcy$Vt>|IIV<>c<#Nn{fo%JwDf)R$y_0lMagA+_%1_P;3L%*^*9vM77MQgCIm)AqXACcz%?}O&QHjl
z1VXj9D^6dEDmfpBGAtDeLMkt+Y}+roo=vC$UOC4q47ZGR{q=WfJb^?BEE_`_r7)E`COpplBMT4IsIkT!2mk6
zvy$2^_3&XB-PZct;^;4)p#LGN@9hXW3&L{j`6Aak_hXXbf89a=Pkg+Azvr!XT=C1u
zbN()0n-H{g-IBLKh5N2g_JEi@i({-Yjuv&vN1?QIzT*-stN9ZKf+041T!4^9tcDeP
zT5_?=Ii0$aZfG%Kb+?3)6!MRnAKk9s`_-Pt(a!Xv!YiRi?mOwa=P%rb7Lj5gsJEb&
zXnU%m`}LW^e~?({H-AKNV}%*^k7JSsTcRI8HxEw8CAbm>LPUfp@yG8ec{G{Hd%Q<0
z+OBoPe-VYq!Q45~Td0LAut711TZ@-NcSAe&Vay>lCz;d9bl#fOClmAzA8F~HFEw-|
z&6kkZkKm%dcEBu;Ect~s0v+<-zi;PT^t}du%iCA)e^=$V=OE|0(3Y~Wd;jkFDc~XW
z#V^$J3_By}$J_gRAFZ`*nEN(3-{oQemj9+#Ywz}gcWv`~Ot<#suK=}zstqB74(*l?
zaEyJ&wA9*v!zl+AFc7?dJRpxV*dDNO?vDzM>_WlP#T0g8fAIU
zkv3U*sw|1J04~9gU`LrWmafM;$ez_Tp%gm=fs%+9bt%~t7mF^4qtCm>&0qiB7lsso
z&fI|@v~0qh=;fIy1*9C2RDK4d8*7L`;M5zxe_#m?<^K!%ag
z>;h1Tzd4*v&<(kdt7Yli0fVt_NJLb;6f7Ggi;BzTsKnCwO`;6F2DZucTosRsSPw(7
ze+ECV#P|&M>UxcIs|zu9gxHSS-X%q>+Ya(8tHNp_q?mwy-DDWu;qIhYsMKz9yr@Ic
z#&4F}&^t0D5C{>}1nWY`NyP#=jH=F@JAZqyD2(NCs=J!$G(D_~xYrd|r-LlxHf``+^}w)trCJFEpb^FI5o!
z!_5BdR)RDYZzX7d7mWx<(8Hn}
z;rlvtR2^xc!>%LRf--?3&jL5Ie@g18o4|HtX*#>i9l2AKKNl7y9)239t(Zieb#JFpWH3hT^`iZm!iaYN~;g{xgNfhinFwNq%Ve+v$UWkI6a
zY{eTVMwwXZAjPD))XxlA)6a~+RoM^DTQo0n>A!|`h30?-+=;4^-}MN4?|=e9j1zjiA7etSGmi5U1e%MRcouT5c-*GGh-tFju;
z(nUWw*UA}654g8e|mXJpG}D0z7v)fXZ)ipbaTa2H`EVEp81S&y|VH1e2fLMkaqc^DE^c3L}fLmPpy;dPev?Bo@XAp5Ziy!92cL^$)7EH`QAY#VcSUJ-$?s
ziE`Aw(C+u8vxT(lKv026sc3HG6~-{)ogT5fC(*+&^+HhSG<)h)L%D<02%i_?DXW)1
zIFXaqiaHTZ!$>Ljf7{0FVLCu`NX_NqDP^W-M(bv{O@WmX38t3nC>V)0+Ms7p&Tcj(
z9e>{dIv%9S@}1cWr4z!_BnRf1Z@+N-HU)mIHI=uO5To@L99wY{;8dd=@4(e6B5lf}yvxjYnO>B-+pOzx$p1XOQc&ai_5lf~Yxzo7>6$|`jRO*Z(s%9bW8dtq
z3(9k%7uVV0{{C@Zk?qRfUrEDlrP|ttKc;+E0*@3(iF1_9F`@+k1%ZVR&ihcx=xNs*sTQqo}7CBK2
z%Cc6ENG1-L@#y6BA88n6E_GfPxcValr4gCIGa}OmZ=4{aGFSehQ7Umnd5iu|(GB?A{vR8dbHU*L18w8d2W?l(0LDyL-T%AdPf3d-zEEyeWyf*Fw3nqx}XVI3Y
z0G6V1$G}8E}chy3-Dz>#z;BnpQ`-ilySgk%dyvTf>noCUD8oZ+K=n3yoz0zBLuy(fhN)@xE
zk;aWQ}=gbn85Msx?KPd_{#)TWJ4Af1@3#n1r7!GEY!S8q)87T{-^vdm^SaMFy3+>!@7vzzkqIZN@7o7jn0Qkv4hJFLjL)#I5v93|-q4GkMI>pZ{l8h9OG
zrZMR#e)aRyL)P|T4u$*$O(!wCabz+qOycW570@@=-O41Y&ck?5T&ILS)7>f8$3)
zQV$^bOF)o@h7?dxgYd||p?1zS8_&z;Y3gtCt?-T*C$wwY{60Nt`p#aQ-5@V4IKQ>j
zLGsw@$}!yT0?S`EyBgxHZ}j)If#hR~F;QAt@+PYD1=Zf6Pn2KH}VHeyY8J{-V^HH69I{6_guKBZOIriC)x*-4~bn)^pOX{=Q%!9y1c~DIsoND!8
zzZoQrfB4>a^HM{|^8S2D0&*3hr~8XLD$9u}z;DVz;2y@ApdKWe5^!KGe{5A0!z+L0
zm|lbA+A$AO6vo+HVml;=lu(evy%5=u!HtA_$4z}9>hhTqN+3$q-`_Vh6umP_5-NjI
zh^rL?0cQzIBy4C1l@}V>MCIK7ILf?V9+nY=lIA=LeF<;E=jD8g^8zO3pB*kzUpgTW
zz8Z6S-(%6iZon0&G|YC^5ZTZ^b!5XDKR$`vE|;OzVB2~
z7C%SEU$j!Vrh>&y{H`*lPQ+j3WW)4H?O$N9wtHs4WGYZ{77A)4e89
zwzehjXy8U;i`z~FdfZ!(|9#~7VPP5P4UNL%-KsrZgld-w)sF+P0w#XC}w>Gp+Ru_lE>-Roy}aK>B1s)r7X|Ibark+mrMcpQ+{(W4o@4NUm}LzM%sxlD*}l^YOkRn0o327P=K@jhj^$z
z<)2yoC6;`W(ZbAl1u|4;b|Z|?bP>YZ$KowkTu0e>d1hC@z1NI6h3q!PtrD
z9k^DMS_QgEW!IzozJ@S&68_7cHgipQuJ7Y%&k)MoY=d9kYqw$|EV{dOxr!$5tRLt{
z#i4tu#sy0pERWAmY|rhL*Y7{{WHPa2RHFfxG
zBk*i93P~eD$+cJv^UBE5+sRqRwvM<2lQ(_f&NIRyeNCjAAdOUe0>Do*brCY3&PWmJ)%K7@QP(`v##0Z&hQh!pn18srE8Xg
zYKsQWjhek>O!8u(9C%{5G*pnu=JCq^gi(o$aMnjvkIQy83cvx;+>N4zoC0MW!o+-^
zwC*G9W4YLbnTK=*vHPVHCK4yS&`kN+!6!(ye^tNSq90Ku{a`nUUqgI1k8$&NmSnS&
zK2xn4U*ked3Uw
z#yG?8_Pyv8wBUdHlzJ>p=Y-{RD(^oi8F=&xtO{f;`bavbAo0pwG~^59d#dI61(62K
zf9TVJctrqJG+~5-hg}%zS1>q+)D6T!h$}{Ov;@`TPPWHtO6BIel@U(D;g<>b38J`m
z*DP!KN;byPYgt;j`do$PIgY^v2@N(71tpH}ZjMn3*g5(ArvF<&BP4m&&phfWI$T8&RC5PDOPwHI&AU5=c$UJ8@GlhlNw9T{A-L&K{(24gss2;M}Xn@R;8pd6Rj3Yx3~b^fm9<`|j*@
zXZ_SOpfJLbCgCLyHHc)_R`*GiC3^SjQTwm1$W1d9N-r
zPPMZAfIH)4|xvAH^wfp7%SlfLYE?MK3c1#4>4ckWP
z4a+~4XJv&Od8>LKk*;?@U8G^?QDOJ?IejRON@
zbAS7G3)Jn7bL(0GHzYxot`_x6MO%TM&X5`Hw8`20u4NY{FDH27&QpH|(fB2Ozk;^%
zA=2Sz#D$j)F(JQl+qH&df8e#YWW6zx=jX~`&JrPC#9|Ys`QcnYYcmq*x~A|iw5n=6
zGQvT)&<)(GT#9Shj%y}_z(U_}*FK>ERR5<}#G}b7D3G4W^I%;Q0@OrZFyB~`W#)M1
zGLx&Nr@A0>>Mwb;h-2ydVb#QI4<+LYC$+-MU?7aw&&YXEI&>6De>5{J%7umuX!Zt_
z-GvJtTuTD36QjVw9K*rnCb+968xFj&dk1amJ~^s^>|b7>!_FI)nhu4ADlBGlUJAIx
zuV>b1kL{ALFyl74V%s1#QCC;VmPR;
zXg8ZKf?gQWe}bNr89k^L?p2ofwCGY=T>G9MVgW99p5E&To?H{elm^RtGur!p2fl)h
zL`t_f8lM8Ll9N&hfrz&dvtOl~xSpncAXq!q}I(zIQ^tO>OyI5~EDE|y)a%lsc;l;G;
zoJ^=7f1JGKoS}hZLEKCP9vVmvP8xR#l!oS`yCqmYO
z9*qu-J9aO5PiOcB4&rdZrvY91C4s#?{4W{#W^tA@3f2~TVK|mRNiDpq)aqg{U
za9&=cR`$NDGg~1IJOQQ(t
z!=gQ-*;WG6>RnA-h`qib=ofY4$3AEP)54pn*wgEF`R6|eeBbHHT<*Du$WrC+F6FQR
zKWCAyKF1M`KTJ3tr!jvuaxz5wk7bt0ABJF0nZBjaYW`jv7C^2&TJ5!6Y^@O&@8rnQ
ze@4^VS0a^NnpHN2fj$xHtDbAiCc1}b;;-*Hx|!TUW~GM|8})7$3jUd)NkAUmqif}y
z>h_WnmWW5v?uR&jCQ09HbBiWm>!{u}^)uDIoUd+%K%28*-WQ(R0l{7+a+3rAicmW;
zn{Hi@HCS%MA(fW8
zwG`cLm>QcgrtS8S6X(MfcKvMi$#3JvOH6u7TQkK&Es7;j?g>OzgHH6#nmD_(f2?|j
z{Z{-4hwyvUkUz&L`mff5Ds6{wTNNz#aNP53btuA@cSF||Z|Gm&k`iXl2TylAKGLdQ
znazh6>zN%{%r|Di0jyd!cCkml*AESdZ2x5g3}}xS5WhW!TES;UWfuvg4$YEoXBSuX
z1J={M+EN?fi~*W=04~mBvLadnfBpgLfpsfL?P+;QEYK%Ou!K^Kj!cx6bY#ySZ(Xwv
zHyP6QRQrmif$0;M|M~cP@^z>N*?B9N(w@hUmr5}T@N>*Nb>`q@JlgK#TrO9RL4mepzs8v;BmXdq-jyf~16hybB)ggmkzWDfdaXHF&$2}7Vge(q~v
zTM*=9|CB3dW*{0HYiJP)CUrlwh|D6pawkESGKgtOfmT&y>v&Xp7{=|o@6L1n3uJTN
zIYkwiTSlK;#D+r+$C#qckS=+WxO@FDudKm!70Je_uu4aG!)QTi_{6g?&Y-mn7R`
z@_9wB_H-$B+T9;h{C*`S&bHl~s)0ZI+K-otJ7ip650aEqxyl%-f0~qvrTYw16R;=B
zuGn-brsj!xm(&YlwMAID3cI)`L-M2APp-su0)J-GuRhQ)Ij|~%2wx`7ZZz0CP$R-v
z#uOioTWZ3?GY{T9ND$e=?{5ByBMmOEA)7s%j!4l-!R9P+K;R3L6s!WjyoB>9}
zbrmIP9~+b1A^i6ZcU|3@jNjkccMJ7|DLz*U`lUxRM-=;>e=kq_*8``nzr<5|NSQIi
z+X3%1{@%wnAX2GCAx|;D6!3*0$^y{jqu`PzNCh$^4r)v#O2LY&IcRNSRT;V1%{yI=Lv#bYERfhwo>?=f@^y-AJEvB`LS6}BrH`ZVwX
z4t%ZFNipgef6&ZQJP-@8fN}0T+bH|G^q?rXxhN~%>6wB$?lGu)EdNo9GVD76FWv77
zjl$QErMHRsH-6c6ptJx~I_eIue5n&ZDb}7bynX3qao|4g=_nrfl_;AqF>dW&T_Fx4
zzwdv^fd!J!h0q~R^8;#*yM!g+;63hPTF6|`ZQ;yFfBPp!nI&7D!0$ZhuYH}srsgH3
z7^m+z2!nht*CyYC_k7p;gIH~>=5Y@P$yF?M&fScou?BIT3_m+hlONnB35<1=_)$qd
zeq_ks=dv>&WAi!A!%i<%x{@h7cvn3;W+vr?RSo=tuJ<{G{Jy!_V~dIeQ6`GReKUzj
zsj)b9f8C#-{I2V&qq6JxK|Bziacn$k#o;ta@E#S+BblZ={oGccjS=7fe-{8uPTT@*
z2UoE;eBYg{CaEu9rYQ;`%E8#_xSz3s1W<;$7q2fi47^!xp(gs*Etjn=%LVg+>L8YA
zMJ@U=Af8Qx<;nTkfoQ{+-d0PH6$g60e{wnFn
zK{o6RjPk>9pERr|)RdGymgpL}X63vk1rS4s||fl<40;;jcE1yag`L^u-^Wu%}N
z<-eqW=!dyI+P_M;_2f$>isvNK=W
z1-J%Uj@`oPU~G@>Z8tByr(?RXzgvyH!@3|7m*r#)NFwr!CZ*a^Om^s=Uk+{;w-ELH
zVE+Keu%P;#GpbrE%#un&eS}dte|xP9Y6)~UVjR%*e0|iM;k8pbO_BPuMnsj|;`PEs
zTvX9xyX}A@*>_#o$y)C7_QwaA$v0k2T9pqr15BQDOrL*Bgr!3{8li|=7)b6<>v*Yg
z?q~yHWddA%FWMiAUUXjc1+8&2(mL
zyvwaKgGyG0QlQt1l=iZ*w7y?TA_vY|(7U7bEiDh@A6*ZkUsve`CwlLQJGy-?f8XO&
zu{Rup{wh?m5t=8TY|1{De`2%vlKNsQ?7$;NhF!&SW5&MhpY{(f5{35Uv3x(gsw>*}
zsc@L_E$wo1s?GzS5Z{Hk5OO9YT^q5RZ0LG?!{yBdR$-g!A%p#LwZYOF=UT%|MTe*0
zT5H!tII|`ARUf{m-0dU}7fu{`)H#b0o*gPHVVm4IIxArh;f*3ye`08dCX8^Q(ugw2
zs#uq#JgDVAaSd7px)rRYwkul<=)?5~uU{FsP#ARGEW!MbqQ}5$9-|uC%S;*T#ecO*L
zR`(r~?{fR{28*S@rY?s5`zqM-#SktL&v;BfYkI(@umb8
zfzYwjEh!L7f;7JA$fIT~A~U0-D&kHVa=?z4rwnyxk3Cvs{CFRCYX&DMWS(10j+3lv=H0Q>=yI~g
zUy6pMW`llV`cdT|Gv5zoiiwuGvmUUmeA<=kqhZFFM9>xVf;aUNj-FHLsYE9#Bt~g=
zY0^j)=JNAk#O?3wki;ptx~Jq}3fSs2gryDYjZt-te?QxfmS@6fD3td*Sui)08y93-
z?AZK>4lUOHQf5Imq+XKiuJ#qjgEr(8Q)I_gk=8Ef=@~ikFMMZ5)hTcBmkz$8u5-a1
zMbP6G%B7CKn+;hOT#KpbLqlZ}$=frdWc{|&so?~BMkSl2Y8LQ^G?5^W$sg^o&1iQH
z+)g%we@0F`6uTZOtVfxD2?z@ZP8~_i9J{|sv@Jz9W;LK>#`xV$^+aClFOnqauNcQfX!Kwm=^;aE{1hLUjaSCbi)|1<
zprA%KWo7!x=#>kVK9+JiT%8FKhUYsHe|Kn=uXjF+&oFZ{@;BJr`v47vlD?ccF@Ayt
zA*Yg(fG^(Fe#F)=0<(gAfggPRVdvb23bz6$bN^=sP+iv8CL*esmida!^J;n4Y4xG0
z{%t++-@G$9P~WXd=G%loy38GR6X$jSI9%}$m>&?N-hq0qk*Bg^iZ;TI({PbQf81np
z1@{GOPoy{8)0sIcH`c7~fKhUc0?NC|k4eJO|sSMRg8y3oWsF^Yf@NCv(_m_g>a
z&VS#Hm@c!q=sp_6>uBxAmDgN0e|V7Bd%yiLQljkfZCK33N&sSc`{glK8-}*nqUfFkIvQJS>^bPJ^?p25D^vCe>o+Qek-z&
zQhm3C2>B7_(TdVkEgoATp>Jl{l;GrjK(ibFt&`CVFlY`$!>1#6>Sp#
z@x2o8Ld=M1Go5$~=vojPfAF`K)uE6`FTy7=5v#xyB-y%$}`cYp`sa8Qo
zoAS-paWQ@Plgr?Kc?iwfX(q3KC4N$@&qnvdlHm*k+PdAre5CWz=)-x=^tFG
zI1KZ_kH(b71T*3-S1`z-D*W5W=3O`X#=}JkP%i3Pe$BWT&{yO2Deq*XmgVu$%O=p~
zrFC-h_{Nw?ZS@x=f40D6*rrguAeCnY0yZiSRGt_Zrdyr~sj(`BKH?LSNzt0e85W*b
ze*n=d4#URGC=e_C;!8fQguj^W?IL6eIk5sKM=XJE+$CiNg1@vM-6J4nAuhjr{kgey
zl>4>Fu-^!Z;e1H0tmFm?`k5C}=m3Q*0v3{3VTR-d?;PC
z2$d|2I%nK`L!#{hLW=3W(i1vU)xk0Lr#_w3W=%`a&zLuV)SJ=ae4VKem*ahHYxQMK
zSIW4Ff0Bk`4(-%O?(oPu8@lncQj>hL-e`CfXv;^j)EOj8d9PRd2*v;;3$7q-Q
zObI!Xf3|;YGX>}&33wPb^@5LEjzN)`f%lWr<(sN3wPtqDMvOlE!6lUCP)i3kv7LC_
zKVr7-a+CWnD4x^721?erMF8a~23Q4^nll~+e?dP&IdhlLCEt7EA|d6(LrI<;ch`p&
z6?Y8Y#+>ikqv;ZvL3?Jy28R~C+2yRMCPiW^7jzv)rWNl^QE#o=|GNKW!Zv)9+YTL}
zChonH#+s_2BDibxRiN?^YLCLS;Z?CJkI-;%ySS3A5N63?X(Pt*iG5hcP9~
zc?u7EM+v~>+F#~r4^xGn@3XPW8y>M>(D_2whO?!CVEI@qXo=frq-8))bO8PS(^dNY
z*3%mhc2ZrQGD~MUVixl9_YQUZgZ2*Ve|I>b<`Kr}P%R4!_9kgDB-gRNRhK)P;4dZQ
z@7fNe{#0T$9C{8&bT~V1o(&8JK9oGFsl`y-2PAdjVCOw~ikb0Wf%I6ocV_itI|&ll
zXPh_(EW=Dh!ej?5(k2N*n8x5%Z%!vt%y94(prIfb*}Zcc`sP8tN^8Bp(!1eBy38L`V33M>%;d5+dAWFfuRF
z{mj?Oe9mWui%N)~^q_d?(;F=N^sxKg0rXmfcUv(cXgqQ1EJ-AzGy0KkbA2A1e{knEDYqNMa_)9x#v}?OowvogeqMs^WoIRU6>&;G
zJZ6*{E-ywiR4gk>jqb#|G1_gm&h!s#a@3wIkC*RejhUFa8QuBDtz|}Z@Cwh}Jlw#o
zKSJ&>9JFI|c7PIH#KwAc5Cd-X$`nXD*g5+SW6h&Q+Ed(FLZ8dfx{h
zR4*!&c&4o
z^#0hK?87`L#AcH_5@W_ee}#On@hKKT@Ve67aqs
zLy@-#xPoOZTbxAc%tRPNONf9wy~~r?(WQ}@sG7*IR`4EO;$0r&7*_Dx5G{5-GB80$
z0_d*Uk*gNi=l-NT!3+OUzdmGDC<4uw)u?ye%y#tZO-Ro`I!in_e+AI00_u8%4e9ke
z)a#o@pf{OwA8V0Yr~eEY^>-M}krHa8~cxky+IlD1Xk%XZL0;F7YAqKE>KHck$AD3Nx=%
z!?WfdV|Aq$B$PzhQ0>8O6-|PoD~cIC-yeE!PfnK`_Wz!@$Cski(p!=DdEw-Q6~&>*
zzD0TqP{w~dV=&
zl-j~Oa;=ZE?i*2V*efw(ZE?3Kz~vDPiW3R(bFOo^?n5yQ)z<=>63v{1teBYQ-2-P%&V?*onCXd
zf5O*bh`Sw$mVIwv+}$Zx)_D8;;;YTa;j=e)TF9JgwEWtKtJ3%0h9MlyHwtp9OvkSG
zA5?m%qYKNs`p3F(bfCsC3CEf|3+so9$BfCi)f;RQi$Lmqpy&8+ObS8u5xYf$IhPW4
z(Q4e@sSQ_sk_JLvD@40W641-gmf3!Kf1+>jLg+P@ni_st0!$Jt!D_FU&AO+|$f)Ww
zaWmA5ZjH$@+C}NWUr;FbbbE{1)0j=;%eWsR_u(oS3D%_Nf&f9tOqYGmtlcqt<~we=
zn-OBY`E^bR^F{3w;Lph(H872sHu~L+I`e7rIqdgLAe}BY@
zCRj1>YI6dRb04mU8XAA$mloaOP6a8_JNT*4oBfd(T-2_q{#CrVRdT!aF<|N6x^~{-
zLO4Cj&SokCY(%$F38#$`tsy`#j|YaUPxQOrt&|(DV-OmIRLY0j!A1lfLji@*p`Uwq
z@oFBy0nX=rtwGm9&&Wzncj;Khe{6sLU`Iag0o(WNG92-JHwk0W=8+T{{67xO$$yJ+
zpnDZ
zBfl{*-YLWmNi}3#kwrKfj%pBSKZZt#gQ0Qj6!gF=tXL|PDJeuIE3xvv
z2kt?LwHApHcJyfj;lcX*7JIIVqXCI`%*Am;3XfAiqt2p$n$Q&|_GJ~--Ad$=YBIq+
zaxUB}Tn=2Pe_HCJA0~5Mt1n#!dW0$QKSy#{dO>_kymdKTe*^`fMRBhU$+u!X83~7n
z`Q&X>lBLm}{L~Rg6i_d0P2ChQZwr(!aA|$be~^&Xt1|tP7RrLksH^-2OHh4;nCY^NNrcV3G#-46=o^VsCT=7p)B
zk*5{h7n;mz3jd5-t@NwK8#yK16*=~!4W%v_EnI#>6dDA*~-?sx-vni8@lk_bPdZMrQt|hgE&2X
zMPAEsW*q|woqNi?)RuNI0S3QbQShuVq3qIQ>^`POq6@jrP!GG$?K8`z?;0Wyssm+C
zet9cfn)yVPU=5Ltb~zcF94swIQ$~X}sYbzye=JQAX%J-4XOQocd^J^#URnT!9o?GX
z=iag5-|=*%w6oI^ai31>^6HH=V!HR$P=R=sTMWIyfpF%R$_(WM0F9}M3w-uOl%psr
z?@C(4B-7;AIyxg+lL0tv+I%GGGM7QPT+Y1Nk}aI5aXJi{{!HQlm6>-Y1kpC}*x9y^
ze*_EH;pz(|)XV1_E<3ZChxJxl^u7!$X-jN~#a~90L}e1{d~7MfTFFVtIO5aX`&}3A
zkDU5x?c|
zB46^w-E!xJO&w|?N@O+ldh3nV*h|45e_MFJ?W=RY{skI8g=k-A=Bu^
zcKhk>=foPGHAB@eHw~NX1SZ6#4RtrR8v#}?{IaA-V2(9ETU8Z}Te-bVoR~+ue`DQh
z#tL?zkMdW2R|JB_XAICbifgF%X~bi@9EYbkR3%+uh{oeSjbQSR^~4`Wx?&`2XOq`;}2A{uX&|6l!(lWB{u=c+39Her`s%ISv&tO&!I4Rl2)5tJO8ZRY`Y@ep(wz
zxN%%ouc^)haLgQTQaR?iX$Xd;7UNt4Bv3l?ct_H(BT}V9rk{bzU=5HpfBZ8!cQejC
zLb16j{_`FULm~t<21XKMx(CcITLvRN8JL!!DOO$SmRn_1zji;
zyM#PUuHi=UDK5oHyvNRpyXpPx*an_^)>|?`)fPGC5LCy>c-`TDo}MQA=(MQnE{;1N
zsUjOI<+Nt5A%3&CY5&^te}_8;J_WU$v6v3m)WRo8L!zFhI&+jJP)2;UZ_unLp>0ki
zNKd4=u4lT{W*Q)than-h`Pg^g6sFhD0H7s;L6L*;xHCm9+IdP(u9Y
z7{mp!*Pjw9r~c8I3X847+|*2uILaxNwcZeNp;f5W_YGn}{`#WGMDO;>qj}#PU7cC70F+?;|kUkDJiDD$lD4=zS#R+<=3cI4#J=8k$bB8`$=$N
z6)`Qw!AOh;oA;cUf2n_31WSVgKWxgWvgMX+bmzdvE7#yQNC0hBXEimmt$7=7wseX^
z^J^65&$fQ;UEX@xZjyOIn!?*6jw8mau^&EfBzEgK)h6~e_wUyy3ZCPf)u%1NEtQJ
z2}Y?v-fvcFYY=w;H9*S0IWMSA5Oe=%PWPKhc9bZJxBr8XE44ULoGLQbfkeZUdEQPW
zK~iDlvBwSZv=I-iAEoyCPis$&hxB=W?9X;8reP8>|C+RcE)PLu&>t%+V+1$rgYw@}&W@{VU^Y3YFMVPy7TPMZzx+<(N{DXj~OO2{qZO9J~%
zC2|W*MpAHz@f_ohHth?3K6!uH>9r+#D40VeO-^4FYx+D-WEaTRFX;GDc+Qb^3bkX#
zK4K8;10Iz}*L-hQZe^527Qh|aK)IZd3+!l)$3<&RZxKd(ro{1ESdC1m^#9)l5SLU8
zQc+5aos=D}UQ-trp|+?T#|eFoIDS0dm$-sA$R*RVPhoW9QvkZLe(cRX-Z(Ji&?|
z;GuTJ%G>ir6^ZP7OY+acI419ND^$LzX#6IAK_yBIDMLJd71Eb8mvHSmSHRI5uZsUM
zDwL-;nW?pb|LEr@BQDvqaL#=-m=lGDBg7zE*@VhayMKZumP%La41p~`7^=%Tufqj7
z8&sb?!g1Q8%7Zv8fpC6iVk(2d9ih_yz|)aQ&?!Ro)FK4_h0o!X1QZg!h>Y^gy%NzQc>zhlD{p
z*o)5@0)H0@Si2p1&jWtwX<#F@I6>pIm7kqd_4-1(C9D4WRR6-VbOOd?N)#FM;KA*x
z$8Y+tyDVDya>co_?+x+6{xWfm%@C(W8-5WqyKiAK+5JIWmba1-4j4yE5F0=8y
z5PcAgyk)2`a(-JIlsgSNDIIv0sdn2}N7hU6{w1lqj7K-9w7@ixI1s=V0z9f`Sq!jVRefm6*V8A$gbYOZEl)Ni_K6
zUw@G4Ze%L-*G+to12F3W-)!{EK5EveW5?j`5p#^kdrb=IXMYGWNM!<6*i9t{9;zx3m_$uWg^FakNA#Df
zM0U2+-9*m>Df43oYcgSvd*;0FqDe7tB0s<{6L_$_Up!Be|9;}+`&4RrSaeRbQz*5~
zFNQ+YdtE6&wEqFg_Of%>)N$SuCS{ophmGlpmu6exiOAzgk(#j=HRU({%zVoI3x7Qm
zBB!6kpIQ2s9h<)s&8aX5Q??)pE|SXnl8D~esgI|8l#=C8A?Ib`Z0nADrzmAe*Q59o
z89sFDdhRd)V7p^UkQt0b*v_wA3U{LG&s}h|dE`JR;h7NEZP{!}*B?B0vb_nPaa9D18a@IN}7O4(s
zxHZ@KN2(XWFSob%MBC`|?-xp7W}qhD>T&IHRrg)n_us3&L@ExPrzaqVTM-K)h3uK1
zn{NP8@9&ezT|Cw`z+Ym}uns4KCilObVng80tTsPlk9HOvNq}$bXQd6?9o%
zv$FUe!O-#Gis3HStW=9
za2U$sh13?4`54yzwJsrE3qB&~zw$Bo(q}0cc-|%59%|N|8W|yfAmLGNjR>^xf6`yk|PFI|XA9cN#qN(;zvn)#w31(lx`w*|;I$$6L><7Y{9>+w7+vRiK
z_xk%#>)BDixtIQ5i~#c>}>(~eAEq01Q5SxrO^-o+|a8V~aTcDU#V|0)g*+EUg2)3fGS
zyaxfUv!h^Y0s*eG4r6Bm0S1$HW%pTs7eKzFGSBLtgJ2Nc*_ofR`_<6FVr^CKMi81g
z+l`?!-L07^sskF}tXquAi)AW;NmjD=1J_wHp8ommcYf(1Xi&)J7OJ=2Z0%(~Hl*}#
zRD1lpA-2N_g*v*IWwcW%&?p)_36pGAX6=Z
z6u@es{(8cul!eBB*gn2nk^Iv}OvDm@=_X}=%o{ax?VDd^v5mRzx0E=eIj6@RQL9&V
z8c4ul+gfotaun+SyxzJ6jzJQPFmcB_gXr(LpCC$RahQhkc%CtjJ|Yn2!YF@y|S)9ULYTR_bcxhHT-^mKfefD
zI?oaBVG*;VSrESkC#$gSnLgm0N2Z8vK$!zX-zuuCPng|bK{_qefEmZ>zMQ)Jz-tHj2
zYdvWN3DnC?8KSRO3W$&{B%OTz!l?aYrJdFEvssixIE_mJ{h-u;;F3wHO{*HQpa8@(
zssbI5DjEKd+06EsLcDf=Vp+LC-}582=a;_`M1IKuOm;g0E>te}K1a+Rz7#L^M~5Y^
zcc;nPn=3Qe-;FuYSY<$}jZH(0msO7$he&6Qs#~ykYI*d$qt+y&v`MouQP^mhPZ`&yUTIy+QtRDi{=Y
z?W}Ab_|BL+@WL8FXYZR~HnE>27q@cQQl?l*iU<3X^-v+Ce=-Czu##3J&zRJao*9%I
zjT@G9!caoo-3#=8ctZ24m5-S76x`gNA6?JO5dM&v={oYS^q$zO
z>FJ8>sq6K+V-|FOSLeuooj@l~>UuT{8w4dm_Z2D!gAc^%C6$bNB9Tt{Mol!0=%f6f)7KDxU{hug<{0KZcD7NM^VYpS
z2SPbML)x-Ko0Qde5E_cv>0r|^ZEJfV%d@oyT|)lG>C4wqC02Iv@HeywL4B%=jG+oS
z2>gnMs?2~s^Az+$R4;grfd6?+03yzlgBLn6)i&F$-n*`5B4C~8?L>%8%t9+AP2sUK
zE*rcmxc**$ku1AXUt*Jt~NqS_&~O`WWg;)S+wi{=sPoURqH8Itj^Y!d~jW+*8a}VRcG9P
zepT8SmqTbq3Du`4T7a1b_8t>t%O%`S0VdKThW@XATfZ|h7LP62EiI5FI=(K&=dB;o
z#E}7owUm6{Gw8TrN45`NOLlYN>9@HEocAvA&Sgwv3>LYLwq~kO%FobrRsQr@_fZ<@
zC`Q~%k3K+WZo7#S1je{OZk|I-j<)MWB`T{5$(D5_dt%VNHFbOG1v8ZVJd-?5QW
zn-l-ekC@$Zr9aMN$<6<$LRFx;4_