]> granicus.if.org Git - graphviz/commitdiff
new qt-based gvedit
authorarif <devnull@localhost>
Fri, 18 Feb 2011 15:24:13 +0000 (15:24 +0000)
committerarif <devnull@localhost>
Fri, 18 Feb 2011 15:24:13 +0000 (15:24 +0000)
15 files changed:
cmd/gvedit/document1.png [new file with mode: 0644]
cmd/gvedit/document2.png [new file with mode: 0644]
cmd/gvedit/gvedit.ncb
cmd/gvedit/gvedit.vcproj
cmd/gvedit/main.cpp
cmd/gvedit/mainwindow.cpp
cmd/gvedit/mainwindow.h
cmd/gvedit/mdi.vcproj
cmd/gvedit/mdi.vcproj.RESEARCH.arif.user
cmd/gvedit/mdichild.cpp
cmd/gvedit/mdichild.h
cmd/gvedit/ui/main.ui [new file with mode: 0644]
cmd/gvedit/ui/settings.ui [new file with mode: 0644]
cmd/gvedit/vc90.idb
cmd/gvedit/vc90.pdb

diff --git a/cmd/gvedit/document1.png b/cmd/gvedit/document1.png
new file mode 100644 (file)
index 0000000..944a149
Binary files /dev/null and b/cmd/gvedit/document1.png differ
diff --git a/cmd/gvedit/document2.png b/cmd/gvedit/document2.png
new file mode 100644 (file)
index 0000000..3739e2b
Binary files /dev/null and b/cmd/gvedit/document2.png differ
index 3c8813ce9b7e5e44218d58c4b650e6ae515c1008..61c2060d79daa550b43187fdd9ec00f307836f7c 100644 (file)
Binary files a/cmd/gvedit/gvedit.ncb and b/cmd/gvedit/gvedit.ncb differ
index 7515449aa2541414a976dfadc530a997adfff595..c1471f77d5040ee75523ea5cb557b09c8ed873ac 100644 (file)
                                >
                        </File>
                </Filter>
+               <File
+                       RelativePath=".\ui\settings.ui"
+                       >
+               </File>
        </Files>
        <Globals>
        </Globals>
index c47fac125752852ac7107c6137983342d8c1fe7f..0adf54873e288ef84b66f1f846e4d3cf968bd381 100644 (file)
 **
 ****************************************************************************/
 
+#include "windows.h"
 #include <QApplication>
 
 #include "mainwindow.h"
 
+#ifdef WIN32_DLL
+__declspec(dllimport) boolean MemTest;
+/*gvc.lib cgraph.lib*/
+#ifdef WITH_CGRAPH
+    #pragma comment( lib, "cgraph.lib" )
+#else
+    #pragma comment( lib, "graph.lib" )
+#endif
+    #pragma comment( lib, "gvc.lib" )
+#endif
+
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(mdi);
index 72d19193594b5e96c74540aed53431ed0cc24cfe..9a6d0147d823752d33892f2edd84f2f9a9c9fb4c 100644 (file)
@@ -42,6 +42,8 @@
 
 #include "mainwindow.h"
 #include "mdichild.h"
+#include "csettings.h"
+
 
 MainWindow::MainWindow()
 {
@@ -55,6 +57,8 @@ MainWindow::MainWindow()
     connect(windowMapper, SIGNAL(mapped(QWidget*)),
             this, SLOT(setActiveSubWindow(QWidget*)));
 
+    frmSettings= new CFrmSettings();
+
     createActions();
     createMenus();
     createToolBars();
@@ -149,6 +153,16 @@ void MainWindow::about()
                "document interface applications using Qt."));
 }
 
+
+void MainWindow::settings()
+{
+    frmSettings->showSettings(activeMdiChild());
+
+}
+
+
+
+
 void MainWindow::updateMenus()
 {
     bool hasMdiChild = (activeMdiChild() != 0);
@@ -186,28 +200,32 @@ void MainWindow::updateWindowMenu()
     separatorAct->setVisible(!windows.isEmpty());
 
     for (int i = 0; i < windows.size(); ++i) {
-        MdiChild *child = qobject_cast<MdiChild *>(windows.at(i)->widget());
-
-        QString text;
-        if (i < 9) {
-            text = tr("&%1 %2").arg(i + 1)
+       if (typeid(windows.at(i)->widget()).name()=="MdiChild")
+       {
+           MdiChild *child = qobject_cast<MdiChild *>(windows.at(i)->widget());
+            QString text;
+           if (i < 9) {
+               text = tr("&%1 %2").arg(i + 1)
                                .arg(child->userFriendlyCurrentFile());
-        } else {
-            text = tr("%1 %2").arg(i + 1)
-                              .arg(child->userFriendlyCurrentFile());
-        }
-        QAction *action  = windowMenu->addAction(text);
-        action->setCheckable(true);
-        action ->setChecked(child == activeMdiChild());
-        connect(action, SIGNAL(triggered()), windowMapper, SLOT(map()));
-        windowMapper->setMapping(action, windows.at(i));
+           } else {
+               text = tr("%1 %2").arg(i + 1)
+                                 .arg(child->userFriendlyCurrentFile());
+           }
+           QAction *action  = windowMenu->addAction(text);
+           action->setCheckable(true);
+           action ->setChecked(child == activeMdiChild());
+           connect(action, SIGNAL(triggered()), windowMapper, SLOT(map()));
+           windowMapper->setMapping(action, windows.at(i));
+       }
     }
 }
 
 MdiChild *MainWindow::createMdiChild()
 {
     MdiChild *child = new MdiChild;
+    child->parentFrm=this;
     mdiArea->addSubWindow(child);
+    
 
     connect(child, SIGNAL(copyAvailable(bool)),
             cutAct, SLOT(setEnabled(bool)));
@@ -305,6 +323,19 @@ void MainWindow::createActions()
     aboutQtAct = new QAction(tr("About &Qt"), this);
     aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
     connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+
+
+    settingsAct = new QAction(tr("Settings"), this);
+    settingsAct->setStatusTip(tr("Show Graphviz Settings"));
+    connect(settingsAct, SIGNAL(triggered()), this, SLOT(settings()));
+
+
+
+    layoutAct = new QAction(QIcon(":/images/cut.png"),tr("Layout"), this);
+    layoutAct->setStatusTip(tr("Layout the active graph"));
+    connect(layoutAct, SIGNAL(triggered()), this, SLOT(about()));
+
+
 }
 
 void MainWindow::createMenus()
@@ -324,6 +355,10 @@ void MainWindow::createMenus()
     editMenu->addAction(copyAct);
     editMenu->addAction(pasteAct);
 
+    graphMenu =  menuBar()->addMenu (tr("&Graph"));
+    graphMenu->addAction(settingsAct);
+    graphMenu->addAction(layoutAct);
+
     windowMenu = menuBar()->addMenu(tr("&Window"));
     updateWindowMenu();
     connect(windowMenu, SIGNAL(aboutToShow()), this, SLOT(updateWindowMenu()));
@@ -346,6 +381,11 @@ void MainWindow::createToolBars()
     editToolBar->addAction(cutAct);
     editToolBar->addAction(copyAct);
     editToolBar->addAction(pasteAct);
+
+    graphToolBar = addToolBar(tr("Graph"));
+    graphToolBar->addAction(settingsAct);
+    graphToolBar->addAction(layoutAct);
+
 }
 
 void MainWindow::createStatusBar()
index bd21357818833316f15cc86a753dbd9b8d6385a3..2d77e39f961f7c84833e8d37d7a936d0fc27058a 100644 (file)
@@ -1,49 +1,12 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include "ui_settings.h"
 
 class MdiChild;
+class CFrmSettings;
 QT_BEGIN_NAMESPACE
 class QAction;
 class QMenu;
@@ -58,6 +21,7 @@ class MainWindow : public QMainWindow
 
 public:
     MainWindow();
+    QMdiArea *mdiArea;
 
 protected:
     void closeEvent(QCloseEvent *event);
@@ -76,6 +40,7 @@ private slots:
     MdiChild *createMdiChild();
     void switchLayoutDirection();
     void setActiveSubWindow(QWidget *window);
+    void settings();
 
 private:
     void createActions();
@@ -87,15 +52,18 @@ private:
     MdiChild *activeMdiChild();
     QMdiSubWindow *findMdiChild(const QString &fileName);
 
-    QMdiArea *mdiArea;
     QSignalMapper *windowMapper;
 
