X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=vym.pro;h=7af5d4879a5c2c9af2b59ed21e87e8c7a0ab08dd;hb=HEAD;hp=f8b2ba62cd1b500f6d717700258bdf7f3f4f58d2;hpb=7dfa3fe589d1722d49681f42cdb0bf1e6efb5223;p=sven%2Fvym.git

diff --git a/vym.pro b/vym.pro
index f8b2ba6..7af5d48 100644
--- a/vym.pro
+++ b/vym.pro
@@ -8,9 +8,9 @@ QMAKE_MAC_SDK = macosx10.10
 
 QT += network 
 QT += xml 
+QT += script 
 QT += svg 
 QT += printsupport
-
 QT += widgets
 
 #  include(tmp/modeltest/modeltest.pri)
@@ -21,13 +21,14 @@ unix:!macx:isEmpty(NO_DBUS) {
     message("Compiling with DBUS")
     DEFINES += VYM_DBUS
     QT      += dbus 
-    HEADERS += adaptormodel.h adaptorvym.h 
-    SOURCES += adaptormodel.cpp adaptorvym.cpp 
+    HEADERS += src/adaptormodel.h src/adaptorvym.h 
+    SOURCES += src/adaptormodel.cpp src/adaptorvym.cpp 
 }
 
 win32 {
-    HEADERS += mkdtemp.h
-    SOURCES += mkdtemp.cpp
+    message("Compiling with win32")
+    HEADERS += src/mkdtemp.h
+    SOURCES += src/mkdtemp.cpp
     RC_FILE = vym.rc
     # Manifest embedding was suggested by Qt docs somewhere...
     win32: CONFIG += embed_manifest_exe
@@ -42,7 +43,7 @@ macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
 }
 
-TRANSLATIONS += lang/vym.de_DE.ts
+TRANSLATIONS += lang/vym.de.ts
 TRANSLATIONS += lang/vym.el.ts
 TRANSLATIONS += lang/vym.en.ts
 TRANSLATIONS += lang/vym.es.ts
@@ -62,228 +63,286 @@ ICON =icons/vym.icns
 
 
 HEADERS	+= \
-    aboutdialog.h \
-    taskfiltermodel.h \
-    animpoint.h \
-    arrowobj.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 \
-    heading.h \
-    headingeditor.h \
-    headingobj.h \
-    highlighter.h \
-    historywindow.h \
-    imageitem.h \
-    imageobj.h \
-    imports.h \
-    lineeditdialog.h \
-    linkablemapobj.h \
-    lockedfiledialog.h \
-    macros.h \
-    mainwindow.h \
-    mapeditor.h \
-    mapitem.h \
-    mapobj.h \
-    misc.h \
-    mysortfilterproxymodel.h \
-    noteeditor.h \
-    options.h \
-    ornamentedobj.h \
-    parser.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 \
-    vymlock.h \
-    vymmodel.h \
-    vymnote.h \
-    vymprocess.h \
-    vymtext.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 
+    src/aboutdialog.h \
+    src/animpoint.h \
+    src/arrowobj.h \
+    src/attribute.h \
+    src/attributeitem.h \
+#    src/attributedelegate.h\
+#    src/attributedialog.h \
+#    src/attributewidget.h \
+    src/branchitem.h \
+    src/branchobj.h \
+    src/branchpropeditor.h\
+    src/codeeditor.h \
+    src/command.h \
+    src/confluence-agent.h \
+    src/confluence-user.h \
+    src/confluence-userdialog.h \
+    src/credentials.h \
+    src/dockeditor.h \
+    src/download-agent.h \
+    src/editxlinkdialog.h \
+    src/exportoofiledialog.h \
+    src/export-html-dialog.h\
+    src/export-confluence-dialog.h\
+    src/export-ao.h \
+    src/export-ascii.h \
+    src/export-base.h \
+    src/export-csv.h \
+    src/export-confluence.h \
+    src/export-firefox.h \
+    src/export-html.h \
+    src/export-impress.h \
+    src/export-latex.h \
+    src/export-markdown.h \
+    src/export-orgmode.h \
+    src/export-taskjuggler.h \
+    src/extrainfodialog.h \
+    src/file.h \
+    src/findwidget.h \
+    src/findresultwidget.h \
+    src/findresultitem.h \
+    src/findresultmodel.h \
+    src/flag.h \
+    src/flagobj.h \
+    src/flagrowobj.h \
+    src/flagrow.h \
+    src/flagrowmaster.h \
+    src/floatimageobj.h \
+    src/floatobj.h \
+    src/frameobj.h \
+    src/geometry.h \
+    src/heading.h \
+    src/headingeditor.h \
+    src/headingobj.h \
+    src/highlighter.h \
+    src/historywindow.h \
+    src/imageitem.h \
+    src/imageobj.h \
+    src/imports.h \
+    src/jira-agent.h \
+    src/lineeditdialog.h \
+    src/linkablemapobj.h \
+    src/lockedfiledialog.h \
+    src/macros.h \
+    src/mainwindow.h \
+    src/mapeditor.h \
+    src/mapitem.h \
+    src/mapobj.h \
+    src/misc.h \
+    src/mysortfilterproxymodel.h \
+    src/noteeditor.h \
+    src/options.h \
+    src/ornamentedobj.h \
+    src/scripteditor.h\
+    src/scripting.h \
+    src/scriptoutput.h \
+    src/settings.h \
+    src/shortcuts.h\
+    src/showtextdialog.h\
+    src/slidecontrolwidget.h\
+    src/slideeditor.h\
+    src/slideitem.h\
+    src/slidemodel.h\
+    src/task.h\
+    src/taskeditor.h\
+    src/taskfiltermodel.h \
+    src/taskmodel.h\
+    src/treedelegate.h \
+    src/treeeditor.h \
+    src/treeitem.h \
+    src/treemodel.h \
+    src/texteditor.h \
+    src/version.h \
+    src/vymlock.h \
+    src/vymmodel.h \
+    src/vymmodelwrapper.h \
+    src/vymnote.h \
+    src/vymprocess.h \
+    src/vymtext.h \
+    src/vymview.h \
+    src/winter.h \
+    src/warningdialog.h \
+    src/xlink.h \
+    src/xlinkitem.h \
+    src/xlinkobj.h \
+    src/xml-base.h \
+    src/xml-vym.h \
+    src/xml-freemind.h \
+    src/xmlobj.h\
+    src/xsltproc.h \
+    src/zip-settings-dialog.h
 
 SOURCES	+= \
-    aboutdialog.cpp \
-    taskfiltermodel.cpp \
-    animpoint.cpp \
-    arrowobj.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 \
-    heading.cpp \
-    headingeditor.cpp \
-    headingobj.cpp \
-    highlighter.cpp \
-    historywindow.cpp \
-    imageitem.cpp \
-    imageobj.cpp \
-    imports.cpp \
-    lineeditdialog.cpp \
-    linkablemapobj.cpp \
-    lockedfiledialog.cpp \
-    macros.cpp \
-    main.cpp \
-    mainwindow.cpp \
-    mapeditor.cpp \
-    mapitem.cpp \
-    mapobj.cpp \
-    misc.cpp \
-    mysortfilterproxymodel.cpp \
-    noteeditor.cpp \
-    options.cpp \
-    ornamentedobj.cpp \
-    parser.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 \
-    vymlock.cpp \
-    vymmodel.cpp \
-    vymnote.cpp \
-    vymprocess.cpp \
-    vymtext.cpp \
-    vymview.cpp \
-    warningdialog.cpp \
-    winter.cpp \
-    xlink.cpp \
-    xlinkitem.cpp \
-    xlinkobj.cpp \
-    xml-base.cpp \
-    xml-vym.cpp \
-    xml-freemind.cpp \
-    xmlobj.cpp \
-    xsltproc.cpp 
+    src/aboutdialog.cpp \
+    src/animpoint.cpp \
+    src/arrowobj.cpp \
+    src/attribute.cpp \
+    src/attributeitem.cpp \
+#    src/attributedelegate.cpp \
+#    src/attributedialog.cpp \
+#    src/attributewidget.cpp \
+    src/branchitem.cpp \
+    src/branchobj.cpp \
+    src/branchpropeditor.cpp \
+    src/codeeditor.cpp \
+    src/command.cpp \
+    src/confluence-agent.cpp \
+    src/confluence-user.cpp \
+    src/credentials.cpp \
+    src/dockeditor.cpp \
+    src/download-agent.cpp \
+    src/editxlinkdialog.cpp \
+    src/export-html-dialog.cpp \
+    src/export-confluence-dialog.cpp \
+    src/exportoofiledialog.cpp \
+    src/export-ao.cpp \
+    src/export-ascii.cpp \
+    src/export-base.cpp \
+    src/export-confluence.cpp \
+    src/export-csv.cpp \
+    src/export-firefox.cpp \
+    src/export-html.cpp \
+    src/export-impress.cpp \
+    src/export-latex.cpp \
+    src/export-markdown.cpp \
+    src/export-orgmode.cpp \
+    src/export-taskjuggler.cpp \
+    src/extrainfodialog.cpp \
+    src/file.cpp \
+    src/findwidget.cpp \
+    src/findresultwidget.cpp \
+    src/findresultitem.cpp \
+    src/findresultmodel.cpp \
+    src/flag.cpp \
+    src/flagobj.cpp \
+    src/flagrow.cpp \
+    src/flagrowmaster.cpp \
+    src/flagrowobj.cpp \
+    src/floatimageobj.cpp \
+    src/floatobj.cpp \
+    src/frameobj.cpp \
+    src/geometry.cpp \
+    src/heading.cpp \
+    src/headingeditor.cpp \
+    src/headingobj.cpp \
+    src/highlighter.cpp \
+    src/historywindow.cpp \
+    src/imageitem.cpp \
+    src/imageobj.cpp \
+    src/imports.cpp \
+    src/jira-agent.cpp \
+    src/lineeditdialog.cpp \
+    src/linkablemapobj.cpp \
+    src/lockedfiledialog.cpp \
+    src/macros.cpp \
+    src/main.cpp \
+    src/mainwindow.cpp \
+    src/mapeditor.cpp \
+    src/mapitem.cpp \
+    src/mapobj.cpp \
+    src/misc.cpp \
+    src/mysortfilterproxymodel.cpp \
+    src/noteeditor.cpp \
+    src/options.cpp \
+    src/ornamentedobj.cpp \
+    src/scripteditor.cpp \
+    src/scripting.cpp \
+    src/scriptoutput.cpp \
+    src/settings.cpp \
+    src/shortcuts.cpp\
+    src/showtextdialog.cpp \
+    src/slidecontrolwidget.cpp \
+    src/slideeditor.cpp \
+    src/slideitem.cpp \
+    src/slidemodel.cpp \
+    src/task.cpp \
+    src/taskeditor.cpp \
+    src/taskfiltermodel.cpp \
+    src/taskmodel.cpp \
+    src/texteditor.cpp \
+    src/treedelegate.cpp \
+    src/treeeditor.cpp \
+    src/treeitem.cpp \
+    src/treemodel.cpp \
+    src/confluence-userdialog.cpp \
+    src/version.cpp \
+    src/vymlock.cpp \
+    src/vymmodel.cpp \
+    src/vymmodelwrapper.cpp \
+    src/vymnote.cpp \
+    src/vymprocess.cpp \
+    src/vymtext.cpp \
+    src/vymview.cpp \
+    src/warningdialog.cpp \
+    src/winter.cpp \
+    src//xlink.cpp \
+    src/xlinkitem.cpp \
+    src/xlinkobj.cpp \
+    src/xml-base.cpp \
+    src/xml-vym.cpp \
+    src/xml-freemind.cpp \
+    src/xmlobj.cpp \
+    src/xsltproc.cpp \
+    src/zip-settings-dialog.cpp
 
 FORMS = \
-    attributewidget.ui \
-    branchpropeditor.ui \
-    exporthtmldialog.ui \
-    extrainfodialog.ui \
-    editxlinkdialog.ui \
-    historywindow.ui \
-    lineeditdialog.ui \
-    lockedfiledialog.ui \
-    scripteditor.ui \
-    showtextdialog.ui \
-    warningdialog.ui \
+    forms/attributewidget.ui \
+    forms/branchpropeditor.ui \
+    forms/credentials.ui \
+    forms/export-html-dialog.ui \
+    forms/export-confluence-dialog.ui \
+    forms/extrainfodialog.ui \
+    forms/editxlinkdialog.ui \
+    forms/historywindow.ui \
+    forms/lineeditdialog.ui \
+    forms/lockedfiledialog.ui \
+    forms/scripteditor.ui \
+    forms/showtextdialog.ui \
+    forms/confluence-userdialog.ui \
+    forms/warningdialog.ui \
+    forms/zip-settings-dialog.ui
 
 isEmpty( PREFIX ) {
-    PREFIX = /usr/local
+    PREFIX = /usr/share
     count( INSTALLDIR, 1 ) {
 	PREFIX = $${INSTALLDIR}
-	message( "Please use PREFIX instead of INSTALLDIR" )
     }
 }
 isEmpty( BINDIR ) {
-    BINDIR = $${PREFIX}/bin
+    BINDIR = /usr/bin
 }
 isEmpty( DATADIR ) {
-    DATADIR = $${PREFIX}
+    DATADIR = $${PREFIX}/vym
 }
 
-message( "Installation directory" )
-message( $$PREFIX )
-
-
 target.path = $${BINDIR}
 INSTALLS += target
 
+DEFINES += "VYMBASEDIR='\"$${DATADIR}\"'"
+
+message( "PREFIX Dir: $$PREFIX" )
+message( "DATADIR: $$DATADIR" )
+message( "DEFINES: $$DEFINES" )
+
 language.files = lang/*.qm
-language.path = $${DATADIR}/vym/lang
+language.path = $${DATADIR}/lang
 INSTALLS += language
 
-support.files = styles/ scripts/ icons/ flags/ macros/ exports/ demos/
-support.files += LICENSE.txt
-support.path = $${DATADIR}/vym
+support.files = demos \
+    exports/  \
+    flags/ \
+    icons/ \
+    macros/ \
+    scripts/ \
+    styles/ 
+
+support.path = $${DATADIR}
 INSTALLS += support 
 
+# doc.files = doc/vym.pdf
+# doc.files += LICENSE.txt
+# doc.path = $${DOCDIR}
+# INSTALLS += doc
+# DEFINES += VYM_DOCDIR=\\\"$${DOCDIR}\\\"