Mataes's patch for Weather protocol

git-svn-id: http://svn.miranda-ng.org/main/trunk@37 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 28 insertions, 25 deletions

diff --git a/protocols/weather/resource.rc b/protocols/weather/resource.rc
index 4cac31dfe1..79854b8c84 100644
--- a/protocols/weather/resource.rc
+++ b/protocols/weather/resource.rc
@@ -39,7 +39,7 @@ BEGIN
     DEFPUSHBUTTON   "Close",IDCANCEL,184,213,48,13

 END

 

-IDD_OPTIONS DIALOGEX 0, 0, 306, 212

+IDD_OPTIONS DIALOGEX 0, 0, 306, 222

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

@@ -49,7 +49,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,10,219,8

     CONTROL         "Update weather information every",IDC_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,19,206,8

     EDITTEXT        IDC_UPDATETIME,231,15,21,12,ES_AUTOHSCROLL | ES_NUMBER | NOT WS_BORDER,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE

-    LTEXT           "minutes",IDC_STATIC,257,16,45,9

+    LTEXT           "minutes",IDC_STATIC,257,16,43,9

     CONTROL         "Consider weather info updated only when condition and temperature are changed",IDC_UPDCONDCHG,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,28,282,8

     CONTROL         "Remove old data when updating",IDC_REMOVEOLD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,38,282,8

@@ -60,7 +60,7 @@ BEGIN
     CONTROL         "Use weather condition as protocol status",IDC_PROTOCOND,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,81,278,8

     CONTROL         "Avatar only mode",IDC_DISCONDICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,91,278,8

-    GROUPBOX        "Units",IDC_STATIC,3,107,299,70,WS_GROUP

+    GROUPBOX        "Units",IDC_STATIC,3,107,299,80,WS_GROUP

     LTEXT           "Temperature",IDC_STATIC,8,116,53,8

     CONTROL         "Celsius",IDC_T1,"Button",BS_AUTORADIOBUTTON,65,116,40,8

     CONTROL         "Fahrenheit",IDC_T2,"Button",BS_AUTORADIOBUTTON,120,116,47,8

@@ -83,12 +83,15 @@ BEGIN
     CONTROL         "No change",IDC_D1,"Button",BS_AUTORADIOBUTTON,65,153,52,8

     CONTROL         "2 chars",IDC_D2,"Button",BS_AUTORADIOBUTTON,120,153,56,8

     CONTROL         "3 chars",IDC_D3,"Button",BS_AUTORADIOBUTTON,176,153,56,8

-    CONTROL         "Do not append units to values",IDC_DONOTAPPUNITS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,164,144,8

-    CONTROL         "Do not display fractional values",IDC_NOFRAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,165,146,8

-    GROUPBOX        "Frame",IDC_STATIC,3,177,300,29

-    EDITTEXT        IDC_AVATARSIZE,11,187,29,14,ES_AUTOHSCROLL | ES_NUMBER | NOT WS_BORDER,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE

-    CONTROL         "",IDC_AVATARSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,28,187,11,14

-    LTEXT           "Avatar size",IDC_STATIC,42,190,85,9

+    LTEXT           "Elevation",IDC_STATIC,8,163,53,8

+    CONTROL         "ft",IDC_E1,"Button",BS_AUTORADIOBUTTON,65,163,34,8

+    CONTROL         "m",IDC_E2,"Button",BS_AUTORADIOBUTTON,120,163,34,8

+    CONTROL         "Do not append units to values",IDC_DONOTAPPUNITS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,174,144,8

+    CONTROL         "Do not display fractional values",IDC_NOFRAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,174,146,8

+    GROUPBOX        "Frame",IDC_STATIC,3,187,300,29

+    EDITTEXT        IDC_AVATARSIZE,11,197,29,14,ES_AUTOHSCROLL | ES_NUMBER | NOT WS_BORDER,WS_EX_CLIENTEDGE | WS_EX_STATICEDGE

+    CONTROL         "",IDC_AVATARSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,28,197,11,14

+    LTEXT           "Avatar size",IDC_STATIC,42,200,85,9

 END

 

 IDD_EDIT DIALOGEX 0, 0, 241, 226

@@ -172,26 +175,26 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "Contact List",IDC_TM1,"MButtonClass",WS_TABSTOP | 0x100,2,9,58,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_CTEXT,64,8,139,12,ES_AUTOHSCROLL

-    CONTROL         "Brief Info Title",IDC_TM2,"MButtonClass",WS_TABSTOP,2,41,58,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_BTITLE,64,40,139,12,ES_AUTOHSCROLL

-    CONTROL         "Brief Info",IDC_TM3,"MButtonClass",WS_TABSTOP,2,55,58,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_BTEXT,64,54,139,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

-    CONTROL         "Note Text",IDC_TM4,"MButtonClass",WS_TABSTOP,2,101,58,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_NTEXT,64,100,139,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

-    CONTROL         "Extra Text",IDC_TM5,"MButtonClass",WS_TABSTOP,2,147,58,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_XTEXT,64,146,139,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

-    CONTROL         "External Log",IDC_TM6,"MButtonClass",WS_TABSTOP,2,193,58,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_ETEXT,64,192,139,12,ES_AUTOHSCROLL

-    CONTROL         "History Log",IDC_TM7,"MButtonClass",WS_TABSTOP,2,208,58,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_HTEXT,64,207,139,12,ES_AUTOHSCROLL

+    CONTROL         "Contact List",IDC_TM1,"MButtonClass",WS_TABSTOP | 0x100,2,9,77,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

+    EDITTEXT        IDC_CTEXT,80,8,124,12,ES_AUTOHSCROLL

+    CONTROL         "Brief Info Title",IDC_TM2,"MButtonClass",WS_TABSTOP,2,41,77,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

+    EDITTEXT        IDC_BTITLE,80,40,124,12,ES_AUTOHSCROLL

+    CONTROL         "Brief Info",IDC_TM3,"MButtonClass",WS_TABSTOP,2,55,77,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

+    EDITTEXT        IDC_BTEXT,80,54,124,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

+    CONTROL         "Note Text",IDC_TM4,"MButtonClass",WS_TABSTOP,2,101,77,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

+    EDITTEXT        IDC_NTEXT,80,100,124,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

+    CONTROL         "Extra Text",IDC_TM5,"MButtonClass",WS_TABSTOP,2,147,77,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

+    EDITTEXT        IDC_XTEXT,80,146,124,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

+    CONTROL         "External Log",IDC_TM6,"MButtonClass",WS_TABSTOP,2,193,77,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

+    EDITTEXT        IDC_ETEXT,80,192,124,12,ES_AUTOHSCROLL

+    CONTROL         "History Log",IDC_TM7,"MButtonClass",WS_TABSTOP,2,208,77,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

+    EDITTEXT        IDC_HTEXT,80,207,124,12,ES_AUTOHSCROLL

     GROUPBOX        "Variable List",IDC_STATIC,206,4,99,198

     LTEXT           "",IDC_VARLIST,213,15,86,158

     CONTROL         "More Variables",IDC_MORE,"MButtonClass",WS_TABSTOP,214,188,76,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "Reset",IDC_RESET,"MButtonClass",WS_TABSTOP,222,208,61,12,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

-    EDITTEXT        IDC_BTITLE2,64,24,139,12,ES_AUTOHSCROLL

-    CONTROL         "Status Message",IDC_TM8,"MButtonClass",WS_TABSTOP | 0x100,2,25,58,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

+    EDITTEXT        IDC_BTITLE2,80,24,124,12,ES_AUTOHSCROLL

+    CONTROL         "Status Message",IDC_TM8,"MButtonClass",WS_TABSTOP | 0x100,2,25,77,9,WS_EX_WINDOWEDGE | WS_EX_NOACTIVATE | 0x10000000L

 END

 

 IDD_USERINFO DIALOGEX 0, 0, 222, 132