Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

build: Various fixes to get "make distcheck" to work

Generate all the binaries in a toplevel bin/ folder. As the
generated makefiles wipe out the build folder during distclean, having
it set to the project folder leads to bad things.

Use $(srcdir) to find the various .snk files, so that they are found
during an out-of-tree build, as "make distcheck" does it.

Go over all the various assembly references, and do not require a
specific version when it's not needed.

Let MonoDevelop refresh the generated code in
src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/.
  • Loading branch information...
commit 4390e8981f479d2bbde560d92a1d6263c6c9c83d 1 parent bf42138
@bl8 bl8 authored
Showing with 1,492 additions and 1,617 deletions.
  1. +1 −0  .gitignore
  2. +1 −0  Mono.Upnp.sln
  3. +3 −3 src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.csproj
  4. +7 −7 src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.make
  5. +12 −14 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Makefile.am
  6. +1 −1  ...pnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.csproj
  7. +39 −34 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer/Makefile.am
  8. +2 −2 ...o.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.csproj
  9. +26 −27 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Makefile.am
  10. +5 −3 ...no.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.csproj
  11. +33 −30 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.GtkClient/Makefile.am
  12. +12 −4 ...Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.GtkClient/Mono.Upnp.Dcp.MediaServer1.GtkClient.csproj
  13. +15 −19 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1/Makefile.am
  14. +2 −2 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.csproj
  15. +14 −18 src/Mono.Upnp/Mono.Upnp.GtkClient/Makefile.am
  16. +11 −3 src/Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.csproj
  17. +86 −98 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ActionInvocationWindow.cs
  18. +104 −118 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.DeviceAnnouncementInfo.cs
  19. +328 −358 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.DeviceDescriptionInfo.cs
  20. +29 −38 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyDeviceInfo.cs
  21. +29 −38 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyIcon.cs
  22. +29 −38 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyServiceInfo.cs
  23. +73 −87 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.MainWindow.cs
  24. +43 −53 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.RawXmlInfo.cs
  25. +104 −118 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ServiceAnnouncementInfo.cs
  26. +161 −179 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ServiceDescriptionInfo.cs
  27. +52 −64 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ServiceScpdInfo.cs
  28. +114 −114 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/generated.cs
  29. +1 −1  src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/gui.stetic
  30. +12 −16 src/Mono.Upnp/Mono.Upnp/Makefile.am
  31. +4 −4 src/Mono.Upnp/Mono.Upnp/Mono.Upnp.csproj
  32. +10 −12 tests/Mono.Ssdp.Tests/Makefile.am
  33. +8 −4 tests/Mono.Ssdp.Tests/Mono.Ssdp.Tests.csproj
  34. +38 −37 tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests/Makefile.am
  35. +15 −7 tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests/Mono.Upnp.Dcp.MediaServer1.FileSystem.Tests.csproj
  36. +29 −33 tests/Mono.Upnp.Dcp.MediaServer1.Tests/Makefile.am
  37. +11 −5 tests/Mono.Upnp.Dcp.MediaServer1.Tests/Mono.Upnp.Dcp.MediaServer1.Tests.csproj
  38. +15 −21 tests/Mono.Upnp.Tests/Makefile.am
  39. +13 −7 tests/Mono.Upnp.Tests/Mono.Upnp.Tests.csproj
