gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

winspector: Save iconpath if icon will be used

Browse Source 
This patch avoids to save the icon name in the configuration file
if the flag "Ignore client supplied icon" is not selected.

First, when winspector tries to show the icon to the user, it must not search
the default icon. It should use the specific icon or the icon provided
by the client.

When we click in "save Settings", the function saveSettings reads the icon
specified by the user in the text box. If the checkbox "Ignore client supplied
icon" is not selected, then saves the icon too.

Using this behaviour we never recover the initial position (no icon selected,
no ignore client supplied icon flag set). This patch recovers the initial
state of the icon options.

When the user unsets the ignore client the filename provided is not saved in
the configuration file. Now, the configuration is like the initial status.
If the user checks the flag and set the file to use as icon, the file is used.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-11-28 23:56:19 +01:00
committed by Carlos R. Mafra
parent e206f471fe
commit c164db31bf
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/winspector.c
View File

@@ -314,8 +314,8 @@ static int showIconFor(WMScreen *scrPtr, InspectorPanel *panel, char *wm_instanc
file = NULL;
}
} else {
/* Get the application icon, default included */
db_icon = wDefaultGetIconFile(wm_instance, wm_class, True);
/* Get the application icon, default NOT included */
db_icon = wDefaultGetIconFile(wm_instance, wm_class, False);
if (db_icon != NULL)
file = wstrdup(db_icon);
}
@@ -433,7 +433,7 @@ static void saveSettings(WMButton *button, InspectorPanel *panel)
WWindow *wwin = panel->inspected;
WDDomain *db = WDWindowAttributes;
WMPropList *dict = NULL;
WMPropList *winDic, *appDic, *value, *key = NULL, *key2;
WMPropList *winDic, *appDic, *value, *value1, *key = NULL, *key2;
char *icon_file, *buf1, *buf2;
int flags = 0, i = 0, different = 0, different2 = 0;
@@ -475,16 +475,29 @@ static void saveSettings(WMButton *button, InspectorPanel *panel)
winDic = WMCreatePLDictionary(NULL, NULL);
appDic = WMCreatePLDictionary(NULL, NULL);
/* Update icon for window */
icon_file = WMGetTextFieldText(panel->fileText);
if (icon_file) {
if (icon_file[0] != 0) {
value = WMCreatePLString(icon_file);
different |= insertAttribute(dict, winDic, AIcon, value, flags);
different2 |= insertAttribute(dict, appDic, AIcon, value, flags);
WMReleasePropList(value);
/* If the "Ignore client suplied icon is not selected" flag was not set,
* then, don't save the icon filename. If saved, the application will use
* that icon, even the flag is not set. */
if (WMGetButtonSelected(panel->alwChk) != 0) {
/* Update icon for window */
icon_file = WMGetTextFieldText(panel->fileText);
if (icon_file) {
if (icon_file[0] != 0) {
value = WMCreatePLString(icon_file);
different |= insertAttribute(dict, winDic, AIcon, value, flags);
different2 |= insertAttribute(dict, appDic, AIcon, value, flags);
WMReleasePropList(value);
/* Set the ckeck for AAlwaysUserIcon only if icon_file exists */
buf1 = wmalloc(4);
snprintf(buf1, 4, "%s", (WMGetButtonSelected(panel->alwChk) != 0) ? "Yes" : "No");
value1 = WMCreatePLString(buf1);
different |= insertAttribute(dict, winDic, AAlwaysUserIcon, value1, flags);
WMReleasePropList(value1);
wfree(buf1);
}
wfree(icon_file);
}
wfree(icon_file);
}
i = WMGetPopUpButtonSelectedItem(panel->wsP) - 1;
@@ -496,9 +509,6 @@ static void saveSettings(WMButton *button, InspectorPanel *panel)
flags |= IS_BOOLEAN;
value = (WMGetButtonSelected(panel->alwChk) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, AAlwaysUserIcon, value, flags);
value = (WMGetButtonSelected(panel->attrChk[0]) != 0) ? Yes : No;
different |= insertAttribute(dict, winDic, ANoTitlebar, value, flags);