diff options
Diffstat (limited to 'protocols/Tox')
| -rw-r--r-- | protocols/Tox/res/resource.rc | 73 | ||||
| -rw-r--r-- | protocols/Tox/src/resource.h | 2 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_options.cpp | 6 | 
3 files changed, 59 insertions, 22 deletions
| diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc index 910f7ec8b4..71684ef390 100644 --- a/protocols/Tox/res/resource.rc +++ b/protocols/Tox/res/resource.rc @@ -97,7 +97,7 @@ BEGIN      LTEXT           "Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.",IDC_STATIC,12,91,174,21
  END
 -IDD_OPTIONS_MAIN DIALOGEX 0, 0, 310, 235
 +IDD_OPTIONS_MAIN DIALOGEX 0, 0, 310, 230
  STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
 @@ -118,14 +118,6 @@ BEGIN      EDITTEXT        IDC_PASSWORD,81,47,217,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE
      PUSHBUTTON      "Import tox profile",IDC_IMPORT_PROFILE,81,78,100,14,WS_DISABLED
      LTEXT           "Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.",IDC_STATIC,81,95,217,25
 -    GROUPBOX        "Multimedia",IDC_STATIC,7,164,296,87,NOT WS_VISIBLE
 -    LTEXT           "Audio input device",IDC_STATIC,12,174,60,8,NOT WS_VISIBLE
 -    COMBOBOX        IDC_COMBO_AUDIOINPUT,12,184,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
 -    LTEXT           "Audio output device",IDC_STATIC,12,200,65,8,NOT WS_VISIBLE
 -    COMBOBOX        IDC_COMBO_AUDIOOUTPUT,12,209,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
 -    CONTROL         "Filter audio",IDC_AUDIOFILTER,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,157,186,51,10
 -    LTEXT           "Video input device",IDC_STATIC,15,225,59,8,NOT WS_VISIBLE
 -    COMBOBOX        IDC_COMBO_VIDEOINPUT,12,235,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
  END
  IDD_SEARCH DIALOGEX 0, 0, 109, 113
 @@ -159,7 +151,7 @@ BEGIN      LTEXT           "Tox profile is encrypted. Enter the password to continue.",IDC_STATIC,7,5,197,18
  END
 -IDD_OPTIONS_NODES DIALOGEX 0, 0, 310, 235
 +IDD_OPTIONS_NODES DIALOGEX 0, 0, 310, 230
  STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 0, 0, 0x1
 @@ -168,21 +160,36 @@ BEGIN      PUSHBUTTON      "Add",IDC_ADDNODE,253,213,50,14
  END
 -IDD_NODE_EDITOR DIALOGEX 0, 0, 298, 85
 +IDD_NODE_EDITOR DIALOGEX 0, 0, 289, 97
  STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
  EXSTYLE WS_EX_CONTROLPARENT
  FONT 8, "MS Shell Dlg", 400, 0, 0x1
  BEGIN
 -    CTEXT           "IPv4",IDC_STATIC,31,4,17,8
 -    EDITTEXT        IDC_IPV4,6,13,70,14,ES_AUTOHSCROLL
 -    CTEXT           "IPv6",IDC_STATIC,152,4,15,8
 -    EDITTEXT        IDC_IPV6,98,13,137,14,ES_AUTOHSCROLL
 -    CTEXT           "Port",IDC_STATIC,255,4,34,8
 -    EDITTEXT        IDC_PORT,254,13,34,14,ES_AUTOHSCROLL
 -    CTEXT           "Public key",IDC_STATIC,98,32,63,8
 -    EDITTEXT        IDC_PKEY,6,43,282,14,ES_AUTOHSCROLL
 -    DEFPUSHBUTTON   "OK",IDOK,177,62,50,14
 -    PUSHBUTTON      "Cancel",IDCANCEL,237,62,50,14
 +    CTEXT           "IPv4",IDC_STATIC,7,4,69,8
 +    EDITTEXT        IDC_IPV4,7,12,69,14,ES_AUTOHSCROLL
 +    CTEXT           "IPv6",IDC_STATIC,103,3,135,8
 +    EDITTEXT        IDC_IPV6,81,12,157,14,ES_AUTOHSCROLL
 +    CTEXT           "Port",IDC_STATIC,232,4,50,8
 +    EDITTEXT        IDC_PORT,243,12,39,14,ES_AUTOHSCROLL
 +    CTEXT           "Public key",IDC_STATIC,7,30,275,8
 +    EDITTEXT        IDC_PKEY,7,39,275,23,ES_MULTILINE
 +    DEFPUSHBUTTON   "OK",IDOK,177,76,50,14
 +    PUSHBUTTON      "Cancel",IDCANCEL,232,76,50,14
 +END
 +
 +IDD_OPTIONS_AV DIALOGEX 0, 0, 310, 230
 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 +EXSTYLE WS_EX_CONTROLPARENT
 +FONT 8, "MS Shell Dlg", 400, 0, 0x1
 +BEGIN
 +    GROUPBOX        "Multimedia",-1,7,7,296,89,NOT WS_VISIBLE
 +    LTEXT           "Audio input device",-1,12,17,60,8,NOT WS_VISIBLE
 +    COMBOBOX        IDC_COMBO_AUDIOINPUT,12,26,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
 +    LTEXT           "Audio output device",-1,12,42,65,8,NOT WS_VISIBLE
 +    COMBOBOX        IDC_COMBO_AUDIOOUTPUT,12,52,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
 +    CONTROL         "Filter audio",IDC_AUDIOFILTER,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,157,28,51,10
 +    LTEXT           "Video input device",-1,15,68,59,8,NOT WS_VISIBLE
 +    COMBOBOX        IDC_COMBO_VIDEOINPUT,12,78,138,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
  END
 @@ -217,6 +224,7 @@ BEGIN          VERTGUIDE, 282
          VERTGUIDE, 298
          TOPMARGIN, 7
 +        BOTTOMMARGIN, 228
      END
      IDD_SEARCH, DIALOG
 @@ -246,7 +254,28 @@ BEGIN      IDD_NODE_EDITOR, DIALOG
      BEGIN
 -        BOTTOMMARGIN, 84
 +        LEFTMARGIN, 7
 +        RIGHTMARGIN, 282
 +        VERTGUIDE, 76
 +        VERTGUIDE, 81
 +        VERTGUIDE, 238
 +        VERTGUIDE, 243
 +        BOTTOMMARGIN, 90
 +        HORZGUIDE, 12
 +        HORZGUIDE, 39
 +    END
 +
 +    IDD_OPTIONS_AV, DIALOG
 +    BEGIN
 +        LEFTMARGIN, 7
 +        RIGHTMARGIN, 303
 +        VERTGUIDE, 12
 +        VERTGUIDE, 81
 +        VERTGUIDE, 276
 +        VERTGUIDE, 282
 +        VERTGUIDE, 298
 +        TOPMARGIN, 7
 +        BOTTOMMARGIN, 228
      END
  END
  #endif    // APSTUDIO_INVOKED
 diff --git a/protocols/Tox/src/resource.h b/protocols/Tox/src/resource.h index e554f90be7..0375fdef4b 100644 --- a/protocols/Tox/src/resource.h +++ b/protocols/Tox/src/resource.h @@ -10,6 +10,8 @@  #define IDD_OPTIONS_NODES               107
  #define IDD_ADDNODE                     108
  #define IDD_NODE_EDITOR                 108
 +#define IDD_OPTIONS_MAIN1               109
 +#define IDD_OPTIONS_AV                  109
  #define IDI_TOX                         120
  #define IDC_TOXID                       1001
  #define IDC_CLIPBOARD                   1002
 diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 2b1e0abeed..10662f0134 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -238,6 +238,11 @@ INT_PTR CALLBACK EditNodeDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l  			itemInfo = (ItemInfo*)lParam;
  			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
 +			SendDlgItemMessage(hwndDlg, IDC_IPV4, EM_SETLIMITTEXT, 15, 0);
 +			SendDlgItemMessage(hwndDlg, IDC_IPV6, EM_SETLIMITTEXT, 39, 0);
 +			SendDlgItemMessage(hwndDlg, IDC_PORT, EM_SETLIMITTEXT, 5, 0);
 +			SendDlgItemMessage(hwndDlg, IDC_PKEY, EM_SETLIMITTEXT, TOX_PUBLIC_KEY_SIZE * 2, 0);
 +
  			if (itemInfo->iItem == -1)
  			{
  				SetWindowText(hwndDlg, TranslateT("Add node"));
 @@ -258,6 +263,7 @@ INT_PTR CALLBACK EditNodeDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l  				lvi.iSubItem = 1;
  				SendMessage(itemInfo->hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
 +
  				SetDlgItemTextA(hwndDlg, IDC_IPV6, lvi.pszText);
  				lvi.iSubItem = 2;
 | 
