1.1 --- a/mapeditor.cpp Wed May 18 07:39:58 2005 +0000
1.2 +++ b/mapeditor.cpp Mon May 23 15:28:20 2005 +0000
1.3 @@ -121,6 +121,7 @@
1.4 extern QAction *actionSettingsAutoselectHeading;
1.5 extern QAction *actionSettingsAutoselectText;
1.6 extern QAction *actionSettingsPasteNewHeading;
1.7 +extern QAction *actionSettingsUseFlagGroups;
1.8
1.9 extern QPopupMenu *branchContextMenu;
1.10 extern QPopupMenu *branchLinksContextMenu;
1.11 @@ -193,22 +194,26 @@
1.12
1.13 FlagObj *fo = new FlagObj (mapCanvas);
1.14 fo->load(QPixmap(flag_exclamationmark_xpm));
1.15 - fo->setName("exclamationmark");
1.16 + fo->setName ("exclamationmark");
1.17 + fo->setGroup("standard-mark");
1.18 fo->setToolTip(tr("Take care!","Standardflag"));
1.19 standardFlagsDefault->addFlag (fo); // makes deep copy
1.20
1.21 fo->load(QPixmap(flag_questionmark_xpm));
1.22 fo->setName("questionmark");
1.23 + fo->setGroup("standard-mark");
1.24 fo->setToolTip(tr("Really?","Standardflag"));
1.25 standardFlagsDefault->addFlag (fo);
1.26
1.27 fo->load(QPixmap(flag_hook_green_xpm));
1.28 fo->setName("hook-green");
1.29 + fo->setGroup("standard-hook");
1.30 fo->setToolTip(tr("ok!","Standardflag"));
1.31 standardFlagsDefault->addFlag (fo);
1.32
1.33 fo->load(QPixmap(flag_cross_red_xpm));
1.34 fo->setName("cross-red");
1.35 + fo->setGroup("standard-hook");
1.36 fo->setToolTip(tr("Not ok!","Standardflag"));
1.37 standardFlagsDefault->addFlag (fo);
1.38
1.39 @@ -219,11 +224,13 @@
1.40
1.41 fo->load(QPixmap(flag_smiley_good_xpm));
1.42 fo->setName("smiley-good");
1.43 + fo->setGroup("standard-smiley");
1.44 fo->setToolTip(tr("Good","Standardflag"));
1.45 standardFlagsDefault->addFlag (fo);
1.46
1.47 fo->load(QPixmap(flag_smiley_sad_xpm));
1.48 fo->setName("smiley-sad");
1.49 + fo->setGroup("standard-smiley");
1.50 fo->setToolTip(tr("Bad","Standardflag"));
1.51 standardFlagsDefault->addFlag (fo);
1.52
1.53 @@ -239,21 +246,26 @@
1.54
1.55 fo->load(QPixmap(flag_arrow_up_xpm));
1.56 fo->setName("arrow-up");
1.57 + fo->setGroup("standard-arrow");
1.58 fo->setToolTip(tr("Important","Standardflag"));
1.59 standardFlagsDefault->addFlag (fo);
1.60
1.61 fo->load(QPixmap(flag_arrow_down_xpm));
1.62 fo->setName("arrow-down");
1.63 + fo->setGroup("standard-arrow");
1.64 fo->setToolTip(tr("Unimportant","Standardflag"));
1.65 standardFlagsDefault->addFlag (fo);
1.66
1.67 fo->load(QPixmap(flag_thumb_up_xpm));
1.68 fo->setName("thumb-up");
1.69 + fo->setGroup("standard-thumb");
1.70 fo->setToolTip(tr("I like this","Standardflag"));
1.71 standardFlagsDefault->addFlag (fo);
1.72
1.73 fo->load(QPixmap(flag_thumb_down_xpm));
1.74 fo->setName("thumb-down");
1.75 + fo->setGroup("standard-thumb");
1.76 + fo->setToolTip(tr("I like this","Standardflag"));
1.77 fo->setToolTip(tr("I do not like this","Standardflag"));
1.78 standardFlagsDefault->addFlag (fo);
1.79
1.80 @@ -549,7 +561,6 @@
1.81
1.82 if (writeflags)
1.83 standardFlagsDefault->saveToDir (tmpdir+"/flags/","",writeflags);
1.84 -
1.85 return s;
1.86 }
1.87
1.88 @@ -1996,7 +2007,7 @@
1.89 {
1.90 setChanged();
1.91 saveState(PartOfMap,selection);
1.92 - ((BranchObj*)(selection))->toggleStandardFlag (f);
1.93 + ((BranchObj*)(selection))->toggleStandardFlag (f,actionSettingsUseFlagGroups);
1.94 }
1.95 }
1.96
1.97 @@ -2235,6 +2246,7 @@
1.98 uint b=0;
1.99 uint f=0;
1.100 uint n=0;
1.101 + uint xl=0;
1.102 BranchObj *bo;
1.103 bo=mapCenter->first();
1.104 while (bo)
1.105 @@ -2242,9 +2254,11 @@
1.106 if (!bo->getNote().isEmpty() ) n++;
1.107 f+= bo->countFloatImages();
1.108 b++;
1.109 + xl+=bo->countXLinks();
1.110 bo=bo->next();
1.111 }
1.112 stats+=QString ("%1 branches\n").arg (b-1,6);
1.113 + stats+=QString ("%1 xLinks \n").arg (xl-1,6);
1.114 stats+=QString ("%1 notes\n").arg (n,6);
1.115 stats+=QString ("%1 images\n").arg (f,6);
1.116 dia.setStats (stats);
1.117 @@ -2346,7 +2360,10 @@
1.118
1.119 actionEditCopy->setEnabled (true);
1.120 actionEditCut->setEnabled (true);
1.121 - actionEditPaste->setEnabled (true);
1.122 + if (clipboardME->getMapCenter()->countBranches()>0)
1.123 + actionEditPaste->setEnabled (true);
1.124 + else
1.125 + actionEditPaste->setEnabled (false);
1.126 for (a=actionListBranches.first();a;a=actionListBranches.next())
1.127 a->setEnabled(true);
1.128 actionEditDelete->setEnabled (true);
1.129 @@ -2668,6 +2685,7 @@
1.130 QMessageBox::critical (0,tr("Critical Import Error"),tr("Cannot find the directory"));
1.131 else
1.132 {
1.133 + // Recursively add subdirs
1.134 importDir (bo,d);
1.135 d.cdUp();
1.136 }
1.137 @@ -2685,6 +2703,9 @@
1.138 bo=dst->getLastBranch();
1.139 bo->setHeading (fi->fileName() );
1.140 bo->setColor (QColor("black"),false);
1.141 + if (fi->fileName().right(4) == ".vym" )
1.142 + bo->setVymLink (fi->filePath());
1.143 +
1.144 ++itfile;
1.145 }
1.146 }