Author: akhaldi
Date: Thu Mar 19 10:28:41 2015
New Revision: 66795
URL:
http://svn.reactos.org/svn/reactos?rev=66795&view=rev
Log:
[IEFRAME] Add some icons to dialogs. Load inetcpl when clicking on Properties. Brought to
you by Jared with slight changes by me. CORE-9372
Added:
trunk/reactos/dll/win32/ieframe/resources/ (with props)
trunk/reactos/dll/win32/ieframe/resources/ietoolbar.bmp
- copied unchanged from r66783, trunk/reactos/dll/win32/ieframe/ietoolbar.bmp
trunk/reactos/dll/win32/ieframe/resources/pages.ico (with props)
Removed:
trunk/reactos/dll/win32/ieframe/ietoolbar.bmp
Modified:
trunk/reactos/dll/win32/ieframe/ieframe.rc
trunk/reactos/dll/win32/ieframe/iexplore.c
trunk/reactos/dll/win32/ieframe/resource.h
Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Thu Mar 19 10:28:41 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: trunk/reactos/dll/win32/ieframe/ietoolbar.bmp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ietoolba…
==============================================================================
Binary file - no diff available.
Modified: trunk/reactos/dll/win32/ieframe/iexplore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/iexplore…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/iexplore.c [iso-8859-1] Thu Mar 19 10:28:41 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: trunk/reactos/dll/win32/ieframe/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/resource…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/resource.h [iso-8859-1] Thu Mar 19 10:28:41 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
Propchange: trunk/reactos/dll/win32/ieframe/resources/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Thu Mar 19 10:28:41 2015
@@ -0,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/dll/win32/ieframe/resources/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/dll/win32/ieframe/resources/
------------------------------------------------------------------------------
bugtraq:url =
http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/dll/win32/ieframe/resources/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Added: trunk/reactos/dll/win32/ieframe/resources/pages.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/resource…
==============================================================================
Binary file - no diff available.
Propchange: trunk/reactos/dll/win32/ieframe/resources/pages.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream