1.1 --- a/mainwindow.cpp	Wed May 18 07:39:58 2005 +0000
     1.2 +++ b/mainwindow.cpp	Mon May 23 15:28:20 2005 +0000
     1.3 @@ -129,6 +129,7 @@
     1.4  extern QAction* actionSettingsAutoselectText;
     1.5  extern QAction* actionSettingsPasteNewHeading;
     1.6  extern QAction* actionSettingsUseDelKey;
     1.7 +extern QAction* actionSettingsUseFlagGroups;
     1.8  
     1.9  extern QPopupMenu* branchContextMenu;
    1.10  extern QPopupMenu* branchAddContextMenu;
    1.11 @@ -253,6 +254,7 @@
    1.12  	settings.writeEntry( "/vym/mapeditor/editmode/pastenewheading",actionSettingsPasteNewHeading->isOn() );
    1.13  	settings.writeEntry( "/vym/mapeditor/editmode/autoedit",actionSettingsAutoedit->isOn() );
    1.14  	settings.writeEntry( "/vym/mapeditor/editmode/useDelKey",actionSettingsUseDelKey->isOn() );
    1.15 +	settings.writeEntry( "/vym/mapeditor/editmode/useFlagGroups",actionSettingsUseFlagGroups->isOn() );
    1.16  
    1.17  	QString s;
    1.18  	int maps=lastMaps.count();
    1.19 @@ -517,8 +519,6 @@
    1.20  	actionEditHeading=a;
    1.21      a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
    1.22      connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
    1.23 -    a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_E, this, "editHeading" );
    1.24 -    connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
    1.25  	a->setEnabled (false);
    1.26      a->addTo ( menu );
    1.27  	actionEditHeading=a;
    1.28 @@ -834,6 +834,12 @@
    1.29  	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useDelKey",false) );
    1.30      a->addTo( menu );
    1.31  	actionSettingsUseDelKey=a;
    1.32 +
    1.33 +    a= new QAction( tr( "Use groups in flag toolbars" ), QPixmap(), tr( "Enable flag groups" ), 0, this, "flaggroups" );
    1.34 +	a->setToggleAction(true);
    1.35 +	a->setOn ( settings.readBoolEntry ("/vym/mapeditor/editmode/useFlagGroups",true) );
    1.36 +    a->addTo( menu );
    1.37 +	actionSettingsUseFlagGroups=a;
    1.38  }
    1.39  
    1.40  // Test Actions
    1.41 @@ -964,7 +970,8 @@
    1.42  
    1.43      a = new QAction( tr( "Export as ASCII (still experimental)" ), QPixmap(), tr( "Export (ASCII)" ), 0, this, "exportASCII" );
    1.44      connect( a, SIGNAL( activated() ), this, SLOT( fileExportASCII() ) );
    1.45 -    a->addTo( exportMenu );
    1.46 +	// FIXME deactivated, doesn't work with QRichtext anyway
    1.47 +	//   a->addTo( exportMenu );
    1.48  
    1.49  	a = new QAction( tr( "Export XML" ), QPixmap(), tr( "Export XML" ),  0, this, "exportXML" );
    1.50      connect( a, SIGNAL( activated() ), this, SLOT( fileExportXML() ) );
    1.51 @@ -2307,8 +2314,12 @@
    1.52  void Main::helpDoc()
    1.53  {
    1.54  	QString docpath;
    1.55 -	// default path in SUSE LINUX
    1.56 -	docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
    1.57 +	#if defined(Q_OS_MACX)
    1.58 +		docpath="./vym.app/Contents/vym.pdf";
    1.59 +	#else
    1.60 +		// default path in SUSE LINUX
    1.61 +		docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
    1.62 +	#endif
    1.63  
    1.64  	if (!QFile (docpath).exists() )
    1.65  	{