diff -r e211e2fc9d54 -r fad762341d2d main.cpp
--- a/main.cpp	Tue Feb 21 16:18:23 2006 +0000
+++ b/main.cpp	Tue Mar 14 14:27:08 2006 +0000
@@ -51,6 +51,7 @@
 QAction *actionEditFATE2URL;
 QAction *actionEditOpenVymLink;
 QAction *actionEditVymLink;
+QAction *actionEditToggleHideExport;
 QAction *actionEditDeleteVymLink;
 QAction *actionEditMapInfo;
 QAction *actionEditHeading;
@@ -127,32 +128,10 @@
 {
     QApplication app(argc,argv);
 
-    QMimeSourceFactory *factory = QMimeSourceFactory::defaultFactory();
-    factory->setPixmap("vym_48x48", QPixmap(vym_48x48_xpm));
-    factory->setPixmap("vym_128x128", QPixmap(vym_128x128_xpm));
-    qInitNetworkProtocols();
-
-	// Use /usr/share/vym or /usr/local/share/vym or . ?
-	QDir vymBaseDir;
-	vymBaseDir.setPath ("/usr/share/vym");
-	if (!vymBaseDir.exists())
-        vymBaseDir.setPath ("/usr/local/share/vym");
-	if (!vymBaseDir.exists())
-        vymBaseDir.setPath(vymBaseDir.currentDirPath() );
-
-	// Initialize translations
-	QTranslator translator (0);
-	translator.load( QString("vym_")+QTextCodec::locale(), vymBaseDir.path() + "/lang");
-    app.installTranslator( &translator );
-
-	// Initializing the row of system flags
-	// is done in first call to MapEditor(),
-	// because we need at least one canvas first
-	systemFlagsDefault=NULL;
-	standardFlagsDefault=NULL;
 
 	// Reading and initializing options commandline options
 	options.add ("version", SwitchOption, "v","version");
+	options.add ("local", SwitchOption, "l", "local");
 	options.add ("help", SwitchOption, "h", "help");
 	options.add ("quit", SwitchOption, "q", "quit");
 	options.add ("test", StringOption, "t", "test");
@@ -178,6 +157,20 @@
 		return 0;	
 	}		
 	
+	// Use /usr/share/vym or /usr/local/share/vym or . ?
+	QDir vymBaseDir;
+	if (options.isOn ("local"))
+	{
+		vymBaseDir.setPath (vymBaseDir.currentDirPath());
+	}else
+	{
+		vymBaseDir.setPath ("/usr/share/vym");
+		if (!vymBaseDir.exists())
+			vymBaseDir.setPath ("/usr/local/share/vym");
+		if (!vymBaseDir.exists())
+			vymBaseDir.setPath(vymBaseDir.currentDirPath() );
+	}
+
 	if (options.isOn ("help"))
 	{
 		cout << options.getHelpText()<<endl;
@@ -190,6 +183,23 @@
 		cout << "Testing: "<<options.getArg("test")<< endl;
 	}	
 
+
+    QMimeSourceFactory *factory = QMimeSourceFactory::defaultFactory();
+    factory->setPixmap("vym_128x128", QPixmap(vym_128x128_xpm));
+    qInitNetworkProtocols();
+
+
+	// Initialize translations
+	QTranslator translator (0);
+	translator.load( QString("vym_")+QTextCodec::locale(), vymBaseDir.path() + "/lang");
+    app.installTranslator( &translator );
+
+	// Initializing the row of system flags
+	// is done in first call to MapEditor(),
+	// because we need at least one canvas first
+	systemFlagsDefault=NULL;
+	standardFlagsDefault=NULL;
+
 	// Initialize window of TextEditor
 	textEditor = new TextEditor();
 	textEditor->setIcon (QPixmap (vym_editor_xpm));