Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

notification area button to toggle hidden icons

Browse source 
svn path=/trunk/; revision=11726
This commit is contained in:
Martin Fuchs 2004-11-20 22:35:06 +00:00
parent 110f1eeb5e
commit 716bc3dbb3
9 changed files with 93 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/subsys/system/explorer/doc/changes.txt
View file

@ -90,3 +90,4 @@ If you search for more information, look into the CVS repository.
17.09.2004 m. fuchs handle "." and ".." as special direcory names and move them at the very first beginning of directory listings
23.09.2004 m. fuchs configuration dialog to choose between MDI and SDI mode with persistent storage
20.11.2004 m. fuchs display notification icon change times
notification area button to toggle hidden icons

4
reactos/subsys/system/explorer/explorer-cfg-template.xml
View file

@ -11,7 +11,7 @@
</desktop>
<desktopbar>
<options show-clock="TRUE"/>
<options show-clock="true"/>
<positions>
<bar name="quicklaunch" left="10" top="2" width="250" height="22"/>
<bar name="taskbar" left="300" top="2" width="400" height="22"/>
@ -22,7 +22,7 @@
</taskbar>
<notify-icons>
<options hide-inactive="TRUE" show-hidden="FALSE"/>
<options hide-inactive="true" show-button="true" show-hidden="false"/>
<icon name="Volume Control" text="Volume" show="show"/>
</notify-icons>

8
reactos/subsys/system/explorer/explorer.dsp
View file

@ -518,6 +518,14 @@ SOURCE=.\res\notify_h.ico
# End Source File
# Begin Source File
SOURCE=.\res\notify_l.ico
# End Source File
# Begin Source File
SOURCE=.\res\notify_r.ico
# End Source File
# Begin Source File
SOURCE=.\res\notify_t.ico
# End Source File
# Begin Source File

6
reactos/subsys/system/explorer/explorer_intres.h
View file

@ -44,6 +44,8 @@
#define IDS_NOTIFY_SHOW 40
#define IDS_NOTIFY_HIDE 41
#define IDS_NOTIFY_AUTOHIDE 42
#define IDS_SHOW_HIDDEN_ICONS 43
#define IDS_HIDE_ICONS 44
#define IDI_REACTOS 100
#define IDI_EXPLORER 101
#define IDI_STARTMENU 102
@ -109,6 +111,8 @@
#define IDI_DOT_RED 165
#define IDI_ARROW_UP 166
#define IDI_ARROW_DOWN 167
#define IDI_NOTIFY_L 168
#define IDI_NOTIFY_R 169
#define ID_VIEW_NAME 401
#define ID_VIEW_ALL_ATTRIBUTES 402
#define ID_VIEW_SELECTED_ATTRIBUTES 403
@ -211,7 +215,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 166
#define _APS_NEXT_RESOURCE_VALUE 169
#define _APS_NEXT_COMMAND_VALUE 40024
#define _APS_NEXT_CONTROL_VALUE 1033
#define _APS_NEXT_SYMED_VALUE 101

14
reactos/subsys/system/explorer/explorer_intres.rc
View file

@ -174,6 +174,8 @@ BEGIN
IDS_NOTIFY_SHOW "show"
IDS_NOTIFY_HIDE "hide"
IDS_NOTIFY_AUTOHIDE "autohide"
IDS_SHOW_HIDDEN_ICONS "Show hidden icons"
IDS_HIDE_ICONS "Hide icons"
END
#endif // Romanian resources
@ -568,6 +570,8 @@ IDI_DOT_TRANS ICON DISCARDABLE "res/dot_trans.ico"
IDI_DOT_RED ICON DISCARDABLE "res/dot_red.ico"
IDI_ARROW_UP ICON DISCARDABLE "res/arrow_up.ico"
IDI_ARROW_DOWN ICON DISCARDABLE "res/arrow_dwn.ico"
IDI_NOTIFY_L ICON DISCARDABLE "res\\notify_l.ico"
IDI_NOTIFY_R ICON DISCARDABLE "res/notify_r.ico"
/////////////////////////////////////////////////////////////////////////////
//
@ -627,6 +631,8 @@ BEGIN
IDS_NOTIFY_SHOW "sichtbar"
IDS_NOTIFY_HIDE "versteckt"
IDS_NOTIFY_AUTOHIDE "automatisch"
IDS_SHOW_HIDDEN_ICONS "Zeige versteckte Icons"
IDS_HIDE_ICONS "Verstecke Icons"
END
#endif // German (Germany) resources
@ -1117,6 +1123,8 @@ BEGIN
IDS_NOTIFY_SHOW "show"
IDS_NOTIFY_HIDE "hide"
IDS_NOTIFY_AUTOHIDE "autohide"
IDS_SHOW_HIDDEN_ICONS "Show hidden icons"
IDS_HIDE_ICONS "Hide icons"
END
#endif // English (U.S.) resources
@ -1578,6 +1586,8 @@ BEGIN
IDS_NOTIFY_SHOW "mostrar"
IDS_NOTIFY_HIDE "ocultar"
IDS_NOTIFY_AUTOHIDE "autoocultar"
IDS_SHOW_HIDDEN_ICONS "Show hidden icons"
IDS_HIDE_ICONS "Hide icons"
END
#endif // Spanish (Castilian) resources
@ -1746,6 +1756,8 @@ BEGIN
IDS_NOTIFY_SHOW "show"
IDS_NOTIFY_HIDE "hide"
IDS_NOTIFY_AUTOHIDE "autohide"
IDS_SHOW_HIDDEN_ICONS "Show hidden icons"
IDS_HIDE_ICONS "Hide icons"
END
#endif // French (France) resources
@ -1957,6 +1969,8 @@ BEGIN
IDS_NOTIFY_SHOW "show"
IDS_NOTIFY_HIDE "hide"
IDS_NOTIFY_AUTOHIDE "autohide"
IDS_SHOW_HIDDEN_ICONS "Show hidden icons"
IDS_HIDE_ICONS "Hide icons"
END
#endif // Portuguese (Portugal) resources

