diff -r 7a71a914afdb -r 6d2b32f305f9 mainwindow.cpp --- a/mainwindow.cpp Thu May 07 08:48:53 2009 +0000 +++ b/mainwindow.cpp Wed May 13 08:26:27 2009 +0000 @@ -12,7 +12,7 @@ #include "exportoofiledialog.h" #include "exports.h" #include "file.h" -#include "flagrowobj.h" +#include "flagrow.h" #include "historywindow.h" #include "imports.h" #include "mapeditor.h" @@ -43,8 +43,8 @@ extern QString clipboardFile; extern bool clipboardEmpty; extern int statusbarTime; -extern FlagRowObj* standardFlagsDefault; -extern FlagRowObj* systemFlagsDefault; +extern FlagRow *standardFlagsMaster; +extern FlagRow *systemFlagsMaster; extern QString vymName; extern QString vymVersion; extern QString vymBuildDate; @@ -1187,229 +1187,217 @@ { // Create System Flags QToolBar *tb=NULL; - bool avis=true; - - systemFlagsDefault = new FlagRowObj (); - systemFlagsDefault->setVisibility (false); - systemFlagsDefault->setName ("systemFlagsDef"); - - FlagObj *fo = new FlagObj (); - fo->load(QPixmap(flagsPath+"flag-note.png")); - setupFlag (fo,tb,avis,"note",tr("Note","SystemFlag")); - - fo->load(QPixmap(flagsPath+"flag-url.png")); - setupFlag (fo,tb,avis,"url",tr("URL to Document ","SystemFlag")); + + Flag *flag=new Flag;; + + flag->load(QPixmap(flagsPath+"flag-note.png")); + setupFlag (flag,tb,"system-note",tr("Note","SystemFlag")); + + flag->load(QPixmap(flagsPath+"flag-url.png")); + setupFlag (flag,tb,"system-url",tr("URL to Document ","SystemFlag")); - fo->load(QPixmap(flagsPath+"flag-vymlink.png")); - setupFlag (fo,tb,avis,"vymLink",tr("Link to another vym map","SystemFlag")); - - fo->load(QPixmap(flagsPath+"flag-scrolled-right.png")); - setupFlag (fo,tb,avis,"scrolledright",tr("subtree is scrolled","SystemFlag")); + flag->load(QPixmap(flagsPath+"flag-vymlink.png")); + setupFlag (flag,tb,"system-vymLink",tr("Link to another vym map","SystemFlag")); + + flag->load(QPixmap(flagsPath+"flag-scrolled-right.png")); + setupFlag (flag,tb,"system-scrolledright",tr("subtree is scrolled","SystemFlag")); - fo->load(QPixmap(flagsPath+"flag-tmpUnscrolled-right.png")); - setupFlag (fo,tb,avis,"tmpUnscrolledright",tr("subtree is temporary scrolled","SystemFlag")); - - fo->load(QPixmap(flagsPath+"flag-hideexport.png")); - setupFlag (fo,tb,avis,"hideInExport",tr("Hide object in exported maps","SystemFlag")); + flag->load(QPixmap(flagsPath+"flag-tmpUnscrolled-right.png")); + setupFlag (flag,tb,"system-tmpUnscrolledright",tr("subtree is temporary scrolled","SystemFlag")); + + flag->load(QPixmap(flagsPath+"flag-hideexport.png")); + setupFlag (flag,tb,"system-hideInExport",tr("Hide object in exported maps","SystemFlag")); // Create Standard Flags tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar")); tb->setObjectName ("standardFlagTB"); - standardFlagsDefault = new FlagRowObj (); - standardFlagsDefault->setVisibility (false); - standardFlagsDefault->setName ("standardFlagsDef"); - standardFlagsDefault->setToolBar (tb); - - fo->load(flagsPath+"flag-exclamationmark.png"); - fo->setGroup("standard-mark"); - setupFlag (fo,tb,avis,"exclamationmark",tr("Take care!","Standardflag")); - fo->load(flagsPath+"flag-questionmark.png"); - fo->setGroup("standard-mark"); - setupFlag (fo,tb,avis,"questionmark",tr("Really?","Standardflag")); - - fo->load(flagsPath+"flag-hook-green.png"); - fo->setGroup("standard-hook"); - setupFlag (fo,tb,avis,"hook-green",tr("ok!","Standardflag")); - - fo->load(flagsPath+"flag-cross-red.png"); - fo->setGroup("standard-hook"); - setupFlag (fo,tb,avis,"cross-red",tr("Not ok!","Standardflag")); - fo->unsetGroup(); - - fo->load(flagsPath+"flag-stopsign.png"); - setupFlag (fo,tb,avis,"stopsign",tr("This won't work!","Standardflag")); - - fo->load(flagsPath+"flag-smiley-good.png"); - fo->setGroup("standard-smiley"); - setupFlag (fo,tb,avis,"smiley-good",tr("Good","Standardflag")); - - fo->load(flagsPath+"flag-smiley-sad.png"); - fo->setGroup("standard-smiley"); - setupFlag (fo,tb,avis,"smiley-sad",tr("Bad","Standardflag")); - - fo->load(flagsPath+"flag-smiley-omg.png"); - fo->setGroup("standard-smiley"); - setupFlag (fo,tb,avis,"smiley-omb",tr("Oh no!","Standardflag")); + flag->load(flagsPath+"flag-exclamationmark.png"); + flag->setGroup("standard-mark"); + setupFlag (flag,tb,"exclamationmark",tr("Take care!","Standardflag")); + + flag->load(flagsPath+"flag-questionmark.png"); + flag->setGroup("standard-mark"); + setupFlag (flag,tb,"questionmark",tr("Really?","Standardflag")); + + flag->load(flagsPath+"flag-hook-green.png"); + flag->setGroup("standard-hook"); + setupFlag (flag,tb,"hook-green",tr("ok!","Standardflag")); + + flag->load(flagsPath+"flag-cross-red.png"); + flag->setGroup("standard-hook"); + setupFlag (flag,tb,"cross-red",tr("Not ok!","Standardflag")); + flag->unsetGroup(); + + flag->load(flagsPath+"flag-stopsign.png"); + setupFlag (flag,tb,"stopsign",tr("This won't work!","Standardflag")); + + flag->load(flagsPath+"flag-smiley-good.png"); + flag->setGroup("standard-smiley"); + setupFlag (flag,tb,"smiley-good",tr("Good","Standardflag")); + + flag->load(flagsPath+"flag-smiley-sad.png"); + flag->setGroup("standard-smiley"); + setupFlag (flag,tb,"smiley-sad",tr("Bad","Standardflag")); + + flag->load(flagsPath+"flag-smiley-omg.png"); + flag->setGroup("standard-smiley"); + setupFlag (flag,tb,"smiley-omb",tr("Oh no!","Standardflag")); // Original omg.png (in KDE emoticons) - fo->unsetGroup(); - - fo->load(flagsPath+"flag-kalarm.png"); - setupFlag (fo,tb,avis,"clock",tr("Time critical","Standardflag")); - - fo->load(flagsPath+"flag-phone.png"); - setupFlag (fo,tb,avis,"phone",tr("Call...","Standardflag")); - - fo->load(flagsPath+"flag-lamp.png"); - setupFlag (fo,tb,avis,"lamp",tr("Idea!","Standardflag")); - - fo->load(flagsPath+"flag-arrow-up.png"); - fo->setGroup("standard-arrow"); - setupFlag (fo,tb,avis,"arrow-up",tr("Important","Standardflag")); - - fo->load(flagsPath+"flag-arrow-down.png"); - fo->setGroup("standard-arrow"); - setupFlag (fo,tb,avis,"arrow-down",tr("Unimportant","Standardflag")); - - fo->load(flagsPath+"flag-arrow-2up.png"); - fo->setGroup("standard-arrow"); - setupFlag (fo,tb,avis,"2arrow-up",tr("Very important!","Standardflag")); - - fo->load(flagsPath+"flag-arrow-2down.png"); - fo->setGroup("standard-arrow"); - setupFlag (fo,tb,avis,"2arrow-down",tr("Very unimportant!","Standardflag")); - fo->unsetGroup(); - - fo->load(flagsPath+"flag-thumb-up.png"); - fo->setGroup("standard-thumb"); - setupFlag (fo,tb,avis,"thumb-up",tr("I like this","Standardflag")); - - fo->load(flagsPath+"flag-thumb-down.png"); - fo->setGroup("standard-thumb"); - setupFlag (fo,tb,avis,"thumb-down",tr("I do not like this","Standardflag")); - fo->unsetGroup(); + flag->unsetGroup(); + + flag->load(flagsPath+"flag-kalarm.png"); + setupFlag (flag,tb,"clock",tr("Time critical","Standardflag")); + + flag->load(flagsPath+"flag-phone.png"); + setupFlag (flag,tb,"phone",tr("Call...","Standardflag")); + + flag->load(flagsPath+"flag-lamp.png"); + setupFlag (flag,tb,"lamp",tr("Idea!","Standardflag")); + + flag->load(flagsPath+"flag-arrow-up.png"); + flag->setGroup("standard-arrow"); + setupFlag (flag,tb,"arrow-up",tr("Important","Standardflag")); + + flag->load(flagsPath+"flag-arrow-down.png"); + flag->setGroup("standard-arrow"); + setupFlag (flag,tb,"arrow-down",tr("Unimportant","Standardflag")); + + flag->load(flagsPath+"flag-arrow-2up.png"); + flag->setGroup("standard-arrow"); + setupFlag (flag,tb,"2arrow-up",tr("Very important!","Standardflag")); + + flag->load(flagsPath+"flag-arrow-2down.png"); + flag->setGroup("standard-arrow"); + setupFlag (flag,tb,"2arrow-down",tr("Very unimportant!","Standardflag")); + flag->unsetGroup(); + + flag->load(flagsPath+"flag-thumb-up.png"); + flag->setGroup("standard-thumb"); + setupFlag (flag,tb,"thumb-up",tr("I like this","Standardflag")); + + flag->load(flagsPath+"flag-thumb-down.png"); + flag->setGroup("standard-thumb"); + setupFlag (flag,tb,"thumb-down",tr("I do not like this","Standardflag")); + flag->unsetGroup(); - fo->load(flagsPath+"flag-rose.png"); - setupFlag (fo,tb,avis,"rose",tr("Rose","Standardflag")); - - fo->load(flagsPath+"flag-heart.png"); - setupFlag (fo,tb,avis,"heart",tr("I just love...","Standardflag")); - - fo->load(flagsPath+"flag-present.png"); - setupFlag (fo,tb,avis,"present",tr("Surprise!","Standardflag")); - - fo->load(flagsPath+"flag-flash.png"); - setupFlag (fo,tb,avis,"flash",tr("Dangerous","Standardflag")); + flag->load(flagsPath+"flag-rose.png"); + setupFlag (flag,tb,"rose",tr("Rose","Standardflag")); + + flag->load(flagsPath+"flag-heart.png"); + setupFlag (flag,tb,"heart",tr("I just love...","Standardflag")); + + flag->load(flagsPath+"flag-present.png"); + setupFlag (flag,tb,"present",tr("Surprise!","Standardflag")); + + flag->load(flagsPath+"flag-flash.png"); + setupFlag (flag,tb,"flash",tr("Dangerous","Standardflag")); // Original: xsldbg_output.png - fo->load(flagsPath+"flag-info.png"); - setupFlag (fo,tb,avis,"info",tr("Info","Standardflag")); + flag->load(flagsPath+"flag-info.png"); + setupFlag (flag,tb,"inflag",tr("Info","Standardflag")); // Original khelpcenter.png - fo->load(flagsPath+"flag-lifebelt.png"); - setupFlag (fo,tb,avis,"lifebelt",tr("This will help","Standardflag")); + flag->load(flagsPath+"flag-lifebelt.png"); + setupFlag (flag,tb,"lifebelt",tr("This will help","Standardflag")); // Freemind flags - avis=false; - - fo->load(flagsPath+"freemind/warning.png"); - setupFlag (fo,tb, avis, "freemind-warning",tr("Important","Freemind-Flag")); + flag->load(flagsPath+"freemind/warning.png"); + setupFlag (flag,tb, "freemind-warning",tr("Important","Freemind-Flag")); for (int i=1; i<8; i++) { - fo->load(flagsPath+QString("freemind/priority-%1.png").arg(i)); - setupFlag (fo,tb, avis,QString("freemind-priority-%1").arg(i),tr("Priority","Freemind-Flag")); + flag->load(flagsPath+QString("freemind/priority-%1.png").arg(i)); + setupFlag (flag,tb, QString("freemind-priority-%1").arg(i),tr("Priority","Freemind-Flag")); } - fo->load(flagsPath+"freemind/back.png"); - setupFlag (fo,tb,avis,"freemind-back",tr("Back","Freemind-Flag")); - - fo->load(flagsPath+"freemind/forward.png"); - setupFlag (fo,tb,avis,"freemind-forward",tr("Forward","Freemind-Flag")); - - fo->load(flagsPath+"freemind/attach.png"); - setupFlag (fo,tb,avis,"freemind-attach",tr("Look here","Freemind-Flag")); - - fo->load(flagsPath+"freemind/clanbomber.png"); - setupFlag (fo,tb,avis,"freemind-clanbomber",tr("Dangerous","Freemind-Flag")); - - fo->load(flagsPath+"freemind/desktopnew.png"); - setupFlag (fo,tb,avis,"freemind-desktopnew",tr("Don't forget","Freemind-Flag")); - - fo->load(flagsPath+"freemind/flag.png"); - setupFlag (fo,tb,avis,"freemind-flag",tr("Flag","Freemind-Flag")); - - - fo->load(flagsPath+"freemind/gohome.png"); - setupFlag (fo,tb,avis,"freemind-gohome",tr("Home","Freemind-Flag")); - - - fo->load(flagsPath+"freemind/kaddressbook.png"); - setupFlag (fo,tb,avis,"freemind-kaddressbook",tr("Telephone","Freemind-Flag")); - - fo->load(flagsPath+"freemind/knotify.png"); - setupFlag (fo,tb,avis,"freemind-knotify",tr("Music","Freemind-Flag")); - - fo->load(flagsPath+"freemind/korn.png"); - setupFlag (fo,tb,avis,"freemind-korn",tr("Mailbox","Freemind-Flag")); - - fo->load(flagsPath+"freemind/mail.png"); - setupFlag (fo,tb,avis,"freemind-mail",tr("Maix","Freemind-Flag")); - - fo->load(flagsPath+"freemind/password.png"); - setupFlag (fo,tb,avis,"freemind-password",tr("Password","Freemind-Flag")); - - fo->load(flagsPath+"freemind/pencil.png"); - setupFlag (fo,tb,avis,"freemind-pencil",tr("To be improved","Freemind-Flag")); - - fo->load(flagsPath+"freemind/stop.png"); - setupFlag (fo,tb,avis,"freemind-stop",tr("Stop","Freemind-Flag")); - - fo->load(flagsPath+"freemind/wizard.png"); - setupFlag (fo,tb,avis,"freemind-wizard",tr("Magic","Freemind-Flag")); - - fo->load(flagsPath+"freemind/xmag.png"); - setupFlag (fo,tb,avis,"freemind-xmag",tr("To be discussed","Freemind-Flag")); - - fo->load(flagsPath+"freemind/bell.png"); - setupFlag (fo,tb,avis,"freemind-bell",tr("Reminder","Freemind-Flag")); - - fo->load(flagsPath+"freemind/bookmark.png"); - setupFlag (fo,tb,avis,"freemind-bookmark",tr("Excellent","Freemind-Flag")); - - fo->load(flagsPath+"freemind/penguin.png"); - setupFlag (fo,tb,avis,"freemind-penguin",tr("Linux","Freemind-Flag")); - - fo->load(flagsPath+"freemind/licq.png"); - setupFlag (fo,tb,avis,"freemind-licq",tr("Sweet","Freemind-Flag")); - - delete (fo); + flag->load(flagsPath+"freemind/back.png"); + setupFlag (flag,tb,"freemind-back",tr("Back","Freemind-Flag")); + + flag->load(flagsPath+"freemind/forward.png"); + setupFlag (flag,tb,"freemind-forward",tr("forward","Freemind-Flag")); + + flag->load(flagsPath+"freemind/attach.png"); + setupFlag (flag,tb,"freemind-attach",tr("Look here","Freemind-Flag")); + + flag->load(flagsPath+"freemind/clanbomber.png"); + setupFlag (flag,tb,"freemind-clanbomber",tr("Dangerous","Freemind-Flag")); + + flag->load(flagsPath+"freemind/desktopnew.png"); + setupFlag (flag,tb,"freemind-desktopnew",tr("Don't flagrget","Freemind-Flag")); + + flag->load(flagsPath+"freemind/flag.png"); + setupFlag (flag,tb,"freemind-flag",tr("Flag","Freemind-Flag")); + + + flag->load(flagsPath+"freemind/gohome.png"); + setupFlag (flag,tb,"freemind-gohome",tr("Home","Freemind-Flag")); + + + flag->load(flagsPath+"freemind/kaddressbook.png"); + setupFlag (flag,tb,"freemind-kaddressbook",tr("Telephone","Freemind-Flag")); + + flag->load(flagsPath+"freemind/knotify.png"); + setupFlag (flag,tb,"freemind-knotify",tr("Music","Freemind-Flag")); + + flag->load(flagsPath+"freemind/korn.png"); + setupFlag (flag,tb,"freemind-korn",tr("Mailbox","Freemind-Flag")); + + flag->load(flagsPath+"freemind/mail.png"); + setupFlag (flag,tb,"freemind-mail",tr("Maix","Freemind-Flag")); + + flag->load(flagsPath+"freemind/password.png"); + setupFlag (flag,tb,"freemind-password",tr("Password","Freemind-Flag")); + + flag->load(flagsPath+"freemind/pencil.png"); + setupFlag (flag,tb,"freemind-pencil",tr("To be improved","Freemind-Flag")); + + flag->load(flagsPath+"freemind/stop.png"); + setupFlag (flag,tb,"freemind-stop",tr("Stop","Freemind-Flag")); + + flag->load(flagsPath+"freemind/wizard.png"); + setupFlag (flag,tb,"freemind-wizard",tr("Magic","Freemind-Flag")); + + flag->load(flagsPath+"freemind/xmag.png"); + setupFlag (flag,tb,"freemind-xmag",tr("To be discussed","Freemind-Flag")); + + flag->load(flagsPath+"freemind/bell.png"); + setupFlag (flag,tb,"freemind-bell",tr("Reminder","Freemind-Flag")); + + flag->load(flagsPath+"freemind/bookmark.png"); + setupFlag (flag,tb,"freemind-bookmark",tr("Excellent","Freemind-Flag")); + + flag->load(flagsPath+"freemind/penguin.png"); + setupFlag (flag,tb,"freemind-penguin",tr("Linux","Freemind-Flag")); + + flag->load(flagsPath+"freemind/licq.png"); + setupFlag (flag,tb,"freemind-licq",tr("Sweet","Freemind-Flag")); } -void Main::setupFlag (FlagObj *fo, QToolBar *tb, bool aw, const QString &name, const QString &tooltip) +void Main::setupFlag (Flag *flag, QToolBar *tb, const QString &name, const QString &tooltip) { - fo->setName(name); - fo->setToolTip (tooltip); - QAction *a=new QAction (fo->getPixmap(),fo->getName(),this); + flag->setName(name); + flag->setToolTip (tooltip); + QAction *a; if (tb) { + a=new QAction (flag->getPixmap(),name,this); // StandardFlag tb->addAction (a); - fo->setAction (a); - fo->setAlwaysVisible(aw); a->setCheckable(true); - a->setObjectName(fo->getName()); + a->setObjectName(name); a->setToolTip(tooltip); connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) ); - standardFlagsDefault->addFlag (fo); + standardFlagsMaster->addFlag (flag); } else { // SystemFlag - systemFlagsDefault->addFlag (fo); + systemFlagsMaster->addFlag (flag); } } + // Network Actions void Main::setupNetworkActions() { @@ -2692,107 +2680,6 @@ } } - -void Main::editAttributeFinished() -{ - // only called from editHeading(), so there is a currentME - - /* - MapEditor *me=currentMapEditor(); - if (me) - { - me->setStateEditHeading (false); - QPoint p; //Not used here, only to find out pos of branch - bool ok; - QString s=me->getHeading(ok,p); - -#if defined(Q_OS_MACX) -#else - if (ok && s!=lineedit->text()) - me->setHeading(lineedit->text()); - - lineedit->releaseKeyboard(); - lineedit->hide(); - setFocus(); -#endif - if (!actionSettingsAutoSelectNewBranch->isOn() && - !prevSelection.isEmpty()) - me->select(prevSelection); - prevSelection=""; - } - */ -} - -#include "attribute.h" -#include "attributedialog.h" -void Main::editAttribute() -{ -/* - MapEditor *me=currentMapEditor(); - if (me) - { - BranchObj *bo=me->getModel()->getSelectedBranch(); - if (bo) - { - AttributeDialog dia(this); - dia.setTable (me->attributeTable() ); - dia.setBranch (bo); - dia.setMode (Definition); - dia.updateTable(); - dia.exec(); - } - } - */ - /* - if (currentMapEditor()) - { - MapEditor *me=currentMapEditor(); - QString oldSel=me->getSelectString(); - - if (lineedit->isVisible()) - editAttributeFinished(); - else - { - bool ok; - QPoint p; - QString s=me->getHeading(ok,p); - - if (ok) - { - me->setStateEditHeading (true); -#if defined(Q_OS_MACX) - p=me->mapToGlobal (p); - QDialog *d =new QDialog(NULL); - QLineEdit *le=new QLineEdit (d); - d->setWindowFlags (Qt::FramelessWindowHint); - d->setGeometry(p.x(),p.y(),230,25); - le->resize (d->width()-10,d->height()); - le->setText (s); - le->selectAll(); - connect (le, SIGNAL (returnPressed()), d, SLOT (accept())); - d->activateWindow(); - d->exec(); - me->setHeading (le->text()); - delete (le); - delete (d); - editHeadingFinished(); -#else - p=me->mapTo (this,p); - lineedit->setGeometry(p.x(),p.y(),230,25); - lineedit->setText(s); - lineedit->setCursorPosition(1); - lineedit->selectAll(); - lineedit->show(); - lineedit->grabKeyboard(); - lineedit->setFocus(); -#endif - } - } - } // currentMapEditor() - - */ -} - void Main::openVymLinks(const QStringList &vl) { for (int j=0; jmoveBranchUp(); + if (m) m->moveUp(); } void Main::editMoveDown() { VymModel *m=currentModel(); - if (m) m->moveBranchDown(); + if (m) m->moveDown(); } void Main::editSortChildren() @@ -3266,32 +3153,20 @@ void Main::viewZoomReset() { - if (currentMapEditor()) - { - QMatrix m; - m.reset(); - currentMapEditor()->setMatrix( m ); - } + MapEditor *me=currentMapEditor(); + if (me) me->setZoomFactorTarget (1); } void Main::viewZoomIn() { - if (currentMapEditor()) - { - QMatrix m = currentMapEditor()->matrix(); - m.scale( 1.25, 1.25 ); - currentMapEditor()->setMatrix( m ); - } + MapEditor *me=currentMapEditor(); + if (me) me->setZoomFactorTarget (me->getZoomFactorTarget()*1.25); } void Main::viewZoomOut() { - if (currentMapEditor()) - { - QMatrix m = currentMapEditor()->matrix(); - m.scale( 0.8, 0.8 ); - currentMapEditor()->setMatrix( m ); - } + MapEditor *me=currentMapEditor(); + if (me) me->setZoomFactorTarget (me->getZoomFactorTarget()*0.75); } void Main::viewCenter() @@ -3523,7 +3398,7 @@ if (!status.isEmpty() ) statusMessage (status); */ - // Update Toolbar // FIXME-1, was so far in BranchObj + // Update Toolbar // FIXME-0, was so far in BranchObj //updateFlagsToolbar(); updateActions(); @@ -3640,15 +3515,13 @@ } */ - standardFlagsDefault->setEnabled (true); - actionToggleScroll->setEnabled (true); if ( selbi->isScrolled() ) actionToggleScroll->setOn(true); else actionToggleScroll->setOn(false); -/* FIXME-1 if ( selti->getURL().isEmpty() ) + if ( selti->getURL().isEmpty() ) { actionOpenURL->setEnabled (false); actionOpenURLTab->setEnabled (false); @@ -3667,16 +3540,16 @@ actionOpenVymLink->setEnabled (true); actionDeleteVymLink->setEnabled (true); } -*/ -/* FIXME-1 if (selbi->canMoveBranchUp()) + + if (selbi->canMoveUp()) actionMoveUp->setEnabled (true); else actionMoveUp->setEnabled (false); - if (selbi->canMoveBranchDown()) + if (selbi->canMoveDown()) actionMoveDown->setEnabled (true); else actionMoveDown->setEnabled (false); -*/ + actionSortChildren->setEnabled (true); actionToggleHideExport->setEnabled (true); @@ -3709,7 +3582,7 @@ actionCopy->setEnabled (true); actionCut->setEnabled (true); - actionPaste->setEnabled (false); + actionPaste->setEnabled (false); //FIXME-4 why not allowing copy of images? for (int i=0; isetEnabled(false); actionDelete->setEnabled (true); @@ -3722,7 +3595,6 @@ } else { - standardFlagsDefault->setEnabled (false); actionFileSave->setEnabled (false); actionCopy->setEnabled (false); actionCut->setEnabled (false); @@ -3761,11 +3633,6 @@ return actionSettingsAutoSelectNewBranch->isOn(); } -bool Main::useFlagGroups() -{ - return actionSettingsUseFlagGroups->isOn(); -} - void Main::windowShowNoteEditor() { textEditor->setShowWithMain(true); @@ -3816,13 +3683,18 @@ void Main::standardFlagChanged() { if (currentModel()) - currentModel()->toggleStandardFlag(sender()->name()); + { + if ( actionSettingsUseFlagGroups->isOn() ) + currentModel()->toggleStandardFlag(sender()->name(),standardFlagsMaster); + else + currentModel()->toggleStandardFlag(sender()->name()); + } } void Main::testFunction1() { - //if (!currentMapEditor()) return; - //currentMapEditor()->testFunction1(); + if (!currentMapEditor()) return; + currentMapEditor()->testFunction1(); //editAttribute(); }