open browser for help

qt temp file solution applied

diff --git a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
index 0b11a5d0ef51f14e959ab19c71ce34cea111d97a..0fbf2f69891cb13d6c3d2404c762a485027ac485 100644 (file)
--- a/cmd/gvedit/csettings.cpp
+++ b/cmd/gvedit/csettings.cpp
@@ -21,6 +21,12 @@
 #include "mdichild.h"
 #include "string.h"
 #include "mainwindow.h"
+#include "dwight.h"
+#include <QTemporaryFile>
+
+
+
+
 #define WIDGET(t,f)  ((t*)findChild<t *>(#f))
 typedef struct {
     const char* data;
@@ -175,12 +181,7 @@ void CFrmSettings::addSlot()
 }
 void CFrmSettings::helpSlot()
 {
-#ifdef WIN32
-    ShellExecute(0, "open", "http://www.graphviz.org/doc/info/attrs.html", 0, 0, 1);
-#else
-//UNIX imp, (EMDEN)
-#endif
-
+    QDesktopServices::openUrl (QUrl("http://www.graphviz.org/doc/info/attrs.html")) ;
 }
 void CFrmSettings::cancelSlot()
 {
@@ -292,37 +293,12 @@ bool CFrmSettings::createLayout()
 }
 QString buildTempFile()
 {
-#ifdef WIN32
-
-    DWORD dwRetVal = 0;
-    UINT uRetVal   = 0;
-
-
-    TCHAR szTempFileName[MAX_PATH];  
-    TCHAR lpTempPathBuffer[MAX_PATH];
-     //  Gets the temp path env string (no guarantee it's a valid path).
-    dwRetVal = GetTempPath(MAX_PATH,          // length of the buffer
-                           lpTempPathBuffer); // buffer for path 
-    if (dwRetVal > MAX_PATH || (dwRetVal == 0))
-       exit(2020);
-
-    //  Generates a temporary file name. 
-    uRetVal = GetTempFileName(lpTempPathBuffer, // directory for tmp files
-                              TEXT("DEMO"),     // temp file name prefix 
-                              0,                // create unique name 
-                              szTempFileName);  // buffer for name 
-    if (uRetVal == 0)
-       exit(-2021);
-    ShellExecute(0, "open", "http://www.microsoft.com", 0, 0, 1);
-
-#else
-    //UNIX implementation here(EMDEN)
-
-#endif
-    QString rv;
-    rv.append(szTempFileName);
-    rv.append(".jpg");
-    return rv;
+    QTemporaryFile tempFile;
+    tempFile.setAutoRemove(false);
+    tempFile.open();
+    QString a=tempFile.fileName();
+    tempFile.close();
+    return a;
 }
 
 bool CFrmSettings::renderLayout()

diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp
index 3b8d450a3eef6a1d8f7aefbcfcde8a3c39b3883c..96c53eeb23e6f28184e855b58ac5b76b41b09988 100644 (file)
--- a/cmd/gvedit/main.cpp
+++ b/cmd/gvedit/main.cpp
@@ -36,6 +36,12 @@ __declspec(dllimport) boolean MemTest;
 #else
     #pragma comment( lib, "graph.lib" )
     #pragma comment( lib, "ingraphs.lib" )
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "glib-2.0.lib" )
+    #pragma comment( lib, "pango-1.0.lib" )
+    #pragma comment( lib, "pangocairo-1.0.lib" )
+    #pragma comment( lib, "cairo.lib" )
+    #pragma comment( lib, "gobject-2.0.lib" )
 
 #endif
     #pragma comment( lib, "gvc.lib" )

diff --git a/cmd/gvedit/mdi.vcproj b/cmd/gvedit/mdi.vcproj
index 3daea053ef0bf1fe90056447925775d27586abc1..9957cd44f86deae193c54d753b58c7b85e03783d 100644 (file)
--- a/cmd/gvedit/mdi.vcproj
+++ b/cmd/gvedit/mdi.vcproj
@@ -46,7 +46,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="-Zm200 -w34100 -w34189"
                                Optimization="4"
