# HG changeset patch # User insilmaril # Date 1149605891 0 # Node ID 608f976aa7bb2b4dac092947ec03150442c82641 # Parent 9eb7767c2dfa3be1552a2467fd928d7bddc34b52 First compilation on QT4 diff -r 9eb7767c2dfa -r 608f976aa7bb aboutdialog.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/aboutdialog.cpp Tue Jun 06 14:58:11 2006 +0000 @@ -0,0 +1,208 @@ +#include +#include +//Added by qt3to4: +#include +#include + +#include "aboutdialog.h" +#include "version.h" +#include "settings.h" +#include "mainwindow.h" + + +extern Main *mainWindow; +extern Settings settings; +extern QString iconPath; + +AboutDialog::AboutDialog( QWidget *parent, const char *name) + : QDialog( parent, name) +{ + + mainLayout=new QVBoxLayout( this, 10); + + tabs=new QTabWidget (this); + credits=new AboutTextBrowser (tabs,"credits"); + + credits->setText ( + "
" + "

VYM - View Your Mind

" + "

A tool to put the things you have got in your mind into a map.

" + "

(c) by Uwe Drechsel (vym@InSilmaril.de)

" + "

Version " __VYM_VERSION" - " __BUILD_DATE"

" + "
    " + "
  • Contact
    • " + "" + "
  • Credits " + "
      " + "
    • Matt from www.satbp.com for Taskjuggler export
      • " + "
    • Jakob Hilmer for image drag and drop, "About vym" window patch
      • " + "
    • Thomas Schraitle for the stylesheet used for XHTML-export
      • " + "
    • Debianization by Christoph Thielecke and Steffen Joeris
      • " + "
    • Clemens Kraus for HTML-export " + "(www.clemens-kraus.de)
      • " + "
    • Ken Wimer and Olaf Hering for Mac support
      • " + "
    " + "
    • "); + credits->setFrameStyle( Q3Frame::Panel | Q3Frame::Plain ); + tabs->addTab (credits,"Credits"); + + license=new AboutTextBrowser (tabs,"license"); + //license->setTextFormat (PlainText); + license->setText ( + "

    VYM - View Your Mind

    " + "

    Copyright (C) 2004-2005 Uwe Drechsel

    " + + "

    This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

    " + + "

    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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:" +"

      " + "
    1. You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
      2. " + + "
    2. 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.
      3. " + + "
    3. 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.)
      4. " +"
    " +"

    " + +"

    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:" "

      " + +"
    1. 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,
      2. " + +"
    2. 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,
      3. " + +"
    3. 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.)
      4. " +"

    " + +"

    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

    " + + ); + credits->setFrameStyle( Q3Frame::Panel | Q3Frame::Plain ); + tabs->addTab (license,"License"); + + mainLayout->addWidget (tabs); + tabs->showPage (credits); + + okbutton =new QPushButton (this,"okbutton"); + okbutton->setText (tr("Ok")); + okbutton->setMaximumSize (QSize (50,30)); + okbutton->setAutoDefault (true); + mainLayout->addWidget( okbutton); + + connect( okbutton, SIGNAL( clicked() ), this, SLOT( accept() ) ); +} + +AboutTextBrowser::AboutTextBrowser(QWidget *parent, const char *name) + : Q3TextBrowser(parent, name) +{ + +} + +void AboutTextBrowser::setSource(const QString &name) +{ + Q3MimeSourceFactory *factory = Q3MimeSourceFactory::defaultFactory(); + const QMimeSource *data = factory->data(name); + if (data) { + Q3TextBrowser::setSource(name); + } else { + Q3Process *proc = new Q3Process( this ); + proc->addArgument( settings.readEntry("/vym/mainwindow/readerURL" )); + proc->addArgument( name); + + if ( !proc->start() ) + if (mainWindow->settingsURL() ) + setSource(name); + } +} diff -r 9eb7767c2dfa -r 608f976aa7bb aboutdialog.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/aboutdialog.h Tue Jun 06 14:58:11 2006 +0000 @@ -0,0 +1,41 @@ +#ifndef ABOUTDIALOG_H +#define ABOUTDIALOG_H + +#include +#include +#include +#include +#include +#include + +class AboutTextBrowser; +///////////////////////////////////////////////////////////////////////////// +class AboutDialog :public QDialog +{ + Q_OBJECT + +public: + AboutDialog(QWidget* parent = 0, const char* name = 0); + +private: + QTabWidget *tabs; + AboutTextBrowser *credits; + AboutTextBrowser *license; + + QLayout *mainLayout; + QLayout *topLayout; + QLayout *bottomLayout; + QPushButton *okbutton; + +}; + +class AboutTextBrowser : public Q3TextBrowser +{ + Q_OBJECT; + public: + AboutTextBrowser(QWidget *parent, const char *name = 0); + public slots: + void setSource(const QString &name); +}; + +#endif diff -r 9eb7767c2dfa -r 608f976aa7bb branchobj.cpp --- a/branchobj.cpp Sun Jan 30 12:58:47 2005 +0000 +++ b/branchobj.cpp Tue Jun 06 14:58:11 2006 +0000 @@ -24,13 +24,14 @@ depth=-1; } -BranchObj::BranchObj (QCanvas* c):OrnamentedObj (c) +BranchObj::BranchObj (Q3Canvas* c):OrnamentedObj (c) { // cout << "Const BranchObj (c) called from MapCenterObj (c)\n"; + parObj=NULL; canvas=c; } -BranchObj::BranchObj (QCanvas* c, LinkableMapObj* p):OrnamentedObj (c) +BranchObj::BranchObj (Q3Canvas* c, LinkableMapObj* p):OrnamentedObj (c) { // cout << "Const BranchObj (c,p)\n"; canvas=c; @@ -47,16 +48,18 @@ BranchObj::~BranchObj () { - //cout << "Destr BranchObj\n"; +// cout << "Destr BranchObj of "<getLastBranch(); + bo=((BranchObj*)(parObj))->getLastBranch(); if (!bo) po->unScroll(); } + clear(); } bool BranchObj::operator< ( const BranchObj & other ) @@ -69,7 +72,7 @@ return angle == other.angle; } -int BranchObjPtrList::compareItems ( QPtrCollection::Item i, QPtrCollection::Item j) +int BranchObjPtrList::compareItems ( Q3PtrCollection::Item i, Q3PtrCollection::Item j) { // Make sure PtrList::find works if (i==j) return 0; @@ -82,17 +85,15 @@ void BranchObj::init () { - branch.setAutoDelete (true); + branch.setAutoDelete (false); floatimage.setAutoDelete (true); + xlink.setAutoDelete (false); - absPos=getRandPos(); - absPos+=parObj->getChildPos(); - - // TODO This should be done in TextObj later - QFont font("Sans Serif,8,-1,5,50,0,0,0,0,0"); -// font.setPointSize(12); - heading->setFont(font ); -// heading->setText(QObject::tr("new branch")); + if (parObj) + { + absPos=getRandPos(); + absPos+=parObj->getChildPos(); + } lastSelectedBranch=-1; @@ -101,8 +102,8 @@ scrolled=false; tmpUnscrolled=false; - url=""; - vymLink=""; + includeImagesVer=false; + includeImagesHor=false; } void BranchObj::copy (BranchObj* other) @@ -125,9 +126,6 @@ tmpUnscrolled=other->tmpUnscrolled; setVisibility (other->visible); - url=other->url; - vymLink=other->vymLink; - angle=other->angle; positionBBox(); @@ -135,8 +133,17 @@ void BranchObj::clear() { - branch.clear(); floatimage.clear(); + while (!xlink.isEmpty()) + deleteXLink (xlink.first() ); + + BranchObj *bo; + while (!branch.isEmpty()) + { + bo=branch.first(); + branch.removeFirst(); + delete (bo); + } } int BranchObj::getNum() @@ -149,7 +156,12 @@ int BranchObj::getNum(BranchObj *bo) { - return branch.findRef (bo); + // keep current pointer in branch, + // otherwise save might fail + int cur=branch.at(); + int ind=branch.findRef (bo); + branch.at(cur); + return ind; } int BranchObj::getFloatImageNum(FloatImageObj *fio) @@ -167,6 +179,11 @@ return floatimage.count(); } +int BranchObj::countXLinks() +{ + return xlink.count(); +} + void BranchObj::setParObjTmp(LinkableMapObj* lmo, QPoint m, int off) { // Temporary link to lmo @@ -181,19 +198,10 @@ // ignore mapcenter and mainbranch if (lmo->getDepth()<2) off=0; if (off==0) - { link2ParPos=false; - parObj=o; - } else - { link2ParPos=true; - if (off>0) - parObj=o->getParObj(); - else - parObj=o->getParObj(); - parObj=o; - } + parObj=o; depth=parObj->getDepth()+1; @@ -254,6 +262,7 @@ parObjTmpBuf=NULL; depth=parObj->getDepth()+1; setLinkStyle (getDefLinkStyle() ); + updateLink(); } } @@ -350,6 +359,7 @@ standardFlags->setVisibility(v); LinkableMapObj::setVisibility (v); + // Only change childs, if I am not scrolled if (!scrolled && (depth < toDepth)) { // Now go recursivly through all childs @@ -359,9 +369,11 @@ FloatImageObj *fio; for (fio=floatimage.first(); fio; fio=floatimage.next()) fio->setVisibility (v); + XLinkObj* xlo; + for (xlo=xlink.first(); xlo;xlo=xlink.next() ) + xlo->setVisibility (); } } // depth <= toDepth - move (absPos.x(), absPos.y() ); requestReposition(); } @@ -376,25 +388,21 @@ // Overloaded from LinkableMapObj // BranchObj can use color of heading - if (mapEditor->getLinkColorHint()==HeadingColor) - LinkableMapObj::setLinkColor (heading->getColor() ); - else - LinkableMapObj::setLinkColor (); + if (mapEditor) + if (mapEditor->getLinkColorHint()==HeadingColor) + LinkableMapObj::setLinkColor (heading->getColor() ); + else + LinkableMapObj::setLinkColor (); } -void BranchObj::setColor (QColor col, bool colorChilds) +void BranchObj::setColorChilds (QColor col) { - heading->setColor(col); - setLinkColor(); - if (colorChilds) - { - BranchObj *bo; - for (bo=branch.first(); bo; bo=branch.next() ) - bo->setColor(col,colorChilds); - } + OrnamentedObj::setColor (col); + BranchObj *bo; + for (bo=branch.first(); bo; bo=branch.next() ) + bo->setColorChilds(col); } - BranchObj* BranchObj::first() { itLast=NULL; @@ -521,10 +529,20 @@ itLast=it; } +void BranchObj::positionContents() +{ + FloatImageObj *fio; + for (fio=floatimage.first(); fio; fio=floatimage.next() ) + fio->reposition(); + OrnamentedObj::positionContents(); +} void BranchObj::move (double x, double y) { OrnamentedObj::move (x,y); + FloatImageObj *fio; + for (fio=floatimage.first(); fio; fio=floatimage.next() ) + fio->reposition(); positionBBox(); } @@ -536,12 +554,12 @@ void BranchObj::moveBy (double x, double y) { OrnamentedObj::moveBy (x,y); - positionBBox(); BranchObj* b; for (b=branch.first(); b;b=branch.next() ) b->moveBy (x,y); + positionBBox(); } - + void BranchObj::moveBy (QPoint p) { moveBy (p.x(), p.y()); @@ -550,30 +568,25 @@ void BranchObj::positionBBox() { - - heading->positionBBox(); - systemFlags->positionBBox(); - standardFlags->positionBBox(); - // It seems that setting x,y also affects width,height - int w_old=bbox.width(); - int h_old=bbox.height(); - bbox.setX (absPos.x() ); - bbox.setY (absPos.y() ); - bbox.setWidth(w_old); - bbox.setHeight(h_old); - - + QPoint ap=getAbsPos(); + bbox.moveTopLeft (ap); + positionContents(); setSelBox(); // set the frame frame->setRect(QRect(bbox.x(),bbox.y(),bbox.width(),bbox.height() ) ); + + // Update links to other branches + XLinkObj *xlo; + for (xlo=xlink.first(); xlo; xlo=xlink.next() ) + xlo->updateXLink(); } void BranchObj::calcBBoxSize() { QSize heading_r=heading->getSize(); - int heading_w=static_cast (heading_r.width() ); - int heading_h=static_cast (heading_r.height() ); + int heading_w=(int) heading_r.width() ; + int heading_h=(int) heading_r.height() ; QSize sysflags_r=systemFlags->getSize(); int sysflags_h=sysflags_r.height(); int sysflags_w=sysflags_r.width(); @@ -589,11 +602,73 @@ h=max (sysflags_h,stanflags_h); h=max (h,heading_h); + // Save the dimension of flags and heading + ornamentsBBox.setSize ( QSize(w,h)); + + // clickBox includes Flags and Heading + clickBox.setSize (ornamentsBBox.size() ); + + // Floatimages + QPoint rp; + FloatImageObj *foi; + + topPad=botPad=leftPad=rightPad=0; + if (includeImagesVer || includeImagesHor) + { + if (countFloatImages()>0) + { + for (foi=floatimage.first(); foi; foi=floatimage.next() ) + { + rp=foi->getRelPos(); + if (includeImagesVer) + { + if (rp.y() < 0) + topPad=max (topPad,-rp.y()-h); + if (rp.y()+foi->height() > 0) + botPad=max (botPad,rp.y()+foi->height()); + } + if (includeImagesHor) + { + if (orientation==OrientRightOfCenter) + { + if (-rp.x()-w > 0) + leftPad=max (leftPad,-rp.x()-w); + if (rp.x()+foi->width() > 0) + rightPad=max (rightPad,rp.x()+foi->width()); + } else + { + if (rp.x()< 0) + leftPad=max (leftPad,-rp.x()); + if (rp.x()+foi->width() > w) + rightPad=max (rightPad,rp.x()+foi->width()-w); + } + } + } + } + h+=topPad+botPad; + w+=leftPad+rightPad; + } + + // Frame thickness w+=frame->getBorder(); h+=frame->getBorder(); + + // Finally set size bbox.setSize (QSize (w,h)); } +void BranchObj::setDockPos() +{ + if (getOrientation()==OrientLeftOfCenter ) + { + childPos=QPoint (ornamentsBBox.bottomLeft().x(), ornamentsBBox.bottomLeft().y() ); + parPos=QPoint (ornamentsBBox.bottomRight().x(),ornamentsBBox.bottomRight().y() ); + } else + { + childPos=QPoint (ornamentsBBox.bottomRight().x(), ornamentsBBox.bottomRight().y() ); + parPos=QPoint (ornamentsBBox.bottomLeft().x(),ornamentsBBox.bottomLeft().y() ); + } +} LinkableMapObj* BranchObj::findMapObj(QPoint p, LinkableMapObj* excludeLMO) { // Search branches @@ -606,89 +681,67 @@ } // Search myself - if (inBBox (p) && (this != excludeLMO) && isVisibleObj() ) + if (inBox (p) && (this != excludeLMO) && isVisibleObj() ) return this; // Search float images FloatImageObj *foi; for (foi=floatimage.first(); foi; foi=floatimage.next() ) - if (foi->inBBox(p) && (foi != excludeLMO) && foi->getParObj()!= excludeLMO) return foi; + if (foi->inBox(p) && + (foi != excludeLMO) && + foi->getParObj()!= excludeLMO && + foi->isVisibleObj() + ) return foi; return NULL; } void BranchObj::setHeading(QString s) { - // Adjusting font size - QFont font=heading->getFont(); - if (depth==0) - font.setPointSize(16); - else - if (depth>1) - font.setPointSize(10); - else - font.setPointSize(12); - heading->setFont(font); heading->setText(s); // set new heading calcBBoxSize(); // recalculate bbox positionBBox(); // rearrange contents requestReposition(); } -void BranchObj::setURL(QString s) +void BranchObj::setHideTmp (HideTmpMode mode) { - url=s; - if (!url.isEmpty()) - systemFlags->activate("url"); - else - systemFlags->deactivate("url"); - calcBBoxSize(); // recalculate bbox - positionBBox(); // rearrange contents - forceReposition(); + if (mode==HideExport && hasHiddenExportParent(this)) + { + setVisibility (false); + hidden=true; + }else + { + if (hasScrolledParent(this)) + setVisibility (false); + else + setVisibility (true); + hidden=false; + } + + BranchObj *bo; + for (bo=branch.first(); bo; bo=branch.next() ) + bo->setHideTmp (mode); } -QString BranchObj::getURL() +bool BranchObj::hasHiddenExportParent(BranchObj *start) { - return url; -} + // Calls parents recursivly to + // find out, if we are temp. hidden -void BranchObj::setVymLink(QString s) -{ - if (!s.isEmpty()) - { - // We need the relative (from loading) - // or absolute path (from User event) - // and build the absolute path. - // Note: If we have relative, use path of - // current map to build absolute path - QDir d(s); - if (!d.path().startsWith ("/")) - { - QString p=mapEditor->getDestPath(); - int i=p.findRev("/",-1); - d.setPath(p.left(i)+"/"+s); - d.convertToAbs(); - } - vymLink=d.path(); - systemFlags->activate("vymLink"); - } - else - { - systemFlags->deactivate("vymLink"); - vymLink=""; - } - calcBBoxSize(); // recalculate bbox - positionBBox(); // rearrange contents - forceReposition(); -} + if (hideExport) return true; -QString BranchObj::getVymLink() -{ - return vymLink; + BranchObj* bo=(BranchObj*)(parObj); + if (bo) + return bo->hasHiddenExportParent(start); + else + return false; } QString BranchObj::saveToDir (const QString &tmpdir,const QString &prefix, const QPoint& offset) { + if (hidden) return ""; + QString s,a; QString scrolledAttr; if (scrolled) @@ -696,21 +749,6 @@ else scrolledAttr=""; - QString posAttr; - if (depth<2) posAttr= - attribut("absPosX",QString().setNum(absPos.x(),10)) + - attribut("absPosY",QString().setNum(absPos.y(),10)); - else - posAttr=""; - - QString urlAttr; - if (!url.isEmpty()) - urlAttr=attribut ("url",url); - - QString vymLinkAttr; - if (!vymLink.isEmpty()) - vymLinkAttr=attribut ("vymLink",convertToRel(mapEditor->getDestPath(),vymLink) ); - QString frameAttr; if (frame->getFrameType()!=NoFrame) frameAttr=attribut ("frameType",frame->getFrameTypeName()); @@ -730,11 +768,24 @@ } else areaAttr=""; - s=beginElement ("branch" +scrolledAttr +posAttr +urlAttr +vymLinkAttr +frameAttr +areaAttr); + // Providing an ID for a branch makes export to XHTML easier + QString idAttr; + if (countXLinks()>0) + idAttr=attribut ("id",getSelectString()); + else + idAttr=""; + + s=beginElement ("branch" + +getOrnAttr() + +scrolledAttr + +frameAttr + +areaAttr + +idAttr + +getIncludeImageAttr() ); incIndent(); // save heading - s=s+valueElement("heading", getHeading(), + s+=valueElement("heading", getHeading(), attribut ("textColor",QColor(heading->getColor()).name())); // save names of flags set @@ -748,17 +799,120 @@ BranchObj *bo; for (bo=branch.first(); bo; bo=branch.next() ) s+=bo->saveToDir(tmpdir,prefix,offset); - decIndent(); // Save FloatImages FloatImageObj *fio; for (fio=floatimage.first(); fio; fio=floatimage.next() ) - s+=fio->saveToDir (tmpdir,prefix); + s+=fio->saveToDir (tmpdir,prefix,offset); + // Save XLinks + XLinkObj *xlo; + //FIXME exponential increase in xlinks... + QString ol; // old link + QString cl; // current link + for (xlo=xlink.first(); xlo; xlo=xlink.next() ) + { + cl=xlo->saveToDir(); + if (cl!=ol) + { + s+=cl; + ol=cl; + } else + { + qWarning (QString("Ignoring of duplicate xLink in %1").arg(getHeading())); + } + } + + decIndent(); s+=endElement ("branch"); return s; } +void BranchObj::addXLink (XLinkObj *xlo) +{ + xlink.append (xlo); + +} + +void BranchObj::removeXLinkRef (XLinkObj *xlo) +{ + xlink.remove (xlo); +} + +void BranchObj::deleteXLink(XLinkObj *xlo) +{ + xlo->deactivate(); + if (!xlo->isUsed()) delete (xlo); +} + +void BranchObj::deleteXLinkAt (int i) +{ + XLinkObj *xlo=xlink.at(i); + xlo->deactivate(); + if (!xlo->isUsed()) delete(xlo); +} + +XLinkObj* BranchObj::XLinkAt (int i) +{ + return xlink.at(i); +} + +int BranchObj::countXLink() +{ + return xlink.count(); +} + + +BranchObj* BranchObj::XLinkTargetAt (int i) +{ + if (xlink.at(i)) + return xlink.at(i)->otherBranch (this); + else + return NULL; +} + +void BranchObj::setIncludeImagesVer(bool b) +{ + includeImagesVer=b; + calcBBoxSize(); + positionBBox(); + requestReposition(); + //FIXME undo needed +} + +bool BranchObj::getIncludeImagesVer() +{ + return includeImagesVer; +} + +void BranchObj::setIncludeImagesHor(bool b) +{ + includeImagesHor=b; + calcBBoxSize(); + positionBBox(); + requestReposition(); + //FIXME undo needed +} + +bool BranchObj::getIncludeImagesHor() +{ + return includeImagesHor; +} + +QString BranchObj::getIncludeImageAttr() +{ + QString a; + if (includeImagesVer) + a=attribut ("incImgV","true"); + else + a=attribut ("incImgV","false"); + if (includeImagesHor) + a+=attribut ("incImgH","true"); + else + a+=attribut ("incImgH","false"); + return a; +} + LinkableMapObj* BranchObj::addFloatImage () { FloatImageObj *newfi=new FloatImageObj (canvas,this); @@ -767,8 +921,11 @@ newfi->setVisibility (false); else newfi->setVisibility(visible); + calcBBoxSize(); + positionBBox(); requestReposition(); return newfi; + //FIXME undo needed } LinkableMapObj* BranchObj::addFloatImage (FloatImageObj *fio) @@ -780,8 +937,11 @@ newfi->setVisibility (false); else newfi->setVisibility(visible); + calcBBoxSize(); + positionBBox(); requestReposition(); return newfi; + // FIMXE undo needed } FloatImageObj* BranchObj::getFirstFloatImage () @@ -802,7 +962,10 @@ void BranchObj::removeFloatImage (FloatImageObj *fio) { floatimage.remove (fio); + calcBBoxSize(); + positionBBox(); requestReposition(); + // FIMXE undo needed } void BranchObj::savePosInAngle () @@ -817,19 +980,40 @@ } } +void BranchObj::setDefAttr (BranchModification mod) +{ + int fontsize; + switch (depth) + { + case 0: fontsize=16; break; + case 1: fontsize=12; break; + default: fontsize=10; break; + } + + setLinkColor (); + setLinkStyle(getDefLinkStyle()); + QFont font("Sans Serif,8,-1,5,50,0,0,0,0,0"); + font.setPointSize(fontsize); + heading->setFont(font ); + + if (mod==NewBranch) + setColor (((BranchObj*)(parObj))->getColor()); + + calcBBoxSize(); +} + BranchObj* BranchObj::addBranch() { BranchObj* newbo=new BranchObj(canvas,this); branch.append (newbo); newbo->setParObj(this); - newbo->setColor(getColor(),false); - newbo->setLinkColor(); + newbo->setDefAttr(NewBranch); newbo->setHeading ("new"); - newbo->setLinkStyle (newbo->getDefLinkStyle()); if (scrolled) newbo->setVisibility (false); else newbo->setVisibility(visible); + newbo->updateLink(); requestReposition(); return newbo; } @@ -840,16 +1024,27 @@ branch.append (newbo); newbo->copy(bo); newbo->setParObj(this); - newbo->setHeading (newbo->getHeading()); // adjust fontsize to depth - newbo->setLinkStyle (newbo->getDefLinkStyle()); + newbo->setDefAttr(MovedBranch); if (scrolled) newbo->setVisibility (false); else newbo->setVisibility(bo->visible); + newbo->updateLink(); requestReposition(); return newbo; } +BranchObj* BranchObj::addBranchPtr(BranchObj* bo) +{ + branch.append (bo); + bo->setParObj (this); + bo->depth=depth+1; + bo->setDefAttr(MovedBranch); + if (scrolled) tmpUnscroll(); + setLastSelectedBranch (bo); + return bo; +} + BranchObj* BranchObj::insertBranch(int pos) { savePosInAngle(); @@ -870,11 +1065,56 @@ return newbo; } +BranchObj* BranchObj::insertBranchPtr (BranchObj* bo, int pos) +{ + savePosInAngle(); + // Add new bo and resort branches + bo->angle=pos-0.5; + branch.append (bo); + bo->setParObj (this); + bo->depth=depth+1; + bo->setDefAttr (MovedBranch); + if (scrolled) tmpUnscroll(); + setLastSelectedBranch (bo); + branch.sort(); + return bo; +} + +void BranchObj::removeBranchHere(BranchObj* borem) +{ + // This removes the branch bo from list, but + // inserts its childs at the place of bo + BranchObj *bo; + bo=borem->getLastBranch(); + int pos=borem->getNum(); + while (bo) + { + bo->moveBranchTo (this,pos+1); + bo=borem->getLastBranch(); + } + removeBranch (borem); +} + +void BranchObj::removeChilds() +{ + clear(); +} + void BranchObj::removeBranch(BranchObj* bo) { // if bo is not in branch remove returns false, we // don't care... - branch.remove (bo); + + if (branch.remove (bo)) + delete (bo); + else + qWarning ("BranchObj::removeBranch tried to remove non existing branch?!\n"); + requestReposition(); +} + +void BranchObj::removeBranchPtr(BranchObj* bo) +{ + branch.remove (bo); requestReposition(); } @@ -908,6 +1148,15 @@ return branch.at(i); } +bool BranchObj::canMoveBranchUp() +{ + if (!parObj) return false; + BranchObj* par=(BranchObj*)parObj; + if (this==par->getFirstBranch()) + return false; + else + return true; +} BranchObj* BranchObj::moveBranchUp(BranchObj* bo1) // move a branch up (modify myself) { @@ -923,6 +1172,16 @@ return branch.at(i); } +bool BranchObj::canMoveBranchDown() +{ + if (!parObj) return false; + BranchObj* par=(BranchObj*)parObj; + if (this==par->getLastBranch()) + return false; + else + return true; +} + BranchObj* BranchObj::moveBranchDown(BranchObj* bo1) { savePosInAngle(); @@ -939,29 +1198,63 @@ return branch.at(i); } +BranchObj* BranchObj::moveBranchTo (BranchObj* dst, int pos) +{ + // Find current parent and + // remove pointer to myself there + if (!dst) return NULL; + BranchObj *par=(BranchObj*)(parObj); + if (par) + par->removeBranchPtr (this); + else + return NULL; + + // Create new pointer to myself at dst + if (pos<0||dst->getDepth()==0) + { + // links myself as last branch at dst + dst->addBranchPtr (this); + updateLink(); + return this; + } else + { + // inserts me at pos in parent of dst + if (par) + { + BranchObj *bo=dst->insertBranchPtr (this,pos); + bo->setDefAttr(MovedBranch); + updateLink(); + return bo; + + } else + return NULL; + } +} + void BranchObj::alignRelativeTo (QPoint ref) { -/* FIXME testing - if (!getHeading().isEmpty()) - cout << "BO::alignRelTo "<