LotusNotify:

- options redesign (by pepinlebref)
- minor warnings fixed

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

1 files changed, 84 insertions, 59 deletions

diff --git a/plugins/LotusNotify/res/LotusNotify.rc b/plugins/LotusNotify/res/LotusNotify.rc
index eaaea478c1..9715da43d7 100644
--- a/plugins/LotusNotify/res/LotusNotify.rc
+++ b/plugins/LotusNotify/res/LotusNotify.rc
@@ -38,79 +38,88 @@ IDI_ICON2               ICON                    "icon2.ico"
 // Dialog

 //

 

-IDD_OPT_DIALOG DIALOGEX 0, 0, 315, 250

+IDD_OPT_LOTUS_CONECTION DIALOGEX 0, 0, 255, 185

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Lotus connection settings",IDC_STATIC,0,5,242,57

-    LTEXT           "Primary server:",IDC_STATIC,3,16,65,9

-    COMBOBOX        IDC_SERVER,67,14,115,11,CBS_DROPDOWN | CBS_AUTOHSCROLL | 

+    GROUPBOX        "Lotus connection settings",IDC_STATIC,2,39,251,95

+    LTEXT           "Primary server:",IDC_STATIC,8,73,105,8

+    COMBOBOX        IDC_SERVER,116,71,131,11,CBS_DROPDOWN | CBS_AUTOHSCROLL | 

                     CBS_SORT | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "Secondary server:",IDC_STATIC,3,27,65,9

-    EDITTEXT        IDC_SERVERSEC,67,26,115,11,ES_AUTOHSCROLL

-    LTEXT           "Database:",IDC_STATIC,3,38,65,9

-    EDITTEXT        IDC_DATABASE,67,37,115,11,ES_AUTOHSCROLL

-    LTEXT           "Password:",IDC_STATIC,3,49,65,9

-    EDITTEXT        IDC_PASSWORD,67,48,115,11,ES_PASSWORD | ES_AUTOHSCROLL

-    PUSHBUTTON      "try detect",IDC_BUTTON_DETECT,188,15,50,30,BS_MULTILINE

-    CONTROL         "autoregister",IDC_BUTTON_CHECK,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,186,48,52,12

-    GROUPBOX        "Check interval:",IDC_STATIC,244,5,70,57

-    EDITTEXT        IDC_INTERVAL,247,14,21,11,ES_AUTOHSCROLL

-    LTEXT           "min.",IDC_STATIC,270,16,19,8

-    LTEXT           "(0-disabled)",IDC_STATIC,250,29,56,8

+    LTEXT           "Secondary server:",IDC_STATIC,8,88,105,9

+    EDITTEXT        IDC_SERVERSEC,116,87,131,12,ES_AUTOHSCROLL

+    LTEXT           "Database:",IDC_STATIC,8,103,105,9

+    EDITTEXT        IDC_DATABASE,116,102,131,12,ES_AUTOHSCROLL

+    LTEXT           "Password:",IDC_STATIC,8,118,105,9

+    EDITTEXT        IDC_PASSWORD,116,117,131,12,ES_PASSWORD | ES_AUTOHSCROLL

+    PUSHBUTTON      "try detect",IDC_BUTTON_DETECT,56,51,62,14,BS_MULTILINE

+    CONTROL         "autoregister",IDC_BUTTON_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,54,90,8

+    GROUPBOX        "Check interval:",IDC_STATIC,2,140,251,40

+    EDITTEXT        IDC_INTERVAL,8,151,21,12,ES_AUTOHSCROLL

+    LTEXT           "min.",IDC_STATIC,32,153,19,8

+    LTEXT           "(0-disabled)",IDC_STATIC,55,153,121,8

     CONTROL         "Keep connection on error",IDC_KEEP_CONNEXION_ON_ERROR,

-                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | 

-                    WS_TABSTOP,247,40,63,20

-    GROUPBOX        "Popup options",IDC_STATIC,0,63,315,75,WS_GROUP

+                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,9,167,168,8

+END

+

+IDD_OPT_LOTUS_POPUP DIALOGEX 0, 0, 228, 204

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

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

+BEGIN

     CONTROL         "Set popup colors",IDC_SETCOLOURS,"Button",

-                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,80,83,11

-    CONTROL         "Custom1",IDC_BGCOLOR,"ColourPicker",WS_GROUP | WS_TABSTOP,90,74,10,10

-    LTEXT           "Background",IDC_STATIC,105,75,43,8

-    CONTROL         "Custom1",IDC_FGCOLOR,"ColourPicker",WS_GROUP | WS_TABSTOP,90,87,10,10

-    LTEXT           "Text",IDC_STATIC,105,88,41,8

-    LTEXT           "Close after:",IDC_STATIC,3,102,44,9

-    EDITTEXT        IDC_INTERVAL1,48,101,21,11,ES_AUTOHSCROLL | WS_GROUP

-    LTEXT           "sec (0 default, -1 disabled)",IDC_STATIC,74,102,100,9

-    LTEXT           "Left button click cmd:",IDC_STATIC,3,115,80,9

-    EDITTEXT        IDC_COMMAND,83,114,103,11,ES_AUTOHSCROLL

-    LTEXT           "Command parameters:",IDC_STATIC,3,126,80,9

-    EDITTEXT        IDC_PARAMETERS,83,125,103,11,ES_AUTOHSCROLL

+                    BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,5,35,218,8

+    CONTROL         "Custom1",IDC_BGCOLOR,"ColourPicker",WS_GROUP | WS_TABSTOP,13,48,10,10

+    LTEXT           "Background",IDC_STATIC,28,49,85,8

+    CONTROL         "Custom1",IDC_FGCOLOR,"ColourPicker",WS_GROUP | WS_TABSTOP,117,48,10,10

+    LTEXT           "Text",IDC_STATIC,132,49,85,8

+    LTEXT           "Close after:",IDC_STATIC,5,68,65,8

+    EDITTEXT        IDC_INTERVAL1,71,67,21,12,ES_AUTOHSCROLL | WS_GROUP

+    LTEXT           "sec (0 default, -1 disabled)",IDC_STATIC,97,68,126,9

+    LTEXT           "Left button click cmd:",IDC_STATIC,5,152,113,8

+    EDITTEXT        IDC_COMMAND,120,150,103,12,ES_AUTOHSCROLL

+    LTEXT           "Command parameters:",IDC_STATIC,5,167,113,8

+    EDITTEXT        IDC_PARAMETERS,120,165,103,12,ES_AUTOHSCROLL

     CONTROL         "Show again if still unread",IDC_ONCEONLY,"Button",

-                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,198,69,115,10

+                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,86,218,8

     CONTROL         "...but only if popup not clicked",IDC_NONCLICKEDONLY,"Button",

-                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,198,80,115,10

+                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,98,218,8

     CONTROL         "Show error messages",IDC_SHOWERROR,"Button",

-                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,198,91,115,10

+                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,110,218,8

     CONTROL         "Remember newest message ID and don't show older",IDC_NEWEST,"Button",

-                    BS_AUTOCHECKBOX | BS_LEFT | BS_MULTILINE | WS_TABSTOP,198,102,115,16

+                    BS_AUTOCHECKBOX | BS_LEFT | BS_MULTILINE | WS_TABSTOP,5,122,218,8

     CONTROL         "...even if popup not clicked",IDC_REMEMBEREVENNONCLICKED,"Button",

-                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,198,120,115,10

-    PUSHBUTTON      "Clear popups history",IDC_BUTTON_CLEAR,20,140,140,12,BS_CENTER | BS_MULTILINE

-    GROUPBOX        "Filter messages contain below strings in:",IDC_STATIC,0,163,197,56

-    LTEXT           "Sender",IDC_STATIC,3,176,39,8

-    COMBOBOX        IDC_FILTER_SENDER,44,175,120,11,CBS_DROPDOWN | CBS_SORT | 

+                    BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,5,134,218,8

+    PUSHBUTTON      "Clear popups history",IDC_BUTTON_CLEAR,43,185,140,14,BS_CENTER | BS_MULTILINE

+END

+

+IDD_OPT_LOTUS_MISC DIALOGEX 0, 0, 245, 216

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

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

+BEGIN

+    GROUPBOX        "Filter messages contain below strings in:",IDC_STATIC,5,20,235,62

+    LTEXT           "Sender",IDC_STATIC,9,33,71,8

+    COMBOBOX        IDC_FILTER_SENDER,82,32,120,11,CBS_DROPDOWN | CBS_SORT | 

                     WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "+",IDC_BUTTON_ADD_SENDER_FILTER,167,175,13,12,BS_CENTER

-    PUSHBUTTON      "-",IDC_BUTTON_REMOVE_SENDER_FILTER,181,175,13,12,BS_CENTER

-    LTEXT           "Subject",IDC_STATIC,3,188,39,8

-    COMBOBOX        IDC_FILTER_SUBJECT,44,187,120,11,CBS_DROPDOWN | CBS_SORT | 

+    PUSHBUTTON      "+",IDC_BUTTON_ADD_SENDER_FILTER,206,32,13,12,BS_CENTER

+    PUSHBUTTON      "-",IDC_BUTTON_REMOVE_SENDER_FILTER,220,32,13,12,BS_CENTER

+    LTEXT           "Subject",IDC_STATIC,9,48,71,8

+    COMBOBOX        IDC_FILTER_SUBJECT,82,47,120,11,CBS_DROPDOWN | CBS_SORT | 

                     WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "+",IDC_BUTTON_ADD_SUBJECT_FILTER,167,187,13,12,BS_CENTER

-    PUSHBUTTON      "-",IDC_BUTTON_REMOVE_SUBJECT_FILTER,181,187,13,12,BS_CENTER

-    LTEXT           "To / CopyTo",IDC_STATIC,3,201,39,8

-    COMBOBOX        IDC_FILTER_TO,44,200,120,11,CBS_DROPDOWN | CBS_SORT | 

+    PUSHBUTTON      "+",IDC_BUTTON_ADD_SUBJECT_FILTER,206,47,13,12,BS_CENTER

+    PUSHBUTTON      "-",IDC_BUTTON_REMOVE_SUBJECT_FILTER,220,47,13,12,BS_CENTER

+    LTEXT           "To / CopyTo",IDC_STATIC,9,63,71,8

+    COMBOBOX        IDC_FILTER_TO,82,62,120,11,CBS_DROPDOWN | CBS_SORT | 

                     WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "+",IDC_BUTTON_ADD_TO_FILTER,167,200,13,12,BS_CENTER

-    PUSHBUTTON      "-",IDC_BUTTON_REMOVE_TO_FILTER,181,200,13,12,BS_CENTER

-    GROUPBOX        "Offline status mean:",IDC_STATIC,213,140,101,110

+    PUSHBUTTON      "+",IDC_BUTTON_ADD_TO_FILTER,206,62,13,12,BS_CENTER

+    PUSHBUTTON      "-",IDC_BUTTON_REMOVE_TO_FILTER,220,62,13,12,BS_CENTER

+    GROUPBOX        "Offline status mean:",IDC_STATIC,66,95,113,112

     CONTROL         "",IDC_STATUS,"SysListView32",LVS_REPORT | 

                     LVS_NOLABELWRAP | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | 

-                    LVS_NOSORTHEADER | WS_TABSTOP,216,150,96,97,

+                    LVS_NOSORTHEADER | WS_TABSTOP,71,105,102,97,

                     WS_EX_CLIENTEDGE

-    RTEXT           "version:",IDC_VERSION2,5,234,35,9

-    CTEXT           "",IDC_VERSION,41,233,52,9,0,WS_EX_STATICEDGE

 END

 

 

@@ -120,14 +129,30 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

+GUIDELINES DESIGNINFO

 BEGIN

-    IDD_OPT_DIALOG, DIALOG

+    IDD_OPT_LOTUS_CONECTION, DIALOG

+    BEGIN

+        LEFTMARGIN, 5

+        RIGHTMARGIN, 250

+        TOPMARGIN, 5

+        BOTTOMMARGIN, 180

+    END

+

+    IDD_OPT_LOTUS_POPUP, DIALOG

+    BEGIN

+        LEFTMARGIN, 5

+        RIGHTMARGIN, 223

+        TOPMARGIN, 5

+        BOTTOMMARGIN, 199

+    END

+

+    IDD_OPT_LOTUS_MISC, DIALOG

     BEGIN

         LEFTMARGIN, 5

-        RIGHTMARGIN, 310

+        RIGHTMARGIN, 240

         TOPMARGIN, 5

-        BOTTOMMARGIN, 245

+        BOTTOMMARGIN, 211

     END

 END

 #endif    // APSTUDIO_INVOKED