- renamed ext to OMPlotWindow

- renamed trunk.sln to OMNotebook.sln - renamed OMS.sln to OMShell.sln - got rid of some .suo as they are user specific. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5386 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 25, 2010 · 2e2f1d1 · 2e2f1d1
1 parent 8b221f1
commit 2e2f1d1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/OMNotebook/OMNotebookQT4/trunk.sln → OMNotebook/OMNotebookQT4/OMNotebook.sln b/OMNotebook/OMNotebookQT4/trunk.sln → OMNotebook/OMNotebookQT4/OMNotebook.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OMNotebookQT4", "trunk.vcproj", "{259725BE-54D2-3C8D-A8A8-4CF7BD839D28}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OMNotebookQT4", "OMNotebook.vcproj", "{259725BE-54D2-3C8D-A8A8-4CF7BD839D28}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3700A59E-E33B-4AC7-8385-35D486AEE4E0} = {3700A59E-E33B-4AC7-8385-35D486AEE4E0}
 		{286F13C0-0E92-4179-A57E-E8C949054F46} = {286F13C0-0E92-4179-A57E-E8C949054F46}
@@ -17,7 +17,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Pltpkg2", "..\Pltpkg2\Pltpk
 		{286F13C0-0E92-4179-A57E-E8C949054F46} = {286F13C0-0E92-4179-A57E-E8C949054F46}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext", "..\ext\ext.vcproj", "{79F27DD3-82FE-3AAD-80B3-1255DC2DB9D9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OMPlotWindow", "..\ext\OMPlotWindow.vcproj", "{79F27DD3-82FE-3AAD-80B3-1255DC2DB9D9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{286F13C0-0E92-4179-A57E-E8C949054F46} = {286F13C0-0E92-4179-A57E-E8C949054F46}
 		{D98C1DD4-008F-34B2-A980-0998ECF8427E} = {D98C1DD4-008F-34B2-A980-0998ECF8427E}

diff --git a/OMNotebook/OMNotebookQT4/trunk.vcproj → OMNotebook/OMNotebookQT4/OMNotebook.vcproj b/OMNotebook/OMNotebookQT4/trunk.vcproj → OMNotebook/OMNotebookQT4/OMNotebook.vcproj
diff --git a/OMNotebook/ext/ext.rc → OMNotebook/ext/OMPlotWindow.rc b/OMNotebook/ext/ext.rc → OMNotebook/ext/OMPlotWindow.rc
diff --git a/OMNotebook/ext/ext.vcproj → OMNotebook/ext/OMPlotWindow.vcproj b/OMNotebook/ext/ext.vcproj → OMNotebook/ext/OMPlotWindow.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
-	Name="ext"
+	Name="OMPlotWindow"
 	ProjectGUID="{79F27DD3-82FE-3AAD-80B3-1255DC2DB9D9}"
 	RootNamespace="ext"
 	Keyword="Qt4VSv1.0"
@@ -76,7 +76,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="$(QTHOME)\lib\qtmaind.lib $(QTHOME)\lib\QtGuid4.lib $(QTHOME)\lib\QtCored4.lib $(QTHOME)\lib\QtNetworkd4.lib ..\Pltpkg2\debug\pltpkg2.lib 3Dpkg.lib soqt1d.lib coin3d.lib"
-				OutputFile="debug\ext.exe"
+				OutputFile="debug\OMPlotWindow.exe"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="&quot;$(QTHOME)\lib&quot;;&quot;$(COINDIR)\lib&quot;;&quot;$(SolutionDir)\Debug\&quot;"
 				GenerateDebugInformation="true"
@@ -168,7 +168,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="$(QTHOME)\lib\qtmain.lib $(QTHOME)\lib\QtGui4.lib $(QTHOME)\lib\QtCore4.lib $(QTHOME)\lib\QtNetwork4.lib ..\Pltpkg2\Release\pltpkg2.lib 3Dpkg.lib soqt1.lib coin3.lib"
-				OutputFile="release\ext.exe"
+				OutputFile="release\OMPlotWindow.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="&quot;$(QTHOME)\lib&quot;;&quot;$(COINDIR)\lib&quot;;&quot;$(SolutionDir)\Release\&quot;"
@@ -198,8 +198,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Copy ext.exe and xml files to build/bin"
-				CommandLine="copy $(TargetPath) $(InputDir)\..\..\build\bin\&#x0D;&#x0A;copy $(ProjectDir)\..\OMNotebookQT4\*.xml $(InputDir)\..\..\build\bin\&#x0D;&#x0A;"
+				Description="Copy OMPlotWindow.exe and xml files to build/bin"
+				CommandLine="copy $(TargetPath) $(InputDir)\..\..\build\bin\&#x0D;&#x0A;copy $(ProjectDir)\..\OMNotebookQT4\*.xml $(InputDir)\..\..\build\share\omnotebook&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -243,7 +243,7 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="$(QTHOME)\bin\rcc.exe -o generatedfiles/qtres.cpp qtres.qrc"
+						CommandLine="$(QTHOME)\bin\rcc.exe -o generatedfiles/qtres.cpp qtres.qrc&#x0D;&#x0A;"
 						AdditionalDependencies="qtres.qrc"
 						Outputs="generatedfiles/qtres.cpp"
 					/>
@@ -445,11 +445,11 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath=".\ext.rc"
+			RelativePath="..\OMNotebookQT4\omnotebook_png.png"
 			>
 		</File>
 		<File
-			RelativePath="..\OMNotebookQT4\omnotebook_png.png"
+			RelativePath=".\OMPlotWindow.rc"
 			>
 		</File>
 		<File