BIN
reactos/subsys/system/explorer/res/notify_l.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 318 B

BIN
reactos/subsys/system/explorer/res/notify_r.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 318 B

78
reactos/subsys/system/explorer/taskbar/traynotify.cpp
View file

@ -118,7 +118,7 @@ NotifyInfo& NotifyInfo::operator=(NOTIFYICONDATA* pnid)
if (_hIcon)
DestroyIcon(_hIcon);
_hIcon = (HICON) CopyImage(pnid->hIcon, IMAGE_ICON, 16, 16, 0);
_hIcon = (HICON) CopyImage(pnid->hIcon, IMAGE_ICON, NOTIFYICON_SIZE, NOTIFYICON_SIZE, 0);
}
#ifdef NIF_STATE // as of 21.08.2003 missing in MinGW headers
@ -227,6 +227,7 @@ void NotifyArea::read_config()
_hide_inactive = XMLBool(options, "hide-inactive", true); ///@todo read default setting from registry
_show_hidden = XMLBool(options, "show-hidden", false); ///@todo read default setting from registry
_show_button = XMLBool(options, "show-button", true);
XMLChildrenFilter icons(cfg_pos, "icon");
@ -272,6 +273,7 @@ void NotifyArea::write_config()
XMLPos options(cfg_pos, "options");
XMLBoolRef(options, "hide-inactive") = _hide_inactive;
XMLBoolRef(options, "show-hidden") = _show_hidden;
XMLBoolRef(options, "show-button") = _show_button;
for(NotifyIconCfgList::iterator it=_cfg.begin(); it!=_cfg.end(); ++it) {
NotifyIconConfig& cfg = *it;
@ -365,8 +367,11 @@ LRESULT NotifyArea::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
SetWindowPos(_hwndClock, 0, cx-_clock_width, 0, 0, 0, SWP_NOSIZE|SWP_NOZORDER|SWP_NOACTIVATE);
break;}
case PM_GET_WIDTH:
return _sorted_icons.size()*NOTIFYICON_DIST + NOTIFYAREA_SPACE + _clock_width;
case PM_GET_WIDTH: {
int w = _sorted_icons.size()*NOTIFYICON_DIST + NOTIFYAREA_SPACE + _clock_width;
if (_show_button)
w += NOTIFYICON_DIST;
return w;}
case PM_REFRESH_CONFIG:
read_config();
@ -402,9 +407,11 @@ LRESULT NotifyArea::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
|| nmsg==WM_XBUTTONDOWN
#endif
)
CancelModes();
NotifyIconSet::const_iterator found = IconHitTest(Point(lparam));
Point pt(lparam);
NotifyIconSet::const_iterator found = IconHitTest(pt);
if (found != _sorted_icons.end()) {
const NotifyInfo& entry = const_cast<NotifyInfo&>(*found); // Why does GCC 3.3 need this additional const_cast ?!
@ -446,7 +453,13 @@ LRESULT NotifyArea::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
}
else if (_icon_map.erase(entry)) // delete icons without valid owner window
UpdateIcons();
}
} else
// handle clicks on notification area button "show hidden icons"
if (_show_button)
if (nmsg == WM_LBUTTONDOWN)
if (pt.x>=NOTIFYICON_X && pt.x<NOTIFYICON_X+NOTIFYICON_SIZE &&
pt.y>=NOTIFYICON_Y && pt.y<NOTIFYICON_Y+NOTIFYICON_SIZE)
PostMessage(_hwnd, WM_COMMAND, MAKEWPARAM(ID_SHOW_HIDDEN_ICONS,0), 0);
}
return super::WndProc(nmsg, wparam, lparam);
@ -491,12 +504,22 @@ int NotifyArea::Notify(int id, NMHDR* pnmh)
Point pt(GetMessagePos());
ScreenToClient(_hwnd, &pt);
NotifyIconSet::iterator found = IconHitTest(pt);
if (_show_button &&
pt.x>=NOTIFYICON_X && pt.x<NOTIFYICON_X+NOTIFYICON_SIZE &&
pt.y>=NOTIFYICON_Y && pt.y<NOTIFYICON_Y+NOTIFYICON_SIZE)
{
static ResString sShowIcons(IDS_SHOW_HIDDEN_ICONS);
static ResString sHideIcons(IDS_HIDE_ICONS);
if (found != _sorted_icons.end()) {
NotifyInfo& entry = const_cast<NotifyInfo&>(*found); // Why does GCC 3.3 need this additional const_cast ?!
pdi->lpszText = (LPTSTR)(_show_hidden?sHideIcons:sShowIcons).c_str();
} else {
NotifyIconSet::iterator found = IconHitTest(pt);
pdi->lpszText = (LPTSTR)entry._tipText.c_str();
if (found != _sorted_icons.end()) {
NotifyInfo& entry = const_cast<NotifyInfo&>(*found); // Why does GCC 3.3 need this additional const_cast ?!
pdi->lpszText = (LPTSTR)entry._tipText.c_str();
}
}
}
@ -581,10 +604,18 @@ void NotifyArea::UpdateIcons()
// sync tooltip areas to current icon number
if (_sorted_icons.size() != _last_icon_count) {
RECT rect = {2, 3, 2+16, 3+16};
size_t icon_cnt = _sorted_icons.size();
RECT rect = {NOTIFYICON_X, NOTIFYICON_Y, NOTIFYICON_X+NOTIFYICON_SIZE, NOTIFYICON_Y+NOTIFYICON_SIZE};
size_t tt_idx = 0;
if (_show_button) {
_tooltip.add(_hwnd, tt_idx++, rect);
rect.left += NOTIFYICON_DIST;
rect.right += NOTIFYICON_DIST;
}
size_t icon_cnt = _sorted_icons.size();
while(tt_idx < icon_cnt) {
_tooltip.add(_hwnd, tt_idx++, rect);
@ -612,11 +643,19 @@ void NotifyArea::Paint()
FillRect(canvas, &canvas.rcPaint, GetSysColorBrush(COLOR_BTNFACE));
// draw icons
int x = 2;
int y = 3;
int x = NOTIFYICON_X;
int y = NOTIFYICON_Y;
if (_show_button) {
static SmallIcon leftArrowIcon(IDI_NOTIFY_L);
static SmallIcon rightArrowIcon(IDI_NOTIFY_R);
DrawIconEx(canvas, x, y, _show_hidden?rightArrowIcon:leftArrowIcon, NOTIFYICON_SIZE, NOTIFYICON_SIZE, 0, 0, DI_NORMAL);
x += NOTIFYICON_DIST;
}
for(NotifyIconSet::const_iterator it=_sorted_icons.begin(); it!=_sorted_icons.end(); ++it) {
DrawIconEx(canvas, x, y, it->_hIcon, 16, 16, 0, 0, DI_NORMAL);
DrawIconEx(canvas, x, y, it->_hIcon, NOTIFYICON_SIZE, NOTIFYICON_SIZE, 0, 0, DI_NORMAL);
x += NOTIFYICON_DIST;
}
@ -676,17 +715,20 @@ void NotifyArea::Refresh(bool update)
/// search for a icon at a given client coordinate position
NotifyIconSet::iterator NotifyArea::IconHitTest(const POINT& pos)
{
if (pos.y<2 || pos.y>=2+16)
if (pos.y<NOTIFYICON_Y || pos.y>=NOTIFYICON_Y+NOTIFYICON_SIZE)
return _sorted_icons.end();
NotifyIconSet::iterator it = _sorted_icons.begin();
int x = 2;
int x = NOTIFYICON_X;
if (_show_button)
x += NOTIFYICON_DIST;
for(; it!=_sorted_icons.end(); ++it) {
//NotifyInfo& entry = const_cast<NotifyInfo&>(*it); // Why does GCC 3.3 need this additional const_cast ?!
if (pos.x>=x && pos.x<x+16)
if (pos.x>=x && pos.x<x+NOTIFYICON_SIZE)
break;
x += NOTIFYICON_DIST;
@ -1096,7 +1138,7 @@ void TrayNotifyDlg::SetIconMode(NOTIFYICONMODE mode)
if (!lparam)
return;
NotifyIconConfig& entry = *(NotifyIconConfig*)lparam;
NotifyIconConfig& entry = _info[lparam];
if (entry._mode != mode) {
entry._mode = mode;

3
reactos/subsys/system/explorer/taskbar/traynotify.h
View file

@ -34,6 +34,9 @@
#define NOTIFYAREA_WIDTH_DEF 100
#define NOTIFYICON_DIST 20
#define NOTIFYAREA_SPACE 10
#define NOTIFYICON_SIZE 16
#define NOTIFYICON_X 2
#define NOTIFYICON_Y 3
#define ICON_AUTOHIDE_SECONDS 300