From: arif Date: Fri, 4 Mar 2011 19:21:11 +0000 (+0000) Subject: open browser for help X-Git-Tag: LAST_LIBGRAPH~32^2~951 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5da6cfe2a8a44aebe00f1634d55c90eb825d35df;p=graphviz open browser for help qt temp file solution applied --- diff --git a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp index 0b11a5d0e..0fbf2f698 100644 --- 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 + + + + #define WIDGET(t,f) ((t*)findChild(#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 3b8d450a3..96c53eeb2 100644 --- 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 3daea053e..9957cd44f 100644 --- 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" > + + @@ -250,7 +254,7 @@ @@ -261,7 +265,7 @@ @@ -276,7 +280,7 @@ @@ -287,7 +291,7 @@ @@ -302,7 +306,7 @@ @@ -328,7 +332,7 @@ diff --git a/cmd/gvedit/ui/settings.ui b/cmd/gvedit/ui/settings.ui index e3caf57f5..6904e4c81 100644 --- a/cmd/gvedit/ui/settings.ui +++ b/cmd/gvedit/ui/settings.ui @@ -287,7 +287,7 @@ 2 0 - 436 + 391 62 diff --git a/cmd/gvedit/ui_settings.h b/cmd/gvedit/ui_settings.h index 2c4ded1b5..6177934eb 100644 --- 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 d69a29c38..c2d61901c 100644 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 12107975b..cfe5bacaf 100644 Binary files a/cmd/gvedit/vc90.pdb and b/cmd/gvedit/vc90.pdb differ