Changeset 13060

Timestamp:

Jan 18, 2000, 11:27:56 PM (25 years ago)

Author:

sandervl

Message:

Display Odin logo in Shell about dialog box

Location:

tags/trunk/src/shell32

Files:

• makefile (modified) (2 diffs)
• odinlogo.bmp (added)
• shell32_En.rc (modified) (2 diffs)
• shell32_main.cpp (modified) (3 diffs)
• shres.rc (modified) (2 diffs)

tags/trunk/src/shell32/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.17 1999-11-02 19:17:15 phaller Exp $
+# $Id: makefile,v 1.18 2000-01-18 22:27:55 sandervl Exp $
 
 #
@@ -54 +54 @@
         $(IMPDEF) $** $@
 
-resource.asm: shres.rc
+resource.asm: shres.rc shell32_en.rc
     $(RC) $(RCFLAGS) -o resource.asm shres.rc
 

tags/trunk/src/shell32/shell32_En.rc ¶

@@ -1 @@
-/* $Id: shell32_En.rc,v 1.3 1999-10-11 20:17:11 sandervl Exp $ */
+/* $Id: shell32_En.rc,v 1.4 2000-01-18 22:27:56 sandervl Exp $ */
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
+#if 1
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 216, 170
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "About %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 156, 147, 50, 12, WS_TABSTOP
+ LISTBOX 99, 8, 85, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 50, 14, 16
+ LTEXT "", 100, 8, 50, 137, 33
+ LTEXT "Odin was brought to you by:", 98, 8, 75, 137, 10
+ CONTROL "",2001,"Static",SS_BITMAP,8,2,148,26
+}
+#else
 SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
@@ -13 +27 @@
  LTEXT "Odin was brought to you by:", 98, 8, 55, 137, 10
 }
-
+#endif

tags/trunk/src/shell32/shell32_main.cpp ¶

@@ -1 @@
-/* $Id: shell32_main.cpp,v 1.7 2000-01-09 19:23:09 phaller Exp $ */
+/* $Id: shell32_main.cpp,v 1.8 2000-01-18 22:27:56 sandervl Exp $ */
 
 /*
@@ -559 +559 @@
  * AboutDlgProc32                           (internal)
  */
+#define IDC_ODINLOGO 2001
+#define IDB_ODINLOGO 5555
+
 BOOL WINAPI AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam,
                               LPARAM lParam )
-{   HWND hWndCtl;
+{
+    HWND hWndCtl;
     char Template[512], AppTitle[512];
 
-    TRACE_(shell)("\n");
-
     switch(msg)
-    { case WM_INITDIALOG:
-      { ABOUT_INFO *info = (ABOUT_INFO *)lParam;
-            if (info)
-        { const char* const *pstr = SHELL_People;
-                SendDlgItemMessageA(hWnd, stc1, STM_SETICON,info->hIcon, 0);
-                GetWindowTextA( hWnd, Template, sizeof(Template) );
-                sprintf( AppTitle, Template, info->szApp );
-                SetWindowTextA( hWnd, AppTitle );
-                SetWindowTextA( GetDlgItem(hWnd, IDC_STATIC_TEXT),
-                                  info->szOtherStuff );
-                hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX);
-                SendMessageA( hWndCtl, WM_SETREDRAW, 0, 0 );
-                while (*pstr)
-          { SendMessageA( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)*pstr );
-                    pstr++;
-                }
-                SendMessageA( hWndCtl, WM_SETREDRAW, 1, 0 );
+    {
+    case WM_INITDIALOG:
+    {
+        ABOUT_INFO *info = (ABOUT_INFO *)lParam;
+        if(info)
+        {
+          const char* const *pstr = SHELL_People;
+
+            SendDlgItemMessageA(hWnd, stc1, STM_SETICON,info->hIcon, 0);
+            GetWindowTextA( hWnd, Template, sizeof(Template) );
+            sprintf( AppTitle, Template, info->szApp );
+            SetWindowTextA( hWnd, AppTitle );
+            SetWindowTextA( GetDlgItem(hWnd, IDC_STATIC_TEXT), info->szOtherStuff );
+
+            HWND hwndOdinLogo = GetDlgItem(hWnd, IDC_ODINLOGO);
+            if(hwndOdinLogo) {
+                        HBITMAP hBitmap = LoadBitmapA(shell32_hInstance, MAKEINTRESOURCEA(IDB_ODINLOGO));
+                        SendMessageA(hwndOdinLogo, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM)hBitmap);
             }
+
+            hWndCtl = GetDlgItem(hWnd, IDC_LISTBOX);
+            SendMessageA( hWndCtl, WM_SETREDRAW, 0, 0 );
+            while (*pstr)
+            {
+                SendMessageA( hWndCtl, LB_ADDSTRING, (WPARAM)-1, (LPARAM)*pstr );
+                pstr++;
+            }
+            SendMessageA( hWndCtl, WM_SETREDRAW, 1, 0 );
         }
         return 1;
+    }
 
     case WM_PAINT:
-      { RECT rect;
-       PAINTSTRUCT ps;
-       HDC hDC = BeginPaint( hWnd, &ps );
-
-       if( __get_dropline( hWnd, &rect ) ) {
-           SelectObject( hDC, GetStockObject( BLACK_PEN ) );
-           MoveToEx( hDC, rect.left, rect.top, NULL );
-      LineTo( hDC, rect.right, rect.bottom );
-       }
-       EndPaint( hWnd, &ps );
-   }
-   break;
+    {
+        RECT rect;
+        PAINTSTRUCT ps;
+        HDC hDC = BeginPaint( hWnd, &ps );
+
+        if( __get_dropline( hWnd, &rect ) ) {
+            SelectObject( hDC, GetStockObject( BLACK_PEN ) );
+            MoveToEx( hDC, rect.left, rect.top, NULL );
+            LineTo( hDC, rect.right, rect.bottom );
+        }
+        EndPaint( hWnd, &ps );
+        break;
+   }
 
 #if 0
@@ -682 +696 @@
     case WM_COMMAND:
         if (wParam == IDOK)
-    {  EndDialog(hWnd, TRUE);
+        {
+            EndDialog(hWnd, TRUE);
             return TRUE;
         }
         break;
+
     case WM_CLOSE:
-      EndDialog(hWnd, TRUE);
-      break;
+        EndDialog(hWnd, TRUE);
+        break;
     }
     return 0;

tags/trunk/src/shell32/shres.rc ¶

@@ -1 @@
-/* $Id: shres.rc,v 1.4 1999-10-23 23:02:58 sandervl Exp $ */
+/* $Id: shres.rc,v 1.5 2000-01-18 22:27:56 sandervl Exp $ */
 /*
  * Top level resource file for Common Dialogs
@@ -22 +22 @@
 
 LANGUAGE 0,0
+
+//SvL: Odin logo bitmap
+5555 BITMAP DISCARDABLE "Odinlogo.bmp"
 
 MENU_001 MENU DISCARDABLE