gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-05 21:34:17 +01:00
Code Issues Projects Releases Wiki Activity

Some enhancements to the look of the clip menu entry text, regarding

Browse Source 
single/multiple selected icon(s).
This commit is contained in:
dan
1999-05-25 20:07:36 +00:00
parent adb74c688c
commit 01b5fe34cc
1 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/dock.c
View File

@@ -290,7 +290,27 @@ killCallback(WMenu *menu, WMenuEntry *entry)
icon->editing = 0; icon->editing = 0;
WCHANGE_STATE(WSTATE_NORMAL);} WCHANGE_STATE(WSTATE_NORMAL);
}
/* TODO: replace this function with a member of the dock struct */
static int
numberOfSelectedIcons(WDock *dock)
{
WAppIcon *aicon;
int i, n;
n = 0;
for (i=1; i<dock->max_icons; i++) {
aicon = dock->icon_array[i];
if (aicon && aicon->icon->selected) {
n++;
}
}
return n;
}
static LinkedList* static LinkedList*
@@ -1091,19 +1111,30 @@ dockMenuCreate(WScreen *scr, int type)
wMenuAddCallback(menu, _("Rename Workspace"), renameCallback, NULL); wMenuAddCallback(menu, _("Rename Workspace"), renameCallback, NULL);
wMenuAddCallback(menu, _("(Un)Select Icon"), selectCallback, NULL); entry = wMenuAddCallback(menu, _("Select Icon"), selectCallback, NULL);
free(entry->text);
entry->text = _("Select Icon");
wMenuAddCallback(menu, _("(Un)Select All Icons"), selectIconsCallback, entry = wMenuAddCallback(menu, _("Select All Icons"),
NULL); selectIconsCallback, NULL);
free(entry->text);
entry->text = _("Select All Icons");
wMenuAddCallback(menu, _("Keep Icon(s)"), keepIconsCallback, NULL); entry = wMenuAddCallback(menu, _("Keep Icon"), keepIconsCallback, NULL);
free(entry->text);
entry->text = _("Keep Icon");
entry = wMenuAddCallback(menu, _("Move Icon(s) To"), NULL, NULL); entry = wMenuAddCallback(menu, _("Move Icon To"), NULL, NULL);
free(entry->text);
entry->text = _("Move Icon To");
scr->clip_submenu = makeWorkspaceMenu(scr); scr->clip_submenu = makeWorkspaceMenu(scr);
if (scr->clip_submenu) if (scr->clip_submenu)
wMenuEntrySetCascade(menu, entry, scr->clip_submenu); wMenuEntrySetCascade(menu, entry, scr->clip_submenu);
wMenuAddCallback(menu, _("Remove Icon(s)"), removeIconsCallback, NULL); entry = wMenuAddCallback(menu, _("Remove Icon"), removeIconsCallback,
NULL);
free(entry->text);
entry->text = _("Remove Icon");
wMenuAddCallback(menu, _("Attract Icons"), colectIconsCallback, NULL); wMenuAddCallback(menu, _("Attract Icons"), colectIconsCallback, NULL);
} }
@@ -3276,6 +3307,7 @@ openDockMenu(WDock *dock, WAppIcon *aicon, XEvent *event)
WApplication *wapp = NULL; WApplication *wapp = NULL;
int index = 0; int index = 0;
int x_pos; int x_pos;
int n_selected;
int appIsRunning = aicon->running && aicon->icon && aicon->icon->owner; int appIsRunning = aicon->running && aicon->icon && aicon->icon->owner;
if (dock->type == WM_DOCK) { if (dock->type == WM_DOCK) {
@@ -3292,29 +3324,51 @@ openDockMenu(WDock *dock, WAppIcon *aicon, XEvent *event)
entry = dock->menu->entries[++index]; entry = dock->menu->entries[++index];
entry->clientdata = dock; entry->clientdata = dock;
/* select icon */ /* select/unselect icon */
entry = dock->menu->entries[++index]; entry = dock->menu->entries[++index];
entry->clientdata = aicon; entry->clientdata = aicon;
if (aicon->icon->selected)
entry->text = _("Unselect Icon");
else
entry->text = _("Select Icon");
wMenuSetEnabled(dock->menu, index, aicon!=scr->clip_icon); wMenuSetEnabled(dock->menu, index, aicon!=scr->clip_icon);
/* (un)select all icons */ n_selected = numberOfSelectedIcons(dock);
/* select/unselect all icons */
entry = dock->menu->entries[++index]; entry = dock->menu->entries[++index];
entry->clientdata = aicon; entry->clientdata = aicon;
if (n_selected > 0)
entry->text = _("Unselect All Icons");
else
entry->text = _("Select All Icons");
wMenuSetEnabled(dock->menu, index, dock->icon_count > 1); wMenuSetEnabled(dock->menu, index, dock->icon_count > 1);
/* keep icon(s) */ /* keep icon(s) */
entry = dock->menu->entries[++index]; entry = dock->menu->entries[++index];
entry->clientdata = aicon; entry->clientdata = aicon;
if (n_selected > 1)
entry->text = _("Keep Icons");
else
entry->text = _("Keep Icon");
wMenuSetEnabled(dock->menu, index, dock->icon_count > 1); wMenuSetEnabled(dock->menu, index, dock->icon_count > 1);
/* this is the workspace submenu part */ /* this is the workspace submenu part */
entry = dock->menu->entries[++index];
if (n_selected > 1)
entry->text = _("Move Icons To");
else
entry->text = _("Move Icon To");
if (scr->clip_submenu) if (scr->clip_submenu)
updateWorkspaceMenu(scr->clip_submenu, aicon); updateWorkspaceMenu(scr->clip_submenu, aicon);
wMenuSetEnabled(dock->menu, ++index, !aicon->omnipresent); wMenuSetEnabled(dock->menu, index, !aicon->omnipresent);
/* remove icon(s) */ /* remove icon(s) */
entry = dock->menu->entries[++index]; entry = dock->menu->entries[++index];
entry->clientdata = aicon; entry->clientdata = aicon;
if (n_selected > 1)
entry->text = _("Remove Icons");
else
entry->text = _("Remove Icon");
wMenuSetEnabled(dock->menu, index, dock->icon_count > 1); wMenuSetEnabled(dock->menu, index, dock->icon_count > 1);
/* attract icon(s) */ /* attract icon(s) */