[ros-diffs] [akhaldi] 66796: [CLT2015] Grab r66795 (ieframe improvements).

Author: akhaldi
Date: Thu Mar 19 10:37:30 2015
New Revision: 66796

URL: http://svn.reactos.org/svn/reactos?rev=66796&view=rev
Log:
[CLT2015] Grab r66795 (ieframe improvements).

Added:
    branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resources/
      - copied from r66795, trunk/reactos/dll/win32/ieframe/resources/
Removed:
    branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ietoolbar.bmp
Modified:
    branches/ReactOS-0.3.17-CLT2015/reactos/   (props changed)
    branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ieframe.rc
    branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c
    branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resource.h

Propchange: branches/ReactOS-0.3.17-CLT2015/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Mar 19 10:37:30 2015
@@ -20,4 +20,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:66727-66770,66776-66779
+/trunk/reactos:66727-66770,66776-66779,66795

Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ieframe.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ieframe.rc	[iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ieframe.rc	[iso-8859-1] Thu
Mar 19 10:37:30 2015
@@ -92,6 +92,9 @@
 {
     LTEXT "Specify the URL you wish to open in Internet Explorer",-1,
35,5,160,25
     LTEXT "Open:", -1, 5, 32, 30, 15
+#ifdef __REACTOS__
+    ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON
+#endif
     EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13
     DEFPUSHBUTTON "OK", IDOK, 90, 50, 50, 14
     PUSHBUTTON "Cancel", IDCANCEL, 145, 50, 50, 14
@@ -110,7 +113,11 @@
 #include <wine/wine_common_ver.rc>
 
 /* @makedep: ietoolbar.bmp */
-IDB_IETOOLBAR BITMAP ietoolbar.bmp
+IDB_IETOOLBAR BITMAP resources/ietoolbar.bmp
+
+#ifdef __REACTOS__
+IDC_PAGEICO ICON "resources/pages.ico"
+#endif
 
 /* @makedep: ieframe.rgs */
 1 WINE_REGISTRY ieframe.rgs

Removed: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/ietoolbar.bmp
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
Binary file - no diff available.

Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c	[iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/iexplore.c	[iso-8859-1] Thu
Mar 19 10:37:30 2015
@@ -382,6 +382,13 @@
     DestroyIcon(icon);
 }
 
+#ifdef __REACTOS__
+static void ie_dialog_properties(HWND hwnd)
+{
+    ShellExecute(hwnd, TEXT("open"), TEXT("rundll32.exe"),
TEXT("shell32.dll, Control_RunDLL inetcpl.cpl"), NULL, SW_SHOWNORMAL);
+}
+#endif
+
 static void add_tb_separator(HWND hwnd)
 {
     TBBUTTON btn;
@@ -605,6 +612,12 @@
         case ID_BROWSE_ABOUT:
             ie_dialog_about(hwnd);
             break;
+
+#ifdef __REACTOS__
+        case ID_BROWSE_PROPERTIES:
+            ie_dialog_properties(hwnd);
+            break;
+#endif
 
         case ID_BROWSE_QUIT:
             ShowWindow(hwnd, SW_HIDE);

Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resource.h	[iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/ieframe/resource.h	[iso-8859-1] Thu
Mar 19 10:37:30 2015
@@ -62,6 +62,9 @@
 #define IDS_ADDRESS                    1106
 
 #define IDB_IETOOLBAR                  1400
+#ifdef __REACTOS__
+#define IDC_PAGEICO                    1401
+#endif
 
 /* update status text in BINDSTATUS_* callback */
 #define IDS_STATUSFMT_FIRST            4096