diff -r 4244bcd9e6ea -r 325958acb69b mainwindow.cpp --- a/mainwindow.cpp Thu Sep 22 12:56:05 2005 +0000 +++ b/mainwindow.cpp Mon Oct 10 11:20:25 2005 +0000 @@ -19,6 +19,7 @@ #include #include +#include "misc.h" #include "version.h" #include "aboutdialog.h" @@ -43,10 +44,29 @@ #include "icons/modelink.xpm" #include "icons/modecopy.xpm" //#include "icons/vym-48x48.xpm" + +#include "icons/flag-questionmark.xpm" +#include "icons/flag-exclamationmark.xpm" +#include "icons/flag-hook-green.xpm" +#include "icons/flag-cross-red.xpm" +#include "icons/flag-stopsign.xpm" +#include "icons/flag-smiley-good.xpm" +#include "icons/flag-smiley-sad.xpm" +#include "icons/flag-clock.xpm" +#include "icons/flag-lamp.xpm" +#include "icons/flag-arrow-up.xpm" +#include "icons/flag-arrow-down.xpm" +#include "icons/flag-thumb-up.xpm" +#include "icons/flag-thumb-down.xpm" +#include "icons/flag-heart.xpm" +#include "icons/flag-flash.xpm" +#include "icons/flag-lifebelt.xpm" + #include "icons/flag-note.xpm" #include "icons/flag-url.xpm" #include "icons/flag-vymlink.xpm" #include "icons/flag-scrolled-right.xpm" +#include "icons/flag-tmpUnscrolled-right.xpm" #include "flagrowobj.h" #include "texteditor.h" @@ -61,9 +81,12 @@ extern TextEditor *textEditor; extern Main *mainWindow; extern QString tmpVymDir; +extern QString clipboardDir; +extern bool clipboardEmpty; extern int statusbarTime; extern MapEditor *clipboardME; extern FlagRowObj* standardFlagsDefault; +extern FlagRowObj* systemFlagsDefault; extern QPtrList actionListBranches; @@ -172,11 +195,17 @@ // Create unique temporary directory tmpVymDir=makeUniqueDir ("/tmp/vym-XXXXXX"); - // TODO Create direcctory for clipboard + // Create direcctory for clipboard + clipboardDir=tmpVymDir+"/clipboard"; + QDir d(clipboardDir); + d.mkdir (clipboardDir,true); + makeSubDirs (clipboardDir); + clipboardEmpty=true; + // FIXME not used currently // Set random seed (random used for object IDs) - QTime t = QTime::currentTime(); // set random seed - srand( t.hour()*12+t.minute()*60+t.second()*60 ); + // QTime t = QTime::currentTime(); // set random seed + // srand( t.hour()*12+t.minute()*60+t.second()*60 ); // Initialize some settings, which are platform dependant @@ -246,8 +275,6 @@ connect (textEditor, SIGNAL (textHasChanged() ), this, SLOT (updateNoteFlag())); updateGeometry(); - - // Creating the default map into first tab is done in main.cpp now... } Main::~Main() @@ -792,6 +819,134 @@ // Flag Actions void Main::setupFlagActions() { + // Create System Flags + systemFlagsDefault = new FlagRowObj (); + systemFlagsDefault->setVisibility (false); + systemFlagsDefault->setName ("systemFlagsDef"); + + FlagObj *fo = new FlagObj (); + fo->load(QPixmap(flag_note_xpm)); + fo->setName("note"); + fo->setToolTip(tr("Note","Systemflag")); + systemFlagsDefault->addFlag (fo); // makes deep copy + + fo->load(QPixmap(flag_url_xpm)); + fo->setName("url"); + fo->setToolTip(tr("WWW Document (external)","Systemflag")); + systemFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_vymlink_xpm)); + fo->setName("vymLink"); + fo->setToolTip(tr("Link to another vym map","Systemflag")); + systemFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_scrolled_right_xpm)); + fo->setName("scrolledright"); + fo->setToolTip(tr("subtree is scrolled","Systemflag")); + systemFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_tmpUnscrolled_right_xpm)); + fo->setName("tmpUnscrolledright"); + fo->setToolTip(tr("subtree is temporary scrolled","Systemflag")); + systemFlagsDefault->addFlag (fo); + + // Create Standard Flags + standardFlagsDefault = new FlagRowObj (); + standardFlagsDefault->setVisibility (false); + standardFlagsDefault->setName ("standardFlagsDef"); + + fo->load(QPixmap(flag_exclamationmark_xpm)); + fo->setName ("exclamationmark"); + fo->setGroup("standard-mark"); + fo->setToolTip(tr("Take care!","Standardflag")); + standardFlagsDefault->addFlag (fo); // makes deep copy + + fo->load(QPixmap(flag_questionmark_xpm)); + fo->setName("questionmark"); + fo->setGroup("standard-mark"); + fo->setToolTip(tr("Really?","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_hook_green_xpm)); + fo->setName("hook-green"); + fo->setGroup("standard-hook"); + fo->setToolTip(tr("ok!","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_cross_red_xpm)); + fo->setName("cross-red"); + fo->setGroup("standard-hook"); + fo->setToolTip(tr("Not ok!","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_stopsign_xpm)); + fo->setName("stopsign"); + fo->setToolTip(tr("This won't work!","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_smiley_good_xpm)); + fo->setName("smiley-good"); + fo->setGroup("standard-smiley"); + fo->setToolTip(tr("Good","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_smiley_sad_xpm)); + fo->setName("smiley-sad"); + fo->setGroup("standard-smiley"); + fo->setToolTip(tr("Bad","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_clock_xpm)); + fo->setName("clock"); + fo->setToolTip(tr("Time critical","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_lamp_xpm)); + fo->setName("lamp"); + fo->setToolTip(tr("Idea!","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_arrow_up_xpm)); + fo->setName("arrow-up"); + fo->setGroup("standard-arrow"); + fo->setToolTip(tr("Important","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_arrow_down_xpm)); + fo->setName("arrow-down"); + fo->setGroup("standard-arrow"); + fo->setToolTip(tr("Unimportant","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_thumb_up_xpm)); + fo->setName("thumb-up"); + fo->setGroup("standard-thumb"); + fo->setToolTip(tr("I like this","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_thumb_down_xpm)); + fo->setName("thumb-down"); + fo->setGroup("standard-thumb"); + fo->setToolTip(tr("I like this","Standardflag")); + fo->setToolTip(tr("I do not like this","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_heart_xpm)); + fo->setName("heart"); + fo->setToolTip(tr("I just love... ","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_flash_xpm)); + fo->setName("flash"); + fo->setToolTip(tr("Dangerous","Standardflag")); + standardFlagsDefault->addFlag (fo); + + fo->load(QPixmap(flag_lifebelt_xpm)); + fo->setName("lifebelt"); + fo->setToolTip(tr("This will help","Standardflag")); + standardFlagsDefault->addFlag (fo); + delete (fo); + standardFlagsDefault->makeToolbar(this, "Standard Flags"); } @@ -860,10 +1015,6 @@ a = new QAction( tr( "Test Flag" ), QPixmap(), tr( "test flag" ), 0, this, "flag" ); connect( a, SIGNAL( activated() ), this, SLOT( testFunction() ) ); a->addTo( menu ); - - a = new QAction( tr( "Show Clipboard" ), QPixmap(), tr( "Show clipboard" ), 0, this, "clipboard" ); - connect( a, SIGNAL( activated() ), this, SLOT( testShowClipboard() ) ); - a->addTo( menu ); } // Help Actions @@ -1159,7 +1310,8 @@ tabWidget->addTab (medit,fn); tabWidget->showPage(medit); medit->viewport()->setFocus(); - medit->select("mc:"); + // For the very first map we do not have flagrows yet... + medit->select("mc:"); } void Main::fileLoad(QString fn, const LoadMode &lmode) @@ -2361,11 +2513,6 @@ currentMapEditor()->testFunction(); } -void Main::testShowClipboard() -{ - clipboardME->show(); -} - void Main::helpDoc() { QString docpath;