readded missing 'timeout finished' checkbox

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@207 4f64403b-2f21-0410-a795-97e2b3489a10

4 files changed, 45 insertions, 32 deletions

diff --git a/otr/otr.mdsp b/otr/otr.mdsp
index cce836e..f3f5385 100644
--- a/otr/otr.mdsp
+++ b/otr/otr.mdsp
@@ -128,5 +128,5 @@ extraResourceOptions=
 29=..\..\include\m_metacontacts.h

 30=..\..\include\m_updater.h

 [History]

-dllmain.cpp,37925

+dllmain.cpp,37791

 otr_private.h,171

diff --git a/otr/otr_private.h b/otr/otr_private.h
index 15ed9b9..cc6d768 100644
--- a/otr/otr_private.h
+++ b/otr/otr_private.h
@@ -5,7 +5,7 @@
 #define VER_MAJOR				0

 #define VER_MINOR				5

 #define VER_RELEASE				4

-#define VER_BUILD				3

+#define VER_BUILD				4

 

 #define __STRINGIZE(x)			#x

 #define VER_STRING				__STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )

diff --git a/otr/resource.h b/otr/resource.h
index 1ae4cf5..e450a04 100644
--- a/otr/resource.h
+++ b/otr/resource.h
@@ -1,23 +1,34 @@
-

+//{{NO_DEPENDENCIES}}

+// Microsoft Visual C++ generated include file.

+// Used by resource.rc

+//

 #define IDD_OPT1                        101

+#define IDD_GENKEYNOTIFY                102

 #define IDC_RAD_OPP                     1002

 #define IDC_RAD_ALWAYS                  1003

 #define IDC_RAD_NEVER                   1004

 #define IDC_CLIST                       1005

 #define IDC_RAD_MANUAL                  1006

-#define IDC_LIST_PROTOS					1007

-#define IDC_ED_FINGERPRINT				1008

-#define IDC_BUT_NEWKEY					1009

-#define IDC_CHK_PREFIX					1010

-#define IDC_CHK_MSGINLINE				1011

-#define IDC_ED_PREFIX					1012

-#define IDC_CHK_TIMEFINISH				1013

-#define IDC_CHK_ENDOFFLINE				1014

-#define IDC_CHK_ENDCLOSE				1015

-

-#define IDD_GENKEYNOTIFY				102

-

-#define IDI_START						2000

-#define IDI_STOP						2001

-

+#define IDC_LIST_PROTOS                 1007

+#define IDC_ED_FINGERPRINT              1008

+#define IDC_BUT_NEWKEY                  1009

+#define IDC_CHK_PREFIX                  1010

+#define IDC_CHK_MSGINLINE               1011

+#define IDC_ED_PREFIX                   1012

+#define IDC_CHK_TIMEFINISH              1013

+#define IDC_CHK_ENDOFFLINE              1014

+#define IDC_CHK_ENDCLOSE                1015

+#define IDI_START                       2000

+#define IDI_STOP                        2001

 #define IDC_STATIC                      -1

+

+// Next default values for new objects

+// 

+#ifdef APSTUDIO_INVOKED

+#ifndef APSTUDIO_READONLY_SYMBOLS

+#define _APS_NEXT_RESOURCE_VALUE        101

+#define _APS_NEXT_COMMAND_VALUE         40001

+#define _APS_NEXT_CONTROL_VALUE         1001

+#define _APS_NEXT_SYMED_VALUE           101

+#endif

+#endif

diff --git a/otr/resource.rc b/otr/resource.rc
index 401da8a..a3f624b 100644
--- a/otr/resource.rc
+++ b/otr/resource.rc
@@ -43,21 +43,23 @@ IDD_OPT1 DIALOGEX 0, 0, 288, 217
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

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

 BEGIN

-    CONTROL         "List1",IDC_CLIST,"SysListView32",LVS_REPORT | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,0,0,287,105

-    GROUPBOX        "Default Policy",IDC_STATIC,8,150,109,59

-    CONTROL         "Manual",IDC_RAD_MANUAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,160,95,10

-    CONTROL         "Opportunistic",IDC_RAD_OPP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,172,95,10

-    CONTROL         "Always",IDC_RAD_ALWAYS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,184,95,10

-    CONTROL         "Never",IDC_RAD_NEVER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,195,95,10

-    LISTBOX         IDC_LIST_PROTOS,127,125,152,59,WS_VSCROLL | WS_TABSTOP

-    EDITTEXT        IDC_ED_FINGERPRINT,127,186,152,12,ES_AUTOHSCROLL | ES_READONLY

-    PUSHBUTTON      "New Private Key",IDC_BUT_NEWKEY,127,200,152,10,WS_DISABLED

-    CONTROL         "End Sessions on window close",IDC_CHK_ENDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,112,117,10

+    CONTROL         "List1",IDC_CLIST,"SysListView32",LVS_REPORT | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,0,0,287,99

+    GROUPBOX        "Default Policy",IDC_STATIC,8,144,109,59

+    CONTROL         "Manual",IDC_RAD_MANUAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,154,95,10

+    CONTROL         "Opportunistic",IDC_RAD_OPP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,166,95,10

+    CONTROL         "Always",IDC_RAD_ALWAYS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,178,95,10

+    CONTROL         "Never",IDC_RAD_NEVER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,189,95,10

+    LISTBOX         IDC_LIST_PROTOS,127,119,152,59,WS_VSCROLL | WS_TABSTOP

+    EDITTEXT        IDC_ED_FINGERPRINT,127,180,152,12,ES_AUTOHSCROLL | ES_READONLY

+    PUSHBUTTON      "New Private Key",IDC_BUT_NEWKEY,127,194,152,10,WS_DISABLED

+    CONTROL         "End Sessions on window close",IDC_CHK_ENDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,106,117,10

     CONTROL         "End sessions when contacts go offline",IDC_CHK_ENDOFFLINE,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,112,136,10

-    CONTROL         "Prefix:",IDC_CHK_PREFIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,125,50,10

-    CONTROL         "Show OTR messages inline",IDC_CHK_MSGINLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,137,110,10

-    EDITTEXT        IDC_ED_PREFIX,61,124,57,12,ES_AUTOHSCROLL

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,106,136,10

+    CONTROL         "Prefix:",IDC_CHK_PREFIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,119,50,10

+    CONTROL         "Show OTR messages inline",IDC_CHK_MSGINLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,131,110,10

+    EDITTEXT        IDC_ED_PREFIX,61,118,57,12,ES_AUTOHSCROLL

+    CONTROL         "Timeout FINISHED sessions back to PLAINTEXT (TAKE CARE!)",IDC_CHK_TIMEFINISH,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,206,213,10

 END

 

 IDD_GENKEYNOTIFY DIALOG  0, 0, 200, 80