+
+
     QMenu *fileMenu;
     QMenu *editMenu;
+    QMenu *graphMenu;
     QMenu *windowMenu;
     QMenu *helpMenu;
     QToolBar *fileToolBar;
     QToolBar *editToolBar;
+    QToolBar *graphToolBar;
     QAction *newAct;
     QAction *openAct;
     QAction *saveAct;
@@ -113,6 +81,12 @@ private:
     QAction *separatorAct;
     QAction *aboutAct;
     QAction *aboutQtAct;
+
+    QAction *settingsAct;
+    QAction *layoutAct;
+
+
+    CFrmSettings* frmSettings;
 };
 
 #endif
index c005c8e4431bb0e5ab7fcfc5cd892eb8b506e556..3ea8621a781898775f86dda952c1fca12bf262bc 100644 (file)
@@ -4,6 +4,7 @@
        Version="9.00"
        Name="mdi"
        ProjectGUID="{F493EC02-F24B-3211-8666-ABA635BA96CE}"
+       RootNamespace="mdi"
        Keyword="Qt4VSv1.0"
        TargetFrameworkVersion="0"
        >
                                Name="VCCLCompilerTool"
                                AdditionalOptions="-Zm200 -w34100 -w34189"
                                Optimization="4"
-                               AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;,&quot;$(QTDIR)\include\QtGui&quot;,&quot;$(QTDIR)\include&quot;,&quot;$(QTDIR)\include\ActiveQt&quot;,&quot;debug&quot;,..\..\..\..\Qt\4.7.0\mkspecs\default"
-                               PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
+                               AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\ActiveQt&quot;;debug;..\..\..\..\Qt\4.7.0\mkspecs\default;.\GeneratedFiles;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cdt;..\..\lib\graph;&quot;$(SolutionDir)/&quot;;..\..\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"
                                RuntimeLibrary="3"
-                               BufferSecurityCheck="false"
+                               BufferSecurityCheck="true"
                                TreatWChar_tAsBuiltInType="false"
                                RuntimeTypeInfo="true"
                                AssemblerListingLocation="debug\"
                                Name="VCLinkerTool"
                                IgnoreImportLibrary="true"
                                AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
-                               AdditionalDependencies="qtmaind.lib QtGuid4.lib QtCored4.lib"
-                               OutputFile="debug\mdi.exe"
+                               AdditionalDependencies="qtmaind.lib QtGuid4.lib QtCored4.lib "
+                               OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(QTDIR)\lib"
+                               AdditionalLibraryDirectories="&quot;C:\graphviz-ms\bin&quot;;&quot;$(QTDIR)\lib&quot;"
+                               IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile=""
-                               SubSystem="2"
+                               SubSystem="1"
                                LinkTimeCodeGeneration="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions="-Zm200 -w34100 -w34189"
                                Optimization="2"
-                               AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;,&quot;$(QTDIR)\include\QtGui&quot;,&quot;$(QTDIR)\include&quot;,&quot;$(QTDIR)\include\ActiveQt&quot;,&quot;release&quot;,..\..\..\..\Qt\4.7.0\mkspecs\default"
-                               PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_DLL,QT_NO_DEBUG,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG"
+                               AdditionalIncludeDirectories="&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\ActiveQt&quot;;debug;..\..\..\..\Qt\4.7.0\mkspecs\default;.\GeneratedFiles;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cdt;..\..\lib\graph;..\..\lib\gvc"
+                               PreprocessorDefinitions="QT_NO_DEBUG;NDEBUG;_WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT"
                                GeneratePreprocessedFile="0"
                                ExceptionHandling="1"
                                RuntimeLibrary="2"
                                Name="VCLinkerTool"
                                IgnoreImportLibrary="true"
                                AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
-                               AdditionalDependencies="qtmain.lib QtGui4.lib QtCore4.lib"
-                               OutputFile="release\mdi.exe"
+                               AdditionalDependencies="qtmain.lib QtGuid4.lib QtCored4.lib gvc.lib graph.lib"
+                               OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="$(QTDIR)\lib"
+                               AdditionalLibraryDirectories="&quot;C:\graphviz-ms\bin&quot;;&quot;$(QTDIR)\lib&quot;"
                                GenerateDebugInformation="false"
                                ProgramDatabaseFile=""
                                SubSystem="2"
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
+                       <File
+                               RelativePath=".\csettings.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\imageviewer.cpp"
+                               >
+                       </File>
                        <File
                                RelativePath="main.cpp"
                                >
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
                        <File
-                               RelativePath="mainwindow.h"
+                               RelativePath=".\csettings.h"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="mdichild.h"
+                               RelativePath=".\imageviewer.h"
                                >
                                <FileConfiguration
                                        Name="Debug|Win32"
                                        />
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath="mainwindow.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <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;"
+                                               AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"
+                                               Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Moc&apos;ing $(InputFileName)..."
+                                               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;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;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath="mdichild.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <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;"
+                                               AdditionalDependencies="&quot;$(QTDIR)\bin\moc.exe&quot;;$(InputPath)"
+                                               Outputs="&quot;.\GeneratedFiles\$(ConfigurationName)\moc_$(InputName).cpp&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Moc&apos;ing $(InputFileName)..."
+                                               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;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;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath=".\ui_settings.h"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="Generated Files"
                                Filter="cpp;moc"
                                SourceControlFiles="false"
                                >
+                               <File
+                                       RelativePath=".\GeneratedFiles\Debug\moc_csettings.cpp"
+                                       >
+                                       <FileConfiguration
+                                               Name="Release|Win32"
+                                               ExcludedFromBuild="true"
+                                               >
+                                               <Tool
+                                                       Name="VCCLCompilerTool"
+                                               />
+                                       </FileConfiguration>
+                               </File>
+                               <File
+                                       RelativePath=".\GeneratedFiles\Debug\moc_imageviewer.cpp"
+                                       >
+                                       <FileConfiguration
+                                               Name="Release|Win32"
+                                               ExcludedFromBuild="true"
+                                               >
+                                               <Tool
+                                                       Name="VCCLCompilerTool"
+                                               />
+                                       </FileConfiguration>
+                               </File>
                                <File
                                        RelativePath=".\GeneratedFiles\Debug\moc_mainwindow.cpp"
                                        >
                                Filter="cpp;moc"
                                SourceControlFiles="false"
                                >
+                               <File
+                                       RelativePath=".\GeneratedFiles\Release\moc_csettings.cpp"
+                                       >
+                                       <FileConfiguration
+                                               Name="Debug|Win32"
+                                               ExcludedFromBuild="true"
+                                               >
+                                               <Tool
+                                                       Name="VCCLCompilerTool"
+                                               />
+                                       </FileConfiguration>
+                               </File>
+                               <File
+                                       RelativePath=".\GeneratedFiles\Release\moc_imageviewer.cpp"
+                                       >
+                                       <FileConfiguration
+                                               Name="Debug|Win32"
+                                               ExcludedFromBuild="true"
+                                               >
+                                               <Tool
+                                                       Name="VCCLCompilerTool"
+                                               />
+                                       </FileConfiguration>
+                               </File>
                                <File
                                        RelativePath=".\GeneratedFiles\Release\moc_mainwindow.cpp"
                                        >
                                </FileConfiguration>
                        </File>
                </Filter>
+               <Filter
+                       Name="Form Files"
+                       Filter="ui"
+                       UniqueIdentifier="{99349809-55BA-4b9d-BF79-8FDBB0286EB3}"
+                       >
+                       <File
+                               RelativePath=".\ui\settings.ui"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Uic&apos;ing $(InputFileName)..."
+                                               CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;.\ui_$(InputName).h&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+                                               AdditionalDependencies="$(QTDIR)\bin\uic.exe"
+                                               Outputs="\ui_frmsettings.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Uic&apos;ing $(InputFileName)..."
+                                               CommandLine="&quot;$(QTDIR)\bin\uic.exe&quot; -o &quot;.\GeneratedFiles\ui_$(InputName).h&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+                                               AdditionalDependencies="$(QTDIR)\bin\uic.exe"
+                                               Outputs="&quot;.\GeneratedFiles\ui_$(InputName).h&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+               </Filter>
        </Files>
        <Globals>
                <Global
index c8d3c3ddce6a05e123cf1dbd9ae4ab80346eabff..f7aea540fee48aa5908c2056e68995adc37b2447 100644 (file)
@@ -2,7 +2,7 @@
 <VisualStudioUserFile
        ProjectType="Visual C++"
        Version="9.00"
-       ShowAllFiles="false"
+       ShowAllFiles="true"
        >
        <Configurations>
                <Configuration
@@ -20,7 +20,7 @@
                                HttpUrl=""
                                PDBPath=""
                                SQLDebugging=""
-                               Environment="PATH=$(QTDIR)\bin;$(PATH)"
+                               Environment="PATH=$(QTDIR)\bin;&quot;$(QTDIR)\bin;$(PATH)"
                                EnvironmentMerge="true"
                                DebuggerFlavor=""
                                MPIRunCommand=""
@@ -48,7 +48,7 @@
                                HttpUrl=""
                                PDBPath=""
                                SQLDebugging=""
-                               Environment="PATH=$(QTDIR)\bin;$(PATH)"
+                               Environment="PATH=$(QTDIR)\bin;&quot;$(QTDIR)\bin;$(PATH)"
                                EnvironmentMerge="true"
                                DebuggerFlavor=""
                                MPIRunCommand=""
index 24905a1b05dcf25ddbef4fe0703c090e6e1f8c8f..243743bf5f99fb9dff06f88b03387c794deb5e27 100644 (file)
 #include <QtGui>
 
 #include "mdichild.h"
+#include "mainwindow.h"
 
 MdiChild::MdiChild()
 {
     setAttribute(Qt::WA_DeleteOnClose);
     isUntitled = true;
+    layoutIdx=0;
+    renderIdx=0;
+    preview=true;
+    applyCairo=false;
+    previewFrm=NULL;
 }
 
 void MdiChild::newFile()
@@ -173,3 +179,16 @@ QString MdiChild::strippedName(const QString &fullFileName)
 {
     return QFileInfo(fullFileName).fileName();
 }
+
+void MdiChild::loadPreview(QString fileName)
+{
+    if (!this->previewFrm)
+    {
+       previewFrm=new ImageViewer();
+       parentFrm->mdiArea->addSubWindow(previewFrm);
+    }
+    previewFrm->open(fileName);
+    previewFrm->show();
+
+}
+
index 95f99c85be89befe4d85c56b8be9ed41c3444378..fa5f7e4e302a3bdc58c3089c25e8c87619e73016 100644 (file)
@@ -42,6 +42,8 @@
 #define MDICHILD_H
 
 #include <QTextEdit>
+#include "imageviewer.h"
+class MainWindow;
 
 class MdiChild : public QTextEdit
 {
@@ -57,7 +59,15 @@ public:
     bool saveFile(const QString &fileName);
     QString userFriendlyCurrentFile();
     QString currentFile() { return curFile; }
-
+    int layoutIdx;
+    int renderIdx;
+    QString outputFile;
+    bool preview;
+    bool applyCairo;
+    QString attributes;
+    ImageViewer* previewFrm;
+    MainWindow* parentFrm;
+    void loadPreview(QString fileName);
 protected:
     void closeEvent(QCloseEvent *event);
 
diff --git a/cmd/gvedit/ui/main.ui b/cmd/gvedit/ui/main.ui
new file mode 100644 (file)
index 0000000..d1c7d60
--- /dev/null
@@ -0,0 +1,388 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1076</width>
+    <height>839</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <property name="spacing">
+     <number>1</number>
+    </property>
+    <property name="margin">
+     <number>1</number>
+    </property>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>1076</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>File</string>
+    </property>
+    <addaction name="actionNew"/>
+    <addaction name="actionOpen"/>
+    <addaction name="separator"/>
+    <addaction name="actionSave"/>
+    <addaction name="actionSave_As"/>
+    <addaction name="actionExport"/>
+    <addaction name="separator"/>
+    <addaction name="actionQuit"/>
+   </widget>
+   <widget class="QMenu" name="menuGraph">
+    <property name="title">
+     <string>Graph</string>
+    </property>
+    <addaction name="actionLayout_Settings"/>
+    <addaction name="actionLayout"/>
+   </widget>
+   <widget class="QMenu" name="menuView">
+    <property name="title">
+     <string>View</string>
+    </property>
+    <addaction name="actionZoomout"/>
+    <addaction name="separator"/>
+    <addaction name="actionSwitchto3d"/>
+    <addaction name="actionSwitch_to_Fisheye_Layout"/>
+   </widget>
+   <widget class="QMenu" name="menuPlugins">
+    <property name="title">
+     <string>Plugins</string>
+    </property>
+    <addaction name="actionPlugin_Manager"/>
+   </widget>
+   <widget class="QMenu" name="menuWindows">
+    <property name="title">
+     <string>Windows</string>
+    </property>
+    <addaction name="actionMaximize"/>
+    <addaction name="actionTile"/>
+    <addaction name="actionCascade"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionSmyrna_Help"/>
+    <addaction name="actionAbout"/>
+   </widget>
+   <addaction name="menuFile"/>
+   <addaction name="menuGraph"/>
+   <addaction name="menuView"/>
+   <addaction name="menuPlugins"/>
+   <addaction name="menuWindows"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="minimumSize">
+    <size>
+     <width>240</width>
+     <height>32</height>
+    </size>
+   </property>
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionNew"/>
+   <addaction name="actionOpen"/>
+   <addaction name="actionSave"/>
+   <addaction name="actionSave_As"/>
+   <addaction name="actionExport"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar_2">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>34</width>
+     <height>0</height>
+    </size>
+   </property>
+   <property name="windowTitle">
+    <string>toolBar_2</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>LeftToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionFitInScreen"/>
+   <addaction name="actionZoomin"/>
+   <addaction name="actionZoomout"/>
+   <addaction name="actionSwitchto3d"/>
+   <addaction name="actionSwitch_to_Fisheye_Layout"/>
+  </widget>
+  <widget class="QToolBar" name="toolBar_3">
+   <property name="windowTitle">
+    <string>toolBar_3</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionGraph_Settings"/>
+   <addaction name="actionAttributes"/>
+   <addaction name="actionScripts"/>
+   <addaction name="actionLayouts"/>
+   <addaction name="actionStatics"/>
+  </widget>
+  <action name="actionNew">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../../../../Qt/4.7.0/src/gui/styles/images/New.gif</normaloff>../../../../../Qt/4.7.0/src/gui/styles/images/New.gif</iconset>
+   </property>
+   <property name="text">
+    <string>New</string>
+   </property>
+   <property name="toolTip">
+    <string>Create A New Graph</string>
+   </property>
+  </action>
+  <action name="actionOpen">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../../../../Qt/4.7.0/src/gui/styles/images/OpenDoc.gif</normaloff>../../../../../Qt/4.7.0/src/gui/styles/images/OpenDoc.gif</iconset>
+   </property>
+   <property name="text">
+    <string>Open</string>
+   </property>
+   <property name="toolTip">
+    <string>Open An Existing Graph</string>
+   </property>
+  </action>
+  <action name="actionSave">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../../../../Qt/4.7.0/src/gui/styles/images/SaveC.gif</normaloff>../../../../../Qt/4.7.0/src/gui/styles/images/SaveC.gif</iconset>
+   </property>
+   <property name="text">
+    <string>Save</string>
+   </property>
+   <property name="toolTip">
+    <string>Save Active Graph</string>
+   </property>
+  </action>
+  <action name="actionSave_As">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../../../../../Qt/4.7.0/src/gui/styles/images/standardbutton-save-as-32.png</normaloff>../../../../../../Qt/4.7.0/src/gui/styles/images/standardbutton-save-as-32.png</iconset>
+   </property>
+   <property name="text">
+    <string>Save As...</string>
+   </property>
+   <property name="toolTip">
+    <string>Save Active Graph Under A New Name</string>
+   </property>
+  </action>
+  <action name="actionExport">
+   <property name="icon">
+    <iconset resource="../../smyrna-qt/resource.qrc">
+     <normaloff>:/images/images/export.gif</normaloff>:/images/images/export.gif</iconset>
+   </property>
+   <property name="text">
+    <string>Export</string>
+   </property>
+   <property name="toolTip">
+    <string>Export Graph To Different File Formats</string>
+   </property>
+  </action>
+  <action name="actionQuit">
+   <property name="text">
+    <string>Quit</string>
+   </property>
+   <property name="toolTip">
+    <string>Quit Application</string>
+   </property>
+  </action>
+  <action name="actionGraph_Settings">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../../../../../Qt/4.7.0/src/gui/styles/images/desktop-32.png</normaloff>../../../../../../Qt/4.7.0/src/gui/styles/images/desktop-32.png</iconset>
+   </property>
+   <property name="text">
+    <string>Graph Settings...</string>
+   </property>
+  </action>
+  <action name="actionAttributes">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/Sheet.gif</normaloff>../../smyrna-qt/images/Sheet.gif</iconset>
+   </property>
+   <property name="text">
+    <string>Attributes</string>
+   </property>
+   <property name="toolTip">
+    <string>View / Modify Graph Attributes</string>
+   </property>
+  </action>
+  <action name="actionScripts">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/scripts.gif</normaloff>../../smyrna-qt/images/scripts.gif</iconset>
+   </property>
+   <property name="text">
+    <string>Scripts</string>
+   </property>
+   <property name="toolTip">
+    <string>Open Script Manager</string>
+   </property>
+  </action>
+  <action name="actionLayouts">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/InsInst.gif</normaloff>../../smyrna-qt/images/InsInst.gif</iconset>
+   </property>
+   <property name="text">
+    <string>Layouts</string>
+   </property>
+  </action>
+  <action name="actionStatics">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/BarGraph.gif</normaloff>../../smyrna-qt/images/BarGraph.gif</iconset>
+   </property>
+   <property name="text">
+    <string>Stats</string>
+   </property>
+  </action>
+  <action name="actionFitInScreen">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/cursor-sizef.png</normaloff>../../smyrna-qt/images/cursor-sizef.png</iconset>
+   </property>
+   <property name="text">
+    <string>Fit In Screen</string>
+   </property>
+  </action>
+  <action name="actionZoomin">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/zoom-in-32.png</normaloff>../../smyrna-qt/images/zoom-in-32.png</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom In</string>
+   </property>
+  </action>
+  <action name="actionZoomout">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/zoom-out-32.png</normaloff>../../smyrna-qt/images/zoom-out-32.png</iconset>
+   </property>
+   <property name="text">
+    <string>Zoom Out</string>
+   </property>
+  </action>
+  <action name="actionSwitchto3d">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/3D-view.png</normaloff>../../smyrna-qt/images/3D-view.png</iconset>
+   </property>
+   <property name="text">
+    <string>Switch To 3D</string>
+   </property>
+  </action>
+  <action name="actionSwitch_to_Fisheye_Layout">
+   <property name="icon">
+    <iconset>
+     <normaloff>../../smyrna-qt/images/fisheye.png</normaloff>../../smyrna-qt/images/fisheye.png</iconset>
+   </property>
+   <property name="text">
+    <string>Switch to Fisheye Layout</string>
+   </property>
+  </action>
+  <action name="actionPlugin_Manager">
+   <property name="text">
+    <string>Plugin Manager</string>
+   </property>
+  </action>
+  <action name="actionMaximize">
+   <property name="text">
+    <string>Maximize</string>
+   </property>
+  </action>
+  <action name="actionTile">
+   <property name="text">
+    <string>Tile</string>
+   </property>
+  </action>
+  <action name="actionCascade">
+   <property name="text">
+    <string>Cascade</string>
+   </property>
+  </action>
+  <action name="actionSmyrna_Help">
+   <property name="text">
+    <string>Smyrna Help...</string>
+   </property>
+  </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About</string>
+   </property>
+  </action>
+  <action name="actionLayout_Settings">
+   <property name="text">
+    <string>Layout Settings</string>
+   </property>
+  </action>
+  <action name="actionLayout">
+   <property name="text">
+    <string>Layout</string>
+   </property>
+  </action>
+ </widget>
+ <resources>
+  <include location="../../smyrna-qt/resource.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>actionNew</sender>
+   <signal>activated()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>slotNewGraph()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>537</x>
+     <y>419</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+ <slots>
+  <slot>slotNewGraph()</slot>
+ </slots>
+</ui>
diff --git a/cmd/gvedit/ui/settings.ui b/cmd/gvedit/ui/settings.ui
new file mode 100644 (file)
index 0000000..0add9cf
--- /dev/null
@@ -0,0 +1,614 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>405</width>
+    <height>512</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QFrame" name="frame">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>401</width>
+     <height>181</height>
+    </rect>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Sunken</enum>
+   </property>
+   <property name="lineWidth">
+    <number>2</number>
+   </property>
+   <widget class="QWidget" name="layoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>381</width>
+      <height>161</height>
+     </rect>
+    </property>
+    <layout class="QVBoxLayout" name="verticalLayout_5">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Layout Engine</string>
+           </property>
+           <property name="margin">
+            <number>5</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="cbLayout">
+           <property name="minimumSize">
+            <size>
+             <width>150</width>
+             <height>0</height>
+            </size>
+           </property>
+           <item>
+            <property name="text">
+             <string>dot</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>circo</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>fdp</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>neato</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>nop</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>nop1</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>nop2</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>osage</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>patchwork</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>sfdp</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>twopi</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Output file Type</string>
+           </property>
+           <property name="margin">
+            <number>5</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="cbExtension">
+           <property name="minimumSize">
+            <size>
+             <width>150</width>
+             <height>0</height>
+            </size>
+           </property>
+           <item>
+            <property name="text">
+             <string>png</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>jpg</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>ps</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>dot</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="minimumSize">
+            <size>
+             <width>120</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Output File Name</string>
+           </property>
+           <property name="margin">
+            <number>5</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="leOutput">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pbOut">
+           <property name="maximumSize">
+            <size>
+             <width>50</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
+       <item>
+        <spacer name="horizontalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="chbPreview">
+         <property name="text">
+          <string>Preview Output File</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_6">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="chbCairo">
+         <property name="text">
+          <string>Apply Cairo Filters</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QFrame" name="frame_2">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>180</y>
+     <width>401</width>
+     <height>71</height>
+    </rect>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Raised</enum>
+   </property>
+   <widget class="QWidget" name="layoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>0</y>
+      <width>381</width>
+      <height>62</height>
+     </rect>
+    </property>
+    <layout class="QHBoxLayout" name="horizontalLayout_7">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_5" stretch="1,2,1,2">
+         <item>
+          <widget class="QLabel" name="label_5">
+           <property name="text">
+            <string>Scope</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="cbScope">
+           <item>
+            <property name="text">
+             <string>graph</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>node</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>edge</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="label_6">
+           <property name="text">
+            <string>Name</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="cbName">
+           <item>
+            <property name="text">
+             <string>color</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Font</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>fontname</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>fontcolor</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>bgcolor</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <item>
+          <widget class="QLabel" name="label_7">
+           <property name="minimumSize">
+            <size>
+             <width>40</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>47</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>Value</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="leValue"/>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <widget class="QPushButton" name="pbAdd">
+         <property name="minimumSize">
+          <size>
+           <width>75</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Add</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>13</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="pushButton_4">
+         <property name="minimumSize">
+          <size>
+           <width>75</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Help</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QFrame" name="frame_3">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>250</y>
+     <width>401</width>
+     <height>261</height>
+    </rect>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Raised</enum>
+   </property>
+   <widget class="QWidget" name="layoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>7</x>
+      <y>6</y>
+      <width>391</width>
+      <height>251</height>
+     </rect>
+    </property>
+    <layout class="QVBoxLayout" name="verticalLayout_4">
+     <item>
+      <widget class="QTextEdit" name="teAttributes"/>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_10">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_8">
+         <item>
+          <widget class="QPushButton" name="pbNew">
+           <property name="minimumSize">
+            <size>
+             <width>40</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>40</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>clear</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pbOpen">
+           <property name="minimumSize">
+            <size>
+             <width>40</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>40</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>load</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pbSave">
+           <property name="minimumSize">
+            <size>
+             <width>40</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>40</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>save</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_9">
+         <item>
+          <widget class="QPushButton" name="pbCancel">
+           <property name="text">
+            <string>Cancel</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="btnOK">
+           <property name="text">
+            <string>OK</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <action name="actionCSettingsOK">
+   <property name="text">
+    <string>CSettingsOK</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
index bd8a530211c10345789bf2cca97ff12285b80eec..bb4a2c9d4fdb9d459e8477abc8373f25487f6270 100644 (file)
Binary files a/cmd/gvedit/vc90.idb and b/cmd/gvedit/vc90.idb differ
index 790a0c5ad05840f0deef4584ca6f69a36add789d..6cfc3e1a2d952ef92f1f2cff0ac353989316e70e 100644 (file)
Binary files a/cmd/gvedit/vc90.pdb and b/cmd/gvedit/vc90.pdb differ