Subversion Repositories filter_foundry

Compare Revisions

No changes between revisions

Regard whitespace Rev 125 → Rev 126

/trunk/cursor_hand_question.cur
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/trunk/ui.h
67,6 → 67,7
 
#define IDC_FF_HAND_OPEN 1001
#define IDC_FF_HAND_GRAB 1002
#define IDC_FF_HAND_QUESTION 1003
 
/* --- constants for terminology (scripting) resource */
#define AETE_ID 16000
/trunk/ui_win.c
33,6 → 33,7
HWND preview_hwnd;
HCURSOR hCurHandOpen;
HCURSOR hCurHandGrab;
HCURSOR hCurHandQuestion;
 
extern HANDLE hDllInstance;
 
93,11 → 94,14
 
hCurHandOpen = LoadCursor(hDllInstance, MAKEINTRESOURCE(IDC_FF_HAND_OPEN));
hCurHandGrab = LoadCursor(hDllInstance, MAKEINTRESOURCE(IDC_FF_HAND_GRAB));
hCurHandQuestion = LoadCursor(hDllInstance, MAKEINTRESOURCE(IDC_FF_HAND_QUESTION));
 
preview_hwnd = GetDlgItem(hDlg, PREVIEWITEM);
GetClientRect(preview_hwnd, &preview_rect);
SetClassLongPtr(preview_hwnd, GCLP_HCURSOR, (LONG_PTR)hCurHandOpen);
 
SetClassLongPtr(GetDlgItem(hDlg, FIRSTICONITEM), GCLP_HCURSOR, (LONG_PTR)hCurHandQuestion);
 
for(i = 0; i < 8; ++i){
SendDlgItemMessage(hDlg,FIRSTCTLITEM+i, TBM_SETRANGE,TRUE,MAKELONG(0,255));
SendDlgItemMessage(hDlg,FIRSTCTLITEM+i, TBM_SETTICFREQ,SLIDERPAGE,0);
115,6 → 119,7
gdata->hWndMainDlg = 0;
DestroyCursor(hCurHandOpen);
DestroyCursor(hCurHandGrab);
DestroyCursor(hCurHandQuestion);
break;
case WM_DRAWITEM:
pdi = (DRAWITEMSTRUCT*)lParam;
175,17 → 180,28
 
Boolean maindialog(FilterRecordPtr pb){
PlatformData *p;
WNDCLASSEX clx;
 
// For the preview image, we register a class, so that we can assign a mouse cursor to this class.
WNDCLASSEX clx;
clx.cbSize = sizeof(WNDCLASSEX);
GetClassInfoEx(hDllInstance, "Static", &clx);
clx.lpszClassName = "Preview";
RegisterClassEx(&clx);
 
// For the caution images, we register a class, so that we can assign a mouse cursor to this class.
clx.cbSize = sizeof(WNDCLASSEX);
GetClassInfoEx(hDllInstance, "Static", &clx);
clx.lpszClassName = "CautionSign";
RegisterClassEx(&clx);
 
// Now show the dialog
p = pb->platformData;
return DialogBoxParam(hDllInstance,MAKEINTRESOURCE(gdata->standalone ? ID_PARAMDLG : ID_MAINDLG),
INT_PTR res = DialogBoxParam(hDllInstance,MAKEINTRESOURCE(gdata->standalone ? ID_PARAMDLG : ID_MAINDLG),
(HWND)p->hwnd,maindlgproc,0) == IDOK;
 
UnregisterClass("Preview", hDllInstance);
UnregisterClass("CautionSign", hDllInstance);
 
return res;
}
 
/trunk/ui_win.rc
31,6 → 31,7
/* Cursors for the preview window */
IDC_FF_HAND_OPEN CURSOR "cursor_hand_open.cur"
IDC_FF_HAND_GRAB CURSOR "cursor_hand_grab.cur"
IDC_FF_HAND_QUESTION CURSOR "cursor_hand_question.cur"
 
/* left,top,w,h */
 
83,10 → 84,11
LTEXT "B =",FIRSTLABELITEM+2, 15,191, 13,12
LTEXT "A =",FIRSTLABELITEM+3, 15,219, 13,12
 
CONTROL "CAUTION_ICO",FIRSTICONITEM, "Static",SS_ICON|SS_REALSIZEIMAGE|SS_NOTIFY, 15,147, 12,12
CONTROL "CAUTION_ICO",FIRSTICONITEM+1, "Static",SS_ICON|SS_REALSIZEIMAGE|SS_NOTIFY, 15,175, 12,12
CONTROL "CAUTION_ICO",FIRSTICONITEM+2, "Static",SS_ICON|SS_REALSIZEIMAGE|SS_NOTIFY, 15,203, 12,12
CONTROL "CAUTION_ICO",FIRSTICONITEM+3, "Static",SS_ICON|SS_REALSIZEIMAGE|SS_NOTIFY, 15,231, 12,12
/* The class "CautionSign" is defined in ui_win.c */
CONTROL "CAUTION_ICO",FIRSTICONITEM, "CautionSign",SS_ICON|SS_REALSIZEIMAGE|SS_NOTIFY, 15,147, 12,12
CONTROL "CAUTION_ICO",FIRSTICONITEM+1, "CautionSign",SS_ICON|SS_REALSIZEIMAGE|SS_NOTIFY, 15,175, 12,12
CONTROL "CAUTION_ICO",FIRSTICONITEM+2, "CautionSign",SS_ICON|SS_REALSIZEIMAGE|SS_NOTIFY, 15,203, 12,12
CONTROL "CAUTION_ICO",FIRSTICONITEM+3, "CautionSign",SS_ICON|SS_REALSIZEIMAGE|SS_NOTIFY, 15,231, 12,12
 
EDITTEXT FIRSTEXPRITEM, 35,135, 258, 24, ES_AUTOVSCROLL|ES_MULTILINE|ES_WANTRETURN
EDITTEXT FIRSTEXPRITEM+1, 35,163, 258, 24, ES_AUTOVSCROLL|ES_MULTILINE|ES_WANTRETURN
/trunk/version.h
108,7 → 108,7
- Bugfix: In the preview window, you could (virtually) pan the image beyond the canvas,
so that you needed to pan multiple times to get to the position "0" again.
- The "version information" of standalone filters is now individualized by the creators input
- Win64 support
- Win64 support (*)
- All undocumented symbol aliases of FilterFactory are now supported (rmin, rmax, cnv0, etc.)
- Bugfix: In some cases, the preview image had a small stripe of random pixels at the right or bottom.
- For disabled sliders, the corresponding label is now also grayed out (*)
117,6 → 117,8
- AFS Files are now compatible with FilterFactory. (FilterFactory does ONLY understand "\r" (0D) linebreaks, while
FilterFoundry always saved "\n" (0A) linebreaks, while being able to read "\r", "\n" or "\r\n". Now, "\r" is used
for saving.) (*)
- The "caution" sign that indicates an error in the expression does now have a hand cursor that shows up when
you hover over the icon, to indicate that the user will receive more information if they click on the icon (*)
(Changes by Daniel Marschall)
 
(*) This bug/solution was tested on Windows but needs to be verified and/or implemented on Mac.