[STOBJECT]

* Disable compiling the resource dialog for ro-RO also.

svn path=/trunk/; revision=66016
This commit is contained in:
David Quintana 2015-01-09 16:29:46 +00:00
parent 2f16a3b6da
commit a1fe1d888b
3 changed files with 19 additions and 20 deletions

View file

@ -82,7 +82,7 @@ public:
return -1; return -1;
} }
VOID AddButton(IN CONST NOTIFYICONDATA *iconData) BOOL AddButton(IN CONST NOTIFYICONDATA *iconData)
{ {
TBBUTTON tbBtn; TBBUTTON tbBtn;
NOTIFYICONDATA * notifyItem; NOTIFYICONDATA * notifyItem;
@ -91,8 +91,7 @@ public:
int index = FindItemByIconData(iconData, &notifyItem); int index = FindItemByIconData(iconData, &notifyItem);
if (index >= 0) if (index >= 0)
{ {
UpdateButton(iconData); return UpdateButton(iconData);
return;
} }
notifyItem = new NOTIFYICONDATA(); notifyItem = new NOTIFYICONDATA();
@ -138,9 +137,11 @@ public:
CToolbar::AddButton(&tbBtn); CToolbar::AddButton(&tbBtn);
SetButtonSize(ICON_SIZE, ICON_SIZE); SetButtonSize(ICON_SIZE, ICON_SIZE);
return TRUE;
} }
VOID UpdateButton(IN CONST NOTIFYICONDATA *iconData) BOOL UpdateButton(IN CONST NOTIFYICONDATA *iconData)
{ {
NOTIFYICONDATA * notifyItem; NOTIFYICONDATA * notifyItem;
TBBUTTONINFO tbbi = { 0 }; TBBUTTONINFO tbbi = { 0 };
@ -148,8 +149,7 @@ public:
int index = FindItemByIconData(iconData, &notifyItem); int index = FindItemByIconData(iconData, &notifyItem);
if (index < 0) if (index < 0)
{ {
AddButton(iconData); return AddButton(iconData);
return;
} }
tbbi.cbSize = sizeof(tbbi); tbbi.cbSize = sizeof(tbbi);
@ -197,15 +197,17 @@ public:
/* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */
SetButtonInfo(index, &tbbi); SetButtonInfo(index, &tbbi);
return TRUE;
} }
VOID RemoveButton(IN CONST NOTIFYICONDATA *iconData) BOOL RemoveButton(IN CONST NOTIFYICONDATA *iconData)
{ {
NOTIFYICONDATA * notifyItem; NOTIFYICONDATA * notifyItem;
int index = FindItemByIconData(iconData, &notifyItem); int index = FindItemByIconData(iconData, &notifyItem);
if (index < 0) if (index < 0)
return; return FALSE;
DeleteButton(index); DeleteButton(index);
@ -215,6 +217,8 @@ public:
} }
delete notifyItem; delete notifyItem;
return TRUE;
} }
VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip) VOID GetTooltipText(int index, LPTSTR szTip, DWORD cchTip)
@ -432,20 +436,11 @@ public:
switch (data->notify_code) switch (data->notify_code)
{ {
case NIM_ADD: case NIM_ADD:
{ return Toolbar.AddButton(iconData);
Toolbar.AddButton(iconData);
break;
}
case NIM_MODIFY: case NIM_MODIFY:
{ return Toolbar.UpdateButton(iconData);
Toolbar.UpdateButton(iconData);
break;
}
case NIM_DELETE: case NIM_DELETE:
{ return Toolbar.RemoveButton(iconData);
Toolbar.RemoveButton(iconData);
break;
}
default: default:
TRACE("NotifyMessage received with unknown code %d.\n", data->notify_code); TRACE("NotifyMessage received with unknown code %d.\n", data->notify_code);
break; break;

View file

@ -338,6 +338,8 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP
x = ppt->x + rc.left; x = ppt->x + rc.left;
y = ppt->y + rc.top; y = ppt->y + rc.top;
break; break;
case MPPF_TOP:
break;
case MPPF_TOP | MPPF_ALIGN_LEFT: case MPPF_TOP | MPPF_ALIGN_LEFT:
x = ppt->x - rc.right; x = ppt->x - rc.right;
y = ppt->y + rc.top; y = ppt->y + rc.top;

View file

@ -1,6 +1,7 @@
/* Ștefan Fulea (stefan dot fulea at mail dot md) */ /* Ștefan Fulea (stefan dot fulea at mail dot md) */
LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
#if 0
IDD_POWER_METER DIALOGEX 0, 0, 252, 218 IDD_POWER_METER DIALOGEX 0, 0, 252, 218
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP EXSTYLE WS_EX_CONTEXTHELP
@ -12,6 +13,7 @@ BEGIN
CONTROL "Afișează detalii pentru fiecare &baterie.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8 CONTROL "Afișează detalii pentru fiecare &baterie.", 1003, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 135, 6, 120, 8
CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 CONTROL "", 1000, STATIC, SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178
END END
#endif
STRINGTABLE STRINGTABLE
BEGIN BEGIN