locations displayed as image links from google maps, killSession crash fixed

Telegram/Resources/style.txt

@@ -1638,3 +1638,4 @@ usernameCancel: flatButton(btnSelectCancel) {
 
 youtubeIcon: sprite(336px, 221px, 60px, 60px);
 instagramIcon: sprite(336px, 283px, 60px, 60px);
+locationSize: size(320, 240);

Telegram/SourceFiles/history.cpp

@@ -3122,7 +3122,6 @@ void ImageLinkManager::getData(ImageLinkData *data) {
 		DEBUG_LOG(("App Error: getting image link data without manager init!"));
 		return failed(data);
 	}
-
 	QString url;
 	switch (data->type) {
 	case YouTubeLink: {
@@ -3136,6 +3135,19 @@ void ImageLinkManager::getData(ImageLinkData *data) {
 		QNetworkReply *reply = manager->get(QNetworkRequest(QUrl(url)));
 		imageLoadings[reply] = data;
 	} break;
+	case GoogleMapsLink: {
+		int32 w = st::locationSize.width(), h = st::locationSize.height();
+		int32 zoom = 13, scale = 1;
+		if (cScale() == dbisTwo || cRetina()) {
+			scale = 2;
+		} else {
+			w = convertScale(w);
+			h = convertScale(h);
+		}
+		url = qsl("https://maps.googleapis.com/maps/api/staticmap?center=") + data->id.mid(9) + qsl("&zoom=%1&size=%2x%3&maptype=roadmap&scale=%4&markers=color:red|size:big|").arg(zoom).arg(w).arg(h).arg(scale) + data->id.mid(9) + qsl("&sensor=false");
+		QNetworkReply *reply = manager->get(QNetworkRequest(QUrl(url)));
+		imageLoadings[reply] = data;
+	} break;
 	default: {
 		failed(data);
 	} break;
@@ -3295,9 +3307,8 @@ void ImageLinkManager::onFinished(QNetworkReply *reply) {
 			}
 		} break;
 
-		case InstagramLink: {
+		case InstagramLink: failed(d); break;
-			failed(d);
+		case GoogleMapsLink: failed(d); break;
-		} break;
 		}
 
 		if (App::main()) App::main()->update();
@@ -3315,6 +3326,7 @@ void ImageLinkManager::onFinished(QNetworkReply *reply) {
 				QImageReader reader(&buffer);
 				thumb = QPixmap::fromImageReader(&reader, Qt::ColorOnly);
 				format = reader.format();
+				thumb.setDevicePixelRatio(cRetinaFactor());
 				if (format.isEmpty()) format = QByteArray("JPG");
 			}
 			d->loading = false;
@@ -3361,16 +3373,20 @@ void ImageLinkData::load() {
 }
 
 HistoryImageLink::HistoryImageLink(const QString &url, int32 width) : w(width) {
-	QRegularExpressionMatch m = reYouTube1.match(url);
+	if (url.startsWith(qsl("location:"))) {
-	if (!m.hasMatch()) m = reYouTube2.match(url);
+		data = App::imageLink(url, GoogleMapsLink, qsl("https://maps.google.com/maps?q=") + url.mid(9) + qsl("&ll=") + url.mid(9) + qsl("&z=17"));
-	if (m.hasMatch()) {
-		data = App::imageLink(qsl("youtube:") + m.captured(3), YouTubeLink, url);
 	} else {
-		m = reInstagram.match(url);
+		QRegularExpressionMatch m = reYouTube1.match(url);
+		if (!m.hasMatch()) m = reYouTube2.match(url);
 		if (m.hasMatch()) {
-			data = App::imageLink(qsl("instagram:") + m.captured(3), InstagramLink, url);
+			data = App::imageLink(qsl("youtube:") + m.captured(3), YouTubeLink, url);
 		} else {
-			data = 0;
+			m = reInstagram.match(url);
+			if (m.hasMatch()) {
+				data = App::imageLink(qsl("instagram:") + m.captured(3), InstagramLink, url);
+			} else {
+				data = 0;
+			}
 		}
 	}
 }
@@ -3380,6 +3396,7 @@ int32 HistoryImageLink::fullWidth() const {
 		switch (data->type) {
 		case YouTubeLink: return 640;
 		case InstagramLink: return 640;
+		case GoogleMapsLink: return st::locationSize.width();
 		}
 	}
 	return st::minPhotoWidth;
@@ -3390,6 +3407,7 @@ int32 HistoryImageLink::fullHeight() const {
 		switch (data->type) {
 		case YouTubeLink: return 480;
 		case InstagramLink: return 640;
+		case GoogleMapsLink: return st::locationSize.height();
 		}
 	}
 	return st::minPhotoHeight;
@@ -3424,8 +3442,8 @@ void HistoryImageLink::draw(QPainter &p, const HistoryItem *parent, bool selecte
 	QPixmap toDraw;
 	if (data && !data->thumb->isNull()) {
 		int32 w = data->thumb->width(), h = data->thumb->height();
-		if (width * h == _height * w) {
+		if (width * h == _height * w || (w == convertScale(fullWidth()) && h == convertScale(fullHeight()))) {
-			p.drawPixmap(QPoint(0, 0), data->thumb->pixSingle(width));
+			p.drawPixmap(QPoint(0, 0), data->thumb->pixSingle(width, _height));
 		} else {
 			p.fillRect(QRect(0, 0, width, _height), st::black->b);
 			if (width * h > _height * w) {
@@ -3524,6 +3542,7 @@ const QString HistoryImageLink::inDialogsText() const {
 		switch (data->type) {
 		case YouTubeLink: return qsl("YouTube Video");
 		case InstagramLink: return qsl("Instagram Link");
+		case GoogleMapsLink: return lang(lng_maps_point);
 		}
 	}
 	return QString();
@@ -3614,8 +3633,7 @@ void HistoryMessage::initMedia(const MTPMessageMedia &media, QString &currentTex
 		const MTPGeoPoint &point(media.c_messageMediaGeo().vgeo);
 		if (point.type() == mtpc_geoPoint) {
 			const MTPDgeoPoint &d(point.c_geoPoint());
-			QString ll = QString("%1,%2").arg(d.vlat.v).arg(d.vlong.v);
+			_media = new HistoryImageLink(qsl("location:%1,%2").arg(d.vlat.v).arg(d.vlong.v));
-			currentText.append(QChar('\n') + textcmdLink(qsl("https://maps.google.com/maps?q=") + ll + qsl("&ll=") + ll + qsl("&z=17"), lang(lng_maps_point)));
 		}
 	} break;
 	case mtpc_messageMediaPhoto: {

Telegram/SourceFiles/history.h

@@ -1429,7 +1429,8 @@ void deinitImageLinkManager();
 enum ImageLinkType {
 	InvalidImageLink = 0,
 	YouTubeLink,
-	InstagramLink
+	InstagramLink,
+	GoogleMapsLink
 };
 struct ImageLinkData {
 	ImageLinkData(const QString &id) : id(id), type(InvalidImageLink), loading(false) {

Telegram/SourceFiles/mtproto/mtp.cpp

@@ -726,6 +726,8 @@ namespace MTP {
 		for (Sessions::iterator i = sessions.begin(), e = sessions.end(); i != e; ++i) {
 			i.value()->stop();
 		}
+		sessions.clear();
+		mainSession = MTProtoSessionPtr();
 		delete resender;
 		resender = 0;
 		mtpDestroyConfigLoader();

Telegram/SourceFiles/mtproto/mtpConnection.cpp

@@ -309,6 +309,7 @@ void MTProtoConnection::restart() {
 }
 
 void MTProtoConnection::stop() {
+	data->stop();
 	thread->quit();
 }
 
@@ -1356,7 +1357,10 @@ mtpMsgId MTProtoConnectionPrivate::placeToContainer(mtpRequest &toSendRequest, m
 }
 
 void MTProtoConnectionPrivate::tryToSend() {
-	if (!conn) return;
+	QReadLocker lockFinished(&sessionDataMutex);
+	if (!sessionData || !conn) {
+		return;
+	}
 
 	bool prependOnly = false;
 	mtpRequest pingRequest;
@@ -1563,6 +1567,9 @@ void MTProtoConnectionPrivate::tryToSend() {
 }
 
 void MTProtoConnectionPrivate::retryByTimer() {
+	QReadLocker lockFinished(&sessionDataMutex);
+	if (!sessionData) return;
+
 	if (retryTimeout < 3) {
 		++retryTimeout;
 	} else if (retryTimeout == 3) {
@@ -1625,6 +1632,9 @@ void MTProtoConnectionPrivate::socketStart(bool afterConfig) {
 }
 
 void MTProtoConnectionPrivate::restart(bool maybeBadKey) {
+	QReadLocker lockFinished(&sessionDataMutex);
+	if (!sessionData) return;
+
 	DEBUG_LOG(("MTP Info: restarting MTProtoConnection, maybe bad key = %1").arg(logBool(maybeBadKey)));
 
 	connCheckTimer.stop();
@@ -1739,6 +1749,9 @@ void MTProtoConnectionPrivate::doFinish() {
 }
 
 void MTProtoConnectionPrivate::handleReceived() {
+	QReadLocker lockFinished(&sessionDataMutex);
+	if (!sessionData) return;
+
 	onReceivedSome();
 
 	ReadLockerAttempt lock(sessionData->keyMutex());
@@ -2630,6 +2643,9 @@ mtpRequestId MTProtoConnectionPrivate::resend(mtpMsgId msgId, uint64 msCanWait,
 }
 
 void MTProtoConnectionPrivate::onConnected() {
+	QReadLocker lockFinished(&sessionDataMutex);
+	if (!sessionData) return;
+
 	disconnect(conn, SIGNAL(connected()), this, SLOT(onConnected()));
 	if (!conn->isConnected()) {
 		LOG(("Connection Error: not connected in onConnected(), state: %1").arg(conn->debugState()));
@@ -2669,7 +2685,8 @@ void MTProtoConnectionPrivate::onConnected() {
 }
 
 bool MTProtoConnectionPrivate::updateAuthKey() 	{
-	if (!conn) return false;
+	QReadLocker lockFinished(&sessionDataMutex);
+	if (!sessionData || !conn) return false;
 
 	DEBUG_LOG(("AuthKey Info: MTProtoConnection updating key from MTProtoSession, dc %1").arg(dc));
 	uint64 newKeyId = 0;
@@ -2989,6 +3006,9 @@ void MTProtoConnectionPrivate::dhClientParamsSend() {
 }
 
 void MTProtoConnectionPrivate::dhClientParamsAnswered() {
+	QReadLocker lockFinished(&sessionDataMutex);
+	if (!sessionData) return;
+
 	disconnect(conn, SIGNAL(receivedData()), this, SLOT(dhClientParamsAnswered()));
 	DEBUG_LOG(("AuthKey Info: receiving Req_client_DH_params answer.."));
 
@@ -3283,6 +3303,9 @@ void MTProtoConnectionPrivate::lockKey() {
 }
 
 void MTProtoConnectionPrivate::unlockKey() {
+	QReadLocker lockFinished(&sessionDataMutex);
+	if (!sessionData) return;
+
 	if (myKeyLock) {
 		myKeyLock = false;
 		sessionData->keyMutex()->unlock();
@@ -3293,6 +3316,11 @@ MTProtoConnectionPrivate::~MTProtoConnectionPrivate() {
 	doDisconnect();
 }
 
+void MTProtoConnectionPrivate::stop() {
+	QWriteLocker lockFinished(&sessionDataMutex);
+	sessionData = 0;
+}
+
 MTProtoConnection::~MTProtoConnection() {
 	stopped();
 }

Telegram/SourceFiles/mtproto/mtpConnection.h

@@ -282,6 +282,8 @@ public:
 	MTProtoConnectionPrivate(QThread *thread, MTProtoConnection *owner, MTPSessionData *data, uint32 dc);
 	~MTProtoConnectionPrivate();
 
+	void stop();
+
 	int32 getDC() const;
 
 	int32 getState() const;
@@ -390,6 +392,7 @@ private:
 	bool restarted;
 
 	uint64 keyId;
+	QReadWriteLock sessionDataMutex;
 	MTPSessionData *sessionData;
 	bool myKeyLock;
 	void lockKey();

Telegram/SourceFiles/types.cpp

@@ -245,13 +245,16 @@ uint64 getms(bool checked) {
 
 namespace {
 	QSet<SingleTimer*> _activeSingleTimers;
+	QMutex _activeSingleTimersMutex;
 }
 
 void regSingleTimer(SingleTimer *timer) {
+	QMutexLocker lock(&_activeSingleTimersMutex);
 	_activeSingleTimers.insert(timer);
 }
 
 void unregSingleTimer(SingleTimer *timer) {
+	QMutexLocker lock(&_activeSingleTimersMutex);
 	_activeSingleTimers.remove(timer);
 }
 

Telegram/Telegram.vcxproj

@@ -350,6 +350,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Debug\moc_types.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_usernamebox.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -562,6 +566,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Deploy\moc_types.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_usernamebox.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -783,6 +791,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_types.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_usernamebox.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -869,6 +881,20 @@
     <ClCompile Include="SourceFiles\window.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <CustomBuild Include="SourceFiles\types.h">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">Moc%27ing types.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/types.h"  -DAL_LIBTYPE_STATIC -DCUSTOM_API_ID -DUNICODE -D_WITH_DEBUG -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\OpenSSL-Win32\include" "-I.\..\..\Libraries\libogg-1.3.2\include" "-I.\..\..\Libraries\opus\include" "-I.\..\..\Libraries\opusfile\include" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.3.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.3.1\QtGui"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing types.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/types.h"  -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\OpenSSL-Win32\include" "-I.\..\..\Libraries\libogg-1.3.2\include" "-I.\..\..\Libraries\opus\include" "-I.\..\..\Libraries\opusfile\include" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.3.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.3.1\QtGui"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing types.h...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/types.h"  -DAL_LIBTYPE_STATIC -DUNICODE -D_WITH_DEBUG -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\OpenSSL-Win32\include" "-I.\..\..\Libraries\libogg-1.3.2\include" "-I.\..\..\Libraries\opus\include" "-I.\..\..\Libraries\opusfile\include" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.3.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.3.1\QtGui"</Command>
+    </CustomBuild>
     <CustomBuild Include="SourceFiles\window.h">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing window.h...</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
@@ -1669,7 +1695,6 @@
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
     </CustomBuild>
-    <ClInclude Include="SourceFiles\types.h" />
     <ClInclude Include="SourceFiles\stdafx.h" />
   </ItemGroup>
   <ItemGroup>

Telegram/Telegram.vcxproj.filters

@@ -239,9 +239,6 @@
     <ClCompile Include="SourceFiles\langloaderplain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SourceFiles\types.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_window.cpp">
       <Filter>Generated Files\Deploy</Filter>
     </ClCompile>
@@ -743,14 +740,23 @@
     <ClCompile Include="GeneratedFiles\Release\moc_history.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
+    <ClCompile Include="SourceFiles\types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Deploy\moc_types.cpp">
+      <Filter>Generated Files\Deploy</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Debug\moc_types.cpp">
+      <Filter>Generated Files\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneratedFiles\Release\moc_types.cpp">
+      <Filter>Generated Files\Release</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="SourceFiles\stdafx.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="SourceFiles\types.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="SourceFiles\mtproto\mtpCoreTypes.h">
       <Filter>mtproto</Filter>
     </ClInclude>
@@ -996,6 +1002,9 @@
     <CustomBuild Include="SourceFiles\history.h">
       <Filter>Source Files</Filter>
     </CustomBuild>
+    <CustomBuild Include="SourceFiles\types.h">
+      <Filter>Source Files</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Image Include="SourceFiles\art\iconround256.ico" />