ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bitmaps in ChatView

Browse Source
This commit is contained in:
Christian
2016-08-31 10:55:59 +02:00
parent 9e689fe2a0
commit a1dd1a5553
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BeWo/BeWo.csproj
View File

@@ -38,16 +38,16 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>true</UpdateRequired>
<MapFileExtensions>false</MapFileExtensions>
<InstallUrl>http://FOBP01.fortis-ev.org.local/</InstallUrl>
<InstallUrl>http://app.beyondsoft.de/intern/</InstallUrl>
<TargetCulture>de-DE</TargetCulture>
<ProductName>BeWoPlaner</ProductName>
<PublisherName>beyondSoft GmbH</PublisherName>
<MinimumRequiredVersion>2.0.1.103</MinimumRequiredVersion>
<MinimumRequiredVersion>2.0.1.113</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<TrustUrlParameters>true</TrustUrlParameters>
<ApplicationRevision>104</ApplicationRevision>
<ApplicationRevision>114</ApplicationRevision>
<ApplicationVersion>2.0.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>

2
BeWo/BeWo.csproj.user
View File

@@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PublishUrlHistory>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\</PublishUrlHistory>
<InstallUrlHistory>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/</InstallUrlHistory>
<InstallUrlHistory>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/</InstallUrlHistory>
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />

13
BeWo/View/ChatView.xaml.cs
View File

@@ -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");

6
BeWo/View/HomeDragPanelView.xaml.cs
View File

@@ -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,