From 62f920f0c78ebc8b5280e465ac33ca5f5a0d6905 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Mon, 16 Aug 2004 19:12:31 +0000 Subject: [PATCH] display lean explorer version in about dialog svn path=/branches/lean-explorer/; revision=10573 --- reactos/subsys/system/explorer/desktop/desktop.cpp | 2 +- reactos/subsys/system/explorer/explorer.cpp | 3 +++ reactos/subsys/system/explorer/explorer_intres.h | 3 +-- reactos/subsys/system/explorer/explorer_intres.rc | 7 ++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/reactos/subsys/system/explorer/desktop/desktop.cpp b/reactos/subsys/system/explorer/desktop/desktop.cpp index 98d4936fbd7..19e340c9e85 100644 --- a/reactos/subsys/system/explorer/desktop/desktop.cpp +++ b/reactos/subsys/system/explorer/desktop/desktop.cpp @@ -206,7 +206,7 @@ void BackgroundWindow::DrawDesktopBkgnd(HDC hdc) ClientRect rect(_hwnd); rect.left = rect.right - 280; - rect.top = rect.bottom - 56 - DESKTOPBARBAR_HEIGHT; + rect.top = rect.bottom - 80 - DESKTOPBARBAR_HEIGHT; rect.right = rect.left + 250; rect.bottom = rect.top + 40; diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp index 3563188eb01..6d093ff2f41 100644 --- a/reactos/subsys/system/explorer/explorer.cpp +++ b/reactos/subsys/system/explorer/explorer.cpp @@ -481,6 +481,9 @@ struct ExplorerAboutDlg : public new HyperlinkCtrl(hwnd, IDC_WWW); + FmtString ver_txt(ResString(IDS_EXPLORER_VERSION_STR), (LPCTSTR)ResString(IDS_VERSION_STR)); + SetWindowText(GetDlgItem(hwnd, IDC_VERSION_TXT), ver_txt); + CenterWindow(hwnd); } diff --git a/reactos/subsys/system/explorer/explorer_intres.h b/reactos/subsys/system/explorer/explorer_intres.h index 27249cc997c..4e0c3cfb940 100644 --- a/reactos/subsys/system/explorer/explorer_intres.h +++ b/reactos/subsys/system/explorer/explorer_intres.h @@ -96,6 +96,7 @@ #define IDC_WWW 1012 #define IDC_TOPIC 1017 #define IDC_MAILS_FOUND 1018 +#define IDC_VERSION_TXT 1029 #define ID_REFRESH 1704 #define ID_ABOUT_WINEFILE 1705 #define IDS_VERSION_STR 5000 @@ -114,7 +115,6 @@ #define ID_EXPLORE 40011 #define ID_TASKMGR 40012 #define ID_BROWSE_UP 40013 - #define ID_EDIT_UNDO 40019 #define ID_EDIT_COPY 40020 #define ID_EDIT_CUt 40021 @@ -131,7 +131,6 @@ #define ID_FILE_DELETE 40032 #define ID_FILE_RENAME 40033 #define ID_FILE_PROPERTIES 40034 - #define ID_SWITCH_DESKTOP_1 50000 #define ID_WINDOW_NEW 0xE130 #define ID_EDIT_PROPERTIES 57656 diff --git a/reactos/subsys/system/explorer/explorer_intres.rc b/reactos/subsys/system/explorer/explorer_intres.rc index 38210b0d06e..f4f275fe85d 100644 --- a/reactos/subsys/system/explorer/explorer_intres.rc +++ b/reactos/subsys/system/explorer/explorer_intres.rc @@ -230,7 +230,8 @@ CAPTION "About ReactOS Explorer" FONT 10, "MS Sans Serif" BEGIN LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,29,90,11 - LTEXT "(c) 2003/2004 Martin Fuchs",IDC_STATIC,90,50,79,8 + LTEXT "V 0.9",IDC_VERSION_TXT,91,43,98,8 + LTEXT "(c) 2003/2004 Martin Fuchs",IDC_STATIC,91,58,79,8 LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,21,84,104, 8 CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, @@ -263,9 +264,9 @@ BEGIN "BEGIN\r\n" "IDS_VERSION_STR """"\r\n" "#ifdef UNICODE\r\n" - "IDS_EXPLORER_VERSION_STR ""ROS Explorer""\r\n" + "IDS_EXPLORER_VERSION_STR ""ROS Lean Explorer""\r\n" "#else\r\n" - "IDS_EXPLORER_VERSION_STR ""ROS Explorer Ansi""\r\n" + "IDS_EXPLORER_VERSION_STR ""ROS Lean Explorer Ansi""\r\n" "#endif\r\n" "END\r\n" "#endif\r\n"