-                               AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\ActiveQt";debug;..\..\..\..\Qt\4.7.0\mkspecs\default;.\GeneratedFiles;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cdt;..\..\lib\graph;"$(SolutionDir)/";..\..\lib\gvc"
+                               AdditionalIncludeDirectories=""C:\graphviz-ms\graphviz3\plugin\pango";C:\gtk\include\cairo;"C:\gtk\lib\glib-2.0\include";"C:\gtk\include\glib-2.0";"C:\gtk\include\pango-1.0";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";"$(QTDIR)\include\ActiveQt";debug;..\..\..\..\Qt\4.7.0\mkspecs\default;.\GeneratedFiles;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cdt;..\..\lib\graph;"$(SolutionDir)/";..\..\lib\gvc"
                                PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG;HAVE_CONFIG_H;WIN32_DLL;DEMAND_LOADING;QT_LARGEFILE_SUPPORT;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT"
                                GeneratePreprocessedFile="0"
                                ExceptionHandling="1"
@@ -78,7 +78,7 @@
                                AdditionalDependencies="qtmaind.lib QtGuid4.lib QtCored4.lib "
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""C:\graphviz-ms\bin";"$(QTDIR)\lib""
+                               AdditionalLibraryDirectories="C:\gtk\lib;"C:\graphviz-ms\bin";"$(QTDIR)\lib""
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile=""
@@ -215,6 +215,10 @@
                                RelativePath=".\csettings.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath=".\dwight.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath=".\imageviewer.cpp"
                                >
@@ -250,7 +254,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Moc&apos;ing $(InputFileName)..."
-                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  &quot;$(InputPath)&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DWIN32 -D_DEBUG -DHAVE_CONFIG_H -DWIN32_DLL -DDEMAND_LOADING -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  &quot;-IC:\graphviz-ms\graphviz3\plugin\pango&quot; &quot;-IC:\gtk\include\cairo&quot; &quot;-IC:\gtk\lib\glib-2.0\include&quot; &quot;-IC:\gtk\include\glib-2.0&quot; &quot;-IC:\gtk\include\pango-1.0&quot; &quot;-I$(QTDIR)\include\QtCore&quot; &quot;-I$(QTDIR)\include\QtGui&quot; &quot;-I$(QTDIR)\include&quot; &quot;-I$(QTDIR)\include\ActiveQt&quot; &quot;-I.\debug&quot; &quot;-I.\..\..\..\..\Qt\4.7.0\mkspecs\default&quot; &quot;-I.\GeneratedFiles&quot; &quot;-I.\..\..\lib\common&quot; &quot;-I.\..\..\lib\pathplan&quot; &quot;-I.\..\..\lib\cdt&quot; &quot;-I.\..\..\lib\graph&quot; &quot;-I$(SolutionDir)\.&quot; &quot;-I.\..\..\lib\gvc&quot; &quot;.\csettings.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
                                                AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"
                                                Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"
                                        />
@@ -261,7 +265,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Moc&apos;ing $(InputFileName)..."
-                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  &quot;$(InputPath)&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  &quot;-I$(QTDIR)\include\QtCore&quot; &quot;-I$(QTDIR)\include\QtGui&quot; &quot;-I$(QTDIR)\include&quot; &quot;-I$(QTDIR)\include\ActiveQt&quot; &quot;-I.\debug&quot; &quot;-I.\..\..\..\..\Qt\4.7.0\mkspecs\default&quot; &quot;-I.\GeneratedFiles&quot; &quot;-I.\..\..\lib\common&quot; &quot;-I.\..\..\lib\pathplan&quot; &quot;-I.\..\..\lib\cdt&quot; &quot;-I.\..\..\lib\graph&quot; &quot;-I.\..\..\lib\gvc&quot; &quot;.\csettings.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
                                                AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"
                                                Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"
                                        />