View
1  .gitignore
@@ -11,6 +11,7 @@ Makefile.in
TestResult.xml
aclocal.m4
autom4te.cache/
+bin
config.log
config.status
configure
View
1  Mono.Upnp.sln
@@ -148,5 +148,6 @@ Global
$6.inheritsSet = VisualStudio
$6.inheritsScope = text/plain
$6.scope = text/plain
+ outputpath = bin
EndGlobalSection
EndGlobal
View
6 src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.csproj
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
@@ -64,7 +64,7 @@
<ProjectExtensions>
<MonoDevelop>
<Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" RelativeConfigureInPath="../../..">
<BuildFilesVar />
<DeployFilesVar />
<ResourcesVar />
View
14 src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.make
@@ -4,26 +4,26 @@
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:mono-ssdp.snk"
-ASSEMBLY = Mono.Ssdp.dll
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:$(srcdir)/mono-ssdp.snk"
+ASSEMBLY = ../../../bin/Mono.Ssdp.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES =
-BUILD_DIR = .
+BUILD_DIR = ../../../bin
-MONO_SSDP_DLL_MDB_SOURCE=Mono.Ssdp.dll.mdb
+MONO_SSDP_DLL_MDB_SOURCE=../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:mono-ssdp.snk"
-ASSEMBLY = Mono.Ssdp.dll
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:$(srcdir)/mono-ssdp.snk"
+ASSEMBLY = ../../../bin/Mono.Ssdp.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES =
-BUILD_DIR = .
+BUILD_DIR = ../../../bin
MONO_SSDP_DLL_MDB=
View
26 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Makefile.am
@@ -6,20 +6,20 @@ EXTRA_DIST =
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+ ../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
-MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
endif
@@ -31,12 +31,12 @@ ASSEMBLY = MSMediaServerRegistrar1.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
+ ../../../../bin/Mono.Upnp.dll
BUILD_DIR = .
MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
MONO_SSDP_DLL_MDB=
MONO_UPNP_DLL_MDB=
@@ -73,7 +73,7 @@ EXTRAS = \
mono.upnp.dcp.msmediareceiverregistrar1.pc.in
REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
+ ../../../../bin/Mono.Upnp.dll \
System
DLL_REFERENCES =
@@ -88,8 +88,6 @@ MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_PC = $(BUILD_DIR)/mono.upnp.dcp.msmediar
$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
$(eval $(call emit-deploy-wrapper,MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_PC,mono.upnp.dcp.msmediareceiverregistrar1.pc))
View
2  ....Dcp.MediaServer1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.csproj
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
View
73 ...Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer/Makefile.am
@@ -6,28 +6,34 @@ EXTRA_DIST =
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = exe
PROJECT_REFERENCES = \
- ../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
- ../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
-BUILD_DIR = .
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+BUILD_DIR = ../../../../bin
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB_SOURCE=Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe.mdb
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
-MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_SOURCE=../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll.mdb
MSMEDIASERVERREGISTRAR1_DLL=
endif
@@ -35,24 +41,27 @@ endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.exe
ASSEMBLY_MDB =
COMPILE_TARGET = exe
PROJECT_REFERENCES = \
- ../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.dll \
../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/MSMediaServerRegistrar1.dll
-BUILD_DIR = .
+BUILD_DIR = ../../../../bin
MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_CONSOLESERVER_EXE_MDB=
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
MONO_SSDP_DLL_MDB=
MONO_UPNP_DLL_MDB=
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=
MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL=
+MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB=
MSMEDIASERVERREGISTRAR1_DLL_SOURCE=../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/MSMediaServerRegistrar1.dll
MSMEDIASERVERREGISTRAR1_DLL=$(BUILD_DIR)/MSMediaServerRegistrar1.dll
@@ -69,7 +78,10 @@ PROGRAMFILES = \
$(MONO_SSDP_DLL) \
$(MONO_SSDP_DLL_MDB) \
$(MONO_UPNP_DLL_MDB) \
+ $(MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB) \
+ $(MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB) \
$(MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL) \
+ $(MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL_MDB) \
$(MSMEDIASERVERREGISTRAR1_DLL)
BINARIES = \
@@ -96,10 +108,10 @@ EXTRAS = \
mono-upnp-simple-media-server.in
REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
- ../Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../Mono.Upnp.Dcp.MSMediaReceiverRegistrar1/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MSMediaReceiverRegistrar1.dll \
+ ../../../../bin/Mono.Upnp.dll \
System
DLL_REFERENCES =
@@ -114,13 +126,6 @@ MONO_UPNP_DLL = $(BUILD_DIR)/Mono.Upnp.dll
MONO_SSDP_DLL = $(BUILD_DIR)/Mono.Ssdp.dll
MONO_UPNP_SIMPLE_MEDIA_SERVER = $(BUILD_DIR)/mono-upnp-simple-media-server
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MSMEDIARECEIVERREGISTRAR1_DLL))
$(eval $(call emit-deploy-wrapper,MONO_UPNP_SIMPLE_MEDIA_SERVER,mono-upnp-simple-media-server,x))
$(eval $(call emit-deploy-target,MSMEDIASERVERREGISTRAR1_DLL))
View
4 ...pnp.Dcp.MediaServer1.FileSystem.ConsoleServer/Mono.Upnp.Dcp.MediaServer1.FileSystem.ConsoleServer.csproj
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -29,7 +29,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
View
53 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Makefile.am
@@ -5,44 +5,47 @@ EXTRA_DIST =
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:mono-upnp-dcp-mediaserver1-filesystem.snk"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" "-keyfile:$(srcdir)/mono-upnp-dcp-mediaserver1-filesystem.snk"
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
-MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB_SOURCE=Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll.mdb
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.dll.mdb
endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:mono-upnp-dcp-mediaserver1-filesystem.snk"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:$(srcdir)/mono-upnp-dcp-mediaserver1-filesystem.snk"
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.FileSystem.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_DLL_MDB=
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
MONO_SSDP_DLL_MDB=
MONO_UPNP_DLL_MDB=
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=
endif
@@ -55,7 +58,8 @@ PROGRAMFILES = \
$(MONO_UPNP_DLL) \
$(MONO_SSDP_DLL) \
$(MONO_SSDP_DLL_MDB) \
- $(MONO_UPNP_DLL_MDB)
+ $(MONO_UPNP_DLL_MDB) \
+ $(MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB)
LINUX_PKGCONFIG = \
$(MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_PC)
@@ -91,8 +95,8 @@ EXTRAS = \
mono.upnp.dcp.mediaserver1.filesystem.pc.in
REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.dll \
-pkg:taglib-sharp \
System
@@ -107,11 +111,6 @@ MONO_UPNP_DLL = $(BUILD_DIR)/Mono.Upnp.dll
MONO_SSDP_DLL = $(BUILD_DIR)/Mono.Ssdp.dll
MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_PC = $(BUILD_DIR)/mono.upnp.dcp.mediaserver1.filesystem.pc
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
$(eval $(call emit-deploy-wrapper,MONO_UPNP_DCP_MEDIASERVER1_FILESYSTEM_PC,mono.upnp.dcp.mediaserver1.filesystem.pc))
View
8 ...Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.FileSystem/Mono.Upnp.Dcp.MediaServer1.FileSystem.csproj
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
@@ -34,8 +34,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0">
+ <Reference Include="taglib-sharp, Version=2.0.3.7, Culture=neutral, PublicKeyToken=db62eba44689b5b0">
<Private>False</Private>
+ <Package>taglib-sharp</Package>
+ <SpecificVersion>False</SpecificVersion>
</Reference>
</ItemGroup>
<ItemGroup>
View
63 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.GtkClient/Makefile.am
@@ -6,47 +6,53 @@ EXTRA_DIST =
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = ../../../Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.Dcp.MediaServer1.GtkClient.dll
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.GtkClient.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../../../Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.exe \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = ../../../Mono.Upnp/Mono.Upnp.GtkClient
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.GtkClient.exe \
+ ../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
-MONO_UPNP_DCP_MEDIASERVER1_GTKCLIENT_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.Dcp.MediaServer1.GtkClient.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_GTKCLIENT_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.GtkClient.dll.mdb
MONO_UPNP_DCP_MEDIASERVER1_GTKCLIENT_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.GtkClient.dll.mdb
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
-MONO_UPNP_GTKCLIENT_EXE_SOURCE=../../../Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.exe
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_GTKCLIENT_EXE_SOURCE=../../../../bin/Mono.Upnp.GtkClient.exe
+MONO_UPNP_GTKCLIENT_EXE_MDB_SOURCE=../../../../bin/Mono.Upnp.GtkClient.exe.mdb
+MONO_UPNP_GTKCLIENT_EXE_MDB=$(BUILD_DIR)/Mono.Upnp.GtkClient.exe.mdb
endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize-
-ASSEMBLY = ../../../Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.Dcp.MediaServer1.GtkClient.dll
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.GtkClient.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
- ../../../Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.exe \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = ../../../Mono.Upnp/Mono.Upnp.GtkClient
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.GtkClient.exe \
+ ../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
MONO_UPNP_DCP_MEDIASERVER1_GTKCLIENT_DLL_MDB=
-MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DCP_MEDIASERVER1_DLL_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
MONO_SSDP_DLL_MDB=
MONO_UPNP_DLL_MDB=
-MONO_UPNP_GTKCLIENT_EXE_SOURCE=../../../Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.exe
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=
+MONO_UPNP_GTKCLIENT_EXE_SOURCE=../../../../bin/Mono.Upnp.GtkClient.exe
+MONO_UPNP_GTKCLIENT_EXE_MDB=
endif
@@ -60,7 +66,9 @@ PROGRAMFILES = \
$(MONO_SSDP_DLL) \
$(MONO_SSDP_DLL_MDB) \
$(MONO_UPNP_DLL_MDB) \
- $(MONO_UPNP_GTKCLIENT_EXE)
+ $(MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB) \
+ $(MONO_UPNP_GTKCLIENT_EXE) \
+ $(MONO_UPNP_GTKCLIENT_EXE_MDB)
LINUX_PKGCONFIG = \
$(MONO_UPNP_DCP_MEDIASERVER1_GTKCLIENT_PC)
@@ -85,9 +93,9 @@ EXTRAS = \
mono.upnp.dcp.mediaserver1.gtkclient.pc.in
REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.exe \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll \
- ../Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll \
+ ../../../../bin/Mono.Upnp.dll \
+ ../../../../bin/Mono.Upnp.GtkClient.exe \
-pkg:glib-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-pkg:mono-addins \
@@ -105,11 +113,6 @@ MONO_SSDP_DLL = $(BUILD_DIR)/Mono.Ssdp.dll
MONO_UPNP_GTKCLIENT_EXE = $(BUILD_DIR)/Mono.Upnp.GtkClient.exe
MONO_UPNP_DCP_MEDIASERVER1_GTKCLIENT_PC = $(BUILD_DIR)/mono.upnp.dcp.mediaserver1.gtkclient.pc
-$(eval $(call emit-deploy-target,MONO_UPNP_DCP_MEDIASERVER1_DLL))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
$(eval $(call emit-deploy-wrapper,MONO_UPNP_DCP_MEDIASERVER1_GTKCLIENT_PC,mono.upnp.dcp.mediaserver1.gtkclient.pc))
View
16 ...o.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.GtkClient/Mono.Upnp.Dcp.MediaServer1.GtkClient.csproj
@@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\Mono.Upnp\Mono.Upnp.GtkClient</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,26 +23,34 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\Mono.Upnp\Mono.Upnp.GtkClient</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Package>gtk-sharp-2.0</Package>
+ </Reference>
+ <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <Package>gtk-sharp-2.0</Package>
+ </Reference>
<Reference Include="Mono.Addins, Version=0.6.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<Private>False</Private>
+ <Package>mono-addins</Package>
</Reference>
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Private>False</Private>
+ <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Private>False</Private>
+ <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Private>False</Private>
+ <Package>glib-sharp-2.0</Package>
</Reference>
</ItemGroup>
<ItemGroup>
View
34 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1/Makefile.am
@@ -5,38 +5,38 @@ EXTRA_DIST =
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug -define:DEBUG "-define:DEBUG,TRACE" "-keyfile:mono-upnp-dcp-mediaserver1.snk"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.dll
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug -define:DEBUG "-define:DEBUG,TRACE" "-keyfile:$(srcdir)/mono-upnp-dcp-mediaserver1.snk"
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+ ../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
-MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB_SOURCE=Mono.Upnp.Dcp.MediaServer1.dll.mdb
+MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll.mdb
MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.Dcp.MediaServer1.dll.mdb
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../../bin/Mono.Upnp.dll.mdb
MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:mono-upnp-dcp-mediaserver1.snk"
-ASSEMBLY = Mono.Upnp.Dcp.MediaServer1.dll
+ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ "-keyfile:$(srcdir)/mono-upnp-dcp-mediaserver1.snk"
+ASSEMBLY = ../../../../bin/Mono.Upnp.Dcp.MediaServer1.dll
ASSEMBLY_MDB =
COMPILE_TARGET = library
PROJECT_REFERENCES = \
- ../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+ ../../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../../bin
MONO_UPNP_DCP_MEDIASERVER1_DLL_MDB=
-MONO_UPNP_DLL_SOURCE=../../../Mono.Upnp/Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DLL_SOURCE=../../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../../bin/Mono.Ssdp.dll
MONO_SSDP_DLL_MDB=
MONO_UPNP_DLL_MDB=
@@ -193,10 +193,6 @@ MONO_UPNP_DLL = $(BUILD_DIR)/Mono.Upnp.dll
MONO_SSDP_DLL = $(BUILD_DIR)/Mono.Ssdp.dll
MONO_UPNP_DCP_MEDIASERVER1_PC = $(BUILD_DIR)/mono.upnp.dcp.mediaserver1.pc
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
$(eval $(call emit-deploy-wrapper,MONO_UPNP_DCP_MEDIASERVER1_PC,mono.upnp.dcp.mediaserver1.pc))
View
4 src/Mono.Upnp.Dcp/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1/Mono.Upnp.Dcp.MediaServer1.csproj
@@ -17,7 +17,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<DefineConstants>DEBUG,TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
View
32 src/Mono.Upnp/Mono.Upnp.GtkClient/Makefile.am
@@ -6,20 +6,20 @@ EXTRA_DIST =
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
-ASSEMBLY = Mono.Upnp.GtkClient.exe
+ASSEMBLY = ../../../bin/Mono.Upnp.GtkClient.exe
ASSEMBLY_MDB = $(ASSEMBLY).mdb
COMPILE_TARGET = winexe
PROJECT_REFERENCES = \
- ../Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+ ../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../bin
-MONO_UPNP_GTKCLIENT_EXE_MDB_SOURCE=Mono.Upnp.GtkClient.exe.mdb
+MONO_UPNP_GTKCLIENT_EXE_MDB_SOURCE=../../../bin/Mono.Upnp.GtkClient.exe.mdb
MONO_UPNP_GTKCLIENT_EXE_MDB=$(BUILD_DIR)/Mono.Upnp.GtkClient.exe.mdb
-MONO_UPNP_DLL_SOURCE=../Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
-MONO_SSDP_DLL_MDB_SOURCE=../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll.mdb
+MONO_UPNP_DLL_SOURCE=../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../bin/Mono.Ssdp.dll
+MONO_SSDP_DLL_MDB_SOURCE=../../../bin/Mono.Ssdp.dll.mdb
MONO_SSDP_DLL_MDB=$(BUILD_DIR)/Mono.Ssdp.dll.mdb
-MONO_UPNP_DLL_MDB_SOURCE=../Mono.Upnp/Mono.Upnp.dll.mdb
+MONO_UPNP_DLL_MDB_SOURCE=../../../bin/Mono.Upnp.dll.mdb
MONO_UPNP_DLL_MDB=$(BUILD_DIR)/Mono.Upnp.dll.mdb
endif
@@ -27,16 +27,16 @@ endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = gmcs
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
-ASSEMBLY = Mono.Upnp.GtkClient.exe
+ASSEMBLY = ../../../bin/Mono.Upnp.GtkClient.exe
ASSEMBLY_MDB =
COMPILE_TARGET = winexe
PROJECT_REFERENCES = \
- ../Mono.Upnp/Mono.Upnp.dll
-BUILD_DIR = .
+ ../../../bin/Mono.Upnp.dll
+BUILD_DIR = ../../../bin
MONO_UPNP_GTKCLIENT_EXE_MDB=
-MONO_UPNP_DLL_SOURCE=../Mono.Upnp/Mono.Upnp.dll
-MONO_SSDP_DLL_SOURCE=../../Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.dll
+MONO_UPNP_DLL_SOURCE=../../../bin/Mono.Upnp.dll
+MONO_SSDP_DLL_SOURCE=../../../bin/Mono.Ssdp.dll
MONO_SSDP_DLL_MDB=
MONO_UPNP_DLL_MDB=
@@ -107,7 +107,7 @@ EXTRAS = \
mono-upnp-gtk.in
REFERENCES = \
- ../Mono.Upnp/Mono.Upnp.dll \
+ ../../../bin/Mono.Upnp.dll \
Mono.Posix \
-pkg:glade-sharp-2.0 \
-pkg:glib-sharp-2.0 \
@@ -126,10 +126,6 @@ MONO_UPNP_DLL = $(BUILD_DIR)/Mono.Upnp.dll
MONO_SSDP_DLL = $(BUILD_DIR)/Mono.Ssdp.dll
MONO_UPNP_GTK = $(BUILD_DIR)/mono-upnp-gtk
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL))
-$(eval $(call emit-deploy-target,MONO_SSDP_DLL_MDB))
-$(eval $(call emit-deploy-target,MONO_UPNP_DLL_MDB))
$(eval $(call emit-deploy-wrapper,MONO_UPNP_GTK,mono-upnp-gtk,x))
View
14 src/Mono.Upnp/Mono.Upnp.GtkClient/Mono.Upnp.GtkClient.csproj
@@ -15,7 +15,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\bin</OutputPath>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
- <OutputPath>.</OutputPath>
+ <OutputPath>..\..\..\bin</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -38,24 +38,32 @@
<Reference Include="Mono.Posix" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<SpecificVersion>False</SpecificVersion>
+ <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<SpecificVersion>False</SpecificVersion>
+ <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<SpecificVersion>False</SpecificVersion>
+ <Package>glib-sharp-2.0</Package>
</Reference>
<Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<SpecificVersion>False</SpecificVersion>
+ <Package>glade-sharp-2.0</Package>
</Reference>
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<SpecificVersion>False</SpecificVersion>
+ <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<SpecificVersion>False</SpecificVersion>
+ <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="System.Xml" />
- <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+ <Reference Include="Mono.Addins, Version=0.6.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+ <Private>False</Private>
+ <Package>mono-addins</Package>
<SpecificVersion>False</SpecificVersion>
</Reference>
</ItemGroup>
View
184 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.ActionInvocationWindow.cs
@@ -1,101 +1,89 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-//
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Mono.Upnp.GtkClient {
-
-
- public partial class ActionInvocationWindow {
+// This file has been generated by the GUI designer. Do not modify.
+namespace Mono.Upnp.GtkClient
+{
+ public partial class ActionInvocationWindow
+ {
+ private global::Gtk.VBox vbox;
+ private global::Gtk.Label name;
+ private global::Gtk.VBox inputsBox;
+ private global::Gtk.Button invoke;
+ private global::Gtk.VBox outputsBox;
- private Gtk.VBox vbox;
-
- private Gtk.Label name;
-
- private Gtk.VBox inputsBox;
-
- private Gtk.Button invoke;
-
- private Gtk.VBox outputsBox;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Upnp.GtkClient.ActionInvocationWindow
- this.WidthRequest = 0;
- this.HeightRequest = 0;
- this.Name = "Mono.Upnp.GtkClient.ActionInvocationWindow";
- this.Title = "Invoke Action";
- this.WindowPosition = ((Gtk.WindowPosition)(1));
- this.DefaultWidth = 0;
- this.DefaultHeight = 0;
- // Container child Mono.Upnp.GtkClient.ActionInvocationWindow.Gtk.Container+ContainerChild
- this.vbox = new Gtk.VBox();
- this.vbox.Name = "vbox";
- this.vbox.Spacing = 6;
- this.vbox.BorderWidth = ((uint)(6));
- // Container child vbox.Gtk.Box+BoxChild
- this.name = new Gtk.Label();
- this.name.Name = "name";
- this.name.Xalign = 0F;
- this.name.LabelProp = "<big><b>action</b></big>";
- this.name.UseMarkup = true;
- this.vbox.Add(this.name);
- Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.vbox[this.name]));
- w1.Position = 0;
- w1.Expand = false;
- w1.Fill = false;
- // Container child vbox.Gtk.Box+BoxChild
- this.inputsBox = new Gtk.VBox();
- this.inputsBox.Name = "inputsBox";
- this.inputsBox.Spacing = 6;
- this.vbox.Add(this.inputsBox);
- Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.vbox[this.inputsBox]));
- w2.Position = 1;
- // Container child vbox.Gtk.Box+BoxChild
- this.invoke = new Gtk.Button();
- this.invoke.CanFocus = true;
- this.invoke.Name = "invoke";
- this.invoke.UseUnderline = true;
- this.invoke.Relief = ((Gtk.ReliefStyle)(2));
- // Container child invoke.Gtk.Container+ContainerChild
- Gtk.Alignment w3 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
- // Container child GtkAlignment.Gtk.Container+ContainerChild
- Gtk.HBox w4 = new Gtk.HBox();
- w4.Spacing = 2;
- // Container child GtkHBox.Gtk.Container+ContainerChild
- Gtk.Image w5 = new Gtk.Image();
- w5.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-execute", Gtk.IconSize.Menu, 16);
- w4.Add(w5);
- // Container child GtkHBox.Gtk.Container+ContainerChild
- Gtk.Label w7 = new Gtk.Label();
- w7.LabelProp = Mono.Unix.Catalog.GetString("_Invoke");
- w7.UseUnderline = true;
- w4.Add(w7);
- w3.Add(w4);
- this.invoke.Add(w3);
- this.vbox.Add(this.invoke);
- Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox[this.invoke]));
- w11.Position = 2;
- w11.Expand = false;
- w11.Fill = false;
- // Container child vbox.Gtk.Box+BoxChild
- this.outputsBox = new Gtk.VBox();
- this.outputsBox.Name = "outputsBox";
- this.outputsBox.Spacing = 6;
- this.vbox.Add(this.outputsBox);
- Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox[this.outputsBox]));
- w12.Position = 3;
- this.Add(this.vbox);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Show();
- this.invoke.Clicked += new System.EventHandler(this.OnInvokeClicked);
- }
- }
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget Mono.Upnp.GtkClient.ActionInvocationWindow
+ this.WidthRequest = 0;
+ this.HeightRequest = 0;
+ this.Name = "Mono.Upnp.GtkClient.ActionInvocationWindow";
+ this.Title = "Invoke Action";
+ this.WindowPosition = ((global::Gtk.WindowPosition)(1));
+ this.DefaultWidth = 0;
+ this.DefaultHeight = 0;
+ // Container child Mono.Upnp.GtkClient.ActionInvocationWindow.Gtk.Container+ContainerChild
+ this.vbox = new global::Gtk.VBox ();
+ this.vbox.Name = "vbox";
+ this.vbox.Spacing = 6;
+ this.vbox.BorderWidth = ((uint)(6));
+ // Container child vbox.Gtk.Box+BoxChild
+ this.name = new global::Gtk.Label ();
+ this.name.Name = "name";
+ this.name.Xalign = 0F;
+ this.name.LabelProp = "<big><b>action</b></big>";
+ this.name.UseMarkup = true;
+ this.vbox.Add (this.name);
+ global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox [this.name]));
+ w1.Position = 0;
+ w1.Expand = false;
+ w1.Fill = false;
+ // Container child vbox.Gtk.Box+BoxChild
+ this.inputsBox = new global::Gtk.VBox ();
+ this.inputsBox.Name = "inputsBox";
+ this.inputsBox.Spacing = 6;
+ this.vbox.Add (this.inputsBox);
+ global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox [this.inputsBox]));
+ w2.Position = 1;
+ // Container child vbox.Gtk.Box+BoxChild
+ this.invoke = new global::Gtk.Button ();
+ this.invoke.CanFocus = true;
+ this.invoke.Name = "invoke";
+ this.invoke.UseUnderline = true;
+ this.invoke.Relief = ((global::Gtk.ReliefStyle)(2));
+ // Container child invoke.Gtk.Container+ContainerChild
+ global::Gtk.Alignment w3 = new global::Gtk.Alignment (0.5F, 0.5F, 0F, 0F);
+ // Container child GtkAlignment.Gtk.Container+ContainerChild
+ global::Gtk.HBox w4 = new global::Gtk.HBox ();
+ w4.Spacing = 2;
+ // Container child GtkHBox.Gtk.Container+ContainerChild
+ global::Gtk.Image w5 = new global::Gtk.Image ();
+ w5.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-execute", global::Gtk.IconSize.Menu);
+ w4.Add (w5);
+ // Container child GtkHBox.Gtk.Container+ContainerChild
+ global::Gtk.Label w7 = new global::Gtk.Label ();
+ w7.LabelProp = global::Mono.Unix.Catalog.GetString ("_Invoke");
+ w7.UseUnderline = true;
+ w4.Add (w7);
+ w3.Add (w4);
+ this.invoke.Add (w3);
+ this.vbox.Add (this.invoke);
+ global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox [this.invoke]));
+ w11.Position = 2;
+ w11.Expand = false;
+ w11.Fill = false;
+ // Container child vbox.Gtk.Box+BoxChild
+ this.outputsBox = new global::Gtk.VBox ();
+ this.outputsBox.Name = "outputsBox";
+ this.outputsBox.Spacing = 6;
+ this.vbox.Add (this.outputsBox);
+ global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox [this.outputsBox]));
+ w12.Position = 3;
+ this.Add (this.vbox);
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.Show ();
+ this.invoke.Clicked += new global::System.EventHandler (this.OnInvokeClicked);
+ }
+ }
}
View
222 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.DeviceAnnouncementInfo.cs
@@ -1,121 +1,107 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-//
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Mono.Upnp.GtkClient {
-
-
- public partial class DeviceAnnouncementInfo {
+// This file has been generated by the GUI designer. Do not modify.
+namespace Mono.Upnp.GtkClient
+{
+ public partial class DeviceAnnouncementInfo
+ {
+ private global::Gtk.Table table1;
+ private global::Gtk.Label deviceType;
+ private global::Gtk.Label label1;
+ private global::Gtk.Label label2;
+ private global::Gtk.Label label3;
+ private global::Gtk.VBox locationBox;
+ private global::Gtk.Label udn;
- private Gtk.Table table1;
-
- private Gtk.Label deviceType;
-
- private Gtk.Label label1;
-
- private Gtk.Label label2;
-
- private Gtk.Label label3;
-
- private Gtk.VBox locationBox;
-
- private Gtk.Label udn;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Upnp.GtkClient.DeviceAnnouncementInfo
- Stetic.BinContainer.Attach(this);
- this.Name = "Mono.Upnp.GtkClient.DeviceAnnouncementInfo";
- // Container child Mono.Upnp.GtkClient.DeviceAnnouncementInfo.Gtk.Container+ContainerChild
- this.table1 = new Gtk.Table(((uint)(3)), ((uint)(2)), false);
- this.table1.Name = "table1";
- this.table1.RowSpacing = ((uint)(10));
- this.table1.ColumnSpacing = ((uint)(10));
- this.table1.BorderWidth = ((uint)(10));
- // Container child table1.Gtk.Table+TableChild
- this.deviceType = new Gtk.Label();
- this.deviceType.Name = "deviceType";
- this.deviceType.Xalign = 0F;
- this.deviceType.LabelProp = "deviceType";
- this.deviceType.Selectable = true;
- this.table1.Add(this.deviceType);
- Gtk.Table.TableChild w1 = ((Gtk.Table.TableChild)(this.table1[this.deviceType]));
- w1.LeftAttach = ((uint)(1));
- w1.RightAttach = ((uint)(2));
- w1.XOptions = ((Gtk.AttachOptions)(4));
- w1.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label1 = new Gtk.Label();
- this.label1.Name = "label1";
- this.label1.Xalign = 1F;
- this.label1.LabelProp = Mono.Unix.Catalog.GetString("<b>Device Type</b>");
- this.label1.UseMarkup = true;
- this.table1.Add(this.label1);
- Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this.label1]));
- w2.XOptions = ((Gtk.AttachOptions)(4));
- w2.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label2 = new Gtk.Label();
- this.label2.Name = "label2";
- this.label2.Xalign = 1F;
- this.label2.LabelProp = Mono.Unix.Catalog.GetString("<b>UDN</b>");
- this.label2.UseMarkup = true;
- this.table1.Add(this.label2);
- Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.label2]));
- w3.TopAttach = ((uint)(1));
- w3.BottomAttach = ((uint)(2));
- w3.XOptions = ((Gtk.AttachOptions)(4));
- w3.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label3 = new Gtk.Label();
- this.label3.Name = "label3";
- this.label3.Xalign = 1F;
- this.label3.Yalign = 0F;
- this.label3.LabelProp = Mono.Unix.Catalog.GetString("<b>Locations</b>");
- this.label3.UseMarkup = true;
- this.table1.Add(this.label3);
- Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.label3]));
- w4.TopAttach = ((uint)(2));
- w4.BottomAttach = ((uint)(3));
- w4.XOptions = ((Gtk.AttachOptions)(4));
- w4.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.locationBox = new Gtk.VBox();
- this.locationBox.Name = "locationBox";
- this.locationBox.Spacing = 6;
- this.table1.Add(this.locationBox);
- Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.locationBox]));
- w5.TopAttach = ((uint)(2));
- w5.BottomAttach = ((uint)(3));
- w5.LeftAttach = ((uint)(1));
- w5.RightAttach = ((uint)(2));
- w5.XOptions = ((Gtk.AttachOptions)(4));
- w5.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.udn = new Gtk.Label();
- this.udn.Name = "udn";
- this.udn.Xalign = 0F;
- this.udn.LabelProp = "udn";
- this.udn.Selectable = true;
- this.table1.Add(this.udn);
- Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.udn]));
- w6.TopAttach = ((uint)(1));
- w6.BottomAttach = ((uint)(2));
- w6.LeftAttach = ((uint)(1));
- w6.RightAttach = ((uint)(2));
- w6.XOptions = ((Gtk.AttachOptions)(4));
- w6.YOptions = ((Gtk.AttachOptions)(4));
- this.Add(this.table1);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Hide();
- }
- }
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget Mono.Upnp.GtkClient.DeviceAnnouncementInfo
+ global::Stetic.BinContainer.Attach (this);
+ this.Name = "Mono.Upnp.GtkClient.DeviceAnnouncementInfo";
+ // Container child Mono.Upnp.GtkClient.DeviceAnnouncementInfo.Gtk.Container+ContainerChild
+ this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
+ this.table1.Name = "table1";
+ this.table1.RowSpacing = ((uint)(10));
+ this.table1.ColumnSpacing = ((uint)(10));
+ this.table1.BorderWidth = ((uint)(10));
+ // Container child table1.Gtk.Table+TableChild
+ this.deviceType = new global::Gtk.Label ();
+ this.deviceType.Name = "deviceType";
+ this.deviceType.Xalign = 0F;
+ this.deviceType.LabelProp = "deviceType";
+ this.deviceType.Selectable = true;
+ this.table1.Add (this.deviceType);
+ global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1 [this.deviceType]));
+ w1.LeftAttach = ((uint)(1));
+ w1.RightAttach = ((uint)(2));
+ w1.XOptions = ((global::Gtk.AttachOptions)(4));
+ w1.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label1 = new global::Gtk.Label ();
+ this.label1.Name = "label1";
+ this.label1.Xalign = 1F;
+ this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Device Type</b>");
+ this.label1.UseMarkup = true;
+ this.table1.Add (this.label1);
+ global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
+ w2.XOptions = ((global::Gtk.AttachOptions)(4));
+ w2.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label2 = new global::Gtk.Label ();
+ this.label2.Name = "label2";
+ this.label2.Xalign = 1F;
+ this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>UDN</b>");
+ this.label2.UseMarkup = true;
+ this.table1.Add (this.label2);
+ global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
+ w3.TopAttach = ((uint)(1));
+ w3.BottomAttach = ((uint)(2));
+ w3.XOptions = ((global::Gtk.AttachOptions)(4));
+ w3.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label3 = new global::Gtk.Label ();
+ this.label3.Name = "label3";
+ this.label3.Xalign = 1F;
+ this.label3.Yalign = 0F;
+ this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Locations</b>");
+ this.label3.UseMarkup = true;
+ this.table1.Add (this.label3);
+ global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
+ w4.TopAttach = ((uint)(2));
+ w4.BottomAttach = ((uint)(3));
+ w4.XOptions = ((global::Gtk.AttachOptions)(4));
+ w4.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.locationBox = new global::Gtk.VBox ();
+ this.locationBox.Name = "locationBox";
+ this.locationBox.Spacing = 6;
+ this.table1.Add (this.locationBox);
+ global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.locationBox]));
+ w5.TopAttach = ((uint)(2));
+ w5.BottomAttach = ((uint)(3));
+ w5.LeftAttach = ((uint)(1));
+ w5.RightAttach = ((uint)(2));
+ w5.XOptions = ((global::Gtk.AttachOptions)(4));
+ w5.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.udn = new global::Gtk.Label ();
+ this.udn.Name = "udn";
+ this.udn.Xalign = 0F;
+ this.udn.LabelProp = "udn";
+ this.udn.Selectable = true;
+ this.table1.Add (this.udn);
+ global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.udn]));
+ w6.TopAttach = ((uint)(1));
+ w6.BottomAttach = ((uint)(2));
+ w6.LeftAttach = ((uint)(1));
+ w6.RightAttach = ((uint)(2));
+ w6.XOptions = ((global::Gtk.AttachOptions)(4));
+ w6.YOptions = ((global::Gtk.AttachOptions)(4));
+ this.Add (this.table1);
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.Hide ();
+ }
+ }
}
View
686 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.DeviceDescriptionInfo.cs
@@ -1,361 +1,331 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-//
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Mono.Upnp.GtkClient {
-
-
- public partial class DeviceDescriptionInfo {
+// This file has been generated by the GUI designer. Do not modify.
+namespace Mono.Upnp.GtkClient
+{
+ public partial class DeviceDescriptionInfo
+ {
+ private global::Gtk.Table table1;
+ private global::Gtk.Label deviceType;
+ private global::Gtk.Label friendlyName;
+ private global::Gtk.VBox iconBox;
+ private global::Gtk.Label label1;
+ private global::Gtk.Label label10;
+ private global::Gtk.Label label11;
+ private global::Gtk.Label label2;
+ private global::Gtk.Label label3;
+ private global::Gtk.Label label4;
+ private global::Gtk.Label label5;
+ private global::Gtk.Label label6;
+ private global::Gtk.Label label7;
+ private global::Gtk.Label label8;
+ private global::Gtk.Label label9;
+ private global::Gtk.Label manufacturer;
+ private global::Gtk.Label manufacturerUrl;
+ private global::Gtk.Label modelName;
+ private global::Gtk.Label modelNumber;
+ private global::Gtk.Label modelUrl;
+ private global::Gtk.Label serialNumber;
+ private global::Gtk.Label udn;
+ private global::Gtk.Label upc;
- private Gtk.Table table1;
-
- private Gtk.Label deviceType;
-
- private Gtk.Label friendlyName;
-
- private Gtk.VBox iconBox;
-
- private Gtk.Label label1;
-
- private Gtk.Label label10;
-
- private Gtk.Label label11;
-
- private Gtk.Label label2;
-
- private Gtk.Label label3;
-
- private Gtk.Label label4;
-
- private Gtk.Label label5;
-
- private Gtk.Label label6;
-
- private Gtk.Label label7;
-
- private Gtk.Label label8;
-
- private Gtk.Label label9;
-
- private Gtk.Label manufacturer;
-
- private Gtk.Label manufacturerUrl;
-
- private Gtk.Label modelName;
-
- private Gtk.Label modelNumber;
-
- private Gtk.Label modelUrl;
-
- private Gtk.Label serialNumber;
-
- private Gtk.Label udn;
-
- private Gtk.Label upc;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Upnp.GtkClient.DeviceDescriptionInfo
- Stetic.BinContainer.Attach(this);
- this.Name = "Mono.Upnp.GtkClient.DeviceDescriptionInfo";
- // Container child Mono.Upnp.GtkClient.DeviceDescriptionInfo.Gtk.Container+ContainerChild
- this.table1 = new Gtk.Table(((uint)(11)), ((uint)(2)), false);
- this.table1.Name = "table1";
- this.table1.RowSpacing = ((uint)(10));
- this.table1.ColumnSpacing = ((uint)(10));
- this.table1.BorderWidth = ((uint)(10));
- // Container child table1.Gtk.Table+TableChild
- this.deviceType = new Gtk.Label();
- this.deviceType.Name = "deviceType";
- this.deviceType.Xalign = 0F;
- this.deviceType.LabelProp = "deviceType";
- this.deviceType.Selectable = true;
- this.table1.Add(this.deviceType);
- Gtk.Table.TableChild w1 = ((Gtk.Table.TableChild)(this.table1[this.deviceType]));
- w1.LeftAttach = ((uint)(1));
- w1.RightAttach = ((uint)(2));
- w1.XOptions = ((Gtk.AttachOptions)(4));
- w1.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.friendlyName = new Gtk.Label();
- this.friendlyName.Name = "friendlyName";
- this.friendlyName.Xalign = 0F;
- this.friendlyName.LabelProp = "friendlyName";
- this.friendlyName.Selectable = true;
- this.table1.Add(this.friendlyName);
- Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this.friendlyName]));
- w2.TopAttach = ((uint)(2));
- w2.BottomAttach = ((uint)(3));
- w2.LeftAttach = ((uint)(1));
- w2.RightAttach = ((uint)(2));
- w2.XOptions = ((Gtk.AttachOptions)(4));
- w2.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.iconBox = new Gtk.VBox();
- this.iconBox.Name = "iconBox";
- this.iconBox.Spacing = 6;
- this.table1.Add(this.iconBox);
- Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.iconBox]));
- w3.TopAttach = ((uint)(10));
- w3.BottomAttach = ((uint)(11));
- w3.LeftAttach = ((uint)(1));
- w3.RightAttach = ((uint)(2));
- w3.XOptions = ((Gtk.AttachOptions)(4));
- w3.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label1 = new Gtk.Label();
- this.label1.Name = "label1";
- this.label1.Xalign = 1F;
- this.label1.Yalign = 0F;
- this.label1.LabelProp = Mono.Unix.Catalog.GetString("<b>Icons</b>");
- this.label1.UseMarkup = true;
- this.table1.Add(this.label1);
- Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.label1]));
- w4.TopAttach = ((uint)(10));
- w4.BottomAttach = ((uint)(11));
- w4.XOptions = ((Gtk.AttachOptions)(4));
- w4.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label10 = new Gtk.Label();
- this.label10.Name = "label10";
- this.label10.Xalign = 1F;
- this.label10.LabelProp = Mono.Unix.Catalog.GetString("<b>UPC</b>");
- this.label10.UseMarkup = true;
- this.table1.Add(this.label10);
- Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.label10]));
- w5.TopAttach = ((uint)(9));
- w5.BottomAttach = ((uint)(10));
- w5.XOptions = ((Gtk.AttachOptions)(4));
- w5.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label11 = new Gtk.Label();
- this.label11.Name = "label11";
- this.label11.Xalign = 1F;
- this.label11.LabelProp = Mono.Unix.Catalog.GetString("<b>Device Type</b>");
- this.label11.UseMarkup = true;
- this.table1.Add(this.label11);
- Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.label11]));
- w6.XOptions = ((Gtk.AttachOptions)(4));
- w6.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label2 = new Gtk.Label();
- this.label2.Name = "label2";
- this.label2.Xalign = 1F;
- this.label2.LabelProp = Mono.Unix.Catalog.GetString("<b>UDN</b>");
- this.label2.UseMarkup = true;
- this.table1.Add(this.label2);
- Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.label2]));
- w7.TopAttach = ((uint)(1));
- w7.BottomAttach = ((uint)(2));
- w7.XOptions = ((Gtk.AttachOptions)(4));
- w7.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label3 = new Gtk.Label();
- this.label3.Name = "label3";
- this.label3.Xalign = 1F;
- this.label3.LabelProp = Mono.Unix.Catalog.GetString("<b>Friendly Name</b>");
- this.label3.UseMarkup = true;
- this.table1.Add(this.label3);
- Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this.label3]));
- w8.TopAttach = ((uint)(2));
- w8.BottomAttach = ((uint)(3));
- w8.XOptions = ((Gtk.AttachOptions)(4));
- w8.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label4 = new Gtk.Label();
- this.label4.Name = "label4";
- this.label4.Xalign = 1F;
- this.label4.LabelProp = Mono.Unix.Catalog.GetString("<b>Manufacturer</b>");
- this.label4.UseMarkup = true;
- this.table1.Add(this.label4);
- Gtk.Table.TableChild w9 = ((Gtk.Table.TableChild)(this.table1[this.label4]));
- w9.TopAttach = ((uint)(3));
- w9.BottomAttach = ((uint)(4));
- w9.XOptions = ((Gtk.AttachOptions)(4));
- w9.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label5 = new Gtk.Label();
- this.label5.Name = "label5";
- this.label5.Xalign = 1F;
- this.label5.LabelProp = Mono.Unix.Catalog.GetString("<b>Manufacturer URL</b>");
- this.label5.UseMarkup = true;
- this.table1.Add(this.label5);
- Gtk.Table.TableChild w10 = ((Gtk.Table.TableChild)(this.table1[this.label5]));
- w10.TopAttach = ((uint)(4));
- w10.BottomAttach = ((uint)(5));
- w10.XOptions = ((Gtk.AttachOptions)(4));
- w10.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label6 = new Gtk.Label();
- this.label6.Name = "label6";
- this.label6.Xalign = 1F;
- this.label6.LabelProp = Mono.Unix.Catalog.GetString("<b>Model Name</b>");
- this.label6.UseMarkup = true;
- this.table1.Add(this.label6);
- Gtk.Table.TableChild w11 = ((Gtk.Table.TableChild)(this.table1[this.label6]));
- w11.TopAttach = ((uint)(5));
- w11.BottomAttach = ((uint)(6));
- w11.XOptions = ((Gtk.AttachOptions)(4));
- w11.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label7 = new Gtk.Label();
- this.label7.Name = "label7";
- this.label7.Xalign = 1F;
- this.label7.LabelProp = Mono.Unix.Catalog.GetString("<b>Model Number</b>");
- this.label7.UseMarkup = true;
- this.table1.Add(this.label7);
- Gtk.Table.TableChild w12 = ((Gtk.Table.TableChild)(this.table1[this.label7]));
- w12.TopAttach = ((uint)(6));
- w12.BottomAttach = ((uint)(7));
- w12.XOptions = ((Gtk.AttachOptions)(4));
- w12.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label8 = new Gtk.Label();
- this.label8.Name = "label8";
- this.label8.Xalign = 1F;
- this.label8.LabelProp = Mono.Unix.Catalog.GetString("<b>Model URL</b>");
- this.label8.UseMarkup = true;
- this.table1.Add(this.label8);
- Gtk.Table.TableChild w13 = ((Gtk.Table.TableChild)(this.table1[this.label8]));
- w13.TopAttach = ((uint)(7));
- w13.BottomAttach = ((uint)(8));
- w13.XOptions = ((Gtk.AttachOptions)(4));
- w13.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.label9 = new Gtk.Label();
- this.label9.Name = "label9";
- this.label9.Xalign = 1F;
- this.label9.LabelProp = Mono.Unix.Catalog.GetString("<b>Serial Number</b>");
- this.label9.UseMarkup = true;
- this.table1.Add(this.label9);
- Gtk.Table.TableChild w14 = ((Gtk.Table.TableChild)(this.table1[this.label9]));
- w14.TopAttach = ((uint)(8));
- w14.BottomAttach = ((uint)(9));
- w14.XOptions = ((Gtk.AttachOptions)(4));
- w14.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.manufacturer = new Gtk.Label();
- this.manufacturer.Name = "manufacturer";
- this.manufacturer.Xalign = 0F;
- this.manufacturer.LabelProp = "manufacturer";
- this.manufacturer.Selectable = true;
- this.table1.Add(this.manufacturer);
- Gtk.Table.TableChild w15 = ((Gtk.Table.TableChild)(this.table1[this.manufacturer]));
- w15.TopAttach = ((uint)(3));
- w15.BottomAttach = ((uint)(4));
- w15.LeftAttach = ((uint)(1));
- w15.RightAttach = ((uint)(2));
- w15.XOptions = ((Gtk.AttachOptions)(4));
- w15.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.manufacturerUrl = new Gtk.Label();
- this.manufacturerUrl.Name = "manufacturerUrl";
- this.manufacturerUrl.Xalign = 0F;
- this.manufacturerUrl.LabelProp = "manufacturerUrl";
- this.manufacturerUrl.Selectable = true;
- this.table1.Add(this.manufacturerUrl);
- Gtk.Table.TableChild w16 = ((Gtk.Table.TableChild)(this.table1[this.manufacturerUrl]));
- w16.TopAttach = ((uint)(4));
- w16.BottomAttach = ((uint)(5));
- w16.LeftAttach = ((uint)(1));
- w16.RightAttach = ((uint)(2));
- w16.XOptions = ((Gtk.AttachOptions)(4));
- w16.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.modelName = new Gtk.Label();
- this.modelName.Name = "modelName";
- this.modelName.Xalign = 0F;
- this.modelName.LabelProp = "modelUrl";
- this.modelName.Selectable = true;
- this.table1.Add(this.modelName);
- Gtk.Table.TableChild w17 = ((Gtk.Table.TableChild)(this.table1[this.modelName]));
- w17.TopAttach = ((uint)(5));
- w17.BottomAttach = ((uint)(6));
- w17.LeftAttach = ((uint)(1));
- w17.RightAttach = ((uint)(2));
- w17.XOptions = ((Gtk.AttachOptions)(4));
- w17.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.modelNumber = new Gtk.Label();
- this.modelNumber.Name = "modelNumber";
- this.modelNumber.Xalign = 0F;
- this.modelNumber.LabelProp = "modelNumber";
- this.modelNumber.Selectable = true;
- this.table1.Add(this.modelNumber);
- Gtk.Table.TableChild w18 = ((Gtk.Table.TableChild)(this.table1[this.modelNumber]));
- w18.TopAttach = ((uint)(6));
- w18.BottomAttach = ((uint)(7));
- w18.LeftAttach = ((uint)(1));
- w18.RightAttach = ((uint)(2));
- w18.XOptions = ((Gtk.AttachOptions)(4));
- w18.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.modelUrl = new Gtk.Label();
- this.modelUrl.Name = "modelUrl";
- this.modelUrl.Xalign = 0F;
- this.modelUrl.LabelProp = "modelUrl";
- this.modelUrl.Selectable = true;
- this.table1.Add(this.modelUrl);
- Gtk.Table.TableChild w19 = ((Gtk.Table.TableChild)(this.table1[this.modelUrl]));
- w19.TopAttach = ((uint)(7));
- w19.BottomAttach = ((uint)(8));
- w19.LeftAttach = ((uint)(1));
- w19.RightAttach = ((uint)(2));
- w19.XOptions = ((Gtk.AttachOptions)(4));
- w19.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.serialNumber = new Gtk.Label();
- this.serialNumber.Name = "serialNumber";
- this.serialNumber.Xalign = 0F;
- this.serialNumber.LabelProp = "serialNumber";
- this.serialNumber.Selectable = true;
- this.table1.Add(this.serialNumber);
- Gtk.Table.TableChild w20 = ((Gtk.Table.TableChild)(this.table1[this.serialNumber]));
- w20.TopAttach = ((uint)(8));
- w20.BottomAttach = ((uint)(9));
- w20.LeftAttach = ((uint)(1));
- w20.RightAttach = ((uint)(2));
- w20.XOptions = ((Gtk.AttachOptions)(4));
- w20.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.udn = new Gtk.Label();
- this.udn.Name = "udn";
- this.udn.Xalign = 0F;
- this.udn.LabelProp = "udn";
- this.udn.Selectable = true;
- this.table1.Add(this.udn);
- Gtk.Table.TableChild w21 = ((Gtk.Table.TableChild)(this.table1[this.udn]));
- w21.TopAttach = ((uint)(1));
- w21.BottomAttach = ((uint)(2));
- w21.LeftAttach = ((uint)(1));
- w21.RightAttach = ((uint)(2));
- w21.XOptions = ((Gtk.AttachOptions)(4));
- w21.YOptions = ((Gtk.AttachOptions)(4));
- // Container child table1.Gtk.Table+TableChild
- this.upc = new Gtk.Label();
- this.upc.Name = "upc";
- this.upc.Xalign = 0F;
- this.upc.LabelProp = "upc";
- this.upc.Selectable = true;
- this.table1.Add(this.upc);
- Gtk.Table.TableChild w22 = ((Gtk.Table.TableChild)(this.table1[this.upc]));
- w22.TopAttach = ((uint)(9));
- w22.BottomAttach = ((uint)(10));
- w22.LeftAttach = ((uint)(1));
- w22.RightAttach = ((uint)(2));
- w22.XOptions = ((Gtk.AttachOptions)(4));
- w22.YOptions = ((Gtk.AttachOptions)(4));
- this.Add(this.table1);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Hide();
- }
- }
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget Mono.Upnp.GtkClient.DeviceDescriptionInfo
+ global::Stetic.BinContainer.Attach (this);
+ this.Name = "Mono.Upnp.GtkClient.DeviceDescriptionInfo";
+ // Container child Mono.Upnp.GtkClient.DeviceDescriptionInfo.Gtk.Container+ContainerChild
+ this.table1 = new global::Gtk.Table (((uint)(11)), ((uint)(2)), false);
+ this.table1.Name = "table1";
+ this.table1.RowSpacing = ((uint)(10));
+ this.table1.ColumnSpacing = ((uint)(10));
+ this.table1.BorderWidth = ((uint)(10));
+ // Container child table1.Gtk.Table+TableChild
+ this.deviceType = new global::Gtk.Label ();
+ this.deviceType.Name = "deviceType";
+ this.deviceType.Xalign = 0F;
+ this.deviceType.LabelProp = "deviceType";
+ this.deviceType.Selectable = true;
+ this.table1.Add (this.deviceType);
+ global::Gtk.Table.TableChild w1 = ((global::Gtk.Table.TableChild)(this.table1 [this.deviceType]));
+ w1.LeftAttach = ((uint)(1));
+ w1.RightAttach = ((uint)(2));
+ w1.XOptions = ((global::Gtk.AttachOptions)(4));
+ w1.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.friendlyName = new global::Gtk.Label ();
+ this.friendlyName.Name = "friendlyName";
+ this.friendlyName.Xalign = 0F;
+ this.friendlyName.LabelProp = "friendlyName";
+ this.friendlyName.Selectable = true;
+ this.table1.Add (this.friendlyName);
+ global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.friendlyName]));
+ w2.TopAttach = ((uint)(2));
+ w2.BottomAttach = ((uint)(3));
+ w2.LeftAttach = ((uint)(1));
+ w2.RightAttach = ((uint)(2));
+ w2.XOptions = ((global::Gtk.AttachOptions)(4));
+ w2.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.iconBox = new global::Gtk.VBox ();
+ this.iconBox.Name = "iconBox";
+ this.iconBox.Spacing = 6;
+ this.table1.Add (this.iconBox);
+ global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.iconBox]));
+ w3.TopAttach = ((uint)(10));
+ w3.BottomAttach = ((uint)(11));
+ w3.LeftAttach = ((uint)(1));
+ w3.RightAttach = ((uint)(2));
+ w3.XOptions = ((global::Gtk.AttachOptions)(4));
+ w3.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label1 = new global::Gtk.Label ();
+ this.label1.Name = "label1";
+ this.label1.Xalign = 1F;
+ this.label1.Yalign = 0F;
+ this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Icons</b>");
+ this.label1.UseMarkup = true;
+ this.table1.Add (this.label1);
+ global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
+ w4.TopAttach = ((uint)(10));
+ w4.BottomAttach = ((uint)(11));
+ w4.XOptions = ((global::Gtk.AttachOptions)(4));
+ w4.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label10 = new global::Gtk.Label ();
+ this.label10.Name = "label10";
+ this.label10.Xalign = 1F;
+ this.label10.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>UPC</b>");
+ this.label10.UseMarkup = true;
+ this.table1.Add (this.label10);
+ global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.label10]));
+ w5.TopAttach = ((uint)(9));
+ w5.BottomAttach = ((uint)(10));
+ w5.XOptions = ((global::Gtk.AttachOptions)(4));
+ w5.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label11 = new global::Gtk.Label ();
+ this.label11.Name = "label11";
+ this.label11.Xalign = 1F;
+ this.label11.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Device Type</b>");
+ this.label11.UseMarkup = true;
+ this.table1.Add (this.label11);
+ global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.label11]));
+ w6.XOptions = ((global::Gtk.AttachOptions)(4));
+ w6.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label2 = new global::Gtk.Label ();
+ this.label2.Name = "label2";
+ this.label2.Xalign = 1F;
+ this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>UDN</b>");
+ this.label2.UseMarkup = true;
+ this.table1.Add (this.label2);
+ global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
+ w7.TopAttach = ((uint)(1));
+ w7.BottomAttach = ((uint)(2));
+ w7.XOptions = ((global::Gtk.AttachOptions)(4));
+ w7.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label3 = new global::Gtk.Label ();
+ this.label3.Name = "label3";
+ this.label3.Xalign = 1F;
+ this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Friendly Name</b>");
+ this.label3.UseMarkup = true;
+ this.table1.Add (this.label3);
+ global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
+ w8.TopAttach = ((uint)(2));
+ w8.BottomAttach = ((uint)(3));
+ w8.XOptions = ((global::Gtk.AttachOptions)(4));
+ w8.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label4 = new global::Gtk.Label ();
+ this.label4.Name = "label4";
+ this.label4.Xalign = 1F;
+ this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Manufacturer</b>");
+ this.label4.UseMarkup = true;
+ this.table1.Add (this.label4);
+ global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.label4]));
+ w9.TopAttach = ((uint)(3));
+ w9.BottomAttach = ((uint)(4));
+ w9.XOptions = ((global::Gtk.AttachOptions)(4));
+ w9.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label5 = new global::Gtk.Label ();
+ this.label5.Name = "label5";
+ this.label5.Xalign = 1F;
+ this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Manufacturer URL</b>");
+ this.label5.UseMarkup = true;
+ this.table1.Add (this.label5);
+ global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.label5]));
+ w10.TopAttach = ((uint)(4));
+ w10.BottomAttach = ((uint)(5));
+ w10.XOptions = ((global::Gtk.AttachOptions)(4));
+ w10.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label6 = new global::Gtk.Label ();
+ this.label6.Name = "label6";
+ this.label6.Xalign = 1F;
+ this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Model Name</b>");
+ this.label6.UseMarkup = true;
+ this.table1.Add (this.label6);
+ global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.label6]));
+ w11.TopAttach = ((uint)(5));
+ w11.BottomAttach = ((uint)(6));
+ w11.XOptions = ((global::Gtk.AttachOptions)(4));
+ w11.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label7 = new global::Gtk.Label ();
+ this.label7.Name = "label7";
+ this.label7.Xalign = 1F;
+ this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Model Number</b>");
+ this.label7.UseMarkup = true;
+ this.table1.Add (this.label7);
+ global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.label7]));
+ w12.TopAttach = ((uint)(6));
+ w12.BottomAttach = ((uint)(7));
+ w12.XOptions = ((global::Gtk.AttachOptions)(4));
+ w12.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label8 = new global::Gtk.Label ();
+ this.label8.Name = "label8";
+ this.label8.Xalign = 1F;
+ this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Model URL</b>");
+ this.label8.UseMarkup = true;
+ this.table1.Add (this.label8);
+ global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.label8]));
+ w13.TopAttach = ((uint)(7));
+ w13.BottomAttach = ((uint)(8));
+ w13.XOptions = ((global::Gtk.AttachOptions)(4));
+ w13.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label9 = new global::Gtk.Label ();
+ this.label9.Name = "label9";
+ this.label9.Xalign = 1F;
+ this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Serial Number</b>");
+ this.label9.UseMarkup = true;
+ this.table1.Add (this.label9);
+ global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.label9]));
+ w14.TopAttach = ((uint)(8));
+ w14.BottomAttach = ((uint)(9));
+ w14.XOptions = ((global::Gtk.AttachOptions)(4));
+ w14.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.manufacturer = new global::Gtk.Label ();
+ this.manufacturer.Name = "manufacturer";
+ this.manufacturer.Xalign = 0F;
+ this.manufacturer.LabelProp = "manufacturer";
+ this.manufacturer.Selectable = true;
+ this.table1.Add (this.manufacturer);
+ global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.manufacturer]));
+ w15.TopAttach = ((uint)(3));
+ w15.BottomAttach = ((uint)(4));
+ w15.LeftAttach = ((uint)(1));
+ w15.RightAttach = ((uint)(2));
+ w15.XOptions = ((global::Gtk.AttachOptions)(4));
+ w15.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.manufacturerUrl = new global::Gtk.Label ();
+ this.manufacturerUrl.Name = "manufacturerUrl";
+ this.manufacturerUrl.Xalign = 0F;
+ this.manufacturerUrl.LabelProp = "manufacturerUrl";
+ this.manufacturerUrl.Selectable = true;
+ this.table1.Add (this.manufacturerUrl);
+ global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1 [this.manufacturerUrl]));
+ w16.TopAttach = ((uint)(4));
+ w16.BottomAttach = ((uint)(5));
+ w16.LeftAttach = ((uint)(1));
+ w16.RightAttach = ((uint)(2));
+ w16.XOptions = ((global::Gtk.AttachOptions)(4));
+ w16.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.modelName = new global::Gtk.Label ();
+ this.modelName.Name = "modelName";
+ this.modelName.Xalign = 0F;
+ this.modelName.LabelProp = "modelUrl";
+ this.modelName.Selectable = true;
+ this.table1.Add (this.modelName);
+ global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 [this.modelName]));
+ w17.TopAttach = ((uint)(5));
+ w17.BottomAttach = ((uint)(6));
+ w17.LeftAttach = ((uint)(1));
+ w17.RightAttach = ((uint)(2));
+ w17.XOptions = ((global::Gtk.AttachOptions)(4));
+ w17.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.modelNumber = new global::Gtk.Label ();
+ this.modelNumber.Name = "modelNumber";
+ this.modelNumber.Xalign = 0F;
+ this.modelNumber.LabelProp = "modelNumber";
+ this.modelNumber.Selectable = true;
+ this.table1.Add (this.modelNumber);
+ global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table1 [this.modelNumber]));
+ w18.TopAttach = ((uint)(6));
+ w18.BottomAttach = ((uint)(7));
+ w18.LeftAttach = ((uint)(1));
+ w18.RightAttach = ((uint)(2));
+ w18.XOptions = ((global::Gtk.AttachOptions)(4));
+ w18.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.modelUrl = new global::Gtk.Label ();
+ this.modelUrl.Name = "modelUrl";
+ this.modelUrl.Xalign = 0F;
+ this.modelUrl.LabelProp = "modelUrl";
+ this.modelUrl.Selectable = true;
+ this.table1.Add (this.modelUrl);
+ global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1 [this.modelUrl]));
+ w19.TopAttach = ((uint)(7));
+ w19.BottomAttach = ((uint)(8));
+ w19.LeftAttach = ((uint)(1));
+ w19.RightAttach = ((uint)(2));
+ w19.XOptions = ((global::Gtk.AttachOptions)(4));
+ w19.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.serialNumber = new global::Gtk.Label ();
+ this.serialNumber.Name = "serialNumber";
+ this.serialNumber.Xalign = 0F;
+ this.serialNumber.LabelProp = "serialNumber";
+ this.serialNumber.Selectable = true;
+ this.table1.Add (this.serialNumber);
+ global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table1 [this.serialNumber]));
+ w20.TopAttach = ((uint)(8));
+ w20.BottomAttach = ((uint)(9));
+ w20.LeftAttach = ((uint)(1));
+ w20.RightAttach = ((uint)(2));
+ w20.XOptions = ((global::Gtk.AttachOptions)(4));
+ w20.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.udn = new global::Gtk.Label ();
+ this.udn.Name = "udn";
+ this.udn.Xalign = 0F;
+ this.udn.LabelProp = "udn";
+ this.udn.Selectable = true;
+ this.table1.Add (this.udn);
+ global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table1 [this.udn]));
+ w21.TopAttach = ((uint)(1));
+ w21.BottomAttach = ((uint)(2));
+ w21.LeftAttach = ((uint)(1));
+ w21.RightAttach = ((uint)(2));
+ w21.XOptions = ((global::Gtk.AttachOptions)(4));
+ w21.YOptions = ((global::Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.upc = new global::Gtk.Label ();
+ this.upc.Name = "upc";
+ this.upc.Xalign = 0F;
+ this.upc.LabelProp = "upc";
+ this.upc.Selectable = true;
+ this.table1.Add (this.upc);
+ global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table1 [this.upc]));
+ w22.TopAttach = ((uint)(9));
+ w22.BottomAttach = ((uint)(10));
+ w22.LeftAttach = ((uint)(1));
+ w22.RightAttach = ((uint)(2));
+ w22.XOptions = ((global::Gtk.AttachOptions)(4));
+ w22.YOptions = ((global::Gtk.AttachOptions)(4));
+ this.Add (this.table1);
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.Hide ();
+ }
+ }
}
View
67 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyDeviceInfo.cs
@@ -1,41 +1,32 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-//
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Mono.Upnp.GtkClient {
-
-
- public partial class LazyDeviceInfo {
+// This file has been generated by the GUI designer. Do not modify.
+namespace Mono.Upnp.GtkClient
+{
+ public partial class LazyDeviceInfo
+ {
+ private global::Gtk.Alignment alignment;
+ private global::Gtk.Label loading;
- private Gtk.Alignment alignment;
-
- private Gtk.Label loading;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Upnp.GtkClient.LazyDeviceInfo
- Stetic.BinContainer.Attach(this);
- this.Name = "Mono.Upnp.GtkClient.LazyDeviceInfo";
- // Container child Mono.Upnp.GtkClient.LazyDeviceInfo.Gtk.Container+ContainerChild
- this.alignment = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
- this.alignment.Name = "alignment";
- // Container child alignment.Gtk.Container+ContainerChild
- this.loading = new Gtk.Label();
- this.loading.Name = "loading";
- this.loading.LabelProp = Mono.Unix.Catalog.GetString("Loading");
- this.alignment.Add(this.loading);
- this.Add(this.alignment);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Hide();
- this.Mapped += new System.EventHandler(this.OnMapped);
- }
- }
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget Mono.Upnp.GtkClient.LazyDeviceInfo
+ global::Stetic.BinContainer.Attach (this);
+ this.Name = "Mono.Upnp.GtkClient.LazyDeviceInfo";
+ // Container child Mono.Upnp.GtkClient.LazyDeviceInfo.Gtk.Container+ContainerChild
+ this.alignment = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+ this.alignment.Name = "alignment";
+ // Container child alignment.Gtk.Container+ContainerChild
+ this.loading = new global::Gtk.Label ();
+ this.loading.Name = "loading";
+ this.loading.LabelProp = global::Mono.Unix.Catalog.GetString ("Loading");
+ this.alignment.Add (this.loading);
+ this.Add (this.alignment);
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.Hide ();
+ this.Mapped += new global::System.EventHandler (this.OnMapped);
+ }
+ }
}
View
67 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyIcon.cs
@@ -1,41 +1,32 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-//
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Mono.Upnp.GtkClient {
-
-
- public partial class LazyIcon {
+// This file has been generated by the GUI designer. Do not modify.
+namespace Mono.Upnp.GtkClient
+{
+ public partial class LazyIcon
+ {
+ private global::Gtk.Alignment alignment;
+ private global::Gtk.Label loading;
- private Gtk.Alignment alignment;
-
- private Gtk.Label loading;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Upnp.GtkClient.LazyIcon
- Stetic.BinContainer.Attach(this);
- this.Name = "Mono.Upnp.GtkClient.LazyIcon";
- // Container child Mono.Upnp.GtkClient.LazyIcon.Gtk.Container+ContainerChild
- this.alignment = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
- this.alignment.Name = "alignment";
- // Container child alignment.Gtk.Container+ContainerChild
- this.loading = new Gtk.Label();
- this.loading.Name = "loading";
- this.loading.LabelProp = Mono.Unix.Catalog.GetString("Loading Icon");
- this.alignment.Add(this.loading);
- this.Add(this.alignment);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Hide();
- this.Mapped += new System.EventHandler(this.OnMapped);
- }
- }
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget Mono.Upnp.GtkClient.LazyIcon
+ global::Stetic.BinContainer.Attach (this);
+ this.Name = "Mono.Upnp.GtkClient.LazyIcon";
+ // Container child Mono.Upnp.GtkClient.LazyIcon.Gtk.Container+ContainerChild
+ this.alignment = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+ this.alignment.Name = "alignment";
+ // Container child alignment.Gtk.Container+ContainerChild
+ this.loading = new global::Gtk.Label ();
+ this.loading.Name = "loading";
+ this.loading.LabelProp = global::Mono.Unix.Catalog.GetString ("Loading Icon");
+ this.alignment.Add (this.loading);
+ this.Add (this.alignment);
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.Hide ();
+ this.Mapped += new global::System.EventHandler (this.OnMapped);
+ }
+ }
}
View
67 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.LazyServiceInfo.cs
@@ -1,41 +1,32 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-//
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Mono.Upnp.GtkClient {
-
-
- public partial class LazyServiceInfo {
+// This file has been generated by the GUI designer. Do not modify.
+namespace Mono.Upnp.GtkClient
+{
+ public partial class LazyServiceInfo
+ {
+ private global::Gtk.Alignment alignment;
+ private global::Gtk.Label loading;
- private Gtk.Alignment alignment;
-
- private Gtk.Label loading;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Upnp.GtkClient.LazyServiceInfo
- Stetic.BinContainer.Attach(this);
- this.Name = "Mono.Upnp.GtkClient.LazyServiceInfo";
- // Container child Mono.Upnp.GtkClient.LazyServiceInfo.Gtk.Container+ContainerChild
- this.alignment = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
- this.alignment.Name = "alignment";
- // Container child alignment.Gtk.Container+ContainerChild
- this.loading = new Gtk.Label();
- this.loading.Name = "loading";
- this.loading.LabelProp = Mono.Unix.Catalog.GetString("Loading");
- this.alignment.Add(this.loading);
- this.Add(this.alignment);
- if ((this.Child != null)) {
- this.Child.ShowAll();
- }
- this.Hide();
- this.Mapped += new System.EventHandler(this.OnMapped);
- }
- }
+ protected virtual void Build ()
+ {
+ global::Stetic.Gui.Initialize (this);
+ // Widget Mono.Upnp.GtkClient.LazyServiceInfo
+ global::Stetic.BinContainer.Attach (this);
+ this.Name = "Mono.Upnp.GtkClient.LazyServiceInfo";
+ // Container child Mono.Upnp.GtkClient.LazyServiceInfo.Gtk.Container+ContainerChild
+ this.alignment = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
+ this.alignment.Name = "alignment";
+ // Container child alignment.Gtk.Container+ContainerChild
+ this.loading = new global::Gtk.Label ();
+ this.loading.Name = "loading";
+ this.loading.LabelProp = global::Mono.Unix.Catalog.GetString ("Loading");
+ this.alignment.Add (this.loading);
+ this.Add (this.alignment);
+ if ((this.Child != null)) {
+ this.Child.ShowAll ();
+ }
+ this.Hide ();
+ this.Mapped += new global::System.EventHandler (this.OnMapped);
+ }
+ }
}
View
160 src/Mono.Upnp/Mono.Upnp.GtkClient/gtk-gui/Mono.Upnp.GtkClient.MainWindow.cs
@@ -1,90 +1,76 @@
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-//
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
-namespace Mono.Upnp.GtkClient {
-
-
- public partial class MainWindow {
+// This file has been generated by the GUI designer. Do not modify.
+namespace Mono.Upnp.GtkClient
+{
+ public partial class MainWindow
+ {
+ private global::Gtk.UIManager UIManager;
+ private global::Gtk.VBox vbox1;
+ private global::Gtk.HPaned hpaned;
+ private global::Gtk.ScrolledWindow GtkScrolledWindow;
+ private global::Gtk.TreeView list;
+ private global::Gtk.VBox infoBox;
+ private global::Gtk.Label infoFiller;
- private Gtk.UIManager UIManager;
-
- private Gtk.VBox vbox1;
-
- private Gtk.HPaned hpaned;
-
- private Gtk.ScrolledWindow GtkScrolledWindow;
-
- private Gtk.TreeView list;
-
- private Gtk.VBox infoBox;
-
- private Gtk.Label infoFiller;
-
- protected virtual void Build() {
- Stetic.Gui.Initialize(this);
- // Widget Mono.Upnp.GtkClient.MainWindow
- this.UIManager = new Gtk.UIManager();
- Gtk.ActionGroup w1 = new Gtk.ActionGroup("Default");
- this.UIManager.InsertActionGroup(w1, 0);
- this.AddAccelGroup(this.UIManager.AccelGroup);
- this.WidthRequest = 0;
- this.HeightRequest = 0;
- this.Name = "Mono.Upnp.GtkClient.MainWindow";
- this.Title = Mono.Unix.Catalog.GetString("Mono.Upnp");