diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 3cbd04235..11e7d5149 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -38,16 +38,16 @@ false true false - http://FOBP01.fortis-ev.org.local/ + http://app.beyondsoft.de/intern/ de-DE BeWoPlaner beyondSoft GmbH - 2.0.1.103 + 2.0.1.113 true publish.htm false true - 104 + 114 2.0.1.%2a false true diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user index 793f7ebf9..0c15cac27 100644 --- a/BeWo/BeWo.csproj.user +++ b/BeWo/BeWo.csproj.user @@ -2,7 +2,7 @@ D:\Projects\beyondsoft\BeWoPlaner\Publish\|C:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish\|C:\Projects\BEYONDSOFT\BeWoPlaner\Publish4\ - http://FOBP01.fortis-ev.org.local/|http://10.0.116.4/|http://app.beyondsoft.de/|http://app.beyondsoft.de/test/|http://app.beyondsoft.de/deploy/ + http://app.beyondsoft.de/intern/|http://app.beyondsoft.de/deploy/|http://FOBP01.fortis-ev.org.local/|http://10.0.116.4/|http://app.beyondsoft.de/ diff --git a/BeWo/View/ChatView.xaml.cs b/BeWo/View/ChatView.xaml.cs index 0bccb6f17..5dcb58866 100644 --- a/BeWo/View/ChatView.xaml.cs +++ b/BeWo/View/ChatView.xaml.cs @@ -677,7 +677,8 @@ namespace BeWo.View item1.Click += new RoutedEventHandler(OnChatRightClickMenue); Image icon = new Image(); - icon.Source = (ImageSource)new ImageSourceConverter().ConvertFromString("../../Ressources/Icons/ClipboardDisabled.png"); + //icon.UriSource = new Uri("pack://application:,,,/Ressources/icons/UserHomeBoyDisabled.png"); + icon.Source = new BitmapImage(new Uri(@"..\..\Ressources\Icons\ClipboardDisabled.png", UriKind.Relative)); icon.SetSize(new Size(16, 16)); item1.Icon = icon; @@ -879,7 +880,15 @@ namespace BeWo.View else { //return null; - return new BitmapImage(new Uri(@"..\..\Ressources\Icons\UserHomeBoyDisabled.png", UriKind.Relative)); + //return new BitmapImage(new Uri(@"..\..\Ressources\Icons\UserHomeBoyDisabled.png", UriKind.Relative)); + BitmapImage bi = new BitmapImage(); + bi.BeginInit(); + bi.UriSource = new Uri("pack://application:,,,/Ressources/icons/UserHomeBoyDisabled.png"); + bi.EndInit(); + return bi; + + //return new ImageSource new BitmapImage(new Uri(@"..\..\Ressources\Icons\UserHomeBoyDisabled.png", UriKind.Relative)); + //(ImageSource) // new ImageSourceConverter().ConvertFromString( // "../../Ressources/Icons/UserHomeBoyDisabled.png"); diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs index 96ecea5fe..6d3a49ea7 100644 --- a/BeWo/View/HomeDragPanelView.xaml.cs +++ b/BeWo/View/HomeDragPanelView.xaml.cs @@ -1297,11 +1297,11 @@ namespace BeWo.View chatpav.StatusSetting.SelectedIndex = 1; }); - var ipAdresse = BeWoApp.IpAddress; //3 |9 || 192.168.1.103"app4.bewoplaner.de" + //var ipAdresse = BeWoApp.IpAddress; //3 |9 || 192.168.1.103"app4.bewoplaner.de" var port = 5000; + var uri = BeWoApp.SiteOfOrigin; - - clientSocket.Connect(ipAdresse, port); + clientSocket.Connect(uri.Host, port); Dispatcher.Invoke( DispatcherPriority.Normal,