1.1 --- a/main.cpp	Tue Jun 13 08:49:12 2006 +0000
     1.2 +++ b/main.cpp	Tue Jun 13 13:54:53 2006 +0000
     1.3 @@ -24,6 +24,7 @@
     1.4  QString tmpVymDir;				// All temp files go there, created in mainwindow
     1.5  QString clipboardDir;			// Clipboard used in all mapEditors
     1.6  QDir vymBaseDir;				// Containing all styles, scripts, images, ...
     1.7 +QDir lastImageDir;
     1.8  QString iconPath;				// Pointing to icons used for toolbars
     1.9  QString flagsPath;				// Pointing to flags
    1.10  bool clipboardEmpty;			
    1.11 @@ -108,22 +109,23 @@
    1.12  QAction *actionSettingsUseFlagGroups;
    1.13  QAction *actionSettingsUseHideExport;
    1.14  
    1.15 -Q3PopupMenu *branchContextMenu;
    1.16 -Q3PopupMenu *branchAddContextMenu;
    1.17 -Q3PopupMenu *branchRemoveContextMenu;
    1.18 -Q3PopupMenu *branchLinksContextMenu;
    1.19 -Q3PopupMenu *branchLinksContextMenuDup;
    1.20 -Q3PopupMenu *floatimageContextMenu;
    1.21 -Q3PopupMenu *saveImageFormatMenu;
    1.22 -Q3PopupMenu *canvasContextMenu;
    1.23 -Q3PopupMenu *lastMapsMenu;
    1.24 -Q3PopupMenu *importMenu;
    1.25 -Q3PopupMenu *exportMenu;
    1.26 -Q3PopupMenu *exportImageFormatMenu;
    1.27 +
    1.28 +QMenu* branchContextMenu;
    1.29 +QMenu* branchAddContextMenu;
    1.30 +QMenu* branchRemoveContextMenu;
    1.31 +QMenu* branchLinksContextMenu;
    1.32 +QMenu* branchLinksContextMenuDup;
    1.33 +QMenu* floatimageContextMenu;
    1.34 +QMenu* saveImageFormatMenu;
    1.35 +QMenu* canvasContextMenu;
    1.36 +QMenu* fileLastMapsMenu;
    1.37 +QMenu* fileImportMenu;
    1.38 +QMenu* fileExportMenu;
    1.39  
    1.40  
    1.41  Settings settings ("vym","vym"); // Organization, Application name
    1.42  Options options;
    1.43 +ImageIO imageIO;
    1.44  
    1.45  int statusbarTime=3500;
    1.46  
    1.47 @@ -185,16 +187,19 @@
    1.48  	iconPath=vymBaseDir.path()+"/icons/";
    1.49  	flagsPath=vymBaseDir.path()+"/flags/";
    1.50  
    1.51 +	// Some directories
    1.52 +	lastImageDir=QDir().home();
    1.53 +
    1.54  	if (options.isOn ("help"))
    1.55  	{
    1.56 -//FIXME QT3 		cout << options.getHelpText()<<endl;
    1.57 +		cout << options.getHelpText().ascii()<<endl;
    1.58  		return 0;	
    1.59  	}	
    1.60  
    1.61  	if (options.isOn ("test"))
    1.62  	{
    1.63  		// FIXME testing string option only
    1.64 -//FIXME QT3		cout << "Testing: "<<options.getArg("test")<< endl;
    1.65 +		cout << "Testing: "<<options.getArg("test").ascii()<< endl;
    1.66  	}	
    1.67  
    1.68