@@ -276,7 +280,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Moc&apos;ing $(InputFileName)..."
-                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  &quot;$(InputPath)&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DWIN32 -D_DEBUG -DHAVE_CONFIG_H -DWIN32_DLL -DDEMAND_LOADING -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  &quot;-IC:\graphviz-ms\graphviz3\plugin\pango&quot; &quot;-IC:\gtk\include\cairo&quot; &quot;-IC:\gtk\lib\glib-2.0\include&quot; &quot;-IC:\gtk\include\glib-2.0&quot; &quot;-IC:\gtk\include\pango-1.0&quot; &quot;-I$(QTDIR)\include\QtCore&quot; &quot;-I$(QTDIR)\include\QtGui&quot; &quot;-I$(QTDIR)\include&quot; &quot;-I$(QTDIR)\include\ActiveQt&quot; &quot;-I.\debug&quot; &quot;-I.\..\..\..\..\Qt\4.7.0\mkspecs\default&quot; &quot;-I.\GeneratedFiles&quot; &quot;-I.\..\..\lib\common&quot; &quot;-I.\..\..\lib\pathplan&quot; &quot;-I.\..\..\lib\cdt&quot; &quot;-I.\..\..\lib\graph&quot; &quot;-I$(SolutionDir)\.&quot; &quot;-I.\..\..\lib\gvc&quot; &quot;.\imageviewer.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
                                                AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"
                                                Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"
                                        />
@@ -287,7 +291,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Moc&apos;ing $(InputFileName)..."
-                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;  &quot;$(InputPath)&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -DQT_NO_DEBUG -DNDEBUG -D_WINDOWS -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  &quot;-I$(QTDIR)\include\QtCore&quot; &quot;-I$(QTDIR)\include\QtGui&quot; &quot;-I$(QTDIR)\include&quot; &quot;-I$(QTDIR)\include\ActiveQt&quot; &quot;-I.\debug&quot; &quot;-I.\..\..\..\..\Qt\4.7.0\mkspecs\default&quot; &quot;-I.\GeneratedFiles&quot; &quot;-I.\..\..\lib\common&quot; &quot;-I.\..\..\lib\pathplan&quot; &quot;-I.\..\..\lib\cdt&quot; &quot;-I.\..\..\lib\graph&quot; &quot;-I.\..\..\lib\gvc&quot; &quot;.\imageviewer.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
                                                AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"
                                                Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"
                                        />
@@ -302,7 +306,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Moc&apos;ing $(InputFileName)..."
-                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DWIN32 -D_DEBUG -DHAVE_CONFIG_H -DWIN32_DLL -DDEMAND_LOADING -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  &quot;-I$(QTDIR)\include\QtCore&quot; &quot;-I$(QTDIR)\include\QtGui&quot; &quot;-I$(QTDIR)\include&quot; &quot;-I$(QTDIR)\include\ActiveQt&quot; &quot;-I.\debug&quot; &quot;-I.\..\..\..\..\Qt\4.7.0\mkspecs\default&quot; &quot;-I.\GeneratedFiles&quot; &quot;-I.\..\..\lib\common&quot; &quot;-I.\..\..\lib\pathplan&quot; &quot;-I.\..\..\lib\cdt&quot; &quot;-I.\..\..\lib\graph&quot; &quot;-I$(SolutionDir)\.&quot; &quot;-I.\..\..\lib\gvc&quot; &quot;mainwindow.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DWIN32 -D_DEBUG -DHAVE_CONFIG_H -DWIN32_DLL -DDEMAND_LOADING -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  &quot;-IC:\graphviz-ms\graphviz3\plugin\pango&quot; &quot;-IC:\gtk\include\cairo&quot; &quot;-IC:\gtk\lib\glib-2.0\include&quot; &quot;-IC:\gtk\include\glib-2.0&quot; &quot;-IC:\gtk\include\pango-1.0&quot; &quot;-I$(QTDIR)\include\QtCore&quot; &quot;-I$(QTDIR)\include\QtGui&quot; &quot;-I$(QTDIR)\include&quot; &quot;-I$(QTDIR)\include\ActiveQt&quot; &quot;-I.\debug&quot; &quot;-I.\..\..\..\..\Qt\4.7.0\mkspecs\default&quot; &quot;-I.\GeneratedFiles&quot; &quot;-I.\..\..\lib\common&quot; &quot;-I.\..\..\lib\pathplan&quot; &quot;-I.\..\..\lib\cdt&quot; &quot;-I.\..\..\lib\graph&quot; &quot;-I$(SolutionDir)\.&quot; &quot;-I.\..\..\lib\gvc&quot; &quot;mainwindow.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
                                                AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"
                                                Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"
                                        />
