1.1 --- a/mainwindow.cpp Thu Aug 09 18:34:07 2007 +0000
1.2 +++ b/mainwindow.cpp Thu Aug 09 18:34:08 2007 +0000
1.3 @@ -1071,43 +1071,34 @@
1.4 void Main::setupFlagActions()
1.5 {
1.6 // Create System Flags
1.7 + QToolBar *tb=NULL;
1.8 + bool avis=true;
1.9 +
1.10 systemFlagsDefault = new FlagRowObj ();
1.11 systemFlagsDefault->setVisibility (false);
1.12 systemFlagsDefault->setName ("systemFlagsDef");
1.13
1.14 FlagObj *fo = new FlagObj ();
1.15 fo->load(QPixmap(flagsPath+"flag-note.png"));
1.16 - fo->setName("note");
1.17 - fo->setToolTip(tr("Note","Systemflag"));
1.18 - systemFlagsDefault->addFlag (fo); // makes deep copy
1.19 + setupFlag (fo,tb,avis,"note",tr("Note","SystemFlag"));
1.20
1.21 fo->load(QPixmap(flagsPath+"flag-url.png"));
1.22 - fo->setName("url");
1.23 - fo->setToolTip(tr("WWW Document (external)","Systemflag"));
1.24 - systemFlagsDefault->addFlag (fo);
1.25 + setupFlag (fo,tb,avis,"url",tr("URL to Document ","SystemFlag"));
1.26
1.27 fo->load(QPixmap(flagsPath+"flag-vymlink.png"));
1.28 - fo->setName("vymLink");
1.29 - fo->setToolTip(tr("Link to another vym map","Systemflag"));
1.30 - systemFlagsDefault->addFlag (fo);
1.31 + setupFlag (fo,tb,avis,"vymLink",tr("Link to another vym map","SystemFlag"));
1.32
1.33 fo->load(QPixmap(flagsPath+"flag-scrolled-right.png"));
1.34 - fo->setName("scrolledright");
1.35 - fo->setToolTip(tr("subtree is scrolled","Systemflag"));
1.36 - systemFlagsDefault->addFlag (fo);
1.37 + setupFlag (fo,tb,avis,"scrolledright",tr("subtree is scrolled","SystemFlag"));
1.38
1.39 fo->load(QPixmap(flagsPath+"flag-tmpUnscrolled-right.png"));
1.40 - fo->setName("tmpUnscrolledright");
1.41 - fo->setToolTip(tr("subtree is temporary scrolled","Systemflag"));
1.42 - systemFlagsDefault->addFlag (fo);
1.43 + setupFlag (fo,tb,avis,"tmpUnscrolledright",tr("subtree is temporary scrolled","SystemFlag"));
1.44
1.45 fo->load(QPixmap(flagsPath+"flag-hideexport.png"));
1.46 - fo->setName("hideInExport");
1.47 - fo->setToolTip(tr("Hide object in exported maps","Systemflag"));
1.48 - systemFlagsDefault->addFlag (fo);
1.49 + setupFlag (fo,tb,avis,"hideInExport",tr("Hide object in exported maps","SystemFlag"));
1.50
1.51 // Create Standard Flags
1.52 - QToolBar *tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar"));
1.53 + tb=addToolBar (tr ("Standard Flags","Standard Flag Toolbar"));
1.54 tb->setObjectName ("standardFlagTB");
1.55
1.56 standardFlagsDefault = new FlagRowObj ();
1.57 @@ -1116,336 +1107,192 @@
1.58 standardFlagsDefault->setToolBar (tb);
1.59
1.60 fo->load(flagsPath+"flag-exclamationmark.png");
1.61 - fo->setName ("exclamationmark");
1.62 fo->setGroup("standard-mark");
1.63 - QAction *a=new QAction (fo->getPixmap(),fo->getName(),this);
1.64 - tb->addAction (a);
1.65 - fo->setAction (a);
1.66 - a->setCheckable(true);
1.67 - a->setObjectName(fo->getName());
1.68 - a->setToolTip(tr("Take care!","Standardflag"));
1.69 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.70 - standardFlagsDefault->addFlag (fo); // makes deep copy
1.71 + setupFlag (fo,tb,avis,"exclamationmark",tr("Take care!","Standardflag"));
1.72
1.73 fo->load(flagsPath+"flag-questionmark.png");
1.74 - fo->setName("questionmark");
1.75 fo->setGroup("standard-mark");
1.76 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.77 - tb->addAction (a);
1.78 - fo->setAction (a);
1.79 - a->setCheckable(true);
1.80 - a->setObjectName(fo->getName());
1.81 - a->setToolTip(tr("Really?","Standardflag"));
1.82 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.83 - standardFlagsDefault->addFlag (fo);
1.84 + setupFlag (fo,tb,avis,"questionmark",tr("Really?","Standardflag"));
1.85
1.86 fo->load(flagsPath+"flag-hook-green.png");
1.87 - fo->setName("hook-green");
1.88 fo->setGroup("standard-hook");
1.89 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.90 - tb->addAction (a);
1.91 - fo->setAction (a);
1.92 - a->setCheckable(true);
1.93 - a->setObjectName(fo->getName());
1.94 - a->setToolTip(tr("ok!","Standardflag"));
1.95 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.96 - standardFlagsDefault->addFlag (fo);
1.97 + setupFlag (fo,tb,avis,"hook-green",tr("ok!","Standardflag"));
1.98
1.99 fo->load(flagsPath+"flag-cross-red.png");
1.100 - fo->setName("cross-red");
1.101 fo->setGroup("standard-hook");
1.102 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.103 - tb->addAction (a);
1.104 - fo->setAction (a);
1.105 - a->setCheckable(true);
1.106 - a->setObjectName(fo->getName());
1.107 - a->setToolTip(tr("Not ok!","Standardflag"));
1.108 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.109 - standardFlagsDefault->addFlag (fo);
1.110 + setupFlag (fo,tb,avis,"cross-red",tr("Not ok!","Standardflag"));
1.111 + fo->unsetGroup();
1.112
1.113 fo->load(flagsPath+"flag-stopsign.png");
1.114 - fo->setName("stopsign");
1.115 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.116 - tb->addAction (a);
1.117 - fo->setAction (a);
1.118 - a->setCheckable(true);
1.119 - a->setObjectName(fo->getName());
1.120 - a->setToolTip(tr("This won't work!","Standardflag"));
1.121 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.122 - standardFlagsDefault->addFlag (fo);
1.123 + setupFlag (fo,tb,avis,"stopsign",tr("This won't work!","Standardflag"));
1.124
1.125 fo->load(flagsPath+"flag-smiley-good.png");
1.126 - fo->setName("smiley-good");
1.127 fo->setGroup("standard-smiley");
1.128 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.129 - tb->addAction (a);
1.130 - fo->setAction (a);
1.131 - a->setCheckable(true);
1.132 - a->setObjectName(fo->getName());
1.133 - a->setToolTip(tr("Good","Standardflag"));
1.134 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.135 - standardFlagsDefault->addFlag (fo);
1.136 + setupFlag (fo,tb,avis,"smiley-good",tr("Good","Standardflag"));
1.137
1.138 fo->load(flagsPath+"flag-smiley-sad.png");
1.139 - fo->setName("smiley-sad");
1.140 fo->setGroup("standard-smiley");
1.141 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.142 - tb->addAction (a);
1.143 - fo->setAction (a);
1.144 - a->setCheckable(true);
1.145 - a->setObjectName(fo->getName());
1.146 - a->setToolTip(tr("Bad","Standardflag"));
1.147 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.148 - standardFlagsDefault->addFlag (fo);
1.149
1.150 fo->load(flagsPath+"flag-smiley-omg.png");
1.151 + fo->setGroup("standard-smiley");
1.152 + setupFlag (fo,tb,avis,"smiley-omb",tr("Oh no!","Standardflag"));
1.153 // Original omg.png (in KDE emoticons)
1.154 - fo->setName("smiley-omg");
1.155 - fo->setGroup("standard-smiley");
1.156 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.157 - tb->addAction (a);
1.158 - fo->setAction (a);
1.159 - a->setCheckable(true);
1.160 - a->setObjectName(fo->getName());
1.161 - a->setToolTip(tr("Oh no!","Standardflag"));
1.162 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.163 - standardFlagsDefault->addFlag (fo);
1.164 + fo->unsetGroup();
1.165
1.166 fo->load(flagsPath+"flag-kalarm.png");
1.167 - fo->setName("clock");
1.168 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.169 - tb->addAction (a);
1.170 - fo->setAction (a);
1.171 - a->setCheckable(true);
1.172 - a->setObjectName(fo->getName());
1.173 - a->setToolTip(tr("Time critical","Standardflag"));
1.174 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.175 - standardFlagsDefault->addFlag (fo);
1.176 + setupFlag (fo,tb,avis,"clock",tr("Time critical","Standardflag"));
1.177
1.178 fo->load(flagsPath+"flag-phone.png");
1.179 - fo->setName("phone");
1.180 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.181 - tb->addAction (a);
1.182 - fo->setAction (a);
1.183 - a->setCheckable(true);
1.184 - a->setObjectName(fo->getName());
1.185 - a->setToolTip(tr("Call...","Standardflag"));
1.186 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.187 - standardFlagsDefault->addFlag (fo);
1.188 + setupFlag (fo,tb,avis,"phone",tr("Call...","Standardflag"));
1.189
1.190 fo->load(flagsPath+"flag-lamp.png");
1.191 - fo->setName("lamp");
1.192 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.193 - tb->addAction (a);
1.194 - fo->setAction (a);
1.195 - a->setCheckable(true);
1.196 - a->setObjectName(fo->getName());
1.197 - a->setToolTip(tr("Idea!","Standardflag"));
1.198 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.199 - standardFlagsDefault->addFlag (fo);
1.200 + setupFlag (fo,tb,avis,"lamp",tr("Idea!","Standardflag"));
1.201
1.202 fo->load(flagsPath+"flag-arrow-up.png");
1.203 - fo->setName("arrow-up");
1.204 fo->setGroup("standard-arrow");
1.205 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.206 - tb->addAction (a);
1.207 - fo->setAction (a);
1.208 - a->setCheckable(true);
1.209 - a->setObjectName(fo->getName());
1.210 - a->setToolTip(tr("Important","Standardflag"));
1.211 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.212 - standardFlagsDefault->addFlag (fo);
1.213 + setupFlag (fo,tb,avis,"arrow-up",tr("Important","Standardflag"));
1.214
1.215 fo->load(flagsPath+"flag-arrow-down.png");
1.216 - fo->setName("arrow-down");
1.217 fo->setGroup("standard-arrow");
1.218 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.219 - tb->addAction (a);
1.220 - fo->setAction (a);
1.221 - a->setCheckable(true);
1.222 - a->setObjectName(fo->getName());
1.223 - a->setToolTip(tr("Unimportant","Standardflag"));
1.224 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.225 - standardFlagsDefault->addFlag (fo);
1.226 + setupFlag (fo,tb,avis,"arrow-down",tr("Unimportant","Standardflag"));
1.227
1.228 fo->load(flagsPath+"flag-arrow-2up.png");
1.229 - fo->setName("2arrow-up");
1.230 fo->setGroup("standard-arrow");
1.231 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.232 - tb->addAction (a);
1.233 - fo->setAction (a);
1.234 - a->setCheckable(true);
1.235 - a->setObjectName(fo->getName());
1.236 - a->setToolTip(tr("Very important!","Standardflag"));
1.237 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.238 - standardFlagsDefault->addFlag (fo);
1.239 + setupFlag (fo,tb,avis,"2arrow-up",tr("Very important!","Standardflag"));
1.240
1.241 fo->load(flagsPath+"flag-arrow-2down.png");
1.242 - fo->setName("2arrow-down");
1.243 fo->setGroup("standard-arrow");
1.244 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.245 - tb->addAction (a);
1.246 - fo->setAction (a);
1.247 - a->setCheckable(true);
1.248 - a->setObjectName(fo->getName());
1.249 - a->setToolTip(tr("Very unimportant!","Standardflag"));
1.250 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.251 - standardFlagsDefault->addFlag (fo);
1.252 + setupFlag (fo,tb,avis,"present",tr("Very unimportant!","Standardflag"));
1.253 + fo->unsetGroup();
1.254
1.255 fo->load(flagsPath+"flag-thumb-up.png");
1.256 - fo->setName("thumb-up");
1.257 fo->setGroup("standard-thumb");
1.258 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.259 - tb->addAction (a);
1.260 - fo->setAction (a);
1.261 - a->setCheckable(true);
1.262 - a->setObjectName(fo->getName());
1.263 - a->setToolTip(tr("I like this","Standardflag"));
1.264 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.265 - standardFlagsDefault->addFlag (fo);
1.266 + setupFlag (fo,tb,avis,"thumb-up",tr("I like this","Standardflag"));
1.267
1.268 fo->load(flagsPath+"flag-thumb-down.png");
1.269 - fo->setName("thumb-down");
1.270 fo->setGroup("standard-thumb");
1.271 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.272 - tb->addAction (a);
1.273 - fo->setAction (a);
1.274 - a->setCheckable(true);
1.275 - a->setObjectName(fo->getName());
1.276 - a->setToolTip(tr("I do not like this","Standardflag"));
1.277 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.278 - standardFlagsDefault->addFlag (fo);
1.279 + setupFlag (fo,tb,avis,"thumb-down",tr("I do not like this","Standardflag"));
1.280 + fo->unsetGroup();
1.281
1.282 fo->load(flagsPath+"flag-rose.png");
1.283 - fo->setName("rose");
1.284 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.285 - tb->addAction (a);
1.286 - fo->setAction (a);
1.287 - a->setCheckable(true);
1.288 - a->setObjectName(fo->getName());
1.289 - a->setToolTip(tr("Rose","Standardflag"));
1.290 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.291 - standardFlagsDefault->addFlag (fo);
1.292 + setupFlag (fo,tb,avis,"rose",tr("Rose","Standardflag"));
1.293
1.294 fo->load(flagsPath+"flag-heart.png");
1.295 - fo->setName("heart");
1.296 - a=new QAction (fo->getPixmap(),fo->getName(),this);
1.297 - tb->addAction (a);
1.298 - a->setCheckable(true);
1.299 - a->setObjectName(fo->getName());
1.300 - a->setToolTip(tr("I just love... ","Standardflag"));
1.301 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.302 - standardFlagsDefault->addFlag (fo);
1.303 -
1.304 + setupFlag (fo,tb,avis,"heart",tr("I just love...","Standardflag"));
1.305
1.306 fo->load(flagsPath+"flag-present.png");
1.307 - setupFlag (fo,tb,"present",tr("Surprise!","Standardflag"));
1.308 + setupFlag (fo,tb,avis,"present",tr("Surprise!","Standardflag"));
1.309
1.310 fo->load(flagsPath+"flag-flash.png");
1.311 - setupFlag (fo,tb,"flash",tr("Dangerous","Standardflag"));
1.312 + setupFlag (fo,tb,avis,"flash",tr("Dangerous","Standardflag"));
1.313
1.314 // Original: xsldbg_output.png
1.315 fo->load(flagsPath+"flag-info.png");
1.316 - setupFlag (fo,tb,"info",tr("Info","Standardflag"));
1.317 + setupFlag (fo,tb,avis,"info",tr("Info","Standardflag"));
1.318
1.319 // Original khelpcenter.png
1.320 fo->load(flagsPath+"flag-lifebelt.png");
1.321 - setupFlag (fo,tb,"lifebelt",tr("This will help","Standardflag"));
1.322 + setupFlag (fo,tb,avis,"lifebelt",tr("This will help","Standardflag"));
1.323
1.324 // Freemind flags
1.325
1.326 + avis=false;
1.327 +
1.328 fo->load(flagsPath+"freemind/warning.png");
1.329 - setupFlag (fo,tb,"freemind-warning",tr("Important","Freemind-Flag"));
1.330 + setupFlag (fo,tb, avis, "freemind-warning",tr("Important","Freemind-Flag"));
1.331
1.332 for (int i=1; i<8; i++)
1.333 {
1.334 fo->load(flagsPath+QString("freemind/priority-%1.png").arg(i));
1.335 - setupFlag (fo,tb,QString("freemind-priority-%1").arg(i),tr("Priority","Freemind-Flag"));
1.336 + setupFlag (fo,tb, avis,QString("freemind-priority-%1").arg(i),tr("Priority","Freemind-Flag"));
1.337 }
1.338
1.339 fo->load(flagsPath+"freemind/back.png");
1.340 - setupFlag (fo,tb,"freemind-back",tr("Back","Freemind-Flag"));
1.341 + setupFlag (fo,tb,avis,"freemind-back",tr("Back","Freemind-Flag"));
1.342
1.343 fo->load(flagsPath+"freemind/forward.png");
1.344 - setupFlag (fo,tb,"freemind-forward",tr("Forward","Freemind-Flag"));
1.345 -
1.346 + setupFlag (fo,tb,avis,"freemind-forward",tr("Forward","Freemind-Flag"));
1.347
1.348 fo->load(flagsPath+"freemind/attach.png");
1.349 - setupFlag (fo,tb,"freemind-attach",tr("Look here","Freemind-Flag"));
1.350 -
1.351 + setupFlag (fo,tb,avis,"freemind-attach",tr("Look here","Freemind-Flag"));
1.352
1.353 fo->load(flagsPath+"freemind/clanbomber.png");
1.354 - setupFlag (fo,tb,"freemind-clanbomber",tr("Dangerous","Freemind-Flag"));
1.355 -
1.356 + setupFlag (fo,tb,avis,"freemind-clanbomber",tr("Dangerous","Freemind-Flag"));
1.357
1.358 fo->load(flagsPath+"freemind/desktopnew.png");
1.359 - setupFlag (fo,tb,"freemind-desktopnew",tr("Don't forget","Freemind-Flag"));
1.360 -
1.361 + setupFlag (fo,tb,avis,"freemind-desktopnew",tr("Don't forget","Freemind-Flag"));
1.362
1.363 fo->load(flagsPath+"freemind/flag.png");
1.364 - setupFlag (fo,tb,"freemind-flag",tr("Flag","Freemind-Flag"));
1.365 + setupFlag (fo,tb,avis,"freemind-flag",tr("Flag","Freemind-Flag"));
1.366
1.367
1.368 fo->load(flagsPath+"freemind/gohome.png");
1.369 - setupFlag (fo,tb,"freemind-gohome",tr("Home","Freemind-Flag"));
1.370 + setupFlag (fo,tb,avis,"freemind-gohome",tr("Home","Freemind-Flag"));
1.371
1.372
1.373 fo->load(flagsPath+"freemind/kaddressbook.png");
1.374 - setupFlag (fo,tb,"freemind-kaddressbook",tr("Telephone","Freemind-Flag"));
1.375 -
1.376 + setupFlag (fo,tb,avis,"freemind-kaddressbook",tr("Telephone","Freemind-Flag"));
1.377
1.378 fo->load(flagsPath+"freemind/knotify.png");
1.379 - setupFlag (fo,tb,"freemind-knotify",tr("Music","Freemind-Flag"));
1.380 -
1.381 + setupFlag (fo,tb,avis,"freemind-knotify",tr("Music","Freemind-Flag"));
1.382
1.383 fo->load(flagsPath+"freemind/korn.png");
1.384 - setupFlag (fo,tb,"freemind-korn",tr("Mailbox","Freemind-Flag"));
1.385 -
1.386 + setupFlag (fo,tb,avis,"freemind-korn",tr("Mailbox","Freemind-Flag"));
1.387
1.388 fo->load(flagsPath+"freemind/mail.png");
1.389 - setupFlag (fo,tb,"freemind-mail",tr("Maix","Freemind-Flag"));
1.390 + setupFlag (fo,tb,avis,"freemind-mail",tr("Maix","Freemind-Flag"));
1.391
1.392 fo->load(flagsPath+"freemind/password.png");
1.393 - setupFlag (fo,tb,"freemind-password",tr("Password","Freemind-Flag"));
1.394 + setupFlag (fo,tb,avis,"freemind-password",tr("Password","Freemind-Flag"));
1.395
1.396 fo->load(flagsPath+"freemind/pencil.png");
1.397 - setupFlag (fo,tb,"freemind-pencil",tr("To be improved","Freemind-Flag"));
1.398 + setupFlag (fo,tb,avis,"freemind-pencil",tr("To be improved","Freemind-Flag"));
1.399
1.400 fo->load(flagsPath+"freemind/stop.png");
1.401 - setupFlag (fo,tb,"freemind-stop",tr("Stop","Freemind-Flag"));
1.402 + setupFlag (fo,tb,avis,"freemind-stop",tr("Stop","Freemind-Flag"));
1.403
1.404 fo->load(flagsPath+"freemind/wizard.png");
1.405 - setupFlag (fo,tb,"freemind-wizard",tr("Magic","Freemind-Flag"));
1.406 + setupFlag (fo,tb,avis,"freemind-wizard",tr("Magic","Freemind-Flag"));
1.407
1.408 fo->load(flagsPath+"freemind/xmag.png");
1.409 - setupFlag (fo,tb,"freemind-xmag",tr("To be discussed","Freemind-Flag"));
1.410 + setupFlag (fo,tb,avis,"freemind-xmag",tr("To be discussed","Freemind-Flag"));
1.411
1.412 fo->load(flagsPath+"freemind/bell.png");
1.413 - setupFlag (fo,tb,"freemind-bell",tr("Reminder","Freemind-Flag"));
1.414 + setupFlag (fo,tb,avis,"freemind-bell",tr("Reminder","Freemind-Flag"));
1.415
1.416 fo->load(flagsPath+"freemind/bookmark.png");
1.417 - setupFlag (fo,tb,"freemind-bookmark",tr("Excellent","Freemind-Flag"));
1.418 + setupFlag (fo,tb,avis,"freemind-bookmark",tr("Excellent","Freemind-Flag"));
1.419
1.420 fo->load(flagsPath+"freemind/penguin.png");
1.421 - setupFlag (fo,tb,"freemind-penguin",tr("Linux","Freemind-Flag"));
1.422 + setupFlag (fo,tb,avis,"freemind-penguin",tr("Linux","Freemind-Flag"));
1.423
1.424 fo->load(flagsPath+"freemind/licq.png");
1.425 - setupFlag (fo,tb,"freemind-licq",tr("Sweet","Freemind-Flag"));
1.426 + setupFlag (fo,tb,avis,"freemind-licq",tr("Sweet","Freemind-Flag"));
1.427
1.428 delete (fo);
1.429 }
1.430
1.431 -void Main::setupFlag (FlagObj *fo, QToolBar *tb, const QString &name, const QString &tooltip)
1.432 +void Main::setupFlag (FlagObj *fo, QToolBar *tb, bool aw, const QString &name, const QString &tooltip)
1.433 {
1.434 fo->setName(name);
1.435 + fo->setToolTip (tooltip);
1.436 QAction *a=new QAction (fo->getPixmap(),fo->getName(),this);
1.437 - tb->addAction (a);
1.438 - fo->setAction (a);
1.439 - a->setCheckable(true);
1.440 - a->setObjectName(fo->getName());
1.441 - a->setToolTip(tooltip);
1.442 - connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.443 - standardFlagsDefault->addFlag (fo);
1.444 + if (tb)
1.445 + {
1.446 + // StandardFlag
1.447 + tb->addAction (a);
1.448 + fo->setAction (a);
1.449 + fo->setAlwaysVisible(aw);
1.450 + a->setCheckable(true);
1.451 + a->setObjectName(fo->getName());
1.452 + a->setToolTip(tooltip);
1.453 + connect (a, SIGNAL( triggered() ), this, SLOT( standardFlagChanged() ) );
1.454 + standardFlagsDefault->addFlag (fo);
1.455 + } else
1.456 + {
1.457 + // SystemFlag
1.458 + systemFlagsDefault->addFlag (fo);
1.459 + }
1.460 }
1.461 // Network Actions
1.462 void Main::setupNetworkActions()