[Dcplusplus-commit] SF.net SVN: dcplusplus: [1010] dcplusplus/trunk

[<zou...@us...>]

Revision: 1010
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1010&view=rev
Author:   zouzou123gen
Date:     2008-02-15 08:46:35 -0800 (Fri, 15 Feb 2008)

Log Message:
-----------
Don't always show the tray icon after killing and re-opening explorer.exe

Modified Paths:
--------------
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/win32/MainWindow.cpp
    dcplusplus/trunk/win32/MainWindow.h

Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2008-02-13 22:50:42 UTC (rev 1009)
+++ dcplusplus/trunk/changelog.txt	2008-02-15 16:46:35 UTC (rev 1010)
@@ -33,6 +33,7 @@
 * [ADC] Number of files counts unique files when sending stats to hub 
 * [ADC] Fixed kick handling
 * Fixed 100% on remove all sources in queue
+* Don't always show the tray icon after killing and re-opening explorer.exe (poy)
 
 -- 0.704 2007-12-14 --
 * Hub lists added to utilize Coral's distributed network (ullner)

Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp	2008-02-13 22:50:42 UTC (rev 1009)
+++ dcplusplus/trunk/win32/MainWindow.cpp	2008-02-15 16:46:35 UTC (rev 1010)
@@ -98,7 +98,7 @@
 
 	onClosing(std::tr1::bind(&MainWindow::closing, this));
 
-	onRaw(std::tr1::bind(&MainWindow::trayMessage, this, _1, _2), SmartWin::Message(RegisterWindowMessage(_T("TaskbarCreated"))));
+	onRaw(std::tr1::bind(&MainWindow::handleTrayMessage, this), SmartWin::Message(RegisterWindowMessage(_T("TaskbarCreated"))));
 	onRaw(std::tr1::bind(&MainWindow::handleEndSession, this, _1, _2), SmartWin::Message(WM_ENDSESSION));
 	onRaw(std::tr1::bind(&MainWindow::handleWhereAreYou, this, _1, _2), SmartWin::Message(SingleInstance::WMU_WHERE_ARE_YOU));
 	
@@ -507,8 +507,9 @@
 	return true;
 }
 
-LRESULT MainWindow::trayMessage(WPARAM wParam, LPARAM lParam) {
-	updateTray(true);
+LRESULT MainWindow::handleTrayMessage() {
+	if(BOOLSETTING(MINIMIZE_TRAY) && isIconic())
+		updateTray(true);
 	return 0;
 }
 

Modified: dcplusplus/trunk/win32/MainWindow.h
===================================================================
--- dcplusplus/trunk/win32/MainWindow.h	2008-02-13 22:50:42 UTC (rev 1009)
+++ dcplusplus/trunk/win32/MainWindow.h	2008-02-15 16:46:35 UTC (rev 1010)
@@ -167,7 +167,7 @@
 	bool handleSized(const SmartWin::WidgetSizedEventResult& sz);
 	
 	LRESULT handleSpeaker(WPARAM wParam, LPARAM lParam);
-	LRESULT trayMessage(WPARAM wParam, LPARAM lParam);
+	LRESULT handleTrayMessage();
 	LRESULT handleCopyData(WPARAM wParam, LPARAM lParam);
 	LRESULT handleWhereAreYou(WPARAM wParam, LPARAM lParam);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.