diff -r 6a0342b3c519 -r ec3d2962893d main.cpp --- a/main.cpp Tue Jun 13 08:49:12 2006 +0000 +++ b/main.cpp Tue Jun 13 13:54:53 2006 +0000 @@ -24,6 +24,7 @@ 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; QString iconPath; // Pointing to icons used for toolbars QString flagsPath; // Pointing to flags bool clipboardEmpty; @@ -108,22 +109,23 @@ QAction *actionSettingsUseFlagGroups; QAction *actionSettingsUseHideExport; -Q3PopupMenu *branchContextMenu; -Q3PopupMenu *branchAddContextMenu; -Q3PopupMenu *branchRemoveContextMenu; -Q3PopupMenu *branchLinksContextMenu; -Q3PopupMenu *branchLinksContextMenuDup; -Q3PopupMenu *floatimageContextMenu; -Q3PopupMenu *saveImageFormatMenu; -Q3PopupMenu *canvasContextMenu; -Q3PopupMenu *lastMapsMenu; -Q3PopupMenu *importMenu; -Q3PopupMenu *exportMenu; -Q3PopupMenu *exportImageFormatMenu; + +QMenu* branchContextMenu; +QMenu* branchAddContextMenu; +QMenu* branchRemoveContextMenu; +QMenu* branchLinksContextMenu; +QMenu* branchLinksContextMenuDup; +QMenu* floatimageContextMenu; +QMenu* saveImageFormatMenu; +QMenu* canvasContextMenu; +QMenu* fileLastMapsMenu; +QMenu* fileImportMenu; +QMenu* fileExportMenu; Settings settings ("vym","vym"); // Organization, Application name Options options; +ImageIO imageIO; int statusbarTime=3500; @@ -185,16 +187,19 @@ iconPath=vymBaseDir.path()+"/icons/"; flagsPath=vymBaseDir.path()+"/flags/"; + // Some directories + lastImageDir=QDir().home(); + if (options.isOn ("help")) { -//FIXME QT3 cout << options.getHelpText()<