@@ -328,7 +332,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Moc&apos;ing $(InputFileName)..."
-                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DWIN32 -D_DEBUG -DHAVE_CONFIG_H -DWIN32_DLL -DDEMAND_LOADING -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  &quot;-I$(QTDIR)\include\QtCore&quot; &quot;-I$(QTDIR)\include\QtGui&quot; &quot;-I$(QTDIR)\include&quot; &quot;-I$(QTDIR)\include\ActiveQt&quot; &quot;-I.\debug&quot; &quot;-I.\..\..\..\..\Qt\4.7.0\mkspecs\default&quot; &quot;-I.\GeneratedFiles&quot; &quot;-I.\..\..\lib\common&quot; &quot;-I.\..\..\lib\pathplan&quot; &quot;-I.\..\..\lib\cdt&quot; &quot;-I.\..\..\lib\graph&quot; &quot;-I$(SolutionDir)\.&quot; &quot;-I.\..\..\lib\gvc&quot; &quot;mdichild.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
+                                               CommandLine="&quot;$(QTDIR)\bin\moc.exe&quot;   -D_WINDOWS -DWIN32 -D_DEBUG -DHAVE_CONFIG_H -DWIN32_DLL -DDEMAND_LOADING -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT  &quot;-IC:\graphviz-ms\graphviz3\plugin\pango&quot; &quot;-IC:\gtk\include\cairo&quot; &quot;-IC:\gtk\lib\glib-2.0\include&quot; &quot;-IC:\gtk\include\glib-2.0&quot; &quot;-IC:\gtk\include\pango-1.0&quot; &quot;-I$(QTDIR)\include\QtCore&quot; &quot;-I$(QTDIR)\include\QtGui&quot; &quot;-I$(QTDIR)\include&quot; &quot;-I$(QTDIR)\include\ActiveQt&quot; &quot;-I.\debug&quot; &quot;-I.\..\..\..\..\Qt\4.7.0\mkspecs\default&quot; &quot;-I.\GeneratedFiles&quot; &quot;-I.\..\..\lib\common&quot; &quot;-I.\..\..\lib\pathplan&quot; &quot;-I.\..\..\lib\cdt&quot; &quot;-I.\..\..\lib\graph&quot; &quot;-I$(SolutionDir)\.&quot; &quot;-I.\..\..\lib\gvc&quot; &quot;mdichild.h&quot; -o &quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;&#x0D;&#x0A;"
                                                AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"
                                                Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"
                                        />

diff --git a/cmd/gvedit/ui/settings.ui b/cmd/gvedit/ui/settings.ui
index e3caf57f5771aa613b420cc5ac413872da233cab..6904e4c813dfb3864592c367b0e5532cff29b333 100644 (file)
--- a/cmd/gvedit/ui/settings.ui
+++ b/cmd/gvedit/ui/settings.ui
@@ -287,7 +287,7 @@
      <rect>
       <x>2</x>
       <y>0</y>
-      <width>436</width>
+      <width>391</width>
       <height>62</height>
      </rect>
     </property>

diff --git a/cmd/gvedit/ui_settings.h b/cmd/gvedit/ui_settings.h
index 2c4ded1b5cbc4b284e70aacb96bcaaae1467e09b..6177934ebf263cd508266d093eb410bafa63a3bb 100644 (file)
--- a/cmd/gvedit/ui_settings.h
+++ b/cmd/gvedit/ui_settings.h
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'settings.ui'
 **
-** Created: Fri Mar 4 11:01:22 2011
+** Created: Fri Mar 4 14:17:36 2011
 **      by: Qt User Interface Compiler version 4.7.0
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!

diff --git a/cmd/gvedit/vc90.idb b/cmd/gvedit/vc90.idb
index d69a29c38ee7f1016b48b11817f92a484533da84..c2d61901c9f428c78522d3f7d3f2bdd46770f6eb 100644 (file)
Binary files a/cmd/gvedit/vc90.idb and b/cmd/gvedit/vc90.idb differ

diff --git a/cmd/gvedit/vc90.pdb b/cmd/gvedit/vc90.pdb
index 12107975b0ba8839745ffc4b53161d0beb8a4313..cfe5bacafb15af2391c808ece6b976f805afbbd3 100644 (file)
Binary files a/cmd/gvedit/vc90.pdb and b/cmd/gvedit/vc90.pdb differ