You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(57) |
Aug
(16) |
Sep
(37) |
Oct
(26) |
Nov
(36) |
Dec
(41) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(78) |
Feb
(45) |
Mar
(37) |
Apr
(56) |
May
(50) |
Jun
(17) |
Jul
(38) |
Aug
(86) |
Sep
(27) |
Oct
(42) |
Nov
(46) |
Dec
(56) |
2009 |
Jan
(49) |
Feb
(94) |
Mar
(101) |
Apr
(70) |
May
(31) |
Jun
(56) |
Jul
(18) |
Aug
(48) |
Sep
(40) |
Oct
(61) |
Nov
(51) |
Dec
(24) |
2010 |
Jan
(12) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <ir0...@us...> - 2010-01-10 06:37:23
|
Revision: 2781 http://emerge.svn.sourceforge.net/emerge/?rev=2781&view=rev Author: ir0nh34d Date: 2010-01-10 06:37:17 +0000 (Sun, 10 Jan 2010) Log Message: ----------- Revert to 7z and add tarsrc and tarbin targets Modified Paths: -------------- trunk/Source/Makefile Modified: trunk/Source/Makefile =================================================================== --- trunk/Source/Makefile 2010-01-10 04:03:35 UTC (rev 2780) +++ trunk/Source/Makefile 2010-01-10 06:37:17 UTC (rev 2781) @@ -64,9 +64,19 @@ .PHONY: src src: $(call remove_file,$(PACKAGE)-$(VERSION)-src.zip) - tar -Jcvf $(PACKAGE)-$(VERSION)-src.tar.xz --exclude-from=excludes.lst * + 7z a $(PACKAGE)-$(VERSION)-src.7z * -x...@ex...t .PHONY: bin bin: $(call remove_file,$(PACKAGE)-$(VERSION).zip) + 7z a $(PACKAGE)-$(VERSION).7z $(BIN_LIST) + +.PHONY: tarsrc +tarsrc: + $(call remove_file,$(PACKAGE)-$(VERSION)-src.zip) + tar -Jcvf $(PACKAGE)-$(VERSION)-src.tar.xz --exclude-from=excludes.lst * + +.PHONY: tarbin +tarbin: + $(call remove_file,$(PACKAGE)-$(VERSION).zip) tar -Jcvf $(PACKAGE)-$(VERSION).tar.xz --transform='s,./$(BIN_DIR)/,,S' $(BIN_LIST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-10 04:03:41
|
Revision: 2780 http://emerge.svn.sourceforge.net/emerge/?rev=2780&view=rev Author: ir0nh34d Date: 2010-01-10 04:03:35 +0000 (Sun, 10 Jan 2010) Log Message: ----------- Initial right-click implementation for LaunchEditor Modified Paths: -------------- trunk/Source/emergeCore/LaunchEditor.cpp trunk/Source/emergeCore/LaunchEditor.h Modified: trunk/Source/emergeCore/LaunchEditor.cpp =================================================================== --- trunk/Source/emergeCore/LaunchEditor.cpp 2010-01-10 02:58:50 UTC (rev 2779) +++ trunk/Source/emergeCore/LaunchEditor.cpp 2010-01-10 04:03:35 UTC (rev 2780) @@ -70,16 +70,16 @@ InitCommonControls(); toolWnd = CreateWindowEx( - 0, - TOOLTIPS_CLASS, - NULL, - TTS_ALWAYSTIP|WS_POPUP|TTS_NOPREFIX, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - NULL, - NULL, - hInstance, - NULL); + 0, + TOOLTIPS_CLASS, + NULL, + TTS_ALWAYSTIP|WS_POPUP|TTS_NOPREFIX, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + NULL, + NULL, + hInstance, + NULL); if (toolWnd) { @@ -804,8 +804,36 @@ EnableWindow(upWnd, true); EnableWindow(downWnd, true); return PopulateFields(hwndDlg, ((LPNMLISTVIEW)lParam)->iItem); + + case NM_RCLICK: + return DoRightClick(hwndDlg, ((LPNMITEMACTIVATE)lParam)->iItem); } return FALSE; } +BOOL LaunchEditor::DoRightClick(HWND hwndDlg, int index) +{ + HWND listWnd = GetDlgItem(hwndDlg, IDC_APPLETLIST); + WCHAR tmp[MAX_LINE_LENGTH], applet[MAX_PATH], appletName[MAX_PATH]; + VERSIONINFO versionInfo; + + ListView_GetItemText(listWnd, index, 0, applet, MAX_PATH); + wcscpy(appletName, PathFindFileName(applet)); + PathRemoveExtension(appletName); + + if (ELAppletFileVersion(applet, &versionInfo)) + { + swprintf(tmp, TEXT("%s\n\nVersion: %s\n\nAuthor: %s"), + versionInfo.Description, + versionInfo.Version, + versionInfo.Author); + + ELMessageBox(hwndDlg, tmp, appletName, ELMB_ICONQUESTION|ELMB_OK|ELMB_MODAL); + + return TRUE; + } + + return FALSE; +} + Modified: trunk/Source/emergeCore/LaunchEditor.h =================================================================== --- trunk/Source/emergeCore/LaunchEditor.h 2010-01-10 02:58:50 UTC (rev 2779) +++ trunk/Source/emergeCore/LaunchEditor.h 2010-01-10 04:03:35 UTC (rev 2780) @@ -63,6 +63,7 @@ bool DoLaunchMove(HWND listWnd, bool up); bool CheckSaveCount(HWND hwndDlg); void InsertListViewItem(HWND listWnd, int index, const WCHAR *item); + BOOL DoRightClick(HWND hwndDlg, int index); BOOL PopulateFields(HWND hwndDlg, int index); UINT saveCount, deleteCount; HINSTANCE hInstance; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-10 02:58:59
|
Revision: 2779 http://emerge.svn.sourceforge.net/emerge/?rev=2779&view=rev Author: ir0nh34d Date: 2010-01-10 02:58:50 +0000 (Sun, 10 Jan 2010) Log Message: ----------- Remove dll/exe on clean Modified Paths: -------------- trunk/Source/globals.in Modified: trunk/Source/globals.in =================================================================== --- trunk/Source/globals.in 2010-01-09 00:59:00 UTC (rev 2778) +++ trunk/Source/globals.in 2010-01-10 02:58:50 UTC (rev 2779) @@ -61,6 +61,7 @@ .IGNORE: clean clean: $(call remove_files, $(TARGET_OBJS)) + $(call remove_file, $(BIN_DIR)/$(TARGET)$(SUFFIX)) .PHONY: makedir makedir: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-09 00:59:06
|
Revision: 2778 http://emerge.svn.sourceforge.net/emerge/?rev=2778&view=rev Author: ir0nh34d Date: 2010-01-09 00:59:00 +0000 (Sat, 09 Jan 2010) Log Message: ----------- Ignore .xz files Property Changed: ---------------- trunk/Source/ trunk/Source/WindowTitleTest/ trunk/Source/emerge/ trunk/Source/emergeAppletEngine/ trunk/Source/emergeBaseClasses/ trunk/Source/emergeCommand/ trunk/Source/emergeCommand/icons/ trunk/Source/emergeCore/ trunk/Source/emergeCore/icons/ trunk/Source/emergeDesktop/ trunk/Source/emergeDesktop/icons/ trunk/Source/emergeGraphics/ trunk/Source/emergeGraphics/icons/ trunk/Source/emergeHelloWorld/ trunk/Source/emergeHelloWorld/icons/ trunk/Source/emergeHotkeys/ trunk/Source/emergeHotkeys/icons/ trunk/Source/emergeLauncher/ trunk/Source/emergeLauncher/icons/ trunk/Source/emergeLib/ trunk/Source/emergeLib/images/ trunk/Source/emergeMediaCtrl/ trunk/Source/emergeMediaCtrl/icons/ trunk/Source/emergePower/ trunk/Source/emergePower/icons/ trunk/Source/emergeSchemeEngine/ trunk/Source/emergeSysMon/ trunk/Source/emergeSysMon/icons/ trunk/Source/emergeTasks/ trunk/Source/emergeTasks/icons/ trunk/Source/emergeTray/ trunk/Source/emergeTray/icons/ trunk/Source/emergeVWM/ trunk/Source/emergeVWM/icons/ trunk/Source/files/ trunk/Source/reg2xml/ trunk/Source/schemes/ trunk/Source/scripts/ trunk/Source/tinyxml/ trunk/Source/tinyxml/docs/ Property changes on: trunk/Source ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/WindowTitleTest ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emerge ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeAppletEngine ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeBaseClasses ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeCommand ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeCommand/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeCore ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeCore/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeDesktop ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeDesktop/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeGraphics ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeGraphics/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeHelloWorld ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeHelloWorld/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeHotkeys ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeHotkeys/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeLauncher ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeLauncher/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeLib ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeLib/images ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeMediaCtrl ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeMediaCtrl/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergePower ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergePower/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeSchemeEngine ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeSysMon ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeSysMon/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeTasks ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeTasks/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeTray ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeTray/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeVWM ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/emergeVWM/icons ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/files ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/reg2xml ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/schemes ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/scripts ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/tinyxml ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz Property changes on: trunk/Source/tinyxml/docs ___________________________________________________________________ Modified: svn:ignore - *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session + *.depend *.layout *.zip *.bmarks *.suo *.ncb svnversion.h .objs64 bin64 .objs tags *.tags bin *.mk Release Debug *.7z .deps .deps64 *.save *.session *.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-09 00:56:39
|
Revision: 2777 http://emerge.svn.sourceforge.net/emerge/?rev=2777&view=rev Author: ir0nh34d Date: 2010-01-09 00:56:28 +0000 (Sat, 09 Jan 2010) Log Message: ----------- Switch from .7z to .xz Modified Paths: -------------- trunk/Source/Makefile Modified: trunk/Source/Makefile =================================================================== --- trunk/Source/Makefile 2010-01-09 00:54:52 UTC (rev 2776) +++ trunk/Source/Makefile 2010-01-09 00:56:28 UTC (rev 2777) @@ -64,10 +64,9 @@ .PHONY: src src: $(call remove_file,$(PACKAGE)-$(VERSION)-src.zip) - 7za a $(PACKAGE)-$(VERSION)-src.7z * -x...@ex...t + tar -Jcvf $(PACKAGE)-$(VERSION)-src.tar.xz --exclude-from=excludes.lst * .PHONY: bin bin: $(call remove_file,$(PACKAGE)-$(VERSION).zip) - 7za a $(PACKAGE)-$(VERSION).7z $(BIN_LIST) - cd .. $(SHELL_BREAK) 7za a Source/$(PACKAGE)-$(VERSION).7z $(DOCUMENTATION) $(SHELL_BREAK) cd Source + tar -Jcvf $(PACKAGE)-$(VERSION).tar.xz --transform='s,./$(BIN_DIR)/,,S' $(BIN_LIST) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-09 00:55:04
|
Revision: 2776 http://emerge.svn.sourceforge.net/emerge/?rev=2776&view=rev Author: ir0nh34d Date: 2010-01-09 00:54:52 +0000 (Sat, 09 Jan 2010) Log Message: ----------- Ignore .xz files Modified Paths: -------------- trunk/Source/.svnignore Modified: trunk/Source/.svnignore =================================================================== --- trunk/Source/.svnignore 2010-01-07 00:24:03 UTC (rev 2775) +++ trunk/Source/.svnignore 2010-01-09 00:54:52 UTC (rev 2776) @@ -19,3 +19,4 @@ .deps64 *.save *.session +*.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-07 00:25:34
|
Revision: 2775 http://emerge.svn.sourceforge.net/emerge/?rev=2775&view=rev Author: ir0nh34d Date: 2010-01-07 00:24:03 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Add MinGW-w32 project file Added Paths: ----------- trunk/Source/EmergeDesktop-w32.cbp Added: trunk/Source/EmergeDesktop-w32.cbp =================================================================== --- trunk/Source/EmergeDesktop-w32.cbp (rev 0) +++ trunk/Source/EmergeDesktop-w32.cbp 2010-01-07 00:24:03 UTC (rev 2775) @@ -0,0 +1,1608 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="EmergeDesktop-w32" /> + <Option platforms="Windows;" /> + <Option pch_mode="2" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Build> + <Target title="emergeLib - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeLib" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option type="3" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> + <Compiler> + <Add option="-DEMERGELIB_EXPORTS" /> + </Compiler> + <ResourceCompiler> + <Add directory=".\emergeLib" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add option="-Wl,--enable-auto-image-base" /> + <Add library="shlwapi" /> + <Add library="version" /> + <Add library="psapi" /> + <Add library="ole32" /> + <Add library="uuid" /> + <Add library="gdi32" /> + <Add library="wtsapi32" /> + <Add library="winmm" /> + <Add library="powrprof" /> + </Linker> + </Target> + <Target title="emergeGraphics - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeGraphics" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option type="3" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> + <Compiler> + <Add option="-DEMERGEGRAPHICS_EXPORTS" /> + </Compiler> + <ResourceCompiler> + <Add directory=".\emergeGraphics" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add option="-Wl,--enable-auto-image-base" /> + <Add library="emergeLib" /> + <Add library="gdi32" /> + <Add library="msimg32" /> + <Add library="ole32" /> + <Add library="shlwapi" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeAppletEngine - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeAppletEngine" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option type="3" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> + <Compiler> + <Add option="-DEMERGEAPPLETENGINE_EXPORTS" /> + </Compiler> + <Linker> + <Add option="-s" /> + <Add option="-Wl,--enable-auto-image-base" /> + <Add library="emergeLib" /> + <Add library="comctl32" /> + <Add library="ole32" /> + <Add library="shlwapi" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeSchemeEngine - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeSchemeEngine" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option type="3" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> + <Compiler> + <Add option="-DEMERGESCHEMEENGINE_EXPORTS" /> + </Compiler> + <Linker> + <Add option="-s" /> + <Add option="-Wl,--enable-auto-image-base" /> + <Add option="-Wl,--export-all-symbols" /> + <Add library="emergeGraphics" /> + <Add library="emergeLib" /> + <Add library="gdi32" /> + <Add library="msimg32" /> + <Add library="comdlg32" /> + <Add library="shlwapi" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeBaseClasses - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeBaseClasses" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option type="3" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> + <Compiler> + <Add option="-DEMERGEBASECLASSES_EXPORTS" /> + </Compiler> + <Linker> + <Add option="-s" /> + <Add option="-Wl,--enable-auto-image-base" /> + <Add option="-Wl,--export-all-symbols" /> + <Add library="emergeGraphics" /> + <Add library="emergeLib" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeAppletEngine" /> + <Add library="gdi32" /> + <Add library="msimg32" /> + <Add library="comdlg32" /> + <Add library="shlwapi" /> + <Add library="ole32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeCore - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeCore" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeLib.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeCore" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeLib" /> + <Add library="shell32" /> + <Add library="shlwapi" /> + <Add library="ole32" /> + <Add library="comctl32" /> + <Add library="uuid" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeCommand - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeCommand" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeCommand" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeLib" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="uuid" /> + <Add library="ole32" /> + <Add library="comctl32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeDesktop - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeDesktop" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeLib.dll;bin\emergeAppletEngine.dll;bin\emergeGraphics.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeDesktop" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeLib" /> + <Add library="shlwapi" /> + <Add library="comctl32" /> + <Add library="emergeGraphics" /> + <Add library="emergeAppletEngine" /> + <Add library="ole32" /> + <Add library="uuid" /> + <Add library="emergeBaseClasses" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeHotkeys - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeHotkeys" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeLib.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeHotkeys" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeBaseClasses" /> + <Add library="emergeLib" /> + <Add library="comctl32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeLauncher - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeLauncher" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeLauncher" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeLib" /> + <Add library="emergeGraphics" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeBaseClasses" /> + <Add library="comctl32" /> + <Add library="shlwapi" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeTasks - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeTasks" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeTasks" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeLib" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="comctl32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeTray - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeTray" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeTray" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeLib" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="comctl32" /> + <Add library="uuid" /> + <Add library="ole32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeVWM - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeVWM" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeVWM" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeLib" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="comctl32" /> + <Add library="shlwapi" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emerge - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emerge" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeLib.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Linker> + <Add option="-s" /> + <Add library="emergeLib" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergePower - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergePower" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeTasks" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeLib" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="comctl32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeSysMon - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeSysMon" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeTasks" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="comctl32" /> + <Add library="emergeLib" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeMediaCtrl - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeMediaCtrl" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeTasks" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeLib" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="reg2xml - Release"> + <Option platforms="Windows;" /> + <Option output="bin\reg2xml" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeLib.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Linker> + <Add option="-s" /> + <Add library="emergeLib" /> + <Add library="emergeBaseClasses" /> + <Add library="shlwapi" /> + <Add library="comctl32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeHelloWorld - Release"> + <Option platforms="Windows;" /> + <Option output="bin\emergeHelloWorld" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <ResourceCompiler> + <Add directory=".\emergeCommand" /> + </ResourceCompiler> + <Linker> + <Add option="-s" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeLib" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="uuid" /> + <Add library="ole32" /> + <Add library="comctl32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeLib - Debug"> + <Option platforms="Windows;" /> + <Option output="bin\emergeLib" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Debug" /> + <Option type="3" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> + <Compiler> + <Add option="-g" /> + <Add option="-DEMERGELIB_EXPORTS" /> + </Compiler> + <ResourceCompiler> + <Add directory=".\emergeLib" /> + </ResourceCompiler> + <Linker> + <Add option="-Wl,--enable-auto-image-base" /> + <Add library="shlwapi" /> + <Add library="version" /> + <Add library="psapi" /> + <Add library="ole32" /> + <Add library="uuid" /> + <Add library="gdi32" /> + <Add library="wtsapi32" /> + <Add library="winmm" /> + <Add library="powrprof" /> + </Linker> + </Target> + <Target title="emergeAppletEngine - Debug"> + <Option platforms="Windows;" /> + <Option output="bin\emergeAppletEngine" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Debug" /> + <Option type="3" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Option createDefFile="1" /> + <Option createStaticLib="1" /> + <Compiler> + <Add option="-g" /> + <Add option="-DEMERGEAPPLETENGINE_EXPORTS" /> + </Compiler> + <Linker> + <Add option="-Wl,--enable-auto-image-base" /> + <Add library="emergeLib" /> + <Add library="comctl32" /> + <Add library="ole32" /> + <Add library="shlwapi" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeDesktop - Debug"> + <Option platforms="Windows;" /> + <Option output="bin\emergeDesktop" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Debug" /> + <Option external_deps="bin\emergeLib.dll;bin\emergeAppletEngine.dll;bin\emergeGraphics.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Compiler> + <Add option="-g" /> + </Compiler> + <ResourceCompiler> + <Add directory=".\emergeDesktop" /> + </ResourceCompiler> + <Linker> + <Add library="emergeLib" /> + <Add library="shlwapi" /> + <Add library="comctl32" /> + <Add library="emergeGraphics" /> + <Add library="emergeAppletEngine" /> + <Add library="ole32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeCore - Debug"> + <Option platforms="Windows;" /> + <Option output="bin\emergeCore" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Debug" /> + <Option external_deps="bin\emergeLib.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Compiler> + <Add option="-g" /> + </Compiler> + <ResourceCompiler> + <Add directory=".\emergeCore" /> + </ResourceCompiler> + <Linker> + <Add library="emergeLib" /> + <Add library="shell32" /> + <Add library="shlwapi" /> + <Add library="ole32" /> + <Add library="comctl32" /> + <Add library="uuid" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeCommand - Debug"> + <Option platforms="Windows;" /> + <Option output="bin\emergeCommand" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Debug" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Compiler> + <Add option="-g" /> + </Compiler> + <ResourceCompiler> + <Add directory=".\emergeCommand" /> + </ResourceCompiler> + <Linker> + <Add library="emergeSchemeEngine" /> + <Add library="emergeLib" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="uuid" /> + <Add library="ole32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeTray - Debug"> + <Option platforms="Windows;" /> + <Option output="bin\emergeTray" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Debug" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Compiler> + <Add option="-g" /> + </Compiler> + <ResourceCompiler> + <Add directory=".\emergeTray" /> + </ResourceCompiler> + <Linker> + <Add library="emergeSchemeEngine" /> + <Add library="emergeLib" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="comctl32" /> + <Add library="uuid" /> + <Add library="ole32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + <Target title="emergeTasks - Debug"> + <Option platforms="Windows;" /> + <Option output="bin\emergeTasks" prefix_auto="1" extension_auto="1" /> + <Option object_output=".objs\Release" /> + <Option external_deps="bin\emergeAppletEngine.dll;bin\emergeBaseClasses.dll;bin\emergeGraphics.dll;bin\emergeLib.dll;bin\emergeSchemeEngine.dll;" /> + <Option type="0" /> + <Option compiler="gnu_gcc_compiler_for_mingww32" /> + <Compiler> + <Add option="-g" /> + </Compiler> + <ResourceCompiler> + <Add directory=".\emergeTasks" /> + </ResourceCompiler> + <Linker> + <Add library="emergeLib" /> + <Add library="emergeSchemeEngine" /> + <Add library="emergeAppletEngine" /> + <Add library="emergeGraphics" /> + <Add library="emergeBaseClasses" /> + <Add library="comctl32" /> + <Add directory=".\bin" /> + </Linker> + </Target> + </Build> + <VirtualTargets> + <Add alias="All - Release" targets="emergeLib - Release;emergeGraphics - Release;emergeAppletEngine - Release;emergeSchemeEngine - Release;emergeBaseClasses - Release;emergeCore - Release;emergeCommand - Release;emergeDesktop - Release;emergeHotkeys - Release;emergeLauncher - Release;emergeTasks - Release;emergeTray - Release;emergeVWM - Release;emerge - Release;emergePower - Release;reg2xml - Release;emergeSysMon - Release;" /> + </VirtualTargets> + <Compiler> + <Add option="-march=pentium4" /> + <Add option="-O2" /> + <Add option="-pedantic" /> + <Add option="-Wfatal-errors" /> + <Add option="-Wextra" /> + <Add option="-Wall" /> + <Add option="-mfpmath=sse" /> + <Add option="-D_GLIBCXX_DLL" /> + </Compiler> + <Linker> + <Add option="-shared-libgcc" /> + <Add option="-Wl,--enable-auto-import" /> + <Add library="stdc++.dll" /> + </Linker> + <ExtraCommands> + <Add before='[[ local svnfile = _T("svnversion.h"); local svncmd = _T("cmd /c svn info --revision HEAD | grep Revision | sed -f svnversion.sed > svnversion.h"); if ( !IO.FileExists(svnfile) ) { IO.Execute(svncmd); } ]]' /> + </ExtraCommands> + <Unit filename="emergeAppletEngine\emergeAppletEngine.h"> + <Option target="emergeAppletEngine - Release" /> + <Option target="emergeAppletEngine - Debug" /> + </Unit> + <Unit filename="emergeAppletEngine\emergeAppletEngine.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeAppletEngine - Release" /> + <Option target="emergeAppletEngine - Debug" /> + </Unit> + <Unit filename="emergeAppletEngine\main.cpp"> + <Option target="emergeAppletEngine - Release" /> + <Option target="emergeAppletEngine - Debug" /> + </Unit> + <Unit filename="emergeAppletEngine\resource.h"> + <Option target="emergeAppletEngine - Release" /> + <Option target="emergeAppletEngine - Debug" /> + </Unit> + <Unit filename="emergeBaseClasses\BaseApplet.cpp"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\BaseApplet.h"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\BaseAppletMenu.cpp"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\BaseAppletMenu.h"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\BasePositionPage.cpp"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\BasePositionPage.dlg"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\BasePositionPage.h"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\BaseSettings.cpp"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\BaseSettings.h"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\emergeBaseClasses.dll.manifest"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\emergeBaseClasses.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeBaseClasses\resource.h"> + <Option target="emergeBaseClasses - Release" /> + </Unit> + <Unit filename="emergeCommand\Applet.cpp"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\Applet.h"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\Command.cpp"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\Command.h"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\Config.cpp"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\Config.h"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\ConfigPage.cpp"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\ConfigPage.dlg"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\ConfigPage.h"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\CustomSource.cpp"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\CustomSource.h"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\Settings.cpp"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\Settings.h"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\TextPage.cpp"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\TextPage.dlg"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\TextPage.h"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\emergeCommand.exe.manifest"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\emergeCommand.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\main.cpp"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCommand\resource.h"> + <Option target="emergeCommand - Release" /> + <Option target="emergeCommand - Debug" /> + </Unit> + <Unit filename="emergeCore\Core.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\Core.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\DDEService.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\DDEService.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\DDEWorker.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\DDEWorker.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\Desktop.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\Desktop.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\LaunchEditor.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\LaunchEditor.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\MessageControl.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\MessageControl.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\Shell.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\Shell.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\ShellChanger.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\ShellChanger.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\ThemeSaver.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\ThemeSaver.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\ThemeSelector.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\ThemeSelector.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\emergeCore.exe.manifest"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\emergeCore.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\main.cpp"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeCore\resource.h"> + <Option target="emergeCore - Release" /> + <Option target="emergeCore - Debug" /> + </Unit> + <Unit filename="emergeDesktop\Config.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\Config.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\CustomDataObject.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\CustomDataObject.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\CustomDropSource.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\CustomDropSource.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\CustomDropTarget.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\CustomDropTarget.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\ItemEditor.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\ItemEditor.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\MenuBuilder.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\MenuBuilder.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\MenuEditor.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\MenuEditor.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\MenuItem.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\MenuItem.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\MenuListItem.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\MenuListItem.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\Settings.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\Settings.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\emergeDesktop.exe.manifest"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\emergeDesktop.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\main.cpp"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeDesktop\resource.h"> + <Option target="emergeDesktop - Release" /> + <Option target="emergeDesktop - Debug" /> + </Unit> + <Unit filename="emergeGraphics\BImage.cpp"> + <Option target="emergeGraphics - Release" /> + </Unit> + <Unit filename="emergeGraphics\BImage.h"> + <Option target="emergeGraphics - Release" /> + </Unit> + <Unit filename="emergeGraphics\emergeGraphics.h"> + <Option target="emergeGraphics - Release" /> + </Unit> + <Unit filename="emergeGraphics\emergeGraphics.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeGraphics - Release" /> + </Unit> + <Unit filename="emergeGraphics\main.cpp"> + <Option target="emergeGraphics - Release" /> + </Unit> + <Unit filename="emergeGraphics\resource.h"> + <Option target="emergeGraphics - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\Applet.cpp"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\Applet.h"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\Config.cpp"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\Config.h"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\ConfigPage.cpp"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\ConfigPage.dlg"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\ConfigPage.h"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\Settings.cpp"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\Settings.h"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\TextPage.cpp"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\TextPage.dlg"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\TextPage.h"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\emergeHelloWorld.exe.manifest"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\emergeHelloWorld.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\main.cpp"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHelloWorld\resource.h"> + <Option target="emergeHelloWorld - Release" /> + </Unit> + <Unit filename="emergeHotkeys\Actions.cpp"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\Actions.h"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\Applet.cpp"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\Applet.h"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\HotkeyCombo.cpp"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\HotkeyCombo.h"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\Settings.cpp"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\Settings.h"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\emergeHotkeys.exe.manifest"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\emergeHotkeys.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\main.cpp"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeHotkeys\resource.h"> + <Option target="emergeHotkeys - Release" /> + </Unit> + <Unit filename="emergeLauncher\Applet.cpp"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\Applet.h"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\Config.cpp"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\Config.h"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\ConfigPage.cpp"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\ConfigPage.dlg"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\ConfigPage.h"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\Item.cpp"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\Item.h"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\LaunchPage.cpp"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\LaunchPage.dlg"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\LaunchPage.h"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\Settings.cpp"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\Settings.h"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\emergeLauncher.exe.manifest"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\emergeLauncher.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\main.cpp"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLauncher\resource.h"> + <Option target="emergeLauncher - Release" /> + </Unit> + <Unit filename="emergeLib\MsgBox.cpp"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\MsgBox.h"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\Shutdown.cpp"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\Shutdown.h"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\emergeLib.dll.manifest"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\emergeLib.doxy"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\emergeLib.h"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\emergeLib.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\main.cpp"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeLib\resource.h"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="emergeMediaCtrl\Applet.h"> + <Option target="emergeMediaCtrl - Release" /> + </Unit> + <Unit filename="emergeMediaCtrl\Button.h"> + <Option target="emergeMediaCtrl - Release" /> + </Unit> + <Unit filename="emergeMediaCtrl\Config.h"> + <Option target="emergeMediaCtrl - Release" /> + </Unit> + <Unit filename="emergeMediaCtrl\Settings.h"> + <Option target="emergeMediaCtrl - Release" /> + </Unit> + <Unit filename="emergeMediaCtrl\emergeMediaCtrl.exe.manifest"> + <Option target="emergeMediaCtrl - Release" /> + </Unit> + <Unit filename="emergeMediaCtrl\emergeMediaCtrl.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeMediaCtrl - Release" /> + </Unit> + <Unit filename="emergeMediaCtrl\resource.h"> + <Option target="emergeMediaCtrl - Release" /> + </Unit> + <Unit filename="emergePower\Applet.cpp"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\Applet.h"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\Config.cpp"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\Config.h"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\ConfigPage.cpp"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\ConfigPage.dlg"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\ConfigPage.h"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\PositionPage.cpp"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\PositionPage.dlg"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\PositionPage.h"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\Settings.cpp"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\Settings.h"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\emergePower.exe.manifest"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\emergePower.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\main.cpp"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergePower\resource.h"> + <Option target="emergePower - Release" /> + </Unit> + <Unit filename="emergeSchemeEngine\SchemeEditor.cpp"> + <Option target="emergeSchemeEngine - Release" /> + </Unit> + <Unit filename="emergeSchemeEngine\SchemeEditor.h"> + <Option target="emergeSchemeEngine - Release" /> + </Unit> + <Unit filename="emergeSchemeEngine\emergeSchemeEngine.h"> + <Option target="emergeSchemeEngine - Release" /> + </Unit> + <Unit filename="emergeSchemeEngine\emergeSchemeEngine.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeSchemeEngine - Release" /> + </Unit> + <Unit filename="emergeSchemeEngine\main.cpp"> + <Option target="emergeSchemeEngine - Release" /> + </Unit> + <Unit filename="emergeSchemeEngine\resource.h"> + <Option target="emergeSchemeEngine - Release" /> + </Unit> + <Unit filename="emergeSysMon\Applet.cpp"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\Applet.h"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\Config.cpp"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\Config.h"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\ConfigPage.cpp"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\ConfigPage.dlg"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\ConfigPage.h"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\DisplayPage.cpp"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\DisplayPage.dlg"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\DisplayPage.h"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\PositionPage.cpp"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\PositionPage.dlg"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\PositionPage.h"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\Settings.cpp"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\Settings.h"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\emergeSysMon.exe.manifest"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\emergeSysMon.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\main.cpp"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeSysMon\resource.h"> + <Option target="emergeSysMon - Release" /> + </Unit> + <Unit filename="emergeTasks\Applet.cpp"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\Applet.h"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\Config.cpp"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\Config.h"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\ConfigPage.cpp"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\ConfigPage.dlg"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\ConfigPage.h"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\Settings.cpp"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\Settings.h"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\Task.cpp"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\Task.h"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\emergeTasks.exe.manifest"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\emergeTasks.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\main.cpp"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTasks\resource.h"> + <Option target="emergeTasks - Release" /> + <Option target="emergeTasks - Debug" /> + </Unit> + <Unit filename="emergeTray\AppBar.cpp"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\AppBar.h"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\Applet.cpp"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\Applet.h"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\Config.cpp"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\Config.h"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\ConfigPage.cpp"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\ConfigPage.dlg"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\ConfigPage.h"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\IconHidePage.cpp"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\IconHidePage.dlg"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\IconHidePage.h"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\Settings.cpp"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\Settings.h"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\TrayIcon.cpp"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\TrayIcon.h"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\emergeTray.exe.manifest"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\emergeTray.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\main.cpp"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeTray\resource.h"> + <Option target="emergeTray - Release" /> + <Option target="emergeTray - Debug" /> + </Unit> + <Unit filename="emergeVWM\Applet.cpp"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\Applet.h"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\Config.cpp"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\Config.h"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\ConfigPage.cpp"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\ConfigPage.dlg"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\ConfigPage.h"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\Settings.cpp"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\Settings.h"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\StickyPage.cpp"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\StickyPage.dlg"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\StickyPage.h"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\Task.cpp"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\Task.h"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\emergeVWM.exe.manifest"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\emergeVWM.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\main.cpp"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emergeVWM\resource.h"> + <Option target="emergeVWM - Release" /> + </Unit> + <Unit filename="emerge\emerge.exe.manifest"> + <Option target="emerge - Release" /> + </Unit> + <Unit filename="emerge\emerge.rc"> + <Option compilerVar="WINDRES" /> + <Option target="emerge - Release" /> + </Unit> + <Unit filename="emerge\main.cpp"> + <Option target="emerge - Release" /> + </Unit> + <Unit filename="reg2xml\AppletSettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\AppletSettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\CommandSettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\CommandSettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\CoreSettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\CoreSettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\DesktopSettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\DesktopSettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\HotkeysSettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\HotkeysSettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\Importer.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\Importer.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\LauncherSettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\LauncherSettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\Makefile"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\TasksSettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\TasksSettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\TraySettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\TraySettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\VWMSettings.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\VWMSettings.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\main.cpp"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\reg2xml.exe.manifest"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\reg2xml.project"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\reg2xml.rc"> + <Option compilerVar="WINDRES" /> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="reg2xml\resource.h"> + <Option target="reg2xml - Release" /> + </Unit> + <Unit filename="svnversion.h" /> + <Unit filename="tinyxml\tinystr.cpp"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="tinyxml\tinystr.h"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="tinyxml\tinyxml.cpp"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="tinyxml\tinyxml.h"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="tinyxml\tinyxmlerror.cpp"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="tinyxml\tinyxmlparser.cpp"> + <Option target="emergeLib - Release" /> + <Option target="emergeLib - Debug" /> + </Unit> + <Unit filename="version.h" /> + <Extensions> + <code_completion /> + <envvars /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-04 00:48:17
|
Revision: 2774 http://emerge.svn.sourceforge.net/emerge/?rev=2774&view=rev Author: ir0nh34d Date: 2010-01-04 00:48:08 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Remove restriction of needing a minimize button to be included in MinimizeAll Modified Paths: -------------- trunk/Source/emergeLib/main.cpp Modified: trunk/Source/emergeLib/main.cpp =================================================================== --- trunk/Source/emergeLib/main.cpp 2010-01-04 00:47:13 UTC (rev 2773) +++ trunk/Source/emergeLib/main.cpp 2010-01-04 00:48:08 UTC (rev 2774) @@ -2743,8 +2743,7 @@ BOOL CALLBACK MinimizeAll(HWND hwnd, LPARAM lParam UNUSED) { - if ((IsWindowVisible(hwnd)) && - (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_MINIMIZEBOX) == WS_MINIMIZEBOX) + if (IsWindowVisible(hwnd)) PostMessage(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-04 00:47:27
|
Revision: 2773 http://emerge.svn.sourceforge.net/emerge/?rev=2773&view=rev Author: ir0nh34d Date: 2010-01-04 00:47:13 +0000 (Mon, 04 Jan 2010) Log Message: ----------- Remove the no-inline restriction for mingw-w32 Modified Paths: -------------- trunk/Source/globals.in Modified: trunk/Source/globals.in =================================================================== --- trunk/Source/globals.in 2010-01-01 23:52:05 UTC (rev 2772) +++ trunk/Source/globals.in 2010-01-04 00:47:13 UTC (rev 2773) @@ -21,7 +21,7 @@ AR = i686-w64-mingw32-ar WINDRES = i686-w64-mingw32-windres LIBS += -L../bin - CFLAGS += -march=pentium4 -mfpmath=sse -fno-inline + CFLAGS += -march=pentium4 -mfpmath=sse else ifeq ($(MINGW64), 1) CC = x86_64-w64-mingw32-g++ AR = x86_64-w64-mingw32-ar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-01 23:52:11
|
Revision: 2772 http://emerge.svn.sourceforge.net/emerge/?rev=2772&view=rev Author: ir0nh34d Date: 2010-01-01 23:52:05 +0000 (Fri, 01 Jan 2010) Log Message: ----------- Switch from 7za to 7z Modified Paths: -------------- trunk/Source/dist.bat trunk/Source/dist64.bat Modified: trunk/Source/dist.bat =================================================================== --- trunk/Source/dist.bat 2010-01-01 20:50:01 UTC (rev 2771) +++ trunk/Source/dist.bat 2010-01-01 23:52:05 UTC (rev 2772) @@ -7,25 +7,25 @@ if /i "%1" == "bin" ( @if exist EmergeDesktop-%2.zip del EmergeDesktop-%2.zip - 7za a EmergeDesktop-%2.7z .\bin\*.exe .\bin\*.dll + 7z a EmergeDesktop-%2.7z .\bin\*.exe .\bin\*.dll cd .. - 7za a Source\EmergeDesktop-%2.7z .\Documentation\*.chm + 7z a Source\EmergeDesktop-%2.7z .\Documentation\*.chm cd Source ) if /i "%1" == "src" ( @if exist EmergeDesktop-%2-src.zip del EmergeDesktop-%2-src.zip - 7za a EmergeDesktop-%2-src.7z * -x...@ex...t + 7z a EmergeDesktop-%2-src.7z * -x...@ex...t ) if /i "%1" == "all" ( @if exist EmergeDesktop-%2.zip del EmergeDesktop-%2.zip @if exist EmergeDesktop-%2-src.zip del EmergeDesktop-%2-src.zip - 7za a EmergeDesktop-%2.7z .\bin\*.exe .\bin\*.dll + 7z a EmergeDesktop-%2.7z .\bin\*.exe .\bin\*.dll cd .. - 7za a Source\EmergeDesktop-%2.7z .\Documentation\*.chm + 7z a Source\EmergeDesktop-%2.7z .\Documentation\*.chm cd Source - 7za a EmergeDesktop-%2-src.7z * -x...@ex...t + 7z a EmergeDesktop-%2-src.7z * -x...@ex...t ) @if /i "%1"=="" ( Modified: trunk/Source/dist64.bat =================================================================== --- trunk/Source/dist64.bat 2010-01-01 20:50:01 UTC (rev 2771) +++ trunk/Source/dist64.bat 2010-01-01 23:52:05 UTC (rev 2772) @@ -7,25 +7,25 @@ if /i "%1" == "bin" ( @if exist EmergeDesktop64-%2.zip del EmergeDesktop64-%2.zip - 7za a EmergeDesktop64-%2.7z .\bin64\*.exe .\bin64\*.dll + 7z a EmergeDesktop64-%2.7z .\bin64\*.exe .\bin64\*.dll cd .. - 7za a Source\EmergeDesktop64-%2.7z .\Documentation\*.chm + 7z a Source\EmergeDesktop64-%2.7z .\Documentation\*.chm cd Source ) if /i "%1" == "src" ( @if exist EmergeDesktop-%2-src.zip del EmergeDesktop-%2-src.zip - 7za a EmergeDesktop-%2-src.7z * -x...@ex...t + 7z a EmergeDesktop-%2-src.7z * -x...@ex...t ) if /i "%1" == "all" ( @if exist EmergeDesktop64-%2.zip del EmergeDesktop64-%2.zip @if exist EmergeDesktop-%2-src.zip del EmergeDesktop-%2-src.zip - 7za a EmergeDesktop64-%2.7z .\bin64\*.exe .\bin64\*.dll + 7z a EmergeDesktop64-%2.7z .\bin64\*.exe .\bin64\*.dll cd .. - 7za a Source\EmergeDesktop64-%2.7z .\Documentation\*.chm + 7z a Source\EmergeDesktop64-%2.7z .\Documentation\*.chm cd Source - 7za a EmergeDesktop-%2-src.7z * -x...@ex...t + 7z a EmergeDesktop-%2-src.7z * -x...@ex...t ) @if /i "%1"=="" ( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2010-01-01 20:50:15
|
Revision: 2771 http://emerge.svn.sourceforge.net/emerge/?rev=2771&view=rev Author: ir0nh34d Date: 2010-01-01 20:50:01 +0000 (Fri, 01 Jan 2010) Log Message: ----------- Update copyright date Modified Paths: -------------- trunk/Source/emerge/emerge.rc trunk/Source/emerge/main.cpp trunk/Source/emergeAppletEngine/emergeAppletEngine.h trunk/Source/emergeAppletEngine/emergeAppletEngine.rc trunk/Source/emergeAppletEngine/main.cpp trunk/Source/emergeBaseClasses/BaseApplet.cpp trunk/Source/emergeBaseClasses/BaseApplet.h trunk/Source/emergeBaseClasses/BasePositionPage.cpp trunk/Source/emergeBaseClasses/BasePositionPage.dlg trunk/Source/emergeBaseClasses/BaseSettings.cpp trunk/Source/emergeBaseClasses/BaseSettings.h trunk/Source/emergeBaseClasses/emergeBaseClasses.rc trunk/Source/emergeCommand/Applet.cpp trunk/Source/emergeCommand/Applet.h trunk/Source/emergeCommand/Command.cpp trunk/Source/emergeCommand/Config.cpp trunk/Source/emergeCommand/ConfigPage.cpp trunk/Source/emergeCommand/ConfigPage.dlg trunk/Source/emergeCommand/Settings.cpp trunk/Source/emergeCommand/TextPage.cpp trunk/Source/emergeCommand/TextPage.dlg trunk/Source/emergeCommand/emergeCommand.rc trunk/Source/emergeCommand/resource.h trunk/Source/emergeCore/Core.cpp trunk/Source/emergeCore/Core.h trunk/Source/emergeCore/DDEService.cpp trunk/Source/emergeCore/DDEService.h trunk/Source/emergeCore/DDEWorker.cpp trunk/Source/emergeCore/DDEWorker.h trunk/Source/emergeCore/Desktop.cpp trunk/Source/emergeCore/Desktop.h trunk/Source/emergeCore/LaunchEditor.cpp trunk/Source/emergeCore/LaunchEditor.h trunk/Source/emergeCore/MessageControl.cpp trunk/Source/emergeCore/MessageControl.h trunk/Source/emergeCore/Shell.cpp trunk/Source/emergeCore/Shell.h trunk/Source/emergeCore/ShellChanger.cpp trunk/Source/emergeCore/ShellChanger.h trunk/Source/emergeCore/ThemeSaver.cpp trunk/Source/emergeCore/ThemeSaver.h trunk/Source/emergeCore/ThemeSelector.cpp trunk/Source/emergeCore/ThemeSelector.h trunk/Source/emergeCore/emergeCore.exe.manifest trunk/Source/emergeCore/emergeCore.rc trunk/Source/emergeCore/main.cpp trunk/Source/emergeCore/resource.h trunk/Source/emergeDesktop/CustomDataObject.cpp trunk/Source/emergeDesktop/CustomDataObject.h trunk/Source/emergeDesktop/CustomDropSource.cpp trunk/Source/emergeDesktop/CustomDropSource.h trunk/Source/emergeDesktop/CustomDropTarget.cpp trunk/Source/emergeDesktop/CustomDropTarget.h trunk/Source/emergeDesktop/ItemEditor.cpp trunk/Source/emergeDesktop/MenuBuilder.cpp trunk/Source/emergeDesktop/MenuBuilder.h trunk/Source/emergeDesktop/MenuEditor.cpp trunk/Source/emergeDesktop/MenuItem.cpp trunk/Source/emergeDesktop/Settings.cpp trunk/Source/emergeDesktop/emergeDesktop.rc trunk/Source/emergeGraphics/emergeGraphics.rc trunk/Source/emergeGraphics/main.cpp trunk/Source/emergeHelloWorld/Applet.cpp trunk/Source/emergeHelloWorld/Applet.h trunk/Source/emergeHelloWorld/Config.cpp trunk/Source/emergeHelloWorld/ConfigPage.cpp trunk/Source/emergeHelloWorld/ConfigPage.dlg trunk/Source/emergeHelloWorld/Settings.cpp trunk/Source/emergeHelloWorld/TextPage.cpp trunk/Source/emergeHelloWorld/TextPage.dlg trunk/Source/emergeHelloWorld/emergeHelloWorld.rc trunk/Source/emergeHelloWorld/resource.h trunk/Source/emergeHotkeys/Actions.cpp trunk/Source/emergeHotkeys/Actions.h trunk/Source/emergeHotkeys/Applet.cpp trunk/Source/emergeHotkeys/Applet.h trunk/Source/emergeHotkeys/HotkeyCombo.cpp trunk/Source/emergeHotkeys/HotkeyCombo.h trunk/Source/emergeHotkeys/Settings.cpp trunk/Source/emergeHotkeys/Settings.h trunk/Source/emergeHotkeys/emergeHotkeys.exe.manifest trunk/Source/emergeHotkeys/emergeHotkeys.rc trunk/Source/emergeHotkeys/main.cpp trunk/Source/emergeHotkeys/resource.h trunk/Source/emergeLauncher/Applet.cpp trunk/Source/emergeLauncher/Applet.h trunk/Source/emergeLauncher/Config.cpp trunk/Source/emergeLauncher/ConfigPage.cpp trunk/Source/emergeLauncher/ConfigPage.dlg trunk/Source/emergeLauncher/Item.cpp trunk/Source/emergeLauncher/LaunchPage.cpp trunk/Source/emergeLauncher/LaunchPage.dlg trunk/Source/emergeLauncher/emergeLauncher.rc trunk/Source/emergeLauncher/resource.h trunk/Source/emergeLib/MsgBox.cpp trunk/Source/emergeLib/MsgBox.h trunk/Source/emergeLib/Shutdown.cpp trunk/Source/emergeLib/Shutdown.h trunk/Source/emergeLib/emergeLib.dll.manifest trunk/Source/emergeLib/emergeLib.h trunk/Source/emergeLib/emergeLib.rc trunk/Source/emergeLib/main.cpp trunk/Source/emergeLib/resource.h trunk/Source/emergeMediaCtrl/Applet.h trunk/Source/emergeMediaCtrl/Button.h trunk/Source/emergeMediaCtrl/Config.h trunk/Source/emergeMediaCtrl/Settings.h trunk/Source/emergeMediaCtrl/emergeMediaCtrl.rc trunk/Source/emergeMediaCtrl/resource.h trunk/Source/emergePower/Applet.cpp trunk/Source/emergePower/Applet.h trunk/Source/emergePower/Config.cpp trunk/Source/emergePower/ConfigPage.cpp trunk/Source/emergePower/ConfigPage.dlg trunk/Source/emergePower/ConfigPage.h trunk/Source/emergePower/PositionPage.cpp trunk/Source/emergePower/PositionPage.dlg trunk/Source/emergePower/PositionPage.h trunk/Source/emergePower/Settings.cpp trunk/Source/emergePower/Settings.h trunk/Source/emergePower/emergePower.rc trunk/Source/emergePower/main.cpp trunk/Source/emergePower/resource.h trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc trunk/Source/emergeSysMon/Applet.cpp trunk/Source/emergeSysMon/Applet.h trunk/Source/emergeSysMon/Config.cpp trunk/Source/emergeSysMon/ConfigPage.cpp trunk/Source/emergeSysMon/ConfigPage.dlg trunk/Source/emergeSysMon/ConfigPage.h trunk/Source/emergeSysMon/DisplayPage.cpp trunk/Source/emergeSysMon/DisplayPage.dlg trunk/Source/emergeSysMon/DisplayPage.h trunk/Source/emergeSysMon/PositionPage.cpp trunk/Source/emergeSysMon/PositionPage.dlg trunk/Source/emergeSysMon/PositionPage.h trunk/Source/emergeSysMon/Settings.cpp trunk/Source/emergeSysMon/Settings.h trunk/Source/emergeSysMon/emergeSysMon.rc trunk/Source/emergeSysMon/main.cpp trunk/Source/emergeSysMon/resource.h trunk/Source/emergeTasks/Applet.cpp trunk/Source/emergeTasks/Applet.h trunk/Source/emergeTasks/Config.cpp trunk/Source/emergeTasks/ConfigPage.cpp trunk/Source/emergeTasks/ConfigPage.dlg trunk/Source/emergeTasks/Task.cpp trunk/Source/emergeTasks/Task.h trunk/Source/emergeTasks/emergeTasks.rc trunk/Source/emergeTasks/resource.h trunk/Source/emergeTray/Applet.cpp trunk/Source/emergeTray/Applet.h trunk/Source/emergeTray/Config.cpp trunk/Source/emergeTray/ConfigPage.dlg trunk/Source/emergeTray/IconHidePage.dlg trunk/Source/emergeTray/emergeTray.rc trunk/Source/emergeVWM/Applet.cpp trunk/Source/emergeVWM/Applet.h trunk/Source/emergeVWM/Config.cpp trunk/Source/emergeVWM/ConfigPage.cpp trunk/Source/emergeVWM/ConfigPage.dlg trunk/Source/emergeVWM/StickyPage.cpp trunk/Source/emergeVWM/StickyPage.dlg trunk/Source/emergeVWM/Task.cpp trunk/Source/emergeVWM/emergeVWM.rc trunk/Source/emergeVWM/resource.h trunk/Source/reg2xml/AppletSettings.cpp trunk/Source/reg2xml/AppletSettings.h trunk/Source/reg2xml/CommandSettings.cpp trunk/Source/reg2xml/CommandSettings.h trunk/Source/reg2xml/CoreSettings.cpp trunk/Source/reg2xml/CoreSettings.h trunk/Source/reg2xml/DesktopSettings.cpp trunk/Source/reg2xml/DesktopSettings.h trunk/Source/reg2xml/HotkeysSettings.cpp trunk/Source/reg2xml/HotkeysSettings.h trunk/Source/reg2xml/Importer.cpp trunk/Source/reg2xml/Importer.h trunk/Source/reg2xml/LauncherSettings.cpp trunk/Source/reg2xml/LauncherSettings.h trunk/Source/reg2xml/TasksSettings.cpp trunk/Source/reg2xml/TasksSettings.h trunk/Source/reg2xml/TraySettings.cpp trunk/Source/reg2xml/TraySettings.h trunk/Source/reg2xml/VWMSettings.cpp trunk/Source/reg2xml/VWMSettings.h trunk/Source/reg2xml/main.cpp trunk/Source/reg2xml/reg2xml.exe.manifest trunk/Source/reg2xml/reg2xml.rc trunk/Source/reg2xml/resource.h Modified: trunk/Source/emerge/emerge.rc =================================================================== --- trunk/Source/emerge/emerge.rc 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emerge/emerge.rc 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ VALUE "FileDescription", "emerge - Emerge Desktop Internal Command utility" VALUE "FileVersion", POINT_VERSION VALUE "InternalName", "emerge" - VALUE "LegalCopyright", "Copyright (C) 2006-2009" + VALUE "LegalCopyright", "Copyright (C) 2006-2010" VALUE "OriginalFilename", "emerge.exe" VALUE "ProductName", "emerge" VALUE "ProductVersion", POINT_VERSION Modified: trunk/Source/emerge/main.cpp =================================================================== --- trunk/Source/emerge/main.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emerge/main.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of the Emerge Desktop source code -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.h =================================================================== --- trunk/Source/emergeAppletEngine/emergeAppletEngine.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeAppletEngine/emergeAppletEngine.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeAppletEngine/emergeAppletEngine.rc =================================================================== --- trunk/Source/emergeAppletEngine/emergeAppletEngine.rc 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeAppletEngine/emergeAppletEngine.rc 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ VALUE "FileDescription", "emergeAppletEngine - Emerge Desktop application library" VALUE "FileVersion", POINT_VERSION VALUE "InternalName", "emergeAppletEngine" - VALUE "LegalCopyright", "Copyright (C) 2006-2009" + VALUE "LegalCopyright", "Copyright (C) 2006-2010" VALUE "OriginalFilename", "emergeAppletEngine.dll" VALUE "ProductName", "emergeAppletEngine" VALUE "ProductVersion", POINT_VERSION Modified: trunk/Source/emergeAppletEngine/main.cpp =================================================================== --- trunk/Source/emergeAppletEngine/main.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeAppletEngine/main.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeBaseClasses/BaseApplet.cpp =================================================================== --- trunk/Source/emergeBaseClasses/BaseApplet.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeBaseClasses/BaseApplet.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -2,7 +2,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeBaseClasses/BaseApplet.h =================================================================== --- trunk/Source/emergeBaseClasses/BaseApplet.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeBaseClasses/BaseApplet.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeBaseClasses/BasePositionPage.cpp =================================================================== --- trunk/Source/emergeBaseClasses/BasePositionPage.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeBaseClasses/BasePositionPage.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeBaseClasses/BasePositionPage.dlg =================================================================== --- trunk/Source/emergeBaseClasses/BasePositionPage.dlg 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeBaseClasses/BasePositionPage.dlg 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeBaseClasses/BaseSettings.cpp =================================================================== --- trunk/Source/emergeBaseClasses/BaseSettings.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeBaseClasses/BaseSettings.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -2,7 +2,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeBaseClasses/BaseSettings.h =================================================================== --- trunk/Source/emergeBaseClasses/BaseSettings.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeBaseClasses/BaseSettings.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeBaseClasses/emergeBaseClasses.rc =================================================================== --- trunk/Source/emergeBaseClasses/emergeBaseClasses.rc 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeBaseClasses/emergeBaseClasses.rc 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ VALUE "FileDescription", "emergeBaseClasses - Emerge Desktop utility library" VALUE "FileVersion", POINT_VERSION VALUE "InternalName", "emergeBaseClasses" - VALUE "LegalCopyright", "Copyright (C) 2004-2009" + VALUE "LegalCopyright", "Copyright (C) 2004-2010" VALUE "OriginalFilename", "emergeBaseClasses.dll" VALUE "ProductName", "emergeBaseClasses" VALUE "ProductVersion", POINT_VERSION Modified: trunk/Source/emergeCommand/Applet.cpp =================================================================== --- trunk/Source/emergeCommand/Applet.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/Applet.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/Applet.h =================================================================== --- trunk/Source/emergeCommand/Applet.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/Applet.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/Command.cpp =================================================================== --- trunk/Source/emergeCommand/Command.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/Command.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/Config.cpp =================================================================== --- trunk/Source/emergeCommand/Config.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/Config.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/ConfigPage.cpp =================================================================== --- trunk/Source/emergeCommand/ConfigPage.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/ConfigPage.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/ConfigPage.dlg =================================================================== --- trunk/Source/emergeCommand/ConfigPage.dlg 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/ConfigPage.dlg 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/Settings.cpp =================================================================== --- trunk/Source/emergeCommand/Settings.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/Settings.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/TextPage.cpp =================================================================== --- trunk/Source/emergeCommand/TextPage.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/TextPage.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/TextPage.dlg =================================================================== --- trunk/Source/emergeCommand/TextPage.dlg 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/TextPage.dlg 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCommand/emergeCommand.rc =================================================================== --- trunk/Source/emergeCommand/emergeCommand.rc 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/emergeCommand.rc 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -45,7 +45,7 @@ VALUE "FileDescription", "emergeCommand - applet for the Emerge Desktop" VALUE "FileVersion", POINT_VERSION VALUE "InternalName", "emergeCommand" - VALUE "LegalCopyright", "Copyright (C) 2004-2009" + VALUE "LegalCopyright", "Copyright (C) 2004-2010" VALUE "OriginalFilename", "emergeCommand.exe" VALUE "ProductName", "emergeCommand" VALUE "ProductVersion", POINT_VERSION Modified: trunk/Source/emergeCommand/resource.h =================================================================== --- trunk/Source/emergeCommand/resource.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCommand/resource.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/Core.cpp =================================================================== --- trunk/Source/emergeCore/Core.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/Core.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -2,7 +2,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/Core.h =================================================================== --- trunk/Source/emergeCore/Core.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/Core.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -2,7 +2,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/DDEService.cpp =================================================================== --- trunk/Source/emergeCore/DDEService.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/DDEService.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/DDEService.h =================================================================== --- trunk/Source/emergeCore/DDEService.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/DDEService.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/DDEWorker.cpp =================================================================== --- trunk/Source/emergeCore/DDEWorker.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/DDEWorker.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/DDEWorker.h =================================================================== --- trunk/Source/emergeCore/DDEWorker.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/DDEWorker.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/Desktop.cpp =================================================================== --- trunk/Source/emergeCore/Desktop.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/Desktop.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/Desktop.h =================================================================== --- trunk/Source/emergeCore/Desktop.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/Desktop.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/LaunchEditor.cpp =================================================================== --- trunk/Source/emergeCore/LaunchEditor.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/LaunchEditor.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -2,7 +2,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/LaunchEditor.h =================================================================== --- trunk/Source/emergeCore/LaunchEditor.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/LaunchEditor.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/MessageControl.cpp =================================================================== --- trunk/Source/emergeCore/MessageControl.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/MessageControl.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/MessageControl.h =================================================================== --- trunk/Source/emergeCore/MessageControl.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/MessageControl.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/Shell.cpp =================================================================== --- trunk/Source/emergeCore/Shell.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/Shell.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/Shell.h =================================================================== --- trunk/Source/emergeCore/Shell.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/Shell.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/ShellChanger.cpp =================================================================== --- trunk/Source/emergeCore/ShellChanger.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/ShellChanger.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/ShellChanger.h =================================================================== --- trunk/Source/emergeCore/ShellChanger.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/ShellChanger.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/ThemeSaver.cpp =================================================================== --- trunk/Source/emergeCore/ThemeSaver.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/ThemeSaver.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -2,7 +2,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/ThemeSaver.h =================================================================== --- trunk/Source/emergeCore/ThemeSaver.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/ThemeSaver.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -2,7 +2,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/ThemeSelector.cpp =================================================================== --- trunk/Source/emergeCore/ThemeSelector.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/ThemeSelector.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -2,7 +2,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/ThemeSelector.h =================================================================== --- trunk/Source/emergeCore/ThemeSelector.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/ThemeSelector.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/emergeCore.exe.manifest =================================================================== --- trunk/Source/emergeCore/emergeCore.exe.manifest 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/emergeCore.exe.manifest 2010-01-01 20:50:01 UTC (rev 2771) @@ -3,7 +3,7 @@ <!-- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/emergeCore.rc =================================================================== --- trunk/Source/emergeCore/emergeCore.rc 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/emergeCore.rc 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ VALUE "FileDescription", "emergeCore - the core of the Emerge Desktop" VALUE "FileVersion", POINT_VERSION VALUE "InternalName", "emergeCore" - VALUE "LegalCopyright", "Copyright (C) 2004-2009" + VALUE "LegalCopyright", "Copyright (C) 2004-2010" VALUE "OriginalFilename", "emergeCore.exe" VALUE "ProductName", "emergeCore" VALUE "ProductVersion", POINT_VERSION Modified: trunk/Source/emergeCore/main.cpp =================================================================== --- trunk/Source/emergeCore/main.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/main.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeCore/resource.h =================================================================== --- trunk/Source/emergeCore/resource.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeCore/resource.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeDesktop/CustomDataObject.cpp =================================================================== --- trunk/Source/emergeDesktop/CustomDataObject.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeDesktop/CustomDataObject.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeDesktop/CustomDataObject.h =================================================================== --- trunk/Source/emergeDesktop/CustomDataObject.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeDesktop/CustomDataObject.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeDesktop/CustomDropSource.cpp =================================================================== --- trunk/Source/emergeDesktop/CustomDropSource.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeDesktop/CustomDropSource.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeDesktop/CustomDropSource.h =================================================================== --- trunk/Source/emergeDesktop/CustomDropSource.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeDesktop/CustomDropSource.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeDesktop/CustomDropTarget.cpp =================================================================== --- trunk/Source/emergeDesktop/CustomDropTarget.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeDesktop/CustomDropTarget.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeDesktop/CustomDropTarget.h =================================================================== --- trunk/Source/emergeDesktop/CustomDropTarget.h 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeDesktop/CustomDropTarget.h 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,7 +1,7 @@ //---- -------------------------------------------------------------------------------------------------------- // // This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team +// Copyright (C) 2004-2010 The Emerge Desktop Development Team // // Emerge Desktop is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by Modified: trunk/Source/emergeDesktop/ItemEditor.cpp =================================================================== --- trunk/Source/emergeDesktop/ItemEditor.cpp 2010-01-01 13:06:55 UTC (rev 2770) +++ trunk/Source/emergeDesktop/ItemEditor.cpp 2010-01-01 20:50:01 UTC (rev 2771) @@ -1,656 +1,656 @@ -//---- -------------------------------------------------------------------------------------------------------- -// -// This file is part of Emerge Desktop. -// Copyright (C) 2004-2009 The Emerge Desktop Development Team -// -// Emerge Desktop is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 3 of the License, or -// (at your option) any later version. -// -// Emerge Desktop is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. -// -//---- -------------------------------------------------------------------------------------------------------- - -#include "ItemEditor.h" - -BOOL CALLBACK ItemEditor::MenuDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - static ItemEditor *pItemEditor = NULL; - - switch (message) - { - case WM_INITDIALOG: - pItemEditor = reinterpret_cast<ItemEditor*>(lParam); - if (!pItemEditor) - break; - return pItemEditor->DoInitDialog(hwndDlg); - - case WM_COMMAND: - return pItemEditor->DoMenuCommand(hwndDlg, wParam, lParam); - } - - return FALSE; -} - -ItemEditor::ItemEditor(HINSTANCE hInstance, HWND mainWnd) -{ - (*this).hInstance = hInstance; - (*this).mainWnd = mainWnd; - section = NULL; - - InitCommonControls(); - - toolWnd = CreateWindowEx( - 0, - TOOLTIPS_CLASS, - NULL, - TTS_ALWAYSTIP|WS_POPUP|TTS_NOPREFIX, - CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, CW_USEDEFAULT, - NULL, - NULL, - hInstance, - NULL); - - if (toolWnd) - { - SendMessage(toolWnd, TTM_SETMAXTIPWIDTH, 0, 300); - SetWindowPos(toolWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | - SWP_NOACTIVATE); - } - - browseIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_BROWSE), IMAGE_ICON, 16, 16, 0); - - dialogVisible = false; -} - -ItemEditor::~ItemEditor() -{ - if (browseIcon) - DestroyIcon(browseIcon); - - DestroyWindow(toolWnd); -} - -int ItemEditor::Show(TiXmlElement *section, WCHAR *name, WCHAR *value, UINT type, WCHAR *workingDir) -{ - (*this).section = section; - wcscpy((*this).name, name); - wcscpy((*this).value, value); - (*this).type = type; - wcscpy((*this).workingDir, workingDir); - dialogVisible = true; - return (int)DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_ITEMEDIT), mainWnd, (DLGPROC)MenuDlgProc, (LPARAM)this); -} - -BOOL ItemEditor::DoInitDialog(HWND hwndDlg) -{ - RECT rect; - int x, y; - TOOLINFO ti; - - ZeroMemory(&ti, sizeof(TOOLINFO)); - GetWindowRect(hwndDlg, &rect); - - HWND nameWnd = GetDlgItem(hwndDlg, IDC_ITEMNAME); - HWND nameTextWnd = GetDlgItem(hwndDlg, IDC_NAMETEXT); - HWND typeWnd = GetDlgItem(hwndDlg, IDC_ITEMTYPE); - HWND typeTextWnd = GetDlgItem(hwndDlg, IDC_TYPETEXT); - HWND valueWnd = GetDlgItem(hwndDlg, IDC_ITEMVALUE); - HWND valueTextWnd = GetDlgItem(hwndDlg, IDC_VALUETEXT); - HWND commandWnd = GetDlgItem(hwndDlg, IDC_ITEMCOMMAND); - HWND saveWnd = GetDlgItem(hwndDlg, IDC_SAVEITEM); - HWND abortWnd = GetDlgItem(hwndDlg, IDC_ABORTITEM); - HWND browseWnd = GetDlgItem(hwndDlg, IDC_ITEMBROWSE); - HWND dirWnd = GetDlgItem(hwndDlg, IDC_WORKINGDIR); - HWND workingDirTextWnd = GetDlgItem(hwndDlg, IDC_WORKINGDIRTEXT); - HWND dirBrowseWnd = GetDlgItem(hwndDlg, IDC_DIRBROWSE); - HWND specialFoldersWnd = GetDlgItem(hwndDlg, IDC_ITEMSPECIALFOLDERS); - - x = (GetSystemMetrics(SM_CXSCREEN) / 2) - ((rect.right - rect.left) / 2); - y = (GetSystemMetrics(SM_CYSCREEN) / 2) - ((rect.bottom - rect.top) / 2); - SetWindowPos(hwndDlg, HWND_TOPMOST, x, y, 0, 0, SWP_NOSIZE); - ELStealFocus(hwndDlg); - - PopulateCommands(commandWnd); - ShowWindow(commandWnd, false); - - PopulateSpecialFolders(specialFoldersWnd); - ShowWindow(specialFoldersWnd, false); - - if (browseIcon) - { - SendMessage(browseWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)browseIcon); - SendMessage(dirBrowseWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)browseIcon); - } - - ti.cbSize = TTTOOLINFOW_V2_SIZE; - ti.uFlags = TTF_SUBCLASS; - ti.hwnd = saveWnd; - ti.uId = (ULONG_PTR)saveWnd; - ti.lpszText = (WCHAR*)TEXT("Save Changes"); - GetClientRect(saveWnd, &ti.rect); - SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti); - - ti.hwnd = abortWnd; - ti.uId = (ULONG_PTR)abortWnd; - ti.lpszText = (WCHAR*)TEXT("Discard Changes"); - GetClientRect(abortWnd, &ti.rect); - SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti); - - ti.hwnd = browseWnd; - ti.uId = (ULONG_PTR)browseWnd; - ti.lpszText = (WCHAR*)TEXT(""); - GetClientRect(browseWnd, &ti.rect); - SendMessage(toolWnd, TTM_ADDTOOL, 0, (LPARAM)(LPTOOLINFO)&ti); - - SetDlgItemText(hwndDlg, IDC_ITEMNAME, name); - SetDlgItemText(hwndDlg, IDC_WORKINGDIR, workingDir); - - EnableWindow(nameWnd, true); - EnableWindow(nameTextWnd, true); - EnableWindow(typeWnd, true); - EnableWindow(typeTextWnd, true); - EnableWindow(valueWnd, false); - EnableWindow(valueTextWnd, false); - EnableWindow(saveWnd, false); - EnableWindow(abortWnd, false); - EnableWindow(commandWnd, false); - EnableWindow(browseWnd, false); - EnableWindow(dirWnd, false); - EnableWindow(workingDirTextWnd, false); - EnableWindow(dirBrowseWnd, false); - EnableWindow(specialFoldersWnd, false); - - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Separator")); - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Executable")); - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Internal Command")); - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DateTime")); - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Special Folder")); - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Submenu")); - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Folder Menu")); - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Tasks Menu")); - SendMessage(typeWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Settings Menu")); - - SendMessage(typeWnd, CB_SETCURSEL, - (WPARAM)GetTypeValue(type), 0); - switch (type) - { - case 2: - SendMessage(commandWnd, CB_SETCURSEL, - SendMessage(commandWnd, - CB_FINDSTRINGEXACT, - (WPARAM)-1, - (LPARAM)value), - 0); - break; - case 4: - { - int folder = ELIsSpecialFolder(value); - if (ELGetSpecialFolder(folder, value)) - SendMessage(specialFoldersWnd, CB_SETCURSEL, - SendMessage(specialFoldersWnd, - CB_FINDSTRINGEXACT, - (WPARAM)-1, - (LPARAM)value), - 0); - } - break; - default: - SetDlgItemText(hwndDlg, IDC_ITEMVALUE, value); - break; - } - EnableFields(hwndDlg); - - return TRUE; -} - -void ItemEditor::PopulateCommands(HWND commandWnd) -{ - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("RightDeskMenu")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("MidDeskMenu")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Quit")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Run")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Shutdown")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Lock")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Hide")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Show")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_1")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_2")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_3")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_4")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_5")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_6")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_7")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_8")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWM_9")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWMUp")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWMDown")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWMLeft")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWMRight")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VWMGather")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("EmptyBin")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Logoff")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Reboot")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Halt")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Suspend")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Hibernate")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("Disconnect")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("ShowDesktop")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VolumeUp")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VolumeDown")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("VolumeMute")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopSettings")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("DesktopItemEditor")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreLaunchEditor")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreShellChanger")); - SendMessage(commandWnd, CB_ADDSTRING, 0, (LPARAM)TEXT("CoreAbout")); -} - -void ItemEditor::PopulateSpecialFolders(HWND specialFoldersWnd) -{ - WCHAR tmp[MAX_PATH]; - - if (ELGetSpecialFolder(CSIDL_DRIVES, tmp)) - SendMessage(specialFoldersWnd, CB_ADDST... [truncated message content] |
From: <ir0...@us...> - 2010-01-01 13:07:04
|
Revision: 2770 http://emerge.svn.sourceforge.net/emerge/?rev=2770&view=rev Author: ir0nh34d Date: 2010-01-01 13:06:55 +0000 (Fri, 01 Jan 2010) Log Message: ----------- Switch to libc++ shared library Modified Paths: -------------- trunk/Source/EmergeDesktop_W64.cbp Modified: trunk/Source/EmergeDesktop_W64.cbp =================================================================== --- trunk/Source/EmergeDesktop_W64.cbp 2009-12-31 21:58:47 UTC (rev 2769) +++ trunk/Source/EmergeDesktop_W64.cbp 2010-01-01 13:06:55 UTC (rev 2770) @@ -93,6 +93,7 @@ <Linker> <Add option="-s" /> <Add option="-Wl,--enable-auto-image-base" /> + <Add option="-Wl,--export-all-symbols" /> <Add library="emergeGraphics" /> <Add library="emergeLib" /> <Add library="gdi32" /> @@ -116,6 +117,7 @@ <Linker> <Add option="-s" /> <Add option="-Wl,--enable-auto-image-base" /> + <Add option="-Wl,--export-all-symbols" /> <Add library="emergeGraphics" /> <Add library="emergeLib" /> <Add library="emergeSchemeEngine" /> @@ -455,7 +457,13 @@ <Add option="-Wall" /> <Add option="-W" /> <Add option="-Wno-unused-value" /> + <Add option="-D_GLIBCXX_DLL" /> </Compiler> + <Linker> + <Add option="-shared-libgcc" /> + <Add option="-Wl,--enable-auto-import" /> + <Add library="stdc++.dll" /> + </Linker> <ExtraCommands> <Add before='[[ local svnfile = _T("svnversion.h"); local svncmd = _T("cmd /c svn info --revision HEAD | grep Revision | sed -f svnversion.sed > svnversion.h"); if ( !IO.FileExists(svnfile) ) { IO.Execute(svncmd); } ]]' /> </ExtraCommands> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-31 21:58:59
|
Revision: 2769 http://emerge.svn.sourceforge.net/emerge/?rev=2769&view=rev Author: ir0nh34d Date: 2009-12-31 21:58:47 +0000 (Thu, 31 Dec 2009) Log Message: ----------- Add support for mingw-w64 libstdc++ as well as mingw-w32 Modified Paths: -------------- trunk/Source/applet_globals.in trunk/Source/emergeBaseClasses/Makefile trunk/Source/emergeSchemeEngine/Makefile trunk/Source/globals.in trunk/Source/lib_globals.in Modified: trunk/Source/applet_globals.in =================================================================== --- trunk/Source/applet_globals.in 2009-12-31 13:18:04 UTC (rev 2768) +++ trunk/Source/applet_globals.in 2009-12-31 21:58:47 UTC (rev 2769) @@ -1,5 +1,7 @@ -ifndef MINGW64 - LIBS += -lstdc++_s +ifdef MINGW64 + LIBS += -lstdc++.dll +else + LIBS += -lstdc_s endif .IGNORE: distclean Modified: trunk/Source/emergeBaseClasses/Makefile =================================================================== --- trunk/Source/emergeBaseClasses/Makefile 2009-12-31 13:18:04 UTC (rev 2768) +++ trunk/Source/emergeBaseClasses/Makefile 2009-12-31 21:58:47 UTC (rev 2769) @@ -8,3 +8,6 @@ include ../globals.in include ../lib_globals.in include ../svn.in + +# Export all symbols as a temporary workaround for a bug in GCC 4.5.0 +LDFLAGS += -Wl,--export-all-symbols Modified: trunk/Source/emergeSchemeEngine/Makefile =================================================================== --- trunk/Source/emergeSchemeEngine/Makefile 2009-12-31 13:18:04 UTC (rev 2768) +++ trunk/Source/emergeSchemeEngine/Makefile 2009-12-31 21:58:47 UTC (rev 2769) @@ -8,3 +8,6 @@ include ../globals.in include ../lib_globals.in include ../svn.in + +# Export all symbols as a temporary workaround for a bug in GCC 4.5.0 +LDFLAGS += -Wl,--export-all-symbols Modified: trunk/Source/globals.in =================================================================== --- trunk/Source/globals.in 2009-12-31 13:18:04 UTC (rev 2768) +++ trunk/Source/globals.in 2009-12-31 21:58:47 UTC (rev 2769) @@ -1,6 +1,5 @@ -CC = mingw32-g++ +CC = g++ AR = ar -DLLTOOL = dlltool WINDRES = windres WINDRESOPS = -E -xc-header -DRC_INVOKED WINDRESFLAGS = -O COFF @@ -14,10 +13,16 @@ TINYOBJS = $(patsubst ../tinyxml/%.cpp,../$(OBJ_DIR)/$(BUILD)/tinyxml/%.o,$(wildcard ../tinyxml/*.cpp)) BUILD = Release SVN_FILE = ../svnversion.h -LDFLAGS = -Wl,--subsystem,windows -shared-libgcc -CFLAGS = -W -Wall -Wextra -Werror -pedantic -fno-inline -D_GLIBCXX_DLL +LDFLAGS = -Wl,--subsystem,windows -shared-libgcc -Wl,--enable-auto-import +CFLAGS = -W -Wall -Wextra -Werror -pedantic -D_GLIBCXX_DLL -ifdef MINGW64 +ifeq ($(MINGW64), 2) + CC = i686-w64-mingw32-g++ + AR = i686-w64-mingw32-ar + WINDRES = i686-w64-mingw32-windres + LIBS += -L../bin + CFLAGS += -march=pentium4 -mfpmath=sse -fno-inline +else ifeq ($(MINGW64), 1) CC = x86_64-w64-mingw32-g++ AR = x86_64-w64-mingw32-ar WINDRES = x86_64-w64-mingw32-windres @@ -27,7 +32,7 @@ LIBS += -L../bin64 else LIBS += -L../bin - CFLAGS += -march=pentium4 -mfpmath=sse + CFLAGS += -march=pentium4 -mfpmath=sse -fno-inline endif ifdef DEBUG Modified: trunk/Source/lib_globals.in =================================================================== --- trunk/Source/lib_globals.in 2009-12-31 13:18:04 UTC (rev 2768) +++ trunk/Source/lib_globals.in 2009-12-31 21:58:47 UTC (rev 2769) @@ -1,11 +1,12 @@ LDFLAGS += -shared CFLAGS += $(EXPORTS) IMPLIB = $(BIN_DIR)/lib$(TARGET).a -DEFLIB = $(BIN_DIR)/lib$(TARGET).def -TARGET_ARGS = -Wl,--out-implib,$(IMPLIB) -Wl,--output-def,$(DEFLIB) -Wl,--enable-auto-image-base +TARGET_ARGS = -Wl,--out-implib,$(IMPLIB) -Wl,--enable-auto-image-base -ifndef MINGW64 - LIBS += -lstdc++_s +ifdef MINGW64 + LIBS += -lstdc++.dll +else + LIBS += -lstdc_s endif .IGNORE: distclean This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-31 13:18:11
|
Revision: 2768 http://emerge.svn.sourceforge.net/emerge/?rev=2768&view=rev Author: ir0nh34d Date: 2009-12-31 13:18:04 +0000 (Thu, 31 Dec 2009) Log Message: ----------- Fix MinimizeAll - Thank you to Lot for the suggested fix Modified Paths: -------------- trunk/Source/emergeLib/main.cpp Modified: trunk/Source/emergeLib/main.cpp =================================================================== --- trunk/Source/emergeLib/main.cpp 2009-12-21 23:08:47 UTC (rev 2767) +++ trunk/Source/emergeLib/main.cpp 2009-12-31 13:18:04 UTC (rev 2768) @@ -2743,7 +2743,8 @@ BOOL CALLBACK MinimizeAll(HWND hwnd, LPARAM lParam UNUSED) { - if (ELCheckWindow(hwnd)) + if ((IsWindowVisible(hwnd)) && + (GetWindowLongPtr(hwnd, GWL_STYLE) & WS_MINIMIZEBOX) == WS_MINIMIZEBOX) PostMessage(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-21 23:09:03
|
Revision: 2767 http://emerge.svn.sourceforge.net/emerge/?rev=2767&view=rev Author: ir0nh34d Date: 2009-12-21 23:08:47 +0000 (Mon, 21 Dec 2009) Log Message: ----------- Don't reposition / change z-order if a fullscreen app is started Modified Paths: -------------- trunk/Source/emergeBaseClasses/BaseApplet.cpp Modified: trunk/Source/emergeBaseClasses/BaseApplet.cpp =================================================================== --- trunk/Source/emergeBaseClasses/BaseApplet.cpp 2009-12-21 04:01:07 UTC (rev 2766) +++ trunk/Source/emergeBaseClasses/BaseApplet.cpp 2009-12-21 23:08:47 UTC (rev 2767) @@ -347,10 +347,13 @@ return 0; } -LRESULT BaseApplet::DoDisplayChange(HWND hwnd UNUSED) +LRESULT BaseApplet::DoDisplayChange(HWND hwnd) { - if (pBaseSettings->GetDynamicPositioning()) - UpdateGUI(); + if (!ELIsFullScreen(hwnd, GetForegroundWindow())) + { + if (pBaseSettings->GetDynamicPositioning()) + UpdateGUI(); + } return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-21 04:01:19
|
Revision: 2766 http://emerge.svn.sourceforge.net/emerge/?rev=2766&view=rev Author: ir0nh34d Date: 2009-12-21 04:01:07 +0000 (Mon, 21 Dec 2009) Log Message: ----------- x64 fixes as a result of last commit Modified Paths: -------------- trunk/Source/emergeSysMon/Applet.cpp trunk/Source/emergeSysMon/Applet.h Modified: trunk/Source/emergeSysMon/Applet.cpp =================================================================== --- trunk/Source/emergeSysMon/Applet.cpp 2009-12-20 21:07:17 UTC (rev 2765) +++ trunk/Source/emergeSysMon/Applet.cpp 2009-12-21 04:01:07 UTC (rev 2766) @@ -22,7 +22,6 @@ #include "Applet.h" #include "Settings.h" #include "Config.h" -#include <psapi.h> WCHAR myName[] = TEXT("emergeSysMon"); Modified: trunk/Source/emergeSysMon/Applet.h =================================================================== --- trunk/Source/emergeSysMon/Applet.h 2009-12-20 21:07:17 UTC (rev 2765) +++ trunk/Source/emergeSysMon/Applet.h 2009-12-21 04:01:07 UTC (rev 2766) @@ -33,12 +33,12 @@ #undef _WIN32_IE #define _WIN32_IE 0x0600 -#include <vector> -#include <process.h> #include "../emergeSchemeEngine/emergeSchemeEngine.h" #include "../emergeAppletEngine/emergeAppletEngine.h" #include "../emergeBaseClasses/BaseApplet.h" - +#include <vector> +#include <process.h> +#include <psapi.h> #include <commctrl.h> #define TIP_SIZE 256 @@ -74,12 +74,6 @@ } ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION; #endif -typedef struct _PAGEFILEINFO -{ - SIZE_T TotalSize; - SIZE_T CurrentUsage; -} PAGEFILEINFO; - typedef BOOL (WINAPI *GetPerformanceInfoFunc)( PPERFORMANCE_INFORMATION pPerformanceInformation, DWORD cb @@ -91,6 +85,12 @@ LPVOID lpContext ); +typedef struct _PAGEFILEINFO +{ + SIZE_T TotalSize; + SIZE_T CurrentUsage; +} PAGEFILEINFO; + #define SystemProcessorPerformanceInformation 0x8 #define MAX_NUM_PROCESSORS 32 typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-20 21:07:29
|
Revision: 2765 http://emerge.svn.sourceforge.net/emerge/?rev=2765&view=rev Author: ir0nh34d Date: 2009-12-20 21:07:17 +0000 (Sun, 20 Dec 2009) Log Message: ----------- More fixes based on cppcheck recommendations Modified Paths: -------------- trunk/Source/emergeSysMon/Applet.cpp trunk/Source/emergeSysMon/Applet.h trunk/Source/emergeSysMon/Settings.cpp trunk/Source/emergeTasks/Applet.cpp trunk/Source/tinyxml/tinyxml.cpp Modified: trunk/Source/emergeSysMon/Applet.cpp =================================================================== --- trunk/Source/emergeSysMon/Applet.cpp 2009-12-20 19:41:38 UTC (rev 2764) +++ trunk/Source/emergeSysMon/Applet.cpp 2009-12-20 21:07:17 UTC (rev 2765) @@ -127,6 +127,16 @@ Applet::Applet(HINSTANCE hInstance) :BaseApplet(hInstance, myName, false) { + requiredTextHeight = 0; + requiredTextWidth = 0; + usedMBytes = 0; + pagefile = 0; + physicalUsage = 0; + commitCharge = 0; + numberOfProcessors = 0; + cursorOffsetX = 0; + cursorOffsetY = 0; + mainFont = NULL; } @@ -559,52 +569,6 @@ DeleteDC(hdc); } -#ifndef _W64 -typedef struct _PERFORMANCE_INFORMATION -{ - DWORD cb; - SIZE_T CommitTotal; - SIZE_T CommitLimit; - SIZE_T CommitPeak; - SIZE_T PhysicalTotal; - SIZE_T PhysicalAvailable; - SIZE_T SystemCache; - SIZE_T KernelTotal; - SIZE_T KernelPaged; - SIZE_T KernelNonpaged; - SIZE_T PageSize; - DWORD HandleCount; - DWORD ProcessCount; - DWORD ThreadCount; -} PERFORMANCE_INFORMATION, *PPERFORMANCE_INFORMATION; - -typedef struct _ENUM_PAGE_FILE_INFORMATION -{ - DWORD cb; - DWORD Reserved; - SIZE_T TotalSize; - SIZE_T TotalInUse; - SIZE_T PeakUsage; -} ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION; -#endif - -typedef struct _PAGEFILEINFO -{ - SIZE_T TotalSize; - SIZE_T CurrentUsage; -} PAGEFILEINFO; - -typedef BOOL (WINAPI *GetPerformanceInfoFunc)( - PPERFORMANCE_INFORMATION pPerformanceInformation, - DWORD cb - ); - -typedef BOOL(CALLBACK *PENUM_PAGE_CALLBACK)(LPVOID,PENUM_PAGE_FILE_INFORMATION,LPCTSTR); -typedef BOOL (WINAPI *EnumPageFilesFunc)( - PENUM_PAGE_CALLBACK pCallbackRoutine, - LPVOID lpContext - ); - BOOL CALLBACK PageFileEnum(LPVOID lpContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCTSTR lpFilename UNUSED) { PAGEFILEINFO *pfi = (PAGEFILEINFO*)lpContext; @@ -671,20 +635,6 @@ } } -#define SystemProcessorPerformanceInformation 0x8 -#define MAX_NUM_PROCESSORS 32 -typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION -{ - LARGE_INTEGER IdleTime; - LARGE_INTEGER KernelTime; - LARGE_INTEGER UserTime; - LARGE_INTEGER DpcTime; - LARGE_INTEGER InterruptTime; - ULARGE_INTEGER InterruptCount; -} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION; - -typedef LONG (WINAPI *NtQuerySystemInformationFunc)(UINT, PVOID, ULONG, PULONG); - void Applet::GetCPUUsages(std::vector<BYTE>& usages) { usages.clear(); Modified: trunk/Source/emergeSysMon/Applet.h =================================================================== --- trunk/Source/emergeSysMon/Applet.h 2009-12-20 19:41:38 UTC (rev 2764) +++ trunk/Source/emergeSysMon/Applet.h 2009-12-20 21:07:17 UTC (rev 2765) @@ -45,6 +45,66 @@ #define MODIFY_POLL_TIME 100 +#ifndef _W64 +typedef struct _PERFORMANCE_INFORMATION +{ + DWORD cb; + SIZE_T CommitTotal; + SIZE_T CommitLimit; + SIZE_T CommitPeak; + SIZE_T PhysicalTotal; + SIZE_T PhysicalAvailable; + SIZE_T SystemCache; + SIZE_T KernelTotal; + SIZE_T KernelPaged; + SIZE_T KernelNonpaged; + SIZE_T PageSize; + DWORD HandleCount; + DWORD ProcessCount; + DWORD ThreadCount; +} PERFORMANCE_INFORMATION, *PPERFORMANCE_INFORMATION; + +typedef struct _ENUM_PAGE_FILE_INFORMATION +{ + DWORD cb; + DWORD Reserved; + SIZE_T TotalSize; + SIZE_T TotalInUse; + SIZE_T PeakUsage; +} ENUM_PAGE_FILE_INFORMATION, *PENUM_PAGE_FILE_INFORMATION; +#endif + +typedef struct _PAGEFILEINFO +{ + SIZE_T TotalSize; + SIZE_T CurrentUsage; +} PAGEFILEINFO; + +typedef BOOL (WINAPI *GetPerformanceInfoFunc)( + PPERFORMANCE_INFORMATION pPerformanceInformation, + DWORD cb + ); + +typedef BOOL(CALLBACK *PENUM_PAGE_CALLBACK)(LPVOID,PENUM_PAGE_FILE_INFORMATION,LPCTSTR); +typedef BOOL (WINAPI *EnumPageFilesFunc)( + PENUM_PAGE_CALLBACK pCallbackRoutine, + LPVOID lpContext + ); + +#define SystemProcessorPerformanceInformation 0x8 +#define MAX_NUM_PROCESSORS 32 +typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION +{ + LARGE_INTEGER IdleTime; + LARGE_INTEGER KernelTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER DpcTime; + LARGE_INTEGER InterruptTime; + ULARGE_INTEGER InterruptCount; +} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION; + +typedef LONG (WINAPI *NtQuerySystemInformationFunc)(UINT, PVOID, ULONG, PULONG); + class Settings; class Applet: public BaseApplet Modified: trunk/Source/emergeSysMon/Settings.cpp =================================================================== --- trunk/Source/emergeSysMon/Settings.cpp 2009-12-20 19:41:38 UTC (rev 2764) +++ trunk/Source/emergeSysMon/Settings.cpp 2009-12-20 21:07:17 UTC (rev 2765) @@ -23,6 +23,18 @@ Settings::Settings(): BaseSettings(false) { + ZeroMemory(MemGradientMethod, MAX_LINE_LENGTH); + ZeroMemory(CPUGradientMethod, MAX_LINE_LENGTH); + ZeroMemory(fontString, MAX_LINE_LENGTH); + ZeroMemory(numberPosition, MAX_LINE_LENGTH); + ZeroMemory(barDirection, MAX_LINE_LENGTH); + showNumbers = false; + historyMode = false; + monitorPagefile = false; + monitorPhysicalMem = false; + monitorCommitCharge = false; + monitorCPU = false; + updateInterval = 0; } void Settings::ResetDefaults() Modified: trunk/Source/emergeTasks/Applet.cpp =================================================================== --- trunk/Source/emergeTasks/Applet.cpp 2009-12-20 19:41:38 UTC (rev 2764) +++ trunk/Source/emergeTasks/Applet.cpp 2009-12-20 21:07:17 UTC (rev 2765) @@ -355,23 +355,27 @@ { (*iter)->DeleteTip(mainWnd, toolWnd); refresh = true; - if (pSettings->GetAutoSize()) - { - AdjustRect(&wndRect); - UpdateIcons(); - SetWindowPos(mainWnd, NULL, wndRect.left, wndRect.top, - wndRect.right - wndRect.left, - wndRect.bottom - wndRect.top, - SWP_NOZORDER | SWP_NOACTIVATE); - } EnterCriticalSection(&vectorLock); taskList.erase(iter); + // Restart from the begining of the taskList so that iter is in a + // known state. + iter = taskList.begin(); LeaveCriticalSection(&vectorLock); } else iter++; } + if (refresh && pSettings->GetAutoSize()) + { + AdjustRect(&wndRect); + UpdateIcons(); + SetWindowPos(mainWnd, NULL, wndRect.left, wndRect.top, + wndRect.right - wndRect.left, + wndRect.bottom - wndRect.top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + return refresh; } Modified: trunk/Source/tinyxml/tinyxml.cpp =================================================================== --- trunk/Source/tinyxml/tinyxml.cpp 2009-12-20 19:41:38 UTC (rev 2764) +++ trunk/Source/tinyxml/tinyxml.cpp 2009-12-20 21:07:17 UTC (rev 2765) @@ -924,6 +924,10 @@ TiXmlDocument::TiXmlDocument( const TiXmlDocument& copy ) : TiXmlNode( TiXmlNode::DOCUMENT ) { + useMicrosoftBOM = false; + error = false; + errorId = 0; + tabsize = 4; copy.CopyTo( this ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-20 19:41:48
|
Revision: 2764 http://emerge.svn.sourceforge.net/emerge/?rev=2764&view=rev Author: ir0nh34d Date: 2009-12-20 19:41:38 +0000 (Sun, 20 Dec 2009) Log Message: ----------- Fixes based on recommendations from cppcheck Modified Paths: -------------- trunk/Source/EmergeDesktop.cbp trunk/Source/emergeAppletEngine/main.cpp trunk/Source/emergeBaseClasses/BaseSettings.cpp trunk/Source/emergeCommand/Command.cpp trunk/Source/emergeCore/Core.cpp trunk/Source/emergeCore/LaunchEditor.cpp trunk/Source/emergeCore/ShellChanger.cpp trunk/Source/emergeCore/ThemeSelector.cpp trunk/Source/emergeDesktop/MenuBuilder.cpp trunk/Source/emergeHotkeys/Applet.cpp trunk/Source/emergeLauncher/LaunchPage.cpp trunk/Source/emergeLib/main.cpp trunk/Source/emergeMediaCtrl/Applet.cpp trunk/Source/emergePower/Settings.cpp trunk/Source/emergeSysMon/Applet.cpp trunk/Source/emergeSysMon/ConfigPage.cpp trunk/Source/emergeTasks/Applet.cpp trunk/Source/emergeTray/IconHidePage.cpp trunk/Source/emergeVWM/StickyPage.cpp trunk/Source/reg2xml/CommandSettings.cpp trunk/Source/reg2xml/CoreSettings.cpp trunk/Source/reg2xml/HotkeysSettings.cpp trunk/Source/reg2xml/TraySettings.cpp trunk/Source/reg2xml/VWMSettings.cpp Modified: trunk/Source/EmergeDesktop.cbp =================================================================== --- trunk/Source/EmergeDesktop.cbp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/EmergeDesktop.cbp 2009-12-20 19:41:38 UTC (rev 2764) @@ -1138,27 +1138,15 @@ <Option target="emergeLib - Release" /> <Option target="emergeLib - Debug" /> </Unit> - <Unit filename="emergeMediaCtrl\Applet.cpp"> - <Option target="emergeMediaCtrl - Release" /> - </Unit> <Unit filename="emergeMediaCtrl\Applet.h"> <Option target="emergeMediaCtrl - Release" /> </Unit> - <Unit filename="emergeMediaCtrl\Button.cpp"> - <Option target="emergeMediaCtrl - Release" /> - </Unit> <Unit filename="emergeMediaCtrl\Button.h"> <Option target="emergeMediaCtrl - Release" /> </Unit> - <Unit filename="emergeMediaCtrl\Config.cpp"> - <Option target="emergeMediaCtrl - Release" /> - </Unit> <Unit filename="emergeMediaCtrl\Config.h"> <Option target="emergeMediaCtrl - Release" /> </Unit> - <Unit filename="emergeMediaCtrl\Settings.cpp"> - <Option target="emergeMediaCtrl - Release" /> - </Unit> <Unit filename="emergeMediaCtrl\Settings.h"> <Option target="emergeMediaCtrl - Release" /> </Unit> @@ -1169,9 +1157,6 @@ <Option compilerVar="WINDRES" /> <Option target="emergeMediaCtrl - Release" /> </Unit> - <Unit filename="emergeMediaCtrl\main.cpp"> - <Option target="emergeMediaCtrl - Release" /> - </Unit> <Unit filename="emergeMediaCtrl\resource.h"> <Option target="emergeMediaCtrl - Release" /> </Unit> Modified: trunk/Source/emergeAppletEngine/main.cpp =================================================================== --- trunk/Source/emergeAppletEngine/main.cpp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/emergeAppletEngine/main.cpp 2009-12-20 19:41:38 UTC (rev 2764) @@ -446,7 +446,7 @@ int EAEDisplayFileMenu(WCHAR *file, HWND callingWnd) { - int command = 0, offset = 0; + int command = 0; POINT pt; GetCursorPos(&pt); WCHAR expandedFile[MAX_PATH]; @@ -525,7 +525,7 @@ if (iter == contextMap.end()) return 0; - offset = command - SYSMENUMIN; + int offset = command - SYSMENUMIN; commandInfo.cbSize = sizeof(commandInfo); commandInfo.hwnd = callingWnd; commandInfo.lpVerb = (LPCSTR)MAKEINTRESOURCE(offset); Modified: trunk/Source/emergeBaseClasses/BaseSettings.cpp =================================================================== --- trunk/Source/emergeBaseClasses/BaseSettings.cpp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/emergeBaseClasses/BaseSettings.cpp 2009-12-20 19:41:38 UTC (rev 2764) @@ -705,12 +705,13 @@ bool BaseSettings::IOHelper::ReadBool(const WCHAR* name, bool& data, bool def) { bool ret = false; - DWORD tmpData, tmpDef = 0; + DWORD tmpData; if (target) return ELReadXMLBoolValue(target, name, &data, def); else if (targetKey) { + DWORD tmpDef = 0; data = false; if (def) tmpDef = 1; Modified: trunk/Source/emergeCommand/Command.cpp =================================================================== --- trunk/Source/emergeCommand/Command.cpp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/emergeCommand/Command.cpp 2009-12-20 19:41:38 UTC (rev 2764) @@ -40,6 +40,8 @@ dragBorder = 0; pac2 = NULL; + ZeroMemory(fontName, MAX_RUN_STRING); + mainInst = hInstance; this->mainWnd = mainWnd; this->pSettings = pSettings; Modified: trunk/Source/emergeCore/Core.cpp =================================================================== --- trunk/Source/emergeCore/Core.cpp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/emergeCore/Core.cpp 2009-12-20 19:41:38 UTC (rev 2764) @@ -472,7 +472,6 @@ TiXmlElement *section, *item; WCHAR program[MAX_PATH], arguments[MAX_LINE_LENGTH], command[MAX_LINE_LENGTH]; bool found; - int index = 0; std::wstring theme = ELToLower(ELGetThemeName()), defaultTheme = TEXT("default"); if (theme == defaultTheme) @@ -497,7 +496,6 @@ if (item) ELWriteXMLStringValue(item, TEXT("Command"), command); launchMap.erase(iter); - index++; } if (found) Modified: trunk/Source/emergeCore/LaunchEditor.cpp =================================================================== --- trunk/Source/emergeCore/LaunchEditor.cpp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/emergeCore/LaunchEditor.cpp 2009-12-20 19:41:38 UTC (rev 2764) @@ -465,7 +465,6 @@ { HWND listWnd = GetDlgItem(hwndDlg, IDC_APPLETLIST); WCHAR applet[MAX_PATH]; - int i = 0; std::tr1::shared_ptr<TiXmlDocument> configXML; TiXmlElement *first, *section; std::wstring theme = ELGetThemeName(), oldTheme, newThemePath, oldThemePath; @@ -488,6 +487,7 @@ configXML = ELOpenXMLConfig(xmlFile, true); if (configXML) { + int i = 0; section = ELGetXMLSection(configXML.get(), (WCHAR*)TEXT("Launch"), true); if (section) @@ -520,7 +520,6 @@ { bool found = false; WCHAR data[MAX_LINE_LENGTH]; - DWORD index = 0; std::tr1::shared_ptr<TiXmlDocument> configXML; TiXmlElement *first, *sibling, *section; @@ -535,6 +534,8 @@ if (first) { + DWORD index = 0; + if (ELReadXMLStringValue(first, TEXT("Command"), data, TEXT(""))) { found = true; Modified: trunk/Source/emergeCore/ShellChanger.cpp =================================================================== --- trunk/Source/emergeCore/ShellChanger.cpp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/emergeCore/ShellChanger.cpp 2009-12-20 19:41:38 UTC (rev 2764) @@ -199,7 +199,7 @@ void ShellChanger::PopulateShells(HWND shellWnd) { - DWORD index = 0, size, result; + DWORD size, result; WCHAR name[MAX_LINE_LENGTH], command[MAX_LINE_LENGTH], ELPath[MAX_LINE_LENGTH], currentShell[MAX_LINE_LENGTH], *lower; HKEY key; bool doCheck = false; @@ -245,6 +245,7 @@ if (first) { + DWORD index = 0; ELReadXMLStringValue(first, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); ELReadXMLStringValue(first, (WCHAR*)TEXT("Command"), command, (WCHAR*)TEXT("\0")); @@ -278,6 +279,7 @@ shellMap.insert(EmergeShellItem(std::wstring(name), std::wstring(command))); sibling = ELGetSiblingXMLElement(first); + index++; } } } @@ -490,7 +492,7 @@ bool ShellChanger::WriteShells(HWND hwndDlg) { HWND shellWnd = GetDlgItem(hwndDlg, IDC_SHELLITEM); - int count = (int)SendMessage(shellWnd, CB_GETCOUNT, 0, 0), index = 2; + int count = (int)SendMessage(shellWnd, CB_GETCOUNT, 0, 0); std::tr1::shared_ptr<TiXmlDocument> configXML; TiXmlElement *first, *section; WCHAR name[MAX_LINE_LENGTH]; @@ -503,6 +505,7 @@ if (section) { + int index = 2; first = ELGetFirstXMLElement(section); while (first) { Modified: trunk/Source/emergeCore/ThemeSelector.cpp =================================================================== --- trunk/Source/emergeCore/ThemeSelector.cpp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/emergeCore/ThemeSelector.cpp 2009-12-20 19:41:38 UTC (rev 2764) @@ -151,7 +151,6 @@ { WIN32_FIND_DATA findData; HANDLE fileHandle; - int i = 0; bool found = false; std::wstring themeDir; @@ -166,6 +165,8 @@ return; else { + int i = 0; + do { // Skip hidden files Modified: trunk/Source/emergeDesktop/MenuBuilder.cpp =================================================================== --- trunk/Source/emergeDesktop/MenuBuilder.cpp 2009-12-11 01:00:36 UTC (rev 2763) +++ trunk/Source/emergeDesktop/MenuBuilder.cpp 2009-12-20 19:41:38 UTC (rev 2764) @@ -37,11 +37,12 @@ WNDCLASSEX wincl; ZeroMemory(&wincl, sizeof(WNDCLASSEX)); - if (FAILED(OleInitialize(NULL))) { - ELMessageBox(GetDesktopWindow(), (WCHAR*)TEXT("COM initialization failed"), (WCHAR*)TEXT("emergeDesktop"), - ELMB_OK|ELMB_ICONERROR|ELMB_MODAL); - return registered; - } + if (FAILED(OleInitialize(NULL))) + { + ELMessageBox(GetDesktopWindow(), (WCHAR*)TEXT("COM initialization failed"), (WCHAR*)TEXT("emergeDesktop"), + ELMB_OK|ELMB_ICONERROR|ELMB_MODAL); + return registered; + } // Register the window class wincl.hInstance = mainInst; @@ -62,13 +63,14 @@ 0, 0, 0, 0, NULL, NULL, mainInst, reinterpret_cast<LPVOID>(this)); // If the window failed to get created, unregister the class and quit the program - if (!menuWnd) { - ELMessageBox(GetDesktopWindow(), - (WCHAR*)TEXT("Failed to create desktop window"), - (WCHAR*)TEXT("emergeDesktop"), - ELMB_OK|ELMB_ICONERROR|ELMB_MODAL); - return false; - } + if (!menuWnd) + { + ELMessageBox(GetDesktopWindow(), + (WCHAR*)TEXT("Failed to create desktop window"), + (WCHAR*)TEXT("emergeDesktop"), + ELMB_OK|ELMB_ICONERROR|ELMB_MODAL); + return false; + } ELStealFocus(menuWnd); SetWindowPos(menuWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); @@ -107,22 +109,23 @@ MenuBuilder::~MenuBuilder() { - if (registered) { - // Unregister the specified Emerge Desktop messages - PostMessage(ELGetCoreWindow(), EMERGE_UNREGISTER, (WPARAM)menuWnd, (LPARAM)EMERGE_CORE); + if (registered) + { + // Unregister the specified Emerge Desktop messages + PostMessage(ELGetCoreWindow(), EMERGE_UNREGISTER, (WPARAM)menuWnd, (LPARAM)EMERGE_CORE); - // dropTarget->Release(); - // RevokeDragDrop(menuWnd); + // dropTarget->Release(); + // RevokeDragDrop(menuWnd); - // Clear the menu hook - if (menuHook) - UnhookWindowsHookEx(menuHook); + // Clear the menu hook + if (menuHook) + UnhookWindowsHookEx(menuHook); - // Unregister the window class - UnregisterClass(menuBuilderClass, mainInst); + // Unregister the window class + UnregisterClass(menuBuilderClass, mainInst); - OleUninitialize(); - } + OleUninitialize(); + } } LRESULT CALLBACK MenuBuilder::MenuProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -131,69 +134,72 @@ CREATESTRUCT *cs; static MenuBuilder *pMenuBuilder = NULL; - if (message == WM_CREATE) { - cs = (CREATESTRUCT*)lParam; - pMenuBuilder = reinterpret_cast<MenuBuilder*>(cs->lpCreateParams); - return DefWindowProc(hwnd, message, wParam, lParam); - } + if (message == WM_CREATE) + { + cs = (CREATESTRUCT*)lParam; + pMenuBuilder = reinterpret_cast<MenuBuilder*>(cs->lpCreateParams); + return DefWindowProc(hwnd, message, wParam, lParam); + } if (pMenuBuilder == NULL) return DefWindowProc(hwnd, message, wParam, lParam); - switch (message) { - case WM_COPYDATA: - cpData = (COPYDATASTRUCT *)lParam; - if (cpData->dwData == EMERGE_MESSAGE) - return pMenuBuilder->DoCopyData(cpData); - break; + switch (message) + { + case WM_COPYDATA: + cpData = (COPYDATASTRUCT *)lParam; + if (cpData->dwData == EMERGE_MESSAGE) + return pMenuBuilder->DoCopyData(cpData); + break; - case WM_SYSCOMMAND: - switch (wParam) { - case SC_CLOSE: - case SC_MAXIMIZE: - case SC_MINIMIZE: + case WM_SYSCOMMAND: + switch (wParam) + { + case SC_CLOSE: + case SC_MAXIMIZE: + case SC_MINIMIZE: + break; + default: + return DefWindowProc(hwnd, message, wParam, lParam); + } break; - default: - return DefWindowProc(hwnd, message, wParam, lParam); - } - break; - case WM_INITMENUPOPUP: - return pMenuBuilder->DoInitMenu((HMENU)wParam); + case WM_INITMENUPOPUP: + return pMenuBuilder->DoInitMenu((HMENU)wParam); - case WM_MENUSELECT: - return pMenuBuilder->DoMenuSelect((HMENU)lParam, HIWORD(wParam), LOWORD(wParam)); + case WM_MENUSELECT: + return pMenuBuilder->DoMenuSelect((HMENU)lParam, HIWORD(wParam), LOWORD(wParam)); - case WM_MEASUREITEM: - return pMenuBuilder->DoMeasureItem((LPMEASUREITEMSTRUCT)lParam); + case WM_MEASUREITEM: + return pMenuBuilder->DoMeasureItem((LPMEASUREITEMSTRUCT)lParam); - case WM_DRAWITEM: - return pMenuBuilder->DoDrawItem((LPDRAWITEMSTRUCT)lParam); + case WM_DRAWITEM: + return pMenuBuilder->DoDrawItem((LPDRAWITEMSTRUCT)lParam); - case WM_CONTEXTMENU: - POINT pt; - GetCursorPos(&pt); - return pMenuBuilder->DoContextMenu(pt); - break; + case WM_CONTEXTMENU: + POINT pt; + GetCursorPos(&pt); + return pMenuBuilder->DoContextMenu(pt); + break; - case WM_MENUDRAG: - return pMenuBuilder->DoMenuDrag(hwnd, (HMENU)lParam); + case WM_MENUDRAG: + return pMenuBuilder->DoMenuDrag(hwnd, (HMENU)lParam); - case WM_MENUGETOBJECT: - return pMenuBuilder->DoMenuGetObject(hwnd, (MENUGETOBJECTINFO*)lParam); + case WM_MENUGETOBJECT: + return pMenuBuilder->DoMenuGetObject(hwnd, (MENUGETOBJECTINFO*)lParam); - case WM_DISPLAYCHANGE: - pMenuBuilder->SetWorkArea(); - break; + case WM_DISPLAYCHANGE: + pMenuBuilder->SetWorkArea(); + break; - case WM_DESTROY: - case WM_NCDESTROY: - PostQuitMessage(0); - break; + case WM_DESTROY: + case WM_NCDESTROY: + PostQuitMessage(0); + break; - default: - return pMenuBuilder->DoDefault(hwnd, message, wParam, lParam); - } + default: + return pMenuBuilder->DoDefault(hwnd, message, wParam, lParam); + } return 0; } @@ -202,10 +208,11 @@ { std::wstring theme = reinterpret_cast<WCHAR*>(cds->lpData); - if (cds->dwData == EMERGE_MESSAGE) { - SetEnvironmentVariable(TEXT("ThemeDir"), theme.c_str()); - return 1; - } + if (cds->dwData == EMERGE_MESSAGE) + { + SetEnvironmentVariable(TEXT("ThemeDir"), theme.c_str()); + return 1; + } return 0; } @@ -217,15 +224,15 @@ switch (lParam) { case CORE_SETTINGS: + { + Config config(mainInst, menuWnd, pSettings); + if (config.Show() == IDOK) { - Config config(mainInst, menuWnd, pSettings); - if (config.Show() == IDOK) - { - UpdateMenuHook(); - SetWorkArea(); - } + UpdateMenuHook(); + SetWorkArea(); } - break; + } + break; case CORE_MENU: pMenuEditor->Show(); @@ -264,7 +271,6 @@ MENUITEMINFO menuItemInfo; HMENU menu; IDropTarget *dropTarget; - UINT itemID = 0; menuItemInfo.cbSize = sizeof(menuItemInfo); menuItemInfo.fMask = MIIM_FTYPE | MIIM_SUBMENU | MIIM_ID; @@ -283,17 +289,20 @@ return MNGO_NOINTERFACE; menu = menuItemInfo.hSubMenu; - if (menu) { - subIter = menuMap.find(menu); - if (subIter == menuMap.end()) - return MNGO_NOINTERFACE; + if (menu) + { + subIter = menuMap.find(menu); + if (subIter == menuMap.end()) + return MNGO_NOINTERFACE; - dropTarget = subIter->second->GetDropTarget(); - } else { - itemID = menuItemInfo.wID; - itemID--; - dropTarget = iter->second->GetMenuItem(itemID)->GetDropTarget(); - } + dropTarget = subIter->second->GetDropTarget(); + } + else + { + UINT itemID = menuItemInfo.wID; + itemID--; + dropTarget = iter->second->GetMenuItem(itemID)->GetDropTarget(); + } mgoInfo->riid = &menuInterface; mgoInfo->pvObj = dropTarget; @@ -334,11 +343,12 @@ MenuMap::iterator iter; // Go through the map backwards to make sure that the newest menu is matched first - for (revIter = menuMap.rbegin(); revIter != menuMap.rend(); revIter++) { - *(index) = MenuItemFromPoint(menuWnd, revIter->first, pt); - if (*(index) != -1) - break; - } + for (revIter = menuMap.rbegin(); revIter != menuMap.rend(); revIter++) + { + *(index) = MenuItemFromPoint(menuWnd, revIter->first, pt); + if (*(index) != -1) + break; + } revIter++; @@ -375,65 +385,72 @@ itemID = menuItemInfo.wID; itemID--; - if (menu) { - subIter = menuMap.find(menu); - if (subIter == menuMap.end()) - return 0; + if (menu) + { + subIter = menuMap.find(menu); + if (subIter == menuMap.end()) + return 0; - wcscpy(value, subIter->second->GetValue()); - } else + wcscpy(value, subIter->second->GetValue()); + } + else wcscpy(value, iter->second->GetMenuItem(itemID)->GetValue()); element = iter->second->GetMenuItem(itemID)->GetElement(); - switch (iter->second->GetType()) { - int res; - case 100: - res = DisplayRegContext(pt); - switch (res) { - case DRM_DELETE: - configXML = ELGetXMLConfig(element); - if (ELRemoveXMLElement(element)) { - if (ELWriteXMLConfig(configXML)) - DeleteMenu(iter->first, index, MF_BYPOSITION); - } + switch (iter->second->GetType()) + { + int res; + case 100: + res = DisplayRegContext(pt); + switch (res) + { + case DRM_DELETE: + configXML = ELGetXMLConfig(element); + if (ELRemoveXMLElement(element)) + { + if (ELWriteXMLConfig(configXML)) + DeleteMenu(iter->first, index, MF_BYPOSITION); + } + break; + case DRM_EDIT: + EditMenuItem(iter, index); + break; + case DRM_ADD: + AddMenuItem(iter, index); + break; + } break; - case DRM_EDIT: - EditMenuItem(iter, index); + case 101: + res = EAEDisplayFileMenu(value, menuWnd); + if (res != 0) + SendMessage(menuWnd, WM_CANCELMODE, 0, 0); break; - case DRM_ADD: - AddMenuItem(iter, index); - break; + case 102: + { + HWND task = (HWND)_wtoi(value); + res = EAEDisplayMenu(menuWnd, task); + switch (res) + { + case SC_CLOSE: + DeleteMenu(iter->first, index, MF_BYPOSITION); + break; + case SC_SIZE: + case SC_MOVE: + case SC_MAXIMIZE: + case SC_RESTORE: + ELSwitchToThisWindow(task); + SendMessage(menuWnd, WM_CANCELMODE, 0, 0); + break; + } + if (res) + PostMessage(task, WM_SYSCOMMAND, (WPARAM)res, MAKELPARAM(pt.x, pt.y)); } break; - case 101: - res = EAEDisplayFileMenu(value, menuWnd); - if (res != 0) - SendMessage(menuWnd, WM_CANCELMODE, 0, 0); - break; - case 102: { - HWND task = (HWND)_wtoi(value); - res = EAEDisplayMenu(menuWnd, task); - switch (res) { - case SC_CLOSE: - DeleteMenu(iter->first, index, MF_BYPOSITION); - break; - case SC_SIZE: - case SC_MOVE: - case SC_MAXIMIZE: - case SC_RESTORE: - ELSwitchToThisWindow(task); - SendMessage(menuWnd, WM_CANCELMODE, 0, 0); - break; - } - if (res) - PostMessage(task, WM_SYSCOMMAND, (WPARAM)res, MAKELPARAM(pt.x, pt.y)); - } - break; - /* case 103: - ExecuteSettingsMenuItem(itemID); - break;*/ - } + /* case 103: + ExecuteSettingsMenuItem(itemID); + break;*/ + } return 1; } @@ -478,23 +495,30 @@ menuItem->GetName(), menuItem->GetValue(), menuItem->GetType(), - menuItem->GetWorkingDir()) == IDCANCEL) { - ELRemoveXMLElement(newElement); - ELWriteXMLConfig(configXML); - } else { - if (ELReadXMLIntValue(newElement, (WCHAR*)TEXT("Type"), &type, 0)) { - if (type == 100) { - subMenu = ELGetFirstXMLElementByName(newElement, (WCHAR*)TEXT("Submenu")); - if (subMenu) { - subItem = ELGetFirstXMLElementByName(subMenu, (WCHAR*)TEXT("item")); - if (subItem) { - ELWriteXMLIntValue(subItem, (WCHAR*)TEXT("Type"), 0); - ELWriteXMLConfig(configXML); - } + menuItem->GetWorkingDir()) == IDCANCEL) + { + ELRemoveXMLElement(newElement); + ELWriteXMLConfig(configXML); + } + else + { + if (ELReadXMLIntValue(newElement, (WCHAR*)TEXT("Type"), &type, 0)) + { + if (type == 100) + { + subMenu = ELGetFirstXMLElementByName(newElement, (WCHAR*)TEXT("Submenu")); + if (subMenu) + { + subItem = ELGetFirstXMLElementByName(subMenu, (WCHAR*)TEXT("item")); + if (subItem) + { + ELWriteXMLIntValue(subItem, (WCHAR*)TEXT("Type"), 0); + ELWriteXMLConfig(configXML); + } + } + } } - } } - } return true; } @@ -539,23 +563,25 @@ LRESULT MenuBuilder::DoMenuSelect(HMENU menu, WORD itemType, WORD item) { - if (menu != NULL) { - SelectedMenu = menu; - SelectedItem = item; - SelectedItemType = itemType; - } + if (menu != NULL) + { + SelectedMenu = menu; + SelectedItem = item; + SelectedItemType = itemType; + } return 1; } BOOL MenuBuilder::DoMeasureItem(LPMEASUREITEMSTRUCT lpMeasureItem) { - if (lpMeasureItem->CtlType == ODT_MENU) { - lpMeasureItem->itemWidth = 16; - lpMeasureItem->itemHeight = 16; + if (lpMeasureItem->CtlType == ODT_MENU) + { + lpMeasureItem->itemWidth = 16; + lpMeasureItem->itemHeight = 16; - return TRUE; - } + return TRUE; + } return FALSE; } @@ -565,16 +591,17 @@ HICON icon = NULL; MenuMap::iterator iter; - if (lpDrawItem->CtlType == ODT_MENU) { - iter = menuMap.find((HMENU)lpDrawItem->hwndItem); - if (iter != menuMap.end()) - icon = iter->second->GetMenuItem(lpDrawItem->itemID - 1)->GetIcon(); + if (lpDrawItem->CtlType == ODT_MENU) + { + iter = menuMap.find((HMENU)lpDrawItem->hwndItem); + if (iter != menuMap.end()) + icon = iter->second->GetMenuItem(lpDrawItem->itemID - 1)->GetIcon(); - if (icon != NULL) - DrawIconEx(lpDrawItem->hDC, 5, 1, icon, 16, 16, 0, NULL, DI_NORMAL); + if (icon != NULL) + DrawIconEx(lpDrawItem->hDC, 5, 1, icon, 16, 16, 0, NULL, DI_NORMAL); - return TRUE; - } + return TRUE; + } return FALSE; } @@ -603,21 +630,21 @@ switch (cwps.message) { case WM_CREATE: + { + WCHAR szClass[128]; + GetClassName(cwps.hwnd, szClass, 127); + if (_wcsicmp(szClass, TEXT("#32768"))==0) { - WCHAR szClass[128]; - GetClassName(cwps.hwnd, szClass, 127); - if (_wcsicmp(szClass, TEXT("#32768"))==0) - { - SetWindowLongPtr(cwps.hwnd, - GWL_EXSTYLE, - GetWindowLongPtr(cwps.hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); - SetLayeredWindowAttributes(cwps.hwnd, - 0, - (BYTE)((255 * globalMenuAlpha) / 100), LWA_ALPHA); - } + SetWindowLongPtr(cwps.hwnd, + GWL_EXSTYLE, + GetWindowLongPtr(cwps.hwnd, GWL_EXSTYLE) | WS_EX_LAYERED); + SetLayeredWindowAttributes(cwps.hwnd, + 0, + (BYTE)((255 * globalMenuAlpha) / 100), LWA_ALPHA); } - break; } + break; + } } return CallNextHookEx((HHOOK)WH_CALLWNDPROC, nCode, wParam, lParam); @@ -631,38 +658,43 @@ ClearMenu(iter); // Registry based menu - if (type == 100) { - BuildXMLMenu(iter); - return; - } + if (type == 100) + { + BuildXMLMenu(iter); + return; + } // Path based menu - if (type == 101) { - BuildFileMenu(iter); - return; - } + if (type == 101) + { + BuildFileMenu(iter); + return; + } // Tasks based menu - if (type == 102) { - taskMenu = iter->first; - EnumWindows(BuildTasksMenu, reinterpret_cast<LPARAM>(this)); - return; - } + if (type == 102) + { + taskMenu = iter->first; + EnumWindows(BuildTasksMenu, reinterpret_cast<LPARAM>(this)); + return; + } // Settings menu - if (type == 103) { - BuildSettingsMenu(iter); - return; - } + if (type == 103) + { + BuildSettingsMenu(iter); + return; + } } void MenuBuilder::ClearAllMenus() { - while (!menuMap.empty()) { - ClearMenu(menuMap.begin()); - DestroyMenu(menuMap.begin()->first); - menuMap.erase(menuMap.begin()); - } + while (!menuMap.empty()) + { + ClearMenu(menuMap.begin()); + DestroyMenu(menuMap.begin()->first); + menuMap.erase(menuMap.begin()); + } } void MenuBuilder::ClearMenu(MenuMap::iterator iter) @@ -683,224 +715,247 @@ HMENU subMenu; TiXmlElement *tmp, *subSection, *child = ELGetFirstXMLElement(iter->second->GetSection()); - while (child) { - found = true; - ELReadXMLIntValue(child, (WCHAR*)TEXT("Type"), &type, 0); + while (child) + { + found = true; + ELReadXMLIntValue(child, (WCHAR*)TEXT("Type"), &type, 0); - // Separator - if (type == 0) { - MenuItem *menuItem = new MenuItem(NULL, type, NULL, NULL, child); + // Separator + if (type == 0) + { + MenuItem *menuItem = new MenuItem(NULL, type, NULL, NULL, child); - itemInfo.fMask = MIIM_FTYPE|MIIM_ID; - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = name; - itemInfo.fType = MFT_SEPARATOR; - itemInfo.wID = GetMenuItemCount(iter->first) + 1; + itemInfo.fMask = MIIM_FTYPE|MIIM_ID; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = name; + itemInfo.fType = MFT_SEPARATOR; + itemInfo.wID = GetMenuItemCount(iter->first) + 1; - iter->second->AddMenuItem(menuItem); + iter->second->AddMenuItem(menuItem); - InsertMenuItem(iter->first, i, TRUE, &itemInfo); - } + InsertMenuItem(iter->first, i, TRUE, &itemInfo); + } - // Executable - if (type == 1) { - if (ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0"))) { - ELReadXMLStringValue(child, (WCHAR*)TEXT("WorkingDir"), workingDir, (WCHAR*)TEXT("\0")); - ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); - NoPrefixString(name); - MenuItem *menuItem = new MenuItem(name, type, value, workingDir, child); + // Executable + if (type == 1) + { + if (ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0"))) + { + ELReadXMLStringValue(child, (WCHAR*)TEXT("WorkingDir"), workingDir, (WCHAR*)TEXT("\0")); + ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); + NoPrefixString(name); + MenuItem *menuItem = new MenuItem(name, type, value, workingDir, child); - itemInfo.fMask = MIIM_STRING | MIIM_ID; - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = name; + itemInfo.fMask = MIIM_STRING | MIIM_ID; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = name; - if (pSettings->GetMenuIcons()) { - menuItem->SetIcon(); - itemInfo.fMask |= MIIM_BITMAP; - itemInfo.hbmpItem = HBMMENU_CALLBACK; - } + if (pSettings->GetMenuIcons()) + { + menuItem->SetIcon(); + itemInfo.fMask |= MIIM_BITMAP; + itemInfo.hbmpItem = HBMMENU_CALLBACK; + } - itemInfo.wID = GetMenuItemCount(iter->first) + 1; + itemInfo.wID = GetMenuItemCount(iter->first) + 1; - iter->second->AddMenuItem(menuItem); + iter->second->AddMenuItem(menuItem); - InsertMenuItem(iter->first, i, TRUE, &itemInfo); - } - } + InsertMenuItem(iter->first, i, TRUE, &itemInfo); + } + } - // System Command - if (type == 2) { - if (ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0"))) { - ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); - if (_wcsicmp(name, TEXT("DateTime")) == 0) - type = 3; - else { - NoPrefixString(name); - MenuItem *menuItem = new MenuItem(name, type, value, NULL, child); + // System Command + if (type == 2) + { + if (ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0"))) + { + ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); + if (_wcsicmp(name, TEXT("DateTime")) == 0) + type = 3; + else + { + NoPrefixString(name); + MenuItem *menuItem = new MenuItem(name, type, value, NULL, child); - itemInfo.fMask = MIIM_STRING | MIIM_ID; - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = name; + itemInfo.fMask = MIIM_STRING | MIIM_ID; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = name; - if (pSettings->GetMenuIcons()) { - menuItem->SetIcon(); - itemInfo.fMask |= MIIM_BITMAP; - itemInfo.hbmpItem = HBMMENU_CALLBACK; - } + if (pSettings->GetMenuIcons()) + { + menuItem->SetIcon(); + itemInfo.fMask |= MIIM_BITMAP; + itemInfo.hbmpItem = HBMMENU_CALLBACK; + } - itemInfo.wID = GetMenuItemCount(iter->first) + 1; + itemInfo.wID = GetMenuItemCount(iter->first) + 1; - iter->second->AddMenuItem(menuItem); + iter->second->AddMenuItem(menuItem); - InsertMenuItem(iter->first, i, TRUE, &itemInfo); + InsertMenuItem(iter->first, i, TRUE, &itemInfo); + } + } } - } - } - if (type == 3) { - if (ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0"))) { - MenuItem *menuItem = new MenuItem(NULL, type, value, NULL, child); - WCHAR datetimeString[MAX_LINE_LENGTH]; - time_t tVal; - struct tm *stVal; + if (type == 3) + { + if (ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0"))) + { + MenuItem *menuItem = new MenuItem(NULL, type, value, NULL, child); + WCHAR datetimeString[MAX_LINE_LENGTH]; + time_t tVal; + struct tm *stVal; - // Grab the current time - time(&tVal); - stVal = localtime(&tVal); + // Grab the current time + time(&tVal); + stVal = localtime(&tVal); - wcscpy(datetimeString, (WCHAR*)ELwcsftime(value, stVal).c_str()); + wcscpy(datetimeString, (WCHAR*)ELwcsftime(value, stVal).c_str()); - itemInfo.fMask = MIIM_STRING|MIIM_ID; - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = datetimeString; - itemInfo.wID = GetMenuItemCount(iter->first) + 1; + itemInfo.fMask = MIIM_STRING|MIIM_ID; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = datetimeString; + itemInfo.wID = GetMenuItemCount(iter->first) + 1; - iter->second->AddMenuItem(menuItem); + iter->second->AddMenuItem(menuItem); - InsertMenuItem(iter->first, i, TRUE, &itemInfo); - } - } + InsertMenuItem(iter->first, i, TRUE, &itemInfo); + } + } - // Special Folder - if (type == 4) { - if (ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0"))) { - ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); - NoPrefixString(name); - MenuItem *menuItem = new MenuItem(name, type, value, NULL, child); + // Special Folder + if (type == 4) + { + if (ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0"))) + { + ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); + NoPrefixString(name); + MenuItem *menuItem = new MenuItem(name, type, value, NULL, child); - itemInfo.fMask = MIIM_STRING | MIIM_ID; - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = name; + itemInfo.fMask = MIIM_STRING | MIIM_ID; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = name; - if (pSettings->GetMenuIcons()) { - menuItem->SetIcon(); - itemInfo.fMask |= MIIM_BITMAP; - itemInfo.hbmpItem = HBMMENU_CALLBACK; - } + if (pSettings->GetMenuIcons()) + { + menuItem->SetIcon(); + itemInfo.fMask |= MIIM_BITMAP; + itemInfo.hbmpItem = HBMMENU_CALLBACK; + } - itemInfo.wID = GetMenuItemCount(iter->first) + 1; + itemInfo.wID = GetMenuItemCount(iter->first) + 1; - iter->second->AddMenuItem(menuItem); + iter->second->AddMenuItem(menuItem); - InsertMenuItem(iter->first, i, TRUE, &itemInfo); - } - } + InsertMenuItem(iter->first, i, TRUE, &itemInfo); + } + } - // Registry based submenu - if (type == 100) { - ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); - subSection = ELGetFirstXMLElementByName(child, (WCHAR*)TEXT("Submenu")); - subMenu = CreatePopupMenu(); - NoPrefixString(name); - MenuItem *menuItem = new MenuItem(name, type, NULL, NULL, child); + // Registry based submenu + if (type == 100) + { + ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); + subSection = ELGetFirstXMLElementByName(child, (WCHAR*)TEXT("Submenu")); + subMenu = CreatePopupMenu(); + NoPrefixString(name); + MenuItem *menuItem = new MenuItem(name, type, NULL, NULL, child); - itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU; - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = name; - itemInfo.hSubMenu = subMenu; + itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = name; + itemInfo.hSubMenu = subMenu; - if (pSettings->GetMenuIcons()) { - menuItem->SetIcon(); - itemInfo.fMask |= MIIM_BITMAP; - itemInfo.hbmpItem = HBMMENU_CALLBACK; - } + if (pSettings->GetMenuIcons()) + { + menuItem->SetIcon(); + itemInfo.fMask |= MIIM_BITMAP; + itemInfo.hbmpItem = HBMMENU_CALLBACK; + } - itemInfo.wID = GetMenuItemCount(iter->first) + 1; + itemInfo.wID = GetMenuItemCount(iter->first) + 1; - iter->second->AddMenuItem(menuItem); - InsertMenuItem(iter->first, i, TRUE, &itemInfo); + iter->second->AddMenuItem(menuItem); + InsertMenuItem(iter->first, i, TRUE, &itemInfo); - iter2 = menuMap.find(iter->first); - if (iter2 != menuMap.end()) { - std::tr1::shared_ptr<MenuListItem> mli(new MenuListItem(name, type, NULL, subSection)); - menuMap.insert(std::pair< HMENU, std::tr1::shared_ptr<MenuListItem> >(subMenu, mli)); - } - } + iter2 = menuMap.find(iter->first); + if (iter2 != menuMap.end()) + { + std::tr1::shared_ptr<MenuListItem> mli(new MenuListItem(name, type, NULL, subSection)); + menuMap.insert(std::pair< HMENU, std::tr1::shared_ptr<MenuListItem> >(subMenu, mli)); + } + } - // Path based submenu - if (type == 101) { - ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); - ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0")); - subMenu = CreatePopupMenu(); - NoPrefixString(name); - MenuItem *menuItem = new MenuItem(name, type, value, NULL, child); + // Path based submenu + if (type == 101) + { + ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); + ELReadXMLStringValue(child, (WCHAR*)TEXT("Value"), value, (WCHAR*)TEXT("\0")); + subMenu = CreatePopupMenu(); + NoPrefixString(name); + MenuItem *menuItem = new MenuItem(name, type, value, NULL, child); - itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU; - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = name; - itemInfo.hSubMenu = subMenu; + itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = name; + itemInfo.hSubMenu = subMenu; - if (pSettings->GetMenuIcons()) { - menuItem->SetIcon(); - itemInfo.fMask |= MIIM_BITMAP; - itemInfo.hbmpItem = HBMMENU_CALLBACK; - } + if (pSettings->GetMenuIcons()) + { + menuItem->SetIcon(); + itemInfo.fMask |= MIIM_BITMAP; + itemInfo.hbmpItem = HBMMENU_CALLBACK; + } - itemInfo.wID = GetMenuItemCount(iter->first) + 1; - iter->second->AddMenuItem(menuItem); - InsertMenuItem(iter->first, i, TRUE, &itemInfo); + itemInfo.wID = GetMenuItemCount(iter->first) + 1; + iter->second->AddMenuItem(menuItem); + InsertMenuItem(iter->first, i, TRUE, &itemInfo); - iter2 = menuMap.find(iter->first); - if (iter2 != menuMap.end()) { - std::tr1::shared_ptr<MenuListItem> mli(new MenuListItem(name, type, value, NULL)); - menuMap.insert(std::pair< HMENU, std::tr1::shared_ptr<MenuListItem> >(subMenu, mli)); - } - } + iter2 = menuMap.find(iter->first); + if (iter2 != menuMap.end()) + { + std::tr1::shared_ptr<MenuListItem> mli(new MenuListItem(name, type, value, NULL)); + menuMap.insert(std::pair< HMENU, std::tr1::shared_ptr<MenuListItem> >(subMenu, mli)); + } + } - // Tasks(102) or Settings(103) submenu - if ((type == 102) || (type == 103)) { - ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); - subMenu = CreatePopupMenu(); - NoPrefixString(name); - MenuItem *menuItem = new MenuItem(name, type, NULL, NULL, child); + // Tasks(102) or Settings(103) submenu + if ((type == 102) || (type == 103)) + { + ELReadXMLStringValue(child, (WCHAR*)TEXT("Name"), name, (WCHAR*)TEXT("\0")); + subMenu = CreatePopupMenu(); + NoPrefixString(name); + MenuItem *menuItem = new MenuItem(name, type, NULL, NULL, child); - itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU; - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = name; - itemInfo.hSubMenu = subMenu; + itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = name; + itemInfo.hSubMenu = subMenu; - if (pSettings->GetMenuIcons()) { - menuItem->SetIcon(); - itemInfo.fMask |= MIIM_BITMAP; - itemInfo.hbmpItem = HBMMENU_CALLBACK; - } + if (pSettings->GetMenuIcons()) + { + menuItem->SetIcon(); + itemInfo.fMask |= MIIM_BITMAP; + itemInfo.hbmpItem = HBMMENU_CALLBACK; + } - itemInfo.wID = GetMenuItemCount(iter->first) + 1; - iter->second->AddMenuItem(menuItem); - InsertMenuItem(iter->first, i, TRUE, &itemInfo); + itemInfo.wID = GetMenuItemCount(iter->first) + 1; + iter->second->AddMenuItem(menuItem); + InsertMenuItem(iter->first, i, TRUE, &itemInfo); - iter2 = menuMap.find(iter->first); - if (iter2 != menuMap.end()) { - std::tr1::shared_ptr<MenuListItem> mli(new MenuListItem(name, type, NULL, NULL)); - menuMap.insert(std::pair< HMENU, std::tr1::shared_ptr<MenuListItem> >(subMenu, mli)); - } - } + iter2 = menuMap.find(iter->first); + if (iter2 != menuMap.end()) + { + std::tr1::shared_ptr<MenuListItem> mli(new MenuListItem(name, type, NULL, NULL)); + menuMap.insert(std::pair< HMENU, std::tr1::shared_ptr<MenuListItem> >(subMenu, mli)); + } + } - tmp = child; - child = ELGetSiblingXMLElement(tmp); + tmp = child; + child = ELGetSiblingXMLElement(tmp); - i++; - } + i++; + } if (!found && (iter->first == rootMenu)) BuildDefaultMenu(iter); @@ -912,145 +967,163 @@ TiXmlElement *section, *xmlItem; section = iter->second->GetSection(); - if (section) { - int type; + if (section) + { + int type; - if (ELIsKeyDown(VK_RBUTTON)) { - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 4; - if (xmlItem) { - ELGetSpecialFolder(CSIDL_DRIVES, specialFolder); - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), specialFolder); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), specialFolder); - } + if (ELIsKeyDown(VK_RBUTTON)) + { + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 4; + if (xmlItem) + { + ELGetSpecialFolder(CSIDL_DRIVES, specialFolder); + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), specialFolder); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), specialFolder); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - if (xmlItem) { - ELGetSpecialFolder(CSIDL_BITBUCKET, specialFolder); - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), specialFolder); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), specialFolder); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + if (xmlItem) + { + ELGetSpecialFolder(CSIDL_BITBUCKET, specialFolder); + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), specialFolder); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), specialFolder); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 0; - if (xmlItem) - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 0; + if (xmlItem) + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 101; - if (xmlItem) { - ELGetSpecialFolder(CSIDL_STARTMENU, specialFolder); - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), specialFolder); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("%StartMenu%|%CommonStartMenu%")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 101; + if (xmlItem) + { + ELGetSpecialFolder(CSIDL_STARTMENU, specialFolder); + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), specialFolder); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("%StartMenu%|%CommonStartMenu%")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - if (xmlItem) { - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Quick Launch")); - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), - (WCHAR*)TEXT("%AppData%\\Microsoft\\Internet Explorer\\Quick Launch")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + if (xmlItem) + { + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Quick Launch")); + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), + (WCHAR*)TEXT("%AppData%\\Microsoft\\Internet Explorer\\Quick Launch")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - if (xmlItem) { - ELGetSpecialFolder(CSIDL_DESKTOP, specialFolder); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), specialFolder); - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("%Desktop%|%CommonDesktop%")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + if (xmlItem) + { + ELGetSpecialFolder(CSIDL_DESKTOP, specialFolder); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), specialFolder); + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("%Desktop%|%CommonDesktop%")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 0; - if (xmlItem) - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 0; + if (xmlItem) + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 103; - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Settings")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 103; + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Settings")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 1; - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Display Properties")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("desk.cpl")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 1; + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Display Properties")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("desk.cpl")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 0; - if (xmlItem) - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 0; + if (xmlItem) + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 2; - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Run")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Run")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 2; + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Run")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Run")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Logoff")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Logoff")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Logoff")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Logoff")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Shutdown")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Shutdown")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Shutdown")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Shutdown")); + } - ELWriteXMLConfig(ELGetXMLConfig(xmlItem)); - } else if (ELIsKeyDown(VK_MBUTTON)) { - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 102; - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Tasks")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0")); - } + ELWriteXMLConfig(ELGetXMLConfig(xmlItem)); + } + else if (ELIsKeyDown(VK_MBUTTON)) + { + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 102; + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Tasks")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("\0")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 0; - if (xmlItem) - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 0; + if (xmlItem) + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - type = 2; - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Show Applets")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Show")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + type = 2; + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Show Applets")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Show")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Hide Applets")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Hide")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Hide Applets")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("Hide")); + } - xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); - if (xmlItem) { - ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Show Desktop")); - ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("ShowDesktop")); - } + xmlItem = ELSetFirstXMLElement(section, (WCHAR*)TEXT("item")); + if (xmlItem) + { + ELWriteXMLIntValue(xmlItem, (WCHAR*)TEXT("Type"), type); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Name"), (WCHAR*)TEXT("Show Desktop")); + ELWriteXMLStringValue(xmlItem, (WCHAR*)TEXT("Value"), (WCHAR*)TEXT("ShowDesktop")); + } - ELWriteXMLConfig(ELGetXMLConfig(xmlItem)); + ELWriteXMLConfig(ELGetXMLConfig(xmlItem)); + } } - } BuildXMLMenu(iter); } @@ -1066,7 +1139,6 @@ { WIN32_FIND_DATA findData; HANDLE fileHandle; - UINT dirCount = 0; WCHAR searchPath[MAX_LINE_LENGTH], tmp[MAX_LINE_LENGTH], *lwrEntry, *lwrValue; MenuMap::iterator iter2; std::wstring workingValue = parsedValue; @@ -1077,168 +1149,187 @@ fileHandle = FindFirstFile(searchPath, &findData); if (fileHandle == INVALID_HANDLE_VALUE) return; - else { - do { - // Skip hidden files - if (wcscmp(findData.cFileName, TEXT(".")) == 0 || - wcscmp(findData.cFileName, TEXT("..")) == 0 || - (findData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) - continue; + else + { + do + { + // Skip hidden files + if (wcscmp(findData.cFileName, TEXT(".")) == 0 || + wcscmp(findData.cFileName, TEXT("..")) == 0 || + (findData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) + continue; - wcscpy(tmp, workingValue.c_str()); - if (tmp[wcslen(tmp) - 1] != '\\') - wcscat(tmp, TEXT("\\")); - wcscat(tmp, findData.cFileName); + wcscpy(tmp, workingValue.c_str()); + if (tmp[wcslen(tmp) - 1] != '\\') + wcscat(tmp, TEXT("\\")); + wcscat(tmp, findData.cFileName); - if (wcsstr(tmp, TEXT("target.lnk")) != NULL) { - SHORTCUTINFO shortcutInfo; - shortcutInfo.flags = SI_PATH; + if (wcsstr(tmp, TEXT("target.lnk")) != NULL) + { + SHORTCUTINFO shortcutInfo; + shortcutInfo.flags = SI_PATH; - if (ELParseShortcut(tmp, &shortcutInfo)) { - if (PathIsDirectory(shortcutInfo.Path)) { - iter->second->SetValue(shortcutInfo.Path); - BuildFileMenu(iter); - break; - } - } - } + if (ELParseShortcut(tmp, &shortcutInfo)) + { + if (PathIsDirectory(shortcutInfo.Path)) + { + iter->second->SetValue(shortcutInfo.Path); + BuildFileMenu(iter); + break; + } + } + } - // Process a subdirectory - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - UINT folderPos, itemID; - ULONG_PTR itemData; - MenuItem *menuItem; - std::tr1::shared_ptr<MenuListItem> mli; + // Process a subdirectory + if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + UINT folderPos, itemID; + ULONG_PTR itemData; + MenuItem *menuItem; + std::tr1::shared_ptr<MenuListItem> mli; - if (!GetPos(iter, findData.cFileName, true, &folderPos, &itemID, &itemData)) { - menuItem = new MenuItem(NULL, 101, tmp, NULL, NULL); - MENUITEMINFO itemInfo; + if (!GetPos(iter, findData.cFileName, true, &folderPos, &itemID, &itemData)) + { + menuItem = new MenuItem(NULL, 101, tmp, NULL, NULL); + MENUITEMINFO itemInfo; - itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU | MIIM_DATA; + itemInfo.fMask = MIIM_STRING | MIIM_ID | MIIM_SUBMENU | MIIM_DATA; - if (pSettings->GetMenuIcons()) { - menuItem->SetIcon(); - itemInfo.fMask |= MIIM_BITMAP; - itemInfo.hbmpItem = HBMMENU_CALLBACK; - } + if (pSettings->GetMenuIcons()) + { + menuItem->SetIcon(); + itemInfo.fMask |= MIIM_BITMAP; + itemInfo.hbmpItem = HBMMENU_CALLBACK; + } - mli = std::tr1::shared_ptr<MenuListItem>(new MenuListItem(NULL, 101, tmp, NULL)); - HMENU subMenu = CreatePopupMenu(); + mli = std::tr1::shared_ptr<MenuListItem>(new MenuListItem(NULL, 101, tmp, NULL)); + HMENU subMenu = CreatePopupMenu(); - wcscpy(tmp, findData.cFileName); + wcscpy(tmp, findData.cFileName); - itemInfo.cbSize = sizeof(MENUITEMINFO); - itemInfo.dwTypeData = tmp; - itemInfo.hSubMenu = subMenu; + itemInfo.cbSize = sizeof(MENUITEMINFO); + itemInfo.dwTypeData = tmp; + itemInfo.hSubMenu = subMenu; -... [truncated message content] |
From: <ir0...@us...> - 2009-12-11 01:00:42
|
Revision: 2763 http://emerge.svn.sourceforge.net/emerge/?rev=2763&view=rev Author: ir0nh34d Date: 2009-12-11 01:00:36 +0000 (Fri, 11 Dec 2009) Log Message: ----------- Force the retrieval of the task icon when adding to the task list Modified Paths: -------------- trunk/Source/emergeDesktop/MenuItem.cpp trunk/Source/emergeGraphics/emergeGraphics.h trunk/Source/emergeGraphics/main.cpp trunk/Source/emergeTasks/Applet.cpp Modified: trunk/Source/emergeDesktop/MenuItem.cpp =================================================================== --- trunk/Source/emergeDesktop/MenuItem.cpp 2009-12-11 00:59:28 UTC (rev 2762) +++ trunk/Source/emergeDesktop/MenuItem.cpp 2009-12-11 01:00:36 UTC (rev 2763) @@ -98,7 +98,7 @@ switch (type) { case 0: - icon = EGGetWindowIcon((HWND)_wtoi(value), true); + icon = EGGetWindowIcon((HWND)_wtoi(value), true, true); break; case 1: if ((_wcsicmp(value, TEXT("%documents%")) == 0) || Modified: trunk/Source/emergeGraphics/emergeGraphics.h =================================================================== --- trunk/Source/emergeGraphics/emergeGraphics.h 2009-12-11 00:59:28 UTC (rev 2762) +++ trunk/Source/emergeGraphics/emergeGraphics.h 2009-12-11 01:00:36 UTC (rev 2763) @@ -134,7 +134,7 @@ DLL_EXPORT HPEN EGCreatePen(DWORD style, DWORD width, BYTE alpha, COLORREF colour); DLL_EXPORT HBITMAP EGCreateBitmap(BYTE alpha, COLORREF colour, RECT wndRect); DLL_EXPORT HICON EGGetFileIcon(WCHAR *file, UINT iconSize); -DLL_EXPORT HICON EGGetWindowIcon(HWND hwnd, bool smallIcon); +DLL_EXPORT HICON EGGetWindowIcon(HWND hwnd, bool smallIcon, bool force); DLL_EXPORT HICON EGGetSystemIcon(UINT iconIndex, UINT iconSize); DLL_EXPORT bool EGDrawAlphaText(BYTE alpha, CLIENTINFO clientInfo, FORMATINFO formatInfo, WCHAR *commandText); DLL_EXPORT HDC EGBeginPaint(HWND wnd); Modified: trunk/Source/emergeGraphics/main.cpp =================================================================== --- trunk/Source/emergeGraphics/main.cpp 2009-12-11 00:59:28 UTC (rev 2762) +++ trunk/Source/emergeGraphics/main.cpp 2009-12-11 01:00:36 UTC (rev 2763) @@ -744,7 +744,7 @@ // Returns: HICON // Purpose: Retrieve the icon for the task //---- -------------------------------------------------------------------------------------------------------- -HICON EGGetWindowIcon(HWND hwnd, bool smallIcon) +HICON EGGetWindowIcon(HWND hwnd, bool smallIcon, bool force) { HICON icon = NULL; UINT iconSize = 32; @@ -754,24 +754,52 @@ { iconSize = 16; - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, reinterpret_cast<ULONG_PTR*>(&icon)); + if (force) + { + icon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_SMALL2, 0); + if (!icon) + icon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_SMALL, 0); + if (!icon) + icon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_BIG, 0); + } + else + { + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, + reinterpret_cast<ULONG_PTR*>(&icon)); + if (!icon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, + reinterpret_cast<ULONG_PTR*>(&icon)); + if (!icon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, + reinterpret_cast<ULONG_PTR*>(&icon)); + } if (!icon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, reinterpret_cast<ULONG_PTR*>(&icon)); - if (!icon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, reinterpret_cast<ULONG_PTR*>(&icon)); - if (!icon) icon = (HICON)GetClassLongPtr(hwnd, GCLP_HICONSM); if (!icon) icon = (HICON)GetClassLongPtr(hwnd, GCLP_HICON); } else { - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, reinterpret_cast<ULONG_PTR*>(&icon)); + if (force) + { + icon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_BIG, 0); + if (!icon) + icon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_SMALL2, 0); + if (!icon) + icon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_SMALL, 0); + } + else + { + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, + reinterpret_cast<ULONG_PTR*>(&icon)); + if (!icon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, + reinterpret_cast<ULONG_PTR*>(&icon)); + if (!icon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, + reinterpret_cast<ULONG_PTR*>(&icon)); + } if (!icon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, reinterpret_cast<ULONG_PTR*>(&icon)); - if (!icon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, ICON_LOOKUP_TIMEOUT, reinterpret_cast<ULONG_PTR*>(&icon)); - if (!icon) icon = (HICON)GetClassLongPtr(hwnd, GCLP_HICON); if (!icon) icon = (HICON)GetClassLongPtr(hwnd, GCLP_HICONSM); Modified: trunk/Source/emergeTasks/Applet.cpp =================================================================== --- trunk/Source/emergeTasks/Applet.cpp 2009-12-11 00:59:28 UTC (rev 2762) +++ trunk/Source/emergeTasks/Applet.cpp 2009-12-11 01:00:36 UTC (rev 2763) @@ -248,9 +248,9 @@ return 1; if (pSettings->GetIconSize() == 32) - icon = EGGetWindowIcon(task, false); + icon = EGGetWindowIcon(task, false, true); else - icon = EGGetWindowIcon(task, true); + icon = EGGetWindowIcon(task, true, true); TaskPtr taskPtr(new Task(task, icon, mainInst)); EnterCriticalSection(&vectorLock); @@ -287,9 +287,9 @@ return 1; if (pSettings->GetIconSize() == 32) - icon = EGGetWindowIcon(task, false); + icon = EGGetWindowIcon(task, false, false); else - icon = EGGetWindowIcon(task, true); + icon = EGGetWindowIcon(task, true, false); (*iter)->SetIcon(icon); DrawAlphaBlend(); @@ -686,9 +686,9 @@ while (iter != taskList.end()) { if (pSettings->GetIconSize() == 32) - icon = EGGetWindowIcon((*iter)->GetWnd(), false); + icon = EGGetWindowIcon((*iter)->GetWnd(), false, true); else - icon = EGGetWindowIcon((*iter)->GetWnd(), true); + icon = EGGetWindowIcon((*iter)->GetWnd(), true, true); (*iter)->SetIcon(icon); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-11 00:59:36
|
Revision: 2762 http://emerge.svn.sourceforge.net/emerge/?rev=2762&view=rev Author: ir0nh34d Date: 2009-12-11 00:59:28 +0000 (Fri, 11 Dec 2009) Log Message: ----------- Switch from ELSwitchToThisWindow to ELStealFocus for z-order setting Modified Paths: -------------- trunk/Source/emergeBaseClasses/BaseApplet.cpp Modified: trunk/Source/emergeBaseClasses/BaseApplet.cpp =================================================================== --- trunk/Source/emergeBaseClasses/BaseApplet.cpp 2009-12-11 00:58:52 UTC (rev 2761) +++ trunk/Source/emergeBaseClasses/BaseApplet.cpp 2009-12-11 00:59:28 UTC (rev 2762) @@ -200,7 +200,7 @@ } // Set focus to mainWnd to fix the 'top' z-order issue - ELSwitchToThisWindow(mainWnd); + ELStealFocus(mainWnd); SetWindowPos(mainWnd, hWndInsertAfter, wndRect.left, wndRect.top, wndRect.right - wndRect.left, wndRect.bottom - wndRect.top, SWP_FRAMECHANGED|SWP_SHOWWINDOW); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-11 00:59:02
|
Revision: 2761 http://emerge.svn.sourceforge.net/emerge/?rev=2761&view=rev Author: ir0nh34d Date: 2009-12-11 00:58:52 +0000 (Fri, 11 Dec 2009) Log Message: ----------- Update ELStealFocus to set both focus and foreground window Modified Paths: -------------- trunk/Source/emergeLib/main.cpp Modified: trunk/Source/emergeLib/main.cpp =================================================================== --- trunk/Source/emergeLib/main.cpp 2009-12-10 04:07:21 UTC (rev 2760) +++ trunk/Source/emergeLib/main.cpp 2009-12-11 00:58:52 UTC (rev 2761) @@ -3421,7 +3421,7 @@ bool ELStealFocus(HWND hwnd) { DWORD threadID1, threadID2; - HWND result = NULL; + bool result = false; threadID1 = GetWindowThreadProcessId(GetForegroundWindow(), NULL); threadID2 = GetWindowThreadProcessId(hwnd, NULL); @@ -3429,13 +3429,13 @@ if (threadID1 != threadID2) { AttachThreadInput(threadID1, threadID2, TRUE); - result = SetFocus(hwnd); + result = ((SetFocus(hwnd) != NULL) && SetForegroundWindow(hwnd)); AttachThreadInput(threadID1, threadID2, FALSE); } else - result = SetFocus(hwnd); + result = ((SetFocus(hwnd) != NULL) && SetForegroundWindow(hwnd)); - return (result != NULL); + return result; } bool ELAdjustVolume(UINT command) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-10 04:07:31
|
Revision: 2760 http://emerge.svn.sourceforge.net/emerge/?rev=2760&view=rev Author: ir0nh34d Date: 2009-12-10 04:07:21 +0000 (Thu, 10 Dec 2009) Log Message: ----------- Fix handling of console based shortcuts with icons and window properties Modified Paths: -------------- trunk/Source/emergeLib/main.cpp Modified: trunk/Source/emergeLib/main.cpp =================================================================== --- trunk/Source/emergeLib/main.cpp 2009-12-09 05:53:31 UTC (rev 2759) +++ trunk/Source/emergeLib/main.cpp 2009-12-10 04:07:21 UTC (rev 2760) @@ -105,6 +105,7 @@ std::wstring GetWindowApp(DWORD processID, bool fullName); bool WriteValue(const WCHAR *fileName, WCHAR *keyword, WCHAR *value); BOOL CALLBACK FullscreenEnum(HWND hwnd, LPARAM lParam); +BOOL CALLBACK WindowIconEnum(HWND hwnd, LPARAM lParam); bool GetSpecialFolderGUID(int folder, WCHAR *classID); bool GetPIDLGUID(LPITEMIDLIST pidl, WCHAR *classID); bool VistaVolumeControl(UINT command); @@ -1372,6 +1373,15 @@ return ELExecute(command); } +BOOL CALLBACK WindowIconEnum(HWND hwnd, LPARAM lParam) +{ + std::wstring debug = L"In Enum"; + ELWriteDebug(debug); + SendMessage(hwnd, WM_SETICON, ICON_SMALL, lParam); + SendMessage(hwnd, WM_SETICON, ICON_BIG, lParam); + return TRUE; +} + //---- -------------------------------------------------------------------------------------------------------- // Function: ELExecute // Requires: LPTSTR applicaiton - application to execute @@ -1389,7 +1399,8 @@ SHORTCUTINFO shortcutInfo; STARTUPINFO si; PROCESS_INFORMATION pi; - std::wstring workingString = application; + std::wstring workingString = application, shortcutPath; + bool isShortcut = false; ZeroMemory(&sei, sizeof(sei)); ZeroMemory(&si, sizeof(si)); @@ -1399,12 +1410,14 @@ ZeroMemory(arguments, MAX_LINE_LENGTH); workingString = ELExpandVars(workingString); + shortcutPath = workingString; ELParseCommand(workingString.c_str(), program, arguments); - shortcutInfo.flags = SI_PATH|SI_ARGUMENTS|SI_WORKINGDIR|SI_SHOW; + shortcutInfo.flags = SI_PATH | SI_ARGUMENTS | SI_WORKINGDIR | SI_SHOW; workingString = program; if (ELParseShortcut(workingString.c_str(), &shortcutInfo)) { + isShortcut = true; wcscpy(program, shortcutInfo.Path); wcscpy(arguments, shortcutInfo.Arguments); wcscpy(directory, shortcutInfo.WorkingDirectory); @@ -1439,8 +1452,24 @@ return false; si.cb = sizeof(si); - si.dwFlags = STARTF_USESHOWWINDOW; - si.wShowWindow = nShow; + if (isShortcut) + { + // 0x800 is an undocumented flag that tells the new process that lpTitle + // is actually the path of a shortcut file. The new console process can + // then extract the icon and title from the shortcut it was launched from. + // + // For console shortcuts, the title is key because that's what used to + // determine window dimensions and buffers (similar to when you change the + // default options you are given the choice to 'Save properties for future + // windows with the same title'. + si.dwFlags = 0x800; + si.lpTitle = (WCHAR*)shortcutPath.c_str(); + } + else + { + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = nShow; + } if (CreateProcess(NULL, command, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-09 05:53:37
|
Revision: 2759 http://emerge.svn.sourceforge.net/emerge/?rev=2759&view=rev Author: ir0nh34d Date: 2009-12-09 05:53:31 +0000 (Wed, 09 Dec 2009) Log Message: ----------- Use nShow to set window state on startup Modified Paths: -------------- trunk/Source/emergeLib/main.cpp Modified: trunk/Source/emergeLib/main.cpp =================================================================== --- trunk/Source/emergeLib/main.cpp 2009-12-09 05:45:23 UTC (rev 2758) +++ trunk/Source/emergeLib/main.cpp 2009-12-09 05:53:31 UTC (rev 2759) @@ -1439,6 +1439,7 @@ return false; si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = nShow; if (CreateProcess(NULL, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-09 05:45:30
|
Revision: 2758 http://emerge.svn.sourceforge.net/emerge/?rev=2758&view=rev Author: ir0nh34d Date: 2009-12-09 05:45:23 +0000 (Wed, 09 Dec 2009) Log Message: ----------- Use SwitchToThisWindow to force focus Modified Paths: -------------- trunk/Source/emergeBaseClasses/BaseApplet.cpp Modified: trunk/Source/emergeBaseClasses/BaseApplet.cpp =================================================================== --- trunk/Source/emergeBaseClasses/BaseApplet.cpp 2009-12-08 16:24:01 UTC (rev 2757) +++ trunk/Source/emergeBaseClasses/BaseApplet.cpp 2009-12-09 05:45:23 UTC (rev 2758) @@ -200,7 +200,7 @@ } // Set focus to mainWnd to fix the 'top' z-order issue - ELStealFocus(mainWnd); + ELSwitchToThisWindow(mainWnd); SetWindowPos(mainWnd, hWndInsertAfter, wndRect.left, wndRect.top, wndRect.right - wndRect.left, wndRect.bottom - wndRect.top, SWP_FRAMECHANGED|SWP_SHOWWINDOW); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ir0...@us...> - 2009-12-08 16:24:09
|
Revision: 2757 http://emerge.svn.sourceforge.net/emerge/?rev=2757&view=rev Author: ir0nh34d Date: 2009-12-08 16:24:01 +0000 (Tue, 08 Dec 2009) Log Message: ----------- Clean-up internal focus functions Modified Paths: -------------- trunk/Source/emergeBaseClasses/BaseApplet.cpp trunk/Source/emergeDesktop/MenuBuilder.cpp trunk/Source/emergeLib/emergeLib.h trunk/Source/emergeLib/main.cpp trunk/Source/emergeTasks/Task.cpp trunk/Source/emergeVWM/Task.cpp Modified: trunk/Source/emergeBaseClasses/BaseApplet.cpp =================================================================== --- trunk/Source/emergeBaseClasses/BaseApplet.cpp 2009-12-08 13:22:23 UTC (rev 2756) +++ trunk/Source/emergeBaseClasses/BaseApplet.cpp 2009-12-08 16:24:01 UTC (rev 2757) @@ -170,6 +170,7 @@ dragBorder = guiInfo.dragBorder + guiInfo.bevelWidth + guiInfo.padding; + // Hide the window to allow the shadow effect to toggle ShowWindow(mainWnd, SW_HIDE); hWndInsertAfter = EAEUpdateGUI(mainWnd, guiInfo.windowShadow, pBaseSettings->GetZPosition()); @@ -201,15 +202,13 @@ // Set focus to mainWnd to fix the 'top' z-order issue ELStealFocus(mainWnd); SetWindowPos(mainWnd, hWndInsertAfter, wndRect.left, wndRect.top, - wndRect.right - wndRect.left, wndRect.bottom - wndRect.top, 0); + wndRect.right - wndRect.left, wndRect.bottom - wndRect.top, SWP_FRAMECHANGED|SWP_SHOWWINDOW); if (pBaseAppletMenu) pBaseAppletMenu->UpdateHook(guiInfo.alphaMenu); ZeroMemory(&oldrt, sizeof(RECT)); - ShowWindow(mainWnd, SW_SHOW); - DrawAlphaBlend(); } Modified: trunk/Source/emergeDesktop/MenuBuilder.cpp =================================================================== --- trunk/Source/emergeDesktop/MenuBuilder.cpp 2009-12-08 13:22:23 UTC (rev 2756) +++ trunk/Source/emergeDesktop/MenuBuilder.cpp 2009-12-08 16:24:01 UTC (rev 2757) @@ -422,7 +422,7 @@ case SC_MOVE: case SC_MAXIMIZE: case SC_RESTORE: - ELForceForeground(task); + ELSwitchToThisWindow(task); SendMessage(menuWnd, WM_CANCELMODE, 0, 0); break; } @@ -1369,7 +1369,7 @@ GetCursorPos(&mousePT); - ELForceForeground(menuWnd); + ELStealFocus(menuWnd); SendMessage(menuWnd, WM_CANCELMODE, 0, 0); if (button == WM_LBUTTONDOWN) Modified: trunk/Source/emergeLib/emergeLib.h =================================================================== --- trunk/Source/emergeLib/emergeLib.h 2009-12-08 13:22:23 UTC (rev 2756) +++ trunk/Source/emergeLib/emergeLib.h 2009-12-08 16:24:01 UTC (rev 2757) @@ -308,6 +308,7 @@ DLL_EXPORT POINT ELGetAnchorPoint(HWND hwnd); DLL_EXPORT bool ELStealFocus(HWND wnd); DLL_EXPORT bool ELSwitchToThisWindow(HWND wnd); +DLL_EXPORT bool ELSetForeground(HWND wnd); DLL_EXPORT bool ELParseShortcut(LPCTSTR shortcut, LPSHORTCUTINFO shortcutInfo); DLL_EXPORT bool ELExit(UINT uFlag , bool prompt); DLL_EXPORT bool ELShowDesktop(); Modified: trunk/Source/emergeLib/main.cpp =================================================================== --- trunk/Source/emergeLib/main.cpp 2009-12-08 13:22:23 UTC (rev 2756) +++ trunk/Source/emergeLib/main.cpp 2009-12-08 16:24:01 UTC (rev 2757) @@ -941,13 +941,13 @@ { if (_wcsicmp(command, TEXT("RightDeskMenu")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_RIGHTMENU); return true; } else if (_wcsicmp(command, TEXT("MidDeskMenu")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_MIDMENU); return true; } @@ -968,97 +968,97 @@ } else if (_wcsicmp(command, TEXT("Hide")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_HIDE); return true; } else if (_wcsicmp(command, TEXT("Show")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_SHOW); return true; } else if(_wcsicmp(command,TEXT("VWM_1")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_1); return true; } else if(_wcsicmp(command,TEXT("VWM_2")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_2); return true; } else if(_wcsicmp(command,TEXT("VWM_3")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_3); return true; } else if(_wcsicmp(command,TEXT("VWM_4")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_4); return true; } else if(_wcsicmp(command,TEXT("VWM_5")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_5); return true; } else if(_wcsicmp(command,TEXT("VWM_6")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_6); return true; } else if(_wcsicmp(command,TEXT("VWM_7")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_7); return true; } else if(_wcsicmp(command,TEXT("VWM_8")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_8); return true; } else if(_wcsicmp(command,TEXT("VWM_9")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(),EMERGE_DISPATCH, (WPARAM)EMERGE_VWM,(LPARAM)VWM_9); return true; } else if (_wcsicmp(command, TEXT("VWMUp")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_VWM, (LPARAM)VWM_UP); return true; } else if (_wcsicmp(command, TEXT("VWMDown")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_VWM, (LPARAM)VWM_DOWN); return true; } else if (_wcsicmp(command, TEXT("VWMLeft")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_VWM, (LPARAM)VWM_LEFT); return true; } else if (_wcsicmp(command, TEXT("VWMRight")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_VWM, (LPARAM)VWM_RIGHT); return true; } else if (_wcsicmp(command, TEXT("VWMGather")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_VWM, (LPARAM)VWM_GATHER); return true; } @@ -1106,37 +1106,37 @@ } else if (_wcsicmp(command, TEXT("DesktopSettings")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_SETTINGS); return true; } else if (_wcsicmp(command, TEXT("CoreLaunchEditor")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_LAUNCH); return true; } else if (_wcsicmp(command, TEXT("DesktopMenuEditor")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_MENU); return true; } else if (_wcsicmp(command, TEXT("CoreShellChanger")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_SHELL); return true; } else if (_wcsicmp(command, TEXT("CoreThemeSelector")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_THEMESELECT); return true; } else if (_wcsicmp(command, TEXT("CoreABout")) == 0) { - ELStealFocus(ELGetCoreWindow()); + ELSwitchToThisWindow(ELGetCoreWindow()); PostMessage(ELGetCoreWindow(), EMERGE_DISPATCH, (WPARAM)EMERGE_CORE, (LPARAM)CORE_ABOUT); return true; } @@ -2293,12 +2293,12 @@ } //---- -------------------------------------------------------------------------------------------------------- -// Function: ELStealFocus +// Function: ELSwitchTorhisWindow // Required: HWND wnd - window that will receive focus // Returns: bool // Purpose: Forces the window supplied to receive focus //---- -------------------------------------------------------------------------------------------------------- -bool ELStealFocus(HWND wnd) +bool ELSwitchToThisWindow(HWND wnd) { HMODULE user32DLL = GetModuleHandle(TEXT("user32.dll")); if (user32DLL) @@ -2329,13 +2329,7 @@ return pt; } -//---- -------------------------------------------------------------------------------------------------------- -// Function: ELSwitchToThisWindow -// Required: HWND wnd - window that will receive focus -// Returns: bool -// Purpose: Forces the window supplied to receive focus -//---- -------------------------------------------------------------------------------------------------------- -bool ELSwitchToThisWindow(HWND wnd) +bool ELSetForeground(HWND wnd) { WINDOWPLACEMENT winPlacement; winPlacement.length = sizeof(WINDOWPLACEMENT); @@ -3394,10 +3388,10 @@ return middle; } -bool ELForceForeground(HWND hwnd) +bool ELStealFocus(HWND hwnd) { DWORD threadID1, threadID2; - bool result = FALSE; + HWND result = NULL; threadID1 = GetWindowThreadProcessId(GetForegroundWindow(), NULL); threadID2 = GetWindowThreadProcessId(hwnd, NULL); @@ -3405,13 +3399,13 @@ if (threadID1 != threadID2) { AttachThreadInput(threadID1, threadID2, TRUE); - result = ELSwitchToThisWindow(hwnd); + result = SetFocus(hwnd); AttachThreadInput(threadID1, threadID2, FALSE); } else - result = ELSwitchToThisWindow(hwnd); + result = SetFocus(hwnd); - return result; + return (result != NULL); } bool ELAdjustVolume(UINT command) Modified: trunk/Source/emergeTasks/Task.cpp =================================================================== --- trunk/Source/emergeTasks/Task.cpp 2009-12-08 13:22:23 UTC (rev 2756) +++ trunk/Source/emergeTasks/Task.cpp 2009-12-08 16:24:01 UTC (rev 2757) @@ -302,7 +302,7 @@ case SC_MOVE: case SC_MAXIMIZE: case SC_RESTORE: - ELForceForeground(wnd); + ELSwitchToThisWindow(wnd); break; } if (res) Modified: trunk/Source/emergeVWM/Task.cpp =================================================================== --- trunk/Source/emergeVWM/Task.cpp 2009-12-08 13:22:23 UTC (rev 2756) +++ trunk/Source/emergeVWM/Task.cpp 2009-12-08 16:24:01 UTC (rev 2757) @@ -176,7 +176,7 @@ case SC_MOVE: case SC_MAXIMIZE: case SC_RESTORE: - ELForceForeground(taskWnd); + ELSwitchToThisWindow(taskWnd); break; } if (res) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |