diff -r 2827ca924b18 -r b1e3a4d88f13 main.cpp
--- a/main.cpp	Mon Apr 24 11:31:15 2006 +0000
+++ b/main.cpp	Tue Sep 05 10:03:29 2006 +0000
@@ -1,16 +1,16 @@
-#include <qapplication.h>
-#include <qpixmap.h>
-#include <qtranslator.h>
-#include <qdir.h>
-#include <qptrlist.h>
-#include <qtextcodec.h>
-#include <qnetwork.h>
-#include <qmime.h>
+#include <QApplication>
+#include <QPixmap>
+#include <QTranslator>
+#include <QDir>
+#include <q3ptrlist.h>
+#include <QTextCodec>
+#include <q3network.h>
+#include <QMenu>
+#include <QActionGroup>
 
 #include "settings.h"
 #include "options.h"
 #include "mainwindow.h"
-
 #include "flagrowobj.h"
 
 // Global variables
@@ -21,6 +21,8 @@
 QString tmpVymDir;				// All temp files go there, created in mainwindow
 QString clipboardDir;			// Clipboard used in all mapEditors
 QDir vymBaseDir;				// Containing all styles, scripts, images, ...
+QDir lastImageDir;
+QDir lastFileDir;
 QString iconPath;				// Pointing to icons used for toolbars
 QString flagsPath;				// Pointing to flags
 bool clipboardEmpty;			
@@ -29,7 +31,7 @@
 
 // Lists of actions
 // (QActionGroup could not be "enabled")
-QPtrList <QAction> actionListBranches;
+Q3PtrList <QAction> actionListBranches;
 
 // Actions which change sometimes
 QAction *actionFileSave;
@@ -44,11 +46,13 @@
 QAction *actionEditToggleScroll;
 QAction *actionEditOpenURL;
 QAction *actionEditOpenURLTab;
+QAction *actionEditOpenMultipleURLTabs;
 QAction *actionEditURL;
 QAction *actionEditHeading2URL;
 QAction *actionEditBugzilla2URL;
 QAction *actionEditFATE2URL;
 QAction *actionEditOpenVymLink;
+QAction *actionEditOpenMultipleVymLinks;
 QAction *actionEditVymLink;
 QAction *actionEditToggleHideExport;
 QAction *actionEditDeleteVymLink;
@@ -99,33 +103,36 @@
 
 QAction *actionSettingsAutoselectHeading;
 QAction *actionSettingsAutoselectText;
-QAction *actionSettingsPasteNewHeading;
 QAction *actionSettingsAutoedit;
 QAction *actionSettingsUseDelKey;
 QAction *actionSettingsUseFlagGroups;
 QAction *actionSettingsUseHideExport;
 
-QPopupMenu *branchContextMenu;
-QPopupMenu *branchAddContextMenu;
-QPopupMenu *branchRemoveContextMenu;
-QPopupMenu *branchLinksContextMenu;
-QPopupMenu *branchLinksContextMenuDup;
-QPopupMenu *floatimageContextMenu;
-QPopupMenu *saveImageFormatMenu;
-QPopupMenu *canvasContextMenu;
-QPopupMenu *lastMapsMenu;
-QPopupMenu *importMenu;
-QPopupMenu *exportMenu;
-QPopupMenu *exportImageFormatMenu;
 
+QMenu* branchContextMenu;
+QMenu* branchAddContextMenu;
+QMenu* branchRemoveContextMenu;
+QMenu* branchLinksContextMenu;
+QMenu* branchXLinksContextMenuEdit;
+QMenu* branchXLinksContextMenuFollow;
+QMenu* floatimageContextMenu;
+QMenu* canvasContextMenu;
+QMenu* fileLastMapsMenu;
+QMenu* fileImportMenu;
+QMenu* fileExportMenu;
 
-Settings settings;
+
+Settings settings ("InSilmaril","vym"); // Organization, Application name
+
 Options options;
+ImageIO imageIO;
 
 int statusbarTime=3500;
 
 int main(int argc, char** argv)
 {
+//FIXME	Q_INIT_RESOURCE (application);
+
     QApplication app(argc,argv);
 
 
@@ -144,14 +151,14 @@
 		"http://www.InSilmaril.de/vym\n");
 	if (options.parse())
 	{
-		cout << endl << options.getHelpText()<<endl;
+		cout << endl << options.getHelpText().ascii()<<endl;
 		return 1;
 	}
 
 	if (options.isOn ("version"))
 	{
 		cout << "vym version "<<__VYM_VERSION
-			<<"  (c) 2004 Uwe Drechsel - "
+			<<"  (c) 2004-2006 Uwe Drechsel - "
 			<<__BUILD_DATE<<endl;
 			
 		return 0;	
@@ -182,22 +189,17 @@
 	iconPath=vymBaseDir.path()+"/icons/";
 	flagsPath=vymBaseDir.path()+"/flags/";
 
+	// Some directories
+	lastImageDir=QDir().current();
+	lastFileDir=QDir().current();
+
 	if (options.isOn ("help"))
 	{
-		cout << options.getHelpText()<<endl;
+		cout << options.getHelpText().ascii()<<endl;
 		return 0;	
 	}	
 
-	if (options.isOn ("test"))
-	{
-		// FIXME testing string option only
-		cout << "Testing: "<<options.getArg("test")<< endl;
-	}	
-
-
-    QMimeSourceFactory *factory = QMimeSourceFactory::defaultFactory();
-    factory->setPixmap("vym-128x128", QPixmap(iconPath+"vym-128x128.png"));
-    qInitNetworkProtocols();
+    q3InitNetworkProtocols();
 
 
 	// Initialize translations