11 Dec
2012
11 Dec
'12
10:15 a.m.
Author: akhaldi
Date: Tue Dec 11 10:15:46 2012
New Revision: 57870
URL: http://svn.reactos.org/svn/reactos?rev=57870&view=rev
Log:
[MAGNIFY]
* Reduce palette window size.
* Fix some Japanese text.
* Brought to you by Hirofumi Katayama.
CORE-6802 #resolve #comment Committed in r57870. Thanks ;)
Modified:
trunk/reactos/base/applications/magnify/lang/ja-JP.rc
trunk/reactos/base/applications/magnify/magnifier.c
Modified: trunk/reactos/base/applications/magnify/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/…
==============================================================================
--- trunk/reactos/base/applications/magnify/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/magnify/lang/ja-JP.rc [iso-8859-1] Tue Dec 11 10:15:46
2012
@@ -38,13 +38,13 @@
LTEXT "æ¡å¤§ç:",IDC_STATIC,6,8,68,8
COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL |
WS_TABSTOP
GROUPBOX "æ¡å¤§ã®å¯¾è±¡",IDC_STATIC,7,25,139,59
- GROUPBOX "表 示",IDC_STATIC,7,87,139,57
- CONTROL "ãã¦ã¹ ã«ã¼ã½
ã«ã®åãã追ã",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,42,114,10
+ GROUPBOX "表示",IDC_STATIC,7,87,139,57
+ CONTROL "ãã¦ã¹
ã«ã¼ã½ã«ã®åãã追ã",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX
| WS_TABSTOP,18,42,114,10
CONTROL
"ãã¼ãã¼ãã®ãã©ã¼ã«ã¹ã追ã",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX
| WS_TABSTOP,18,54,114,10
CONTROL
"ç·¨éä¸ã®ããã¹ãã追ã",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX
| WS_TABSTOP,18,66,114,10
CONTROL
"è²ãå転ãã",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,102,114,10
CONTROL
"æå°åãã¦éå§ãã",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX
| WS_TABSTOP,18,114,114,10
- CONTROL "æ¡å¤§é¡ã表
示ãã",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,18,126,114,10
+ CONTROL
"æ¡å¤§é¡ã表示ãã",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX
| WS_TABSTOP,18,126,114,10
END
IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
@@ -54,8 +54,8 @@
BEGIN
DEFPUSHBUTTON "OK",IDOK,193,76,50,14
ICON IDI_ICON,IDC_STATIC,7,17,20,20
- LTEXT "æ¡å¤§é¡ã¯è»½ãè¦è¦é害ãããæ¹ã«æä½éã®æ©è½
ãæä¾ããããã«è¨è¨ããã¦ãã¾ããã»ã¨ãã©ã®è¦è¦é害è
ã®æ¹ã®å ´åãæ¥å¸¸å©ç¨ããã«ã¯ããé«æ©è½
ãªæ¡å¤§ã¦ã¼ãã£ãªãã£ãå¿
è¦ã¨ãªãã¾ãã",IDC_STATIC,36,7,207,33
- CONTROL "ä»å¾ããã®ã¡ãã»ã¼ã¸ã表
示ããªã",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX |
WS_TABSTOP,43,80,137,10
+ LTEXT
"æ¡å¤§é¡ã¯è»½ãè¦è¦é害ãããæ¹ã«æä½éã®æ©è½ãæä¾ããããã«è¨è¨ããã¦ãã¾ããã»ã¨ãã©ã®è¦è¦é害è
ã®æ¹ã®å ´åãæ¥å¸¸å©ç¨ããã«ã¯ããé«æ©è½ãªæ¡å¤§ã¦ã¼ãã£ãªãã£ãå¿
è¦ã¨ãªãã¾ãã",IDC_STATIC,36,7,207,33
+ CONTROL
"ä»å¾ããã®ã¡ãã»ã¼ã¸ã表示ããªã",IDC_SHOWWARNINGCHECK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
END
STRINGTABLE
Modified: trunk/reactos/base/applications/magnify/magnifier.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/…
==============================================================================
--- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Tue Dec 11 10:15:46
2012
@@ -7,6 +7,7 @@
*
*/
+/* TODO: AppBar */
#include "magnifier.h"
const TCHAR szWindowClass[] = TEXT("MAGNIFIER");
@@ -118,18 +119,21 @@
*/
BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
{
+ RECT rcWorkArea;
hInst = hInstance; // Store instance handle in our global variable
- // Create the Window
+ SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0);
+
+ /* Create the Window */
hMainWnd = CreateWindowEx(
- WS_EX_TOPMOST,
+ WS_EX_TOPMOST | WS_EX_PALETTEWINDOW,
szWindowClass,
szTitle,
WS_OVERLAPPEDWINDOW,
CW_USEDEFAULT,
CW_USEDEFAULT,
- CW_USEDEFAULT,
- CW_USEDEFAULT,
+ (rcWorkArea.right - rcWorkArea.left) * 2 / 3,
+ 200,
NULL,
NULL,
hInstance,