icon is added

diff --git a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
index 5e83da3ff2d36f476fd9b880fd59294e26577215..919df3e6ad756f8abb155ce4e43b8ce1405f97af 100644 (file)
--- a/cmd/gvedit/csettings.cpp
+++ b/cmd/gvedit/csettings.cpp
@@ -128,6 +128,7 @@ CFrmSettings::CFrmSettings()
 
 
     loadAttrs("./attrs.txt",WIDGET(QComboBox,cbNameG),WIDGET(QComboBox,cbNameN),WIDGET(QComboBox,cbNameE));
+    setWindowIcon(QIcon(":/images/icon.png"));
 }
 
 void CFrmSettings::outputSlot()

diff --git a/cmd/gvedit/imageviewer.cpp b/cmd/gvedit/imageviewer.cpp
index ed3521b8c98d6c3a864e989631fbbe367e5e8381..3507cb3a7ee6e2d25532e2f5455dc7cd6fa12739 100644 (file)
--- a/cmd/gvedit/imageviewer.cpp
+++ b/cmd/gvedit/imageviewer.cpp
@@ -37,7 +37,7 @@ ImageViewer::ImageViewer()
     setWindowTitle(tr(""));
     resize(800, 600);
 
-    setWindowIcon(QIcon(":/images/new.png"));
+    setWindowIcon(QIcon(":/images/icon.png"));
 
 }
 //! [0]

diff --git a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
index 35701ef0db962cd348b438ed2632235f07d95f44..9277350bf6bad333d08848037af0516bf6713371 100644 (file)
--- a/cmd/gvedit/mainwindow.cpp
+++ b/cmd/gvedit/mainwindow.cpp
@@ -148,6 +148,8 @@ CMainWindow::CMainWindow()
     cb = (QComboBox*)frmSettings->findChild<QComboBox*>("cbExtension");
     LoadPlugins(cb, frmSettings->gvc, "device");
     statusBar()->showMessage(tr("Ready"));
+    setWindowIcon(QIcon(":/images/icon.png"));
+
 }
 
 void CMainWindow::closeEvent(QCloseEvent *event)

diff --git a/cmd/gvedit/mdi.qrc b/cmd/gvedit/mdi.qrc
index 9001e7da7d14e14103d35f27be06afd3506a0944..df987d54f017e06140198baa33e70739db7d0d07 100644 (file)
--- a/cmd/gvedit/mdi.qrc
+++ b/cmd/gvedit/mdi.qrc
@@ -8,5 +8,6 @@
         <file>images/save.png</file>
         <file>images/run.png</file>
         <file>images/settings.png</file>
+        <file>images/icon.png</file>
     </qresource>
 </RCC>

diff --git a/cmd/gvedit/mdi.vcproj b/cmd/gvedit/mdi.vcproj
index 2b44ad031321e0f57e5fc441545681736b728461..d5db1c4b8f7586b997de814e155987074994e3c1 100644 (file)
--- a/cmd/gvedit/mdi.vcproj
+++ b/cmd/gvedit/mdi.vcproj
@@ -538,6 +538,26 @@
                                        />
                                </FileConfiguration>
                        </File>
+                       <File
+                               RelativePath=".\images\icon.png"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File
                                RelativePath="mdi.qrc"
                                >
@@ -548,7 +568,7 @@
                                                Name="VCCustomBuildTool"
                                                Description="Rcc&apos;ing $(InputFileName)..."
                                                CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name &quot;$(InputName)&quot; -no-compress &quot;$(InputPath)&quot; -o .\GeneratedFiles\qrc_$(InputName).cpp&#x0D;&#x0A;"
-                                               AdditionalDependencies="$(InputPath);.\images\copy.png;.\images\cut.png;.\images\new.png;.\images\open.png;.\images\paste.png;.\images\save.png;.\images\run.png;.\images\settings.png"
+                                               AdditionalDependencies="$(InputPath);.\images\copy.png;.\images\cut.png;.\images\new.png;.\images\open.png;.\images\paste.png;.\images\save.png;.\images\run.png;.\images\settings.png;.\images\icon.png"
                                                Outputs=".\GeneratedFiles\qrc_$(InputName).cpp"
                                        />
                                </FileConfiguration>
@@ -559,7 +579,7 @@
                                                Name="VCCustomBuildTool"
                                                Description="Rcc&apos;ing $(InputFileName)..."
                                                CommandLine="&quot;$(QTDIR)\bin\rcc.exe&quot; -name &quot;$(InputName)&quot; -no-compress &quot;$(InputPath)&quot; -o .\GeneratedFiles\qrc_$(InputName).cpp&#x0D;&#x0A;"
-                                               AdditionalDependencies="$(InputPath);.\images\copy.png;.\images\cut.png;.\images\new.png;.\images\open.png;.\images\paste.png;.\images\save.png;.\images\run.png;.\images\settings.png"
+                                               AdditionalDependencies="$(InputPath);.\images\copy.png;.\images\cut.png;.\images\new.png;.\images\open.png;.\images\paste.png;.\images\save.png;.\images\run.png;.\images\settings.png;.\images\icon.png"
                                                Outputs=".\GeneratedFiles\qrc_$(InputName).cpp"
                                        />
                                </FileConfiguration>

diff --git a/cmd/gvedit/ui/settings.ui b/cmd/gvedit/ui/settings.ui
index 6904e4c813dfb3864592c367b0e5532cff29b333..22ad794325dc7338e1f8673a73ae0d3b809dd23c 100644 (file)
--- a/cmd/gvedit/ui/settings.ui
+++ b/cmd/gvedit/ui/settings.ui
@@ -19,7 +19,7 @@
   <property name="minimumSize">
    <size>
     <width>404</width>
-    <height>512</height>
+    <height>509</height>
    </size>
   </property>
   <property name="maximumSize">

diff --git a/cmd/gvedit/vc90.idb b/cmd/gvedit/vc90.idb
index 2b74f9d84e4ea374a3b34991c0d20c22eef50573..7d42a4fb5ab723a809d592131d44e8c72acc336b 100644 (file)
Binary files a/cmd/gvedit/vc90.idb and b/cmd/gvedit/vc90.idb differ