diff options
| -rw-r--r-- | protocols/Tox/Tox_12.vcxproj | 8 | ||||
| -rw-r--r-- | protocols/Tox/res/resource.rc | 16 | ||||
| -rw-r--r-- | protocols/Tox/src/common.h | 12 | ||||
| -rw-r--r-- | protocols/Tox/src/main.cpp | 3 | ||||
| -rw-r--r-- | protocols/Tox/src/resource.h | 7 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_accounts.cpp | 11 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_events.cpp | 11 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_network.cpp | 10 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_options.cpp | 564 |
9 files changed, 319 insertions, 323 deletions
diff --git a/protocols/Tox/Tox_12.vcxproj b/protocols/Tox/Tox_12.vcxproj index 92496d50fa..1c97ba2148 100644 --- a/protocols/Tox/Tox_12.vcxproj +++ b/protocols/Tox/Tox_12.vcxproj @@ -97,7 +97,7 @@ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
- <AdditionalDependencies>ws2_32.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -125,7 +125,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
</Link>
<ResourceCompile>
@@ -156,7 +156,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
- <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -184,7 +184,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
- <AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
</Link>
diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc index f50699cbe8..95acb0fd4e 100644 --- a/protocols/Tox/res/resource.rc +++ b/protocols/Tox/res/resource.rc @@ -166,12 +166,10 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_NODESLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,9,8,294,174
- PUSHBUTTON "Add",IDC_ADDNODE,79,187,50,14
- PUSHBUTTON "Change",IDC_CHANGE,133,187,50,14
- PUSHBUTTON "Remove",IDC_REMOVE,187,187,50,14
+ PUSHBUTTON "Add",IDC_ADDNODE,253,187,50,14
END
-IDD_ADDNODE DIALOGEX 0, 0, 298, 85
+IDD_NODE_EDITOR DIALOGEX 0, 0, 298, 85
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
@@ -182,8 +180,8 @@ BEGIN 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 "Client ID",IDC_STATIC,98,32,63,8
- EDITTEXT IDC_CLIENTID,6,43,282,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
END
@@ -249,7 +247,11 @@ BEGIN BOTTOMMARGIN, 70
END
- IDD_ADDNODE, DIALOG
+ IDD_OPTIONS_NODES, DIALOG
+ BEGIN
+ END
+
+ IDD_NODE_EDITOR, DIALOG
BEGIN
BOTTOMMARGIN, 84
END
diff --git a/protocols/Tox/src/common.h b/protocols/Tox/src/common.h index 878f9e4d09..81b1e1b717 100644 --- a/protocols/Tox/src/common.h +++ b/protocols/Tox/src/common.h @@ -31,6 +31,7 @@ #include <m_addcontact.h>
#include <m_message.h>
#include <m_avatars.h>
+#include <m_skin.h>
#include <tox.h>
#include <toxdns.h>
@@ -44,7 +45,7 @@ extern HINSTANCE g_hInstance;
-#define MODULE "Tox"
+#define MODULE "TOX"
#define TOX_ERROR -1
@@ -77,16 +78,7 @@ T CreateFunction(LPCSTR functionName) return reinterpret_cast<T>(GetProcAddress(g_hToxLibrary, functionName));
}
-struct ItemInfo
-{
- HWND hwndList;
- int SelNumber;
-};
-
-extern HWND hAddNodeDlg, hChangeNodeDlg;
-
int OptInit(WPARAM wParam, LPARAM lParam);
-int PreShutdown(WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK ToxNodesOptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
#endif //_COMMON_H_
\ No newline at end of file diff --git a/protocols/Tox/src/main.cpp b/protocols/Tox/src/main.cpp index 8970172126..2fd10c2110 100644 --- a/protocols/Tox/src/main.cpp +++ b/protocols/Tox/src/main.cpp @@ -38,10 +38,9 @@ extern "C" int __declspec(dllexport) Load(void) mir_getLP(&pluginInfo);
HookEvent(ME_OPT_INITIALISE, OptInit);
- HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);
PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
- pd.szName = "TOX";
+ pd.szName = MODULE;
pd.type = PROTOTYPE_PROTOCOL;
pd.fnInit = (pfnInitProto)CToxProto::InitAccount;
pd.fnUninit = (pfnUninitProto)CToxProto::UninitAccount;
diff --git a/protocols/Tox/src/resource.h b/protocols/Tox/src/resource.h index 9bbf7d0004..0d79a20d1e 100644 --- a/protocols/Tox/src/resource.h +++ b/protocols/Tox/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by d:\Miranda_orig\protocols\Tox\res\resource.rc
+// Used by e:\Projects\C++\MirandaNG\protocols\Tox\res\resource.rc
//
#define IDD_USER_INFO 101
#define IDD_PASSWORD 102
@@ -10,6 +10,7 @@ #define IDD_OPTIONS_MAIN 106
#define IDD_OPTIONS_NODES 107
#define IDD_ADDNODE 108
+#define IDD_NODE_EDITOR 108
#define IDI_TOX 120
#define IDC_TOXID 1001
#define IDC_CLIPBOARD 1002
@@ -26,12 +27,10 @@ #define IDC_SAVEPERMANENTLY 1013
#define IDC_NODESLIST 1014
#define IDC_ADDNODE 1015
-#define IDC_CHANGE 1016
-#define IDC_REMOVE 1017
#define IDC_IPV4 1018
#define IDC_IPV6 1019
#define IDC_PORT 1020
-#define IDC_CLIENTID 1021
+#define IDC_PKEY 1021
// Next default values for new objects
//
diff --git a/protocols/Tox/src/tox_accounts.cpp b/protocols/Tox/src/tox_accounts.cpp index edefe94051..369fbf5fdd 100644 --- a/protocols/Tox/src/tox_accounts.cpp +++ b/protocols/Tox/src/tox_accounts.cpp @@ -12,12 +12,15 @@ CToxProto* CToxProto::InitAccount(const char *protoName, const wchar_t *userName ptrA address(db_get_sa(NULL, protoName, TOX_SETTINGS_ID));
if (address == NULL)
{
- DialogBoxParam(
+ if (DialogBoxParam(
g_hInstance,
MAKEINTRESOURCE(IDD_PROFILE_IMPORT),
GetActiveWindow(),
CToxProto::ToxProfileImportProc,
- (LPARAM)userName);
+ (LPARAM)userName) == IDOK)
+ {
+ db_set_s(NULL, protoName, TOX_SETTINGS_ID, "");
+ }
}
CToxProto *proto = new CToxProto(protoName, userName);
@@ -41,10 +44,8 @@ int CToxProto::OnAccountLoaded(WPARAM, LPARAM) return 0;
}
-int CToxProto::OnAccountRenamed(WPARAM, LPARAM lParam)
+int CToxProto::OnAccountRenamed(WPARAM, LPARAM)
{
- PROTOACCOUNT *account = (PROTOACCOUNT*)lParam;
-
std::tstring newPath = GetToxProfilePath();
TCHAR oldPath[MAX_PATH];
mir_sntprintf(oldPath, MAX_PATH, _T("%s\\%s.tox"), VARST(_T("%miranda_userdata%")), accountName);
diff --git a/protocols/Tox/src/tox_events.cpp b/protocols/Tox/src/tox_events.cpp index 41832cdee7..72626f5283 100644 --- a/protocols/Tox/src/tox_events.cpp +++ b/protocols/Tox/src/tox_events.cpp @@ -43,14 +43,3 @@ int OptInit(WPARAM wParam, LPARAM) Options_AddPage(wParam, &odp);
return 0;
}
-
-int PreShutdown(WPARAM, LPARAM)
-{
- if (hAddNodeDlg)
- SendMessage(hAddNodeDlg, WM_CLOSE, 0, 0);
-
- if (hChangeNodeDlg)
- SendMessage(hChangeNodeDlg, WM_CLOSE, 0, 0);
-
- return 0;
-}
diff --git a/protocols/Tox/src/tox_network.cpp b/protocols/Tox/src/tox_network.cpp index 70ea5665c4..7d3eb4c5a2 100644 --- a/protocols/Tox/src/tox_network.cpp +++ b/protocols/Tox/src/tox_network.cpp @@ -8,7 +8,7 @@ bool CToxProto::IsOnline() void CToxProto::BootstrapDht()
{
bool isIPv4 = getBool("DisableIPv6", 0);
- int nodeCount = db_get_w(NULL, "TOX", TOX_SETTINGS_NODE_COUNT, 0);
+ int nodeCount = db_get_w(NULL, MODULE, TOX_SETTINGS_NODE_COUNT, 0);
if (!nodeCount)
{
tox_bootstrap_from_address(
@@ -24,16 +24,16 @@ void CToxProto::BootstrapDht() for (int i = 0; i < nodeCount; i++)
{
mir_snprintf(setting, SIZEOF(setting), isIPv4 ? TOX_SETTINGS_NODE_IPV4 : TOX_SETTINGS_NODE_IPV6, i + 1);
- ptrA address(db_get_sa(NULL, "TOX", setting));
+ ptrA address(db_get_sa(NULL, MODULE, setting));
if (address == NULL && !isIPv4)
{
mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, i + 1);
- address = db_get_sa(NULL, "TOX", setting);
+ address = db_get_sa(NULL, MODULE, setting);
}
mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, i + 1);
- int port = db_get_w(NULL, "TOX", setting, 0);
+ int port = db_get_w(NULL, MODULE, setting, 0);
mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, i + 1);
- ptrA pubKey(db_get_sa(NULL, "TOX", setting));
+ ptrA pubKey(db_get_sa(NULL, MODULE, setting));
if (pubKey && address)
{
tox_bootstrap_from_address(tox, address, port, ToxBinAddress(pubKey));
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 1445b3e8e4..7c9bc10935 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -1,7 +1,6 @@ #include "common.h"
-HWND hAddNodeDlg, hChangeNodeDlg;
-bool UpdateListFlag = false;
+static WNDPROC oldWndProc = NULL;
INT_PTR CToxProto::MainOptionsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
@@ -56,7 +55,7 @@ INT_PTR CToxProto::MainOptionsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l break;
}
- case IDC_CLIPBOARD:
+ case IDC_CLIPBOARD:
{
char toxId[TOX_FRIEND_ADDRESS_SIZE * 2 + 1];
GetDlgItemTextA(hwnd, IDC_TOXID, toxId, SIZEOF(toxId));
@@ -70,9 +69,9 @@ INT_PTR CToxProto::MainOptionsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l CloseClipboard();
}
}
- break;
- }
break;
+ }
+ break;
case WM_NOTIFY:
if (reinterpret_cast<NMHDR*>(lParam)->code == PSN_APPLY)
@@ -119,336 +118,351 @@ INT_PTR CToxProto::MainOptionsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l return FALSE;
}
-void CreateList(HWND hwndList)
-{
- LVCOLUMNA lvc = { 0 };
- lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
- lvc.fmt = LVCFMT_LEFT;
-
- lvc.iSubItem = 0;
- lvc.pszText = Translate("IPv4");
- lvc.cx = 100;
- SendMessage(hwndList, LVM_INSERTCOLUMNA, 0, (LPARAM)&lvc);
-
- lvc.iSubItem = 1;
- lvc.pszText = Translate("IPv6");
- lvc.cx = 100;
- SendMessage(hwndList, LVM_INSERTCOLUMNA, 1, (LPARAM)&lvc);
-
- lvc.iSubItem = 2;
- lvc.pszText = Translate("Port");
- lvc.cx = 50;
- SendMessage(hwndList, LVM_INSERTCOLUMNA, 2, (LPARAM)&lvc);
-
- lvc.iSubItem = 3;
- lvc.pszText = Translate("Public key");
- lvc.cx = 150;
- SendMessage(hwndList, LVM_INSERTCOLUMNA, 3, (LPARAM)&lvc);
-
- SendMessage(hwndList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
-}
-
-void UpdateList(HWND hwndList)
+INT_PTR CALLBACK EditNodeDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
- LVITEMA lvI = { 0 };
- char setting[MAX_PATH];
+ HWND hwndList = (HWND)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
+ LONG_PTR iItem = (LONG_PTR)GetWindowLongPtr(hwndDlg, DWLP_USER);
- int nodeCount = db_get_w(NULL, "TOX", TOX_SETTINGS_NODE_COUNT, 0);
- for (int i = 0; i < nodeCount; i++)
+ switch (msg)
{
- UpdateListFlag = true;
- lvI.mask = LVIF_TEXT;
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, i + 1);
- lvI.pszText = db_get_sa(NULL, "TOX", setting);
- lvI.iSubItem = 0;
- lvI.iItem = i;
- SendMessage(hwndList, LVM_INSERTITEMA, 0, (LPARAM)&lvI);
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, i + 1);
- lvI.iSubItem = 1;
- lvI.pszText = db_get_sa(NULL, "TOX", setting);
- SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvI);
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, i + 1);
- int port = db_get_w(NULL, "TOX", setting, 0);
- char portNum[10];
- _itoa(port, portNum, 10);
- lvI.iSubItem = 2;
- lvI.pszText = portNum;
- SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvI);
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, i + 1);
- lvI.iSubItem = 3;
- lvI.pszText = db_get_sa(NULL, "TOX", setting);
- SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvI);
- }
- UpdateListFlag = false;
-}
-
-void DeleteAllItems(HWND hwndList)
-{
- ListView_DeleteAllItems(hwndList);
-}
-
-INT_PTR CALLBACK AddNodeDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
- switch (msg) {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);
- SetWindowText(hwndDlg, TranslateT("Add node"));
- SetDlgItemInt(hwndDlg, IDC_PORT, 33445, TRUE);
- Utils_RestoreWindowPositionNoSize(hwndDlg, NULL, MODULE, "AddNodeDlg");
- return TRUE;
+ {
+ hwndList = (HWND)lParam;
+ SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);
- case WM_COMMAND:
- switch (LOWORD(wParam)) {
- case IDOK:
+ iItem = ListView_GetHotItem(hwndList);
+ if (iItem == -1)
{
- char value[MAX_PATH];
+ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)-1);
+ SetWindowText(hwndDlg, TranslateT("Add node"));
+ }
+ else
+ {
+ SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)iItem);
+ SetWindowText(hwndDlg, TranslateT("Change node"));
- if (!GetDlgItemTextA(hwndDlg, IDC_IPV4, value, SIZEOF(value))) {
- MessageBox(hwndDlg, TranslateT("Enter IPv4"), TranslateT("Error"), MB_OK);
- break;
- }
- if (!GetDlgItemTextA(hwndDlg, IDC_CLIENTID, value, SIZEOF(value))) {
- MessageBox(hwndDlg, TranslateT("Enter public key"), TranslateT("Error"), MB_OK);
- break;
- }
+ LVITEMA lvi = { 0 };
+ lvi.mask = LVIF_TEXT;
+ lvi.iItem = iItem;
+ lvi.cchTextMax = MAX_PATH;
+ lvi.pszText = (char*)mir_alloc(MAX_PATH);
- char setting[MAX_PATH];
- int nodeCount = db_get_b(NULL, "TOX", "NodeCount", 0);
+ lvi.iSubItem = 0;
+ SendMessage(hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
+ SetDlgItemTextA(hwndDlg, IDC_IPV4, lvi.pszText);
- GetDlgItemTextA(hwndDlg, IDC_IPV4, value, SIZEOF(value));
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, nodeCount + 1);
- db_set_s(NULL, "TOX", setting, value);
+ lvi.iSubItem = 1;
+ SendMessage(hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
+ SetDlgItemTextA(hwndDlg, IDC_IPV6, lvi.pszText);
- GetDlgItemTextA(hwndDlg, IDC_IPV6, value, SIZEOF(value));
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, nodeCount + 1);
- db_set_s(NULL, "TOX", setting, value);
+ lvi.iSubItem = 2;
+ SendMessage(hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
+ SetDlgItemTextA(hwndDlg, IDC_PORT, lvi.pszText);
- GetDlgItemTextA(hwndDlg, IDC_CLIENTID, value, SIZEOF(value));
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, nodeCount + 1);
- db_set_s(NULL, "TOX", setting, value);
+ lvi.iSubItem = 3;
+ SendMessage(hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
+ SetDlgItemTextA(hwndDlg, IDC_PKEY, lvi.pszText);
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, nodeCount + 1);
- db_set_w(NULL, "TOX", setting, GetDlgItemInt(hwndDlg, IDC_PORT, NULL, false));
+ mir_free(lvi.pszText);
+ }
- db_set_w(NULL, "TOX", TOX_SETTINGS_NODE_COUNT, nodeCount + 1);
+ Utils_RestoreWindowPositionNoSize(hwndDlg, NULL, MODULE, "EditNodeDlg");
+ }
+ return TRUE;
+
+ case WM_COMMAND:
+ switch (LOWORD(wParam))
+ {
+ case IDOK:
+ {
+ char value[MAX_PATH];
+ if (!GetDlgItemTextA(hwndDlg, IDC_IPV4, value, SIZEOF(value)))
+ {
+ MessageBox(hwndDlg, TranslateT("Enter IPv4"), TranslateT("Error"), MB_OK);
+ break;
+ }
+ if (!GetDlgItemTextA(hwndDlg, IDC_PKEY, value, SIZEOF(value)))
+ {
+ MessageBox(hwndDlg, TranslateT("Enter public key"), TranslateT("Error"), MB_OK);
+ break;
+ }
- HWND hwndList = (HWND)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
- DeleteAllItems(hwndList);
- UpdateList(hwndList);
+ LVITEMA lvi = { 0 };
+ lvi.mask = 0;
+ lvi.iImage = -1;
+ lvi.iItem = iItem;
+ if (lvi.iItem == -1)
+ {
+ lvi.iItem = ListView_GetItemCount(hwndList);
+ SendMessage(hwndList, LVM_INSERTITEMA, 0, (LPARAM)&lvi);
+ ListView_SetItemState(hwndList, lvi.iItem, LVIS_FOCUSED | LVIS_SELECTED, 0x000F);
+ ListView_EnsureVisible(hwndList, lvi.iItem, TRUE);
}
- // fall through
+ lvi.cchTextMax = MAX_PATH;
+ lvi.mask = LVIF_TEXT | LVIF_IMAGE;
+
+ GetDlgItemTextA(hwndDlg, IDC_IPV4, value, SIZEOF(value));
+ lvi.iSubItem = 0;
+ lvi.pszText = mir_strdup(value);
+ SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvi);
+
+ GetDlgItemTextA(hwndDlg, IDC_IPV6, value, SIZEOF(value));
+ lvi.iSubItem = 1;
+ lvi.pszText = mir_strdup(value);
+ SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvi);
+
+ GetDlgItemTextA(hwndDlg, IDC_PORT, value, SIZEOF(value));
+ lvi.iSubItem = 2;
+ lvi.pszText = mir_strdup(value);
+ SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvi);
+
+ GetDlgItemTextA(hwndDlg, IDC_PKEY, value, SIZEOF(value));
+ lvi.iSubItem = 3;
+ lvi.pszText = mir_strdup(value);
+ SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvi);
+
+ lvi.mask = LVIF_IMAGE;
+ lvi.iSubItem = 4;
+ lvi.iImage = 0;
+ ListView_SetItem(hwndList, &lvi);
+
+ lvi.iSubItem = 5;
+ lvi.iImage = 1;
+ ListView_SetItem(hwndList, &lvi);
+
+ EndDialog(hwndDlg, IDOK);
+ }
+ break;
case IDCANCEL:
- DestroyWindow(hwndDlg);
+ EndDialog(hwndDlg, IDCANCEL);
break;
}
break;
- case WM_CLOSE:
- DestroyWindow(hwndDlg);
- break;
-
case WM_DESTROY:
- hAddNodeDlg = 0;
- Utils_SaveWindowPosition(hwndDlg, NULL, MODULE, "AddNodeDlg");
+ Utils_SaveWindowPosition(hwndDlg, NULL, MODULE, "EditNodeDlg");
break;
}
return FALSE;
}
-INT_PTR CALLBACK ChangeNodeDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK RowItemsSubProc(HWND hwndList, UINT msg, WPARAM wParam, LPARAM lParam)
{
- switch (msg) {
- case WM_INITDIALOG:
- TranslateDialogDefault(hwndDlg);
+ if (msg == WM_LBUTTONDOWN)
+ {
+ LVHITTESTINFO hi;
+ hi.pt.x = LOWORD(lParam);
+ hi.pt.y = HIWORD(lParam);
+ ListView_SubItemHitTest(hwndList, &hi);
+ if (hi.iSubItem == 4)
{
- ItemInfo &SelItem = *(ItemInfo*)lParam;
- ItemInfo *nSelItem = new ItemInfo(SelItem);
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)nSelItem);
- SetWindowText(hwndDlg, TranslateT("Change node"));
-
- char setting[MAX_PATH];
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, SelItem.SelNumber + 1);
- ptrA addressIPv4(db_get_sa(NULL, "TOX", setting));
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, SelItem.SelNumber + 1);
- ptrA addressIPv6(db_get_sa(NULL, "TOX", setting));
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, SelItem.SelNumber + 1);
- int port = db_get_dw(NULL, "TOX", setting, 33445);
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, SelItem.SelNumber + 1);
- ptrA pubKey(db_get_sa(NULL, "TOX", setting));
-
- SetDlgItemTextA(hwndDlg, IDC_IPV4, addressIPv4);
- SetDlgItemTextA(hwndDlg, IDC_IPV6, addressIPv6);
- SetDlgItemInt(hwndDlg, IDC_PORT, port, TRUE);
- SetDlgItemTextA(hwndDlg, IDC_CLIENTID, pubKey);
-
- Utils_RestoreWindowPositionNoSize(hwndDlg, NULL, MODULE, "ChangeNodeDlg");
+ if (DialogBoxParam(
+ g_hInstance,
+ MAKEINTRESOURCE(IDD_ADDNODE),
+ GetParent(hwndList), EditNodeDlgProc,
+ (LPARAM)hwndList) == IDOK)
+ {
+ SendMessage(GetParent(GetParent(hwndList)), PSM_CHANGED, 0, 0);
+ }
}
- return TRUE;
-
- case WM_COMMAND:
- switch (LOWORD(wParam)) {
- case IDOK:
- TCHAR str[MAX_PATH];
+ else if (hi.iSubItem == 5)
+ {
+ if (MessageBox(hwndList, TranslateT("Are you sure?"), TranslateT("Node deleting"), MB_YESNO | MB_ICONWARNING) == IDYES)
{
- ItemInfo *SelItem = (ItemInfo*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
-
- if (!GetDlgItemText(hwndDlg, IDC_IPV4, str, SIZEOF(str))) {
- MessageBox(hwndDlg, TranslateT("Enter IPv4"), TranslateT("Error"), MB_OK);
- break;
- }
- if (!GetDlgItemText(hwndDlg, IDC_CLIENTID, str, SIZEOF(str))) {
- MessageBox(hwndDlg, TranslateT("Enter public key"), TranslateT("Error"), MB_OK);
- break;
- }
-
- char buff[MAX_PATH];
- GetDlgItemText(hwndDlg, IDC_IPV4, str, SIZEOF(str));
- mir_snprintf(buff, SIZEOF(buff), TOX_SETTINGS_NODE_IPV4, SelItem->SelNumber + 1);
- db_set_ts(NULL, "TOX", buff, str);
-
- GetDlgItemText(hwndDlg, IDC_IPV6, str, SIZEOF(str));
- mir_snprintf(buff, SIZEOF(buff), TOX_SETTINGS_NODE_IPV6, SelItem->SelNumber + 1);
- db_set_ts(NULL, "TOX", buff, str);
-
- GetDlgItemText(hwndDlg, IDC_CLIENTID, str, SIZEOF(str));
- mir_snprintf(buff, SIZEOF(buff), TOX_SETTINGS_NODE_PKEY, SelItem->SelNumber + 1);
- db_set_ts(NULL, "TOX", buff, str);
-
- mir_snprintf(buff, SIZEOF(buff), TOX_SETTINGS_NODE_PORT, SelItem->SelNumber + 1);
- db_set_dw(NULL, "TOX", buff, (DWORD)GetDlgItemInt(hwndDlg, IDC_PORT, NULL, false));
-
- DeleteAllItems(SelItem->hwndList);
- UpdateList(SelItem->hwndList);
+ ListView_DeleteItem(hwndList, hi.iItem);
+ SendMessage(GetParent(GetParent(hwndList)), PSM_CHANGED, 0, 0);
}
- // fall through
-
- case IDCANCEL:
- DestroyWindow(hwndDlg);
- break;
}
- break;
-
- case WM_CLOSE:
- DestroyWindow(hwndDlg);
- break;
-
- case WM_DESTROY:
- ItemInfo *SelItem = (ItemInfo *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
- hChangeNodeDlg = 0;
- Utils_SaveWindowPosition(hwndDlg, NULL, MODULE, "ChangeNodeDlg");
- delete SelItem;
- break;
}
- return FALSE;
+ return CallWindowProc(oldWndProc, hwndList, msg, wParam, lParam);
}
INT_PTR CALLBACK ToxNodesOptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
HWND hwndList = GetDlgItem(hwndDlg, IDC_NODESLIST);
- int sel;
- switch (msg) {
+ switch (msg)
+ {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
- SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);
- EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE), FALSE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_REMOVE), FALSE);
- CreateList(hwndList);
- UpdateList(hwndList);
+ {
+ oldWndProc = (WNDPROC)SetWindowLongPtr(hwndList, GWLP_WNDPROC, (LONG_PTR)RowItemsSubProc);
+
+ HIMAGELIST hImageList = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 2, 0);
+ HICON icon = LoadSkinnedIcon(SKINICON_OTHER_TYPING);
+ ImageList_AddIcon(hImageList, icon); Skin_ReleaseIcon(icon);
+ icon = LoadSkinnedIcon(SKINICON_OTHER_DELETE);
+ ImageList_AddIcon(hImageList, icon); Skin_ReleaseIcon(icon);
+ ListView_SetImageList(hwndList, hImageList, LVSIL_SMALL);
+
+ ListView_SetExtendedListViewStyle(hwndList, LVS_EX_SUBITEMIMAGES | LVS_EX_FULLROWSELECT | LVS_EX_LABELTIP);
+
+ LVCOLUMNA lvc = { 0 };
+ lvc.mask = LVCF_WIDTH | LVCF_TEXT;
+ lvc.fmt = LVCFMT_LEFT;
+
+ lvc.iSubItem = 0;
+ lvc.pszText = Translate("IPv4");
+ lvc.cx = 100;
+ SendMessage(hwndList, LVM_INSERTCOLUMNA, 0, (LPARAM)&lvc);
+
+ lvc.iSubItem = 1;
+ lvc.pszText = Translate("IPv6");
+ lvc.cx = 100;
+ SendMessage(hwndList, LVM_INSERTCOLUMNA, 1, (LPARAM)&lvc);
+
+ lvc.iSubItem = 2;
+ lvc.pszText = Translate("Port");
+ lvc.cx = 50;
+ SendMessage(hwndList, LVM_INSERTCOLUMNA, 2, (LPARAM)&lvc);
+
+ lvc.iSubItem = 3;
+ lvc.pszText = Translate("Public key");
+ lvc.cx = 130;
+ SendMessage(hwndList, LVM_INSERTCOLUMNA, 3, (LPARAM)&lvc);
+
+ lvc.iSubItem = 4;
+ lvc.pszText = "";
+ lvc.cx = 32 - GetSystemMetrics(SM_CXVSCROLL);
+ ListView_InsertColumn(hwndList, 4, &lvc);
+
+ lvc.iSubItem = 5;
+ lvc.cx = 32 - GetSystemMetrics(SM_CXVSCROLL);
+ ListView_InsertColumn(hwndList, 5, &lvc);
+
+ char setting[MAX_PATH];
+
+ LVITEMA lvi = { 0 };
+ lvi.cchTextMax = MAX_PATH;
+
+ int nodeCount = db_get_w(NULL, MODULE, TOX_SETTINGS_NODE_COUNT, 0);
+ for (lvi.iItem = 0; lvi.iItem < nodeCount; lvi.iItem++)
+ {
+ lvi.iImage = -1;
+ lvi.mask = LVIF_TEXT | LVIF_IMAGE;
+
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, lvi.iItem + 1);
+ lvi.iSubItem = 0;
+ lvi.pszText = db_get_sa(NULL, MODULE, setting);
+ SendMessage(hwndList, LVM_INSERTITEMA, 0, (LPARAM)&lvi);
+
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, lvi.iItem + 1);
+ lvi.iSubItem = 1;
+ lvi.pszText = db_get_sa(NULL, MODULE, setting);
+ SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvi);
+
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, lvi.iItem + 1);
+ int port = db_get_w(NULL, MODULE, setting, 33445);
+ char portNum[10];
+ itoa(port, portNum, 10);
+ lvi.iSubItem = 2;
+ lvi.pszText = mir_strdup(portNum);
+ SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvi);
+
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, lvi.iItem + 1);
+ lvi.iSubItem = 3;
+ lvi.pszText = db_get_sa(NULL, MODULE, setting);
+ SendMessage(hwndList, LVM_SETITEMA, 0, (LPARAM)&lvi);
+
+ lvi.mask = LVIF_IMAGE;
+ lvi.iSubItem = 4;
+ lvi.iImage = 0;
+ ListView_SetItem(hwndList, &lvi);
+
+ lvi.iSubItem = 5;
+ lvi.iImage = 1;
+ ListView_SetItem(hwndList, &lvi);
+ }
+ }
return TRUE;
case WM_COMMAND:
- switch (LOWORD(wParam)) {
+ switch (LOWORD(wParam))
+ {
case IDC_ADDNODE:
- if (hAddNodeDlg == 0)
- hAddNodeDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_ADDNODE), hwndDlg, AddNodeDlgProc, (LPARAM)hwndList);
+ if (DialogBoxParam(
+ g_hInstance,
+ MAKEINTRESOURCE(IDD_ADDNODE),
+ hwndDlg, EditNodeDlgProc,
+ (LPARAM)hwndList) == IDOK)
+ {
+ SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
+ }
return FALSE;
+ }
+ break;
- case IDC_CHANGE:
- if (hChangeNodeDlg == 0) {
- ItemInfo SelItem = { 0 };
- SelItem.hwndList = hwndList;
- SelItem.SelNumber = ListView_GetSelectionMark(hwndList);
- hChangeNodeDlg = CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_ADDNODE), hwndDlg, ChangeNodeDlgProc, (LPARAM)&SelItem);
+ case WM_NOTIFY:
+ NMHDR *hdr = (NMHDR*)lParam;
+ switch (hdr->code)
+ {
+ case NM_DBLCLK:
+ {
+ if (DialogBoxParam(
+ g_hInstance,
+ MAKEINTRESOURCE(IDD_ADDNODE),
+ hwndDlg, EditNodeDlgProc,
+ (LPARAM)hwndList) == IDOK)
+ {
+ SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
}
- return FALSE;
+ }
+ break;
- case IDC_REMOVE:
- if (MessageBox(hwndDlg, TranslateT("Are you sure?"), TranslateT("Node deleting"), MB_YESNO | MB_ICONWARNING) == IDYES)
+ case PSN_APPLY:
{
char setting[MAX_PATH];
- int sel = ListView_GetSelectionMark(hwndList);
- int nodeCount = db_get_b(NULL, "TOX", "NodeCount", 0);
- for (int i = sel + 1; i < nodeCount; i++)
+
+ LVITEMA lvi = { 0 };
+ lvi.mask = LVIF_TEXT;
+ lvi.cchTextMax = MAX_PATH;
+ lvi.pszText = (char*)mir_alloc(MAX_PATH);
+
+ int itemCount = ListView_GetItemCount(hwndList);
+ for (lvi.iItem = 0; lvi.iItem < itemCount; lvi.iItem++)
{
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, i + 1);
- ptrA addressIPv4(db_get_sa(NULL, "TOX", setting));
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, i);
- db_set_s(NULL, "TOX", setting, addressIPv4);
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, i + 1);
- ptrA addressIPv6(db_get_sa(NULL, "TOX", setting));
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, i);
- db_set_s(NULL, "TOX", setting, addressIPv6);
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, i + 1);
- int port = db_get_w(NULL, "TOX", setting, 0);
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, i);
- db_set_w(NULL, "TOX", setting, port);
-
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, i + 1);
- ptrA pubKey(db_get_sa(NULL, "TOX", setting));
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, i);
- db_set_s(NULL, "TOX", setting, setting);
+ if (itemCount)
+ lvi.iSubItem = 0;
+ SendMessage(hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, lvi.iItem + 1);
+ db_set_s(NULL, MODULE, setting, lvi.pszText);
+
+ lvi.iSubItem = 1;
+ SendMessage(hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, lvi.iItem + 1);
+ db_set_s(NULL, MODULE, setting, lvi.pszText);
+
+ lvi.iSubItem = 2;
+ SendMessage(hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, lvi.iItem + 1);
+ db_set_w(NULL, MODULE, setting, atoi(lvi.pszText));
+
+ lvi.iSubItem = 3;
+ SendMessage(hwndList, LVM_GETITEMA, 0, (LPARAM)&lvi);
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, lvi.iItem + 1);
+ db_set_s(NULL, MODULE, setting, lvi.pszText);
}
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, nodeCount);
- db_unset(NULL, "TOX", setting);
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, nodeCount);
- db_unset(NULL, "TOX", setting);
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, nodeCount);
- db_unset(NULL, "TOX", setting);
- mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, nodeCount);
- db_unset(NULL, "TOX", setting);
-
- db_set_b(NULL, "TOX", TOX_SETTINGS_NODE_COUNT, nodeCount - 1);
- ListView_DeleteItem(hwndList, sel);
- }
- return FALSE;
- }
- break;
+ int nodeCount = db_get_b(NULL, MODULE, TOX_SETTINGS_NODE_COUNT, 0);
+ for (lvi.iItem = itemCount; lvi.iItem < nodeCount; lvi.iItem++)
+ {
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV4, lvi.iItem + 1);
+ db_unset(NULL, MODULE, setting);
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_IPV6, lvi.iItem + 1);
+ db_unset(NULL, MODULE, setting);
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PORT, lvi.iItem + 1);
+ db_unset(NULL, MODULE, setting);
+ mir_snprintf(setting, SIZEOF(setting), TOX_SETTINGS_NODE_PKEY, lvi.iItem + 1);
+ db_unset(NULL, MODULE, setting);
+ }
- case WM_NOTIFY:
- NMHDR *hdr = (NMHDR *)lParam;
- switch (hdr->code) {
- case NM_DBLCLK:
- sel = ListView_GetHotItem(hwndList);
- if (sel != -1) {
- ItemInfo SelItem = { 0 };
- SelItem.hwndList = hwndList;
- SelItem.SelNumber = sel;
- CreateDialogParam(g_hInstance, MAKEINTRESOURCE(IDD_ADDNODE), hwndDlg, ChangeNodeDlgProc, (LPARAM)&SelItem);
+ db_set_b(NULL, MODULE, TOX_SETTINGS_NODE_COUNT, itemCount);
}
- break;
-
- case LVN_ITEMCHANGED:
- NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam;
- EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE), TRUE);
- EnableWindow(GetDlgItem(hwndDlg, IDC_REMOVE), TRUE);
- if (((nmlv->uNewState ^ nmlv->uOldState) & LVIS_STATEIMAGEMASK) && !UpdateListFlag)
- SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
- break;
+ return TRUE;
}
}
return FALSE;
|