Dropbox: resource cosmetics

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

5 files changed, 19 insertions, 115 deletions

diff --git a/plugins/Dropbox/res/resource.rc b/plugins/Dropbox/res/resource.rc
index 6de64684fe..aeb2ab414b 100644
--- a/plugins/Dropbox/res/resource.rc
+++ b/plugins/Dropbox/res/resource.rc
@@ -28,23 +28,22 @@ IDD_OPTIONS_MAIN DIALOGEX 0, 0, 323, 256
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CLIPSIBLINGS

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

 BEGIN

-    GROUPBOX        "Authorization",IDC_STATIC,5,5,313,106

+    GROUPBOX        "Authorization",IDC_STATIC,5,5,313,103

     LTEXT           "To allow Miranda NG access in your Dropbox account:",IDC_STATIC,15,18,270,10

-    CONTROL         "Go to this link",IDC_GETAUTH,"Hyperlink",WS_TABSTOP | 0x1,29,34,61,8

-    LTEXT           "1.",IDC_STATIC,21,34,8,8

-    LTEXT           ",",IDC_STATIC,90,34,8,8

-    LTEXT           "allow access to files in apps folder and copy the security code",IDC_STATIC,96,34,217,8

-    LTEXT           "2.",IDC_STATIC,21,54,8,8

-    LTEXT           "Enter the security code",IDC_STATIC,29,54,97,8

-    EDITTEXT        IDC_REQUEST_CODE,138,52,175,14,ES_AUTOHSCROLL

-    LTEXT           "3.",IDC_STATIC,21,73,8,8

-    LTEXT           "Click authorize button",IDC_STATIC,29,73,97,8

-    PUSHBUTTON      "Authorize",IDC_AUTHORIZE,138,70,175,14

-    GROUPBOX        "Other",IDC_STATIC,5,115,313,33

-    CONTROL         "Use shortened share links",IDC_USE_SHORT_LINKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,129,298,10

-    LTEXT           "4.",IDC_STATIC,21,94,8,8

-    LTEXT           "Check status of authorization",IDC_STATIC,29,94,104,8

-    CTEXT           "",IDC_AUTH_STATUS,138,94,175,8

+    CONTROL         "Go to this link",IDC_GETAUTH,"Hyperlink",WS_GROUP | WS_TABSTOP | 0x1,144,35,169,8

+    LTEXT           "1.",IDC_STATIC,21,35,8,8

+    LTEXT           "Allow access to app folder",IDC_STATIC,29,35,109,16

+    LTEXT           "2.",IDC_STATIC,21,53,8,8

+    LTEXT           "Enter authorization code",IDC_STATIC,29,53,109,16

+    EDITTEXT        IDC_REQUEST_CODE,144,51,169,13,ES_AUTOHSCROLL

+    LTEXT           "3.",IDC_STATIC,21,71,8,8

+    LTEXT           "Initiate authorization",IDC_STATIC,29,71,109,16

+    PUSHBUTTON      "Authorize",IDC_AUTHORIZE,144,68,169,14,BS_CENTER

+    GROUPBOX        "Other",IDC_STATIC,5,111,313,33

+    CONTROL         "Use shortened share links",IDC_USE_SHORT_LINKS,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,125,298,10

+    LTEXT           "4.",IDC_STATIC,22,89,8,8

+    LTEXT           "Check status of authorization",IDC_STATIC,30,89,109,17

+    CTEXT           "",IDC_AUTH_STATUS,145,89,169,8

 END

 

 

@@ -65,8 +64,8 @@ BEGIN
         VERTGUIDE, 29

         VERTGUIDE, 90

         VERTGUIDE, 96

-        VERTGUIDE, 126

         VERTGUIDE, 138

+        VERTGUIDE, 144

         VERTGUIDE, 313

         TOPMARGIN, 5

         BOTTOMMARGIN, 251

@@ -87,42 +86,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 

 /////////////////////////////////////////////////////////////////////////////

 //

-// Dialog

-//

-

-IDD_TOKEN_REQUEST DIALOGEX 0, 0, 147, 57

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "Enter code"

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

-BEGIN

-    LTEXT           "Enter code below:",IDC_TOKEN_LABEL,7,8,132,8

-    EDITTEXT        IDC_TOKEN,7,18,132,14,ES_PASSWORD | ES_AUTOHSCROLL

-    DEFPUSHBUTTON   "OK",IDOK,89,36,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,34,36,50,14

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO

-BEGIN

-    IDD_TOKEN_REQUEST, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 139

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 50

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

 // Icon

 //

 

diff --git a/plugins/Dropbox/src/dropbox.h b/plugins/Dropbox/src/dropbox.h
index c920e79e7b..783297ad44 100644
--- a/plugins/Dropbox/src/dropbox.h
+++ b/plugins/Dropbox/src/dropbox.h
@@ -110,7 +110,6 @@ private:
 	static void Menu_DisableItem(HGENMENU hMenuItem, BOOL bDisable);

 

 	// dialogs

-	static INT_PTR CALLBACK TokenRequestProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 	static INT_PTR CALLBACK MainOptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

 	// utils

diff --git a/plugins/Dropbox/src/dropbox_dialogs.cpp b/plugins/Dropbox/src/dropbox_dialogs.cpp
index c649c3e60e..07bd42c5dd 100644
--- a/plugins/Dropbox/src/dropbox_dialogs.cpp
+++ b/plugins/Dropbox/src/dropbox_dialogs.cpp
@@ -1,61 +1,5 @@
 #include "common.h"

 

-INT_PTR CALLBACK CDropbox::TokenRequestProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	char *token = reinterpret_cast<char*>(::GetWindowLongPtr(hwndDlg, GWLP_USERDATA));

-

-	switch (msg)

-	{

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

-

-		token = (char*)lParam;

-		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

-		{

-			//::SendMessage(hwndDlg, WM_SETICON, ICON_BIG,	(LPARAM)CSkypeProto::IconList[0].Handle);

-			//::SendMessage(hwndDlg, WM_SETICON, ICON_SMALL,	(LPARAM)CSkypeProto::IconList[0].Handle);

-

-			/*wchar_t title[MAX_PATH];

-			::mir_sntprintf(

-			title,

-			MAX_PATH,

-			::TranslateT("Enter a password for %s:"),

-			param->login);*/

-			//::SetDlgItemText(hwndDlg, IDC_INSTRUCTION, title);

-

-			SendDlgItemMessage(hwndDlg, IDC_TOKEN, EM_LIMITTEXT, 128 - 1, 0);

-		}

-		break;

-

-	case WM_CLOSE:

-		EndDialog(hwndDlg, 0);

-		break;

-

-	case WM_COMMAND:

-	{

-		switch (LOWORD(wParam))

-		{

-		case IDOK:

-		{

-			char data[128];

-			GetDlgItemTextA(hwndDlg, IDC_TOKEN, data, SIZEOF(data));

-			strcpy(token, data);

-

-			EndDialog(hwndDlg, IDOK);

-		}

-			break;

-

-		case IDCANCEL:

-			EndDialog(hwndDlg, IDCANCEL);

-			break;

-		}

-	}

-		break;

-	}

-

-	return FALSE;

-}

-

 INT_PTR CALLBACK CDropbox::MainOptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	CDropbox *instance = (CDropbox*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

diff --git a/plugins/Dropbox/src/resource.h b/plugins/Dropbox/src/resource.h
index 6f36825cec..bd27208c23 100644
--- a/plugins/Dropbox/src/resource.h
+++ b/plugins/Dropbox/src/resource.h
@@ -2,7 +2,6 @@
 // Microsoft Visual C++ generated include file.

 // Used by e:\Projects\C++\MirandaNG\plugins\Dropbox\res\resource.rc

 //

-#define IDD_TOKEN_REQUEST               17

 #define IDI_DROPBOX                     102

 #define IDD_OPTIONS_MAIN                109

 #define IDC_REQUEST_CODE                1001

@@ -10,8 +9,7 @@
 #define IDC_CHECK2                      1004

 #define IDC_USE_SHORT_LINKS             1004

 #define IDC_AUTH_STATUS                 1005

-#define IDC_TOKEN                       1006

-#define IDC_TOKEN_LABEL                 1007

+#define IDC_GET_AUTH_LINK               1006

 #define IDC_GETAUTH                     1200

 

 // Next default values for new objects

@@ -20,7 +18,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        103

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1006

+#define _APS_NEXT_CONTROL_VALUE         1007

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif

diff --git a/plugins/Dropbox/src/version.h b/plugins/Dropbox/src/version.h
index c15caf348c..9fd0181274 100644
--- a/plugins/Dropbox/src/version.h
+++ b/plugins/Dropbox/src/version.h
@@ -8,7 +8,7 @@
 #define __PLUGIN_NAME              "Dropbox"

 #define __INTERNAL_NAME            "Dropbox"

 #define __FILENAME                 "Dropbox.dll"

-#define __DESCRIPTION              "Provides ability to upload files on Dropbox."

+#define __DESCRIPTION              "Allows to transfer files via Dropbox"

 #define __AUTHOR                   "unsane"

 #define __AUTHOREMAIL              ""

 #define __AUTHORWEB                "http://miranda-ng.org/p/Dropbox/"