# HG changeset patch
# User insilmaril
# Date 1186684448 0
# Node ID a4c3dd0e48de88f51798ef142db0f4d3b7e65fc9
# Parent  eaa3798cc33a0d768c2dd6571a438eabb1d89327
1.10.0

diff -r eaa3798cc33a -r a4c3dd0e48de demos/vym-projectplan.vym
Binary file demos/vym-projectplan.vym has changed
diff -r eaa3798cc33a -r a4c3dd0e48de mainwindow.cpp
--- a/mainwindow.cpp	Thu Aug 09 18:34:07 2007 +0000
+++ b/mainwindow.cpp	Thu Aug 09 18:34:08 2007 +0000
@@ -1071,43 +1071,34 @@
 void Main::setupFlagActions()
 {
 	// 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"));
-	fo->setName("note");
-	fo->setToolTip(tr("Note","Systemflag"));
-	systemFlagsDefault->addFlag (fo);	// makes deep copy
+	setupFlag (fo,tb,avis,"note",tr("Note","SystemFlag"));
 
 	fo->load(QPixmap(flagsPath+"flag-url.png"));
-	fo->setName("url");
-	fo->setToolTip(tr("WWW Document (external)","Systemflag"));
-	systemFlagsDefault->addFlag (fo);
+	setupFlag (fo,tb,avis,"url",tr("URL to Document ","SystemFlag"));
 	
 	fo->load(QPixmap(flagsPath+"flag-vymlink.png"));
-	fo->setName("vymLink");
-	fo->setToolTip(tr("Link to another vym map","Systemflag"));
-	systemFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"vymLink",tr("Link to another vym map","SystemFlag"));
 
 	fo->load(QPixmap(flagsPath+"flag-scrolled-right.png"));
-	fo->setName("scrolledright");
-	fo->setToolTip(tr("subtree is scrolled","Systemflag"));
-	systemFlagsDefault->addFlag (fo);
+	setupFlag (fo,tb,avis,"scrolledright",tr("subtree is scrolled","SystemFlag"));
 	
 	fo->load(QPixmap(flagsPath+"flag-tmpUnscrolled-right.png"));
-	fo->setName("tmpUnscrolledright");
-	fo->setToolTip(tr("subtree is temporary scrolled","Systemflag"));
-	systemFlagsDefault->addFlag (fo);
+	setupFlag (fo,tb,avis,"tmpUnscrolledright",tr("subtree is temporary scrolled","SystemFlag"));
 
 	fo->load(QPixmap(flagsPath+"flag-hideexport.png"));
-	fo->setName("hideInExport");
-	fo->setToolTip(tr("Hide object in exported maps","Systemflag"));
-	systemFlagsDefault->addFlag (fo);
+	setupFlag (fo,tb,avis,"hideInExport",tr("Hide object in exported maps","SystemFlag"));
 
 	// Create Standard Flags
-	QToolBar *tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar"));
+	tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar"));
 	tb->setObjectName ("standardFlagTB");
 
 	standardFlagsDefault = new FlagRowObj ();
@@ -1116,336 +1107,192 @@
 	standardFlagsDefault->setToolBar (tb);
 
 	fo->load(flagsPath+"flag-exclamationmark.png");
-	fo->setName ("exclamationmark");
 	fo->setGroup("standard-mark");
-	QAction *a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Take care!","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	// makes deep copy
+	setupFlag (fo,tb,avis,"exclamationmark",tr("Take care!","Standardflag"));
 	
 	fo->load(flagsPath+"flag-questionmark.png");
-	fo->setName("questionmark");
 	fo->setGroup("standard-mark");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Really?","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"questionmark",tr("Really?","Standardflag"));
 
 	fo->load(flagsPath+"flag-hook-green.png");
-	fo->setName("hook-green");
 	fo->setGroup("standard-hook");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("ok!","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"hook-green",tr("ok!","Standardflag"));
 
 	fo->load(flagsPath+"flag-cross-red.png");
-	fo->setName("cross-red");
 	fo->setGroup("standard-hook");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Not ok!","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"cross-red",tr("Not ok!","Standardflag"));
+	fo->unsetGroup();
 
 	fo->load(flagsPath+"flag-stopsign.png");
-	fo->setName("stopsign");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("This won't work!","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"stopsign",tr("This won't work!","Standardflag"));
 
 	fo->load(flagsPath+"flag-smiley-good.png");
-	fo->setName("smiley-good");
 	fo->setGroup("standard-smiley");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Good","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"smiley-good",tr("Good","Standardflag"));
 
 	fo->load(flagsPath+"flag-smiley-sad.png");
-	fo->setName("smiley-sad");
 	fo->setGroup("standard-smiley");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Bad","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
 
 	fo->load(flagsPath+"flag-smiley-omg.png");
+	fo->setGroup("standard-smiley");
+	setupFlag (fo,tb,avis,"smiley-omb",tr("Oh no!","Standardflag"));
 	// Original omg.png (in KDE emoticons)
-	fo->setName("smiley-omg");
-	fo->setGroup("standard-smiley");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Oh no!","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	fo->unsetGroup();
 
 	fo->load(flagsPath+"flag-kalarm.png");
-	fo->setName("clock");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Time critical","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"clock",tr("Time critical","Standardflag"));
 
 	fo->load(flagsPath+"flag-phone.png");
-	fo->setName("phone");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Call...","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"phone",tr("Call...","Standardflag"));
 
 	fo->load(flagsPath+"flag-lamp.png");
-	fo->setName("lamp");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Idea!","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"lamp",tr("Idea!","Standardflag"));
 
 	fo->load(flagsPath+"flag-arrow-up.png");
-	fo->setName("arrow-up");
 	fo->setGroup("standard-arrow");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Important","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"arrow-up",tr("Important","Standardflag"));
 
 	fo->load(flagsPath+"flag-arrow-down.png");
-	fo->setName("arrow-down");
 	fo->setGroup("standard-arrow");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Unimportant","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"arrow-down",tr("Unimportant","Standardflag"));
 
 	fo->load(flagsPath+"flag-arrow-2up.png");
-	fo->setName("2arrow-up");
 	fo->setGroup("standard-arrow");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Very important!","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"2arrow-up",tr("Very important!","Standardflag"));
 
 	fo->load(flagsPath+"flag-arrow-2down.png");
-	fo->setName("2arrow-down");
 	fo->setGroup("standard-arrow");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Very unimportant!","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"present",tr("Very unimportant!","Standardflag"));
+	fo->unsetGroup();
 
 	fo->load(flagsPath+"flag-thumb-up.png");
-	fo->setName("thumb-up");
 	fo->setGroup("standard-thumb");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("I like this","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"thumb-up",tr("I like this","Standardflag"));
 
 	fo->load(flagsPath+"flag-thumb-down.png");
-	fo->setName("thumb-down");
 	fo->setGroup("standard-thumb");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("I do not like this","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"thumb-down",tr("I do not like this","Standardflag"));
+	fo->unsetGroup();
 	
 	fo->load(flagsPath+"flag-rose.png");
-	fo->setName("rose");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("Rose","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	setupFlag (fo,tb,avis,"rose",tr("Rose","Standardflag"));
 
 	fo->load(flagsPath+"flag-heart.png");
-	fo->setName("heart");
-	a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tr("I just love... ","Standardflag"));
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
-
+	setupFlag (fo,tb,avis,"heart",tr("I just love...","Standardflag"));
 
 	fo->load(flagsPath+"flag-present.png");
-	setupFlag (fo,tb,"present",tr("Surprise!","Standardflag"));
+	setupFlag (fo,tb,avis,"present",tr("Surprise!","Standardflag"));
 
 	fo->load(flagsPath+"flag-flash.png");
-	setupFlag (fo,tb,"flash",tr("Dangerous","Standardflag"));
+	setupFlag (fo,tb,avis,"flash",tr("Dangerous","Standardflag"));
 	
 	// Original: xsldbg_output.png
 	fo->load(flagsPath+"flag-info.png");
-	setupFlag (fo,tb,"info",tr("Info","Standardflag"));
+	setupFlag (fo,tb,avis,"info",tr("Info","Standardflag"));
 
 	// Original khelpcenter.png
 	fo->load(flagsPath+"flag-lifebelt.png");
-	setupFlag (fo,tb,"lifebelt",tr("This will help","Standardflag"));
+	setupFlag (fo,tb,avis,"lifebelt",tr("This will help","Standardflag"));
 
 	// Freemind flags
 
+	avis=false;
+
 	fo->load(flagsPath+"freemind/warning.png");
-	setupFlag (fo,tb,"freemind-warning",tr("Important","Freemind-Flag"));
+	setupFlag (fo,tb, avis, "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,QString("freemind-priority-%1").arg(i),tr("Priority","Freemind-Flag"));
+		setupFlag (fo,tb, avis,QString("freemind-priority-%1").arg(i),tr("Priority","Freemind-Flag"));
 	}
 
 	fo->load(flagsPath+"freemind/back.png");
-	setupFlag (fo,tb,"freemind-back",tr("Back","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-back",tr("Back","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/forward.png");
-	setupFlag (fo,tb,"freemind-forward",tr("Forward","Freemind-Flag"));
-
+	setupFlag (fo,tb,avis,"freemind-forward",tr("Forward","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/attach.png");
-	setupFlag (fo,tb,"freemind-attach",tr("Look here","Freemind-Flag"));
-
+	setupFlag (fo,tb,avis,"freemind-attach",tr("Look here","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/clanbomber.png");
-	setupFlag (fo,tb,"freemind-clanbomber",tr("Dangerous","Freemind-Flag"));
-
+	setupFlag (fo,tb,avis,"freemind-clanbomber",tr("Dangerous","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/desktopnew.png");
-	setupFlag (fo,tb,"freemind-desktopnew",tr("Don't forget","Freemind-Flag"));
-
+	setupFlag (fo,tb,avis,"freemind-desktopnew",tr("Don't forget","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/flag.png");
-	setupFlag (fo,tb,"freemind-flag",tr("Flag","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-flag",tr("Flag","Freemind-Flag"));
 
 
 	fo->load(flagsPath+"freemind/gohome.png");
-	setupFlag (fo,tb,"freemind-gohome",tr("Home","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-gohome",tr("Home","Freemind-Flag"));
 
 
 	fo->load(flagsPath+"freemind/kaddressbook.png");
-	setupFlag (fo,tb,"freemind-kaddressbook",tr("Telephone","Freemind-Flag"));
-
+	setupFlag (fo,tb,avis,"freemind-kaddressbook",tr("Telephone","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/knotify.png");
-	setupFlag (fo,tb,"freemind-knotify",tr("Music","Freemind-Flag"));
-
+	setupFlag (fo,tb,avis,"freemind-knotify",tr("Music","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/korn.png");
-	setupFlag (fo,tb,"freemind-korn",tr("Mailbox","Freemind-Flag"));
-
+	setupFlag (fo,tb,avis,"freemind-korn",tr("Mailbox","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/mail.png");
-	setupFlag (fo,tb,"freemind-mail",tr("Maix","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-mail",tr("Maix","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/password.png");
-	setupFlag (fo,tb,"freemind-password",tr("Password","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-password",tr("Password","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/pencil.png");
-	setupFlag (fo,tb,"freemind-pencil",tr("To be improved","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-pencil",tr("To be improved","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/stop.png");
-	setupFlag (fo,tb,"freemind-stop",tr("Stop","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-stop",tr("Stop","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/wizard.png");
-	setupFlag (fo,tb,"freemind-wizard",tr("Magic","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-wizard",tr("Magic","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/xmag.png");
-	setupFlag (fo,tb,"freemind-xmag",tr("To be discussed","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-xmag",tr("To be discussed","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/bell.png");
-	setupFlag (fo,tb,"freemind-bell",tr("Reminder","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-bell",tr("Reminder","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/bookmark.png");
-	setupFlag (fo,tb,"freemind-bookmark",tr("Excellent","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-bookmark",tr("Excellent","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/penguin.png");
-	setupFlag (fo,tb,"freemind-penguin",tr("Linux","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-penguin",tr("Linux","Freemind-Flag"));
 
 	fo->load(flagsPath+"freemind/licq.png");
-	setupFlag (fo,tb,"freemind-licq",tr("Sweet","Freemind-Flag"));
+	setupFlag (fo,tb,avis,"freemind-licq",tr("Sweet","Freemind-Flag"));
 
 	delete (fo);
 }
 
-void Main::setupFlag (FlagObj *fo, QToolBar *tb, const QString &name, const QString &tooltip)
+void Main::setupFlag (FlagObj *fo, QToolBar *tb, bool aw, const QString &name, const QString &tooltip)
 {
 	fo->setName(name);
+	fo->setToolTip (tooltip);
 	QAction *a=new QAction (fo->getPixmap(),fo->getName(),this);
-	tb->addAction (a);
-	fo->setAction (a);
-	a->setCheckable(true);
-	a->setObjectName(fo->getName());
-	a->setToolTip(tooltip);
-	connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
-	standardFlagsDefault->addFlag (fo);	
+	if (tb)
+	{
+		// StandardFlag
+		tb->addAction (a);
+		fo->setAction (a);
+		fo->setAlwaysVisible(aw);
+		a->setCheckable(true);
+		a->setObjectName(fo->getName());
+		a->setToolTip(tooltip);
+		connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
+		standardFlagsDefault->addFlag (fo);	
+	} else
+	{
+		// SystemFlag
+		systemFlagsDefault->addFlag (fo);	
+	}
 }
 // Network Actions
 void Main::setupNetworkActions()
diff -r eaa3798cc33a -r a4c3dd0e48de mainwindow.h
--- a/mainwindow.h	Thu Aug 09 18:34:07 2007 +0000
+++ b/mainwindow.h	Thu Aug 09 18:34:08 2007 +0000
@@ -44,7 +44,7 @@
     void setupViewActions();
     void setupModeActions();
     void setupWindowActions();
-    void setupFlag(FlagObj *fo, QToolBar *tb, const QString &name, const QString &tooltip);
+    void setupFlag(FlagObj *fo, QToolBar *tb, bool aw, const QString &name, const QString &tooltip);
     void setupFlagActions();
     void setupNetworkActions();
     void setupSettingsActions();