From f5763bc3d3b53cdb963aad9b25e18c066de546aa Mon Sep 17 00:00:00 2001 From: Daniel Marschall Date: Sun, 9 Jun 2024 17:52:38 +0000 Subject: [PATCH] Introduced ui_win.h git-svn-id: https://svn.viathinksoft.com/svn/filter_foundry/trunk@576 1b5a0048-3058-4200-831f-25aa9e3a14b9 --- .gitignore | 2 +- slider_win.h | 18 +--- ui_win.c | 10 +- ui_win.h | 33 ++++++ ui_win.rc | 106 ++++++++++---------- visual_studio/FilterFoundry.vcxproj | 1 + visual_studio/FilterFoundry.vcxproj.filters | 3 + visual_studio/nmake.mak | 2 +- visual_studio/nmake64.mak | 2 +- wpj/filterfoundry.tgt | 78 ++++++++------ wpj/filterfoundry.wpj | 16 +-- 11 files changed, 156 insertions(+), 115 deletions(-) create mode 100644 ui_win.h diff --git a/.gitignore b/.gitignore index d15bb99..02bb5f1 100644 --- a/.gitignore +++ b/.gitignore @@ -48,11 +48,11 @@ visual_studio/*.idb visual_studio/*.8bf.manifest visual_studio/*.intermediate.manifest - win_flex_bison/custom_build_rules win_flex_bison/data/ win_flex_bison/FlexLexer.h win_flex_bison/README.txt +win_flex_bison/README.md win_flex_bison/UNISTD_ERROR.readme win_flex_bison/win_bison.exe win_flex_bison/win_flex.exe diff --git a/slider_win.h b/slider_win.h index e24b79d..409a2ae 100644 --- a/slider_win.h +++ b/slider_win.h @@ -23,21 +23,13 @@ #include +// If use_plugin_dll_sliders switch enabled: +// The sliders will use PLUGIN.DLL if it is available, +// otherwise (e.g. if the host is non-Adobe), it will use the Windows common control sliders. +// If use_plugin_dll_sliders switch disabled: +// Only Windows common control sliders will be used (requires Win95+) #define use_plugin_dll_sliders -#ifdef use_plugin_dll_sliders - -// PLUGIN.DLL Sliders: - -BOOL PluginDll_RegisterSlider(HINSTANCE hInstanceDll, DWORD* MessageID); -BOOL PluginDll_UnRegisterSlider(HINSTANCE hInstanceDll); -int PluginDll_SetSliderRange(HWND hWnd, int nMin, int nMax); -int PluginDll_SetSliderPos(HWND hWnd, int nPos, BOOL bRepaint); -int PluginDll_GetSliderPos(HWND hWnd, BOOL bPixelPosition); - -#endif - -// Use these functions ONLY: void FF_SetSliderRange(HWND hDlg, int nIDDlgItem, int min, int max); int FF_GetSliderPos(HWND hDlg, int nIDDlgItem); diff --git a/ui_win.c b/ui_win.c index 2c0405c..c4d8f5a 100644 --- a/ui_win.c +++ b/ui_win.c @@ -30,6 +30,7 @@ #include "ff.h" #include "slider_win.h" #include "version.h" +#include "ui_win.h" HWND preview_hwnd; HCURSOR hCurHandOpen; @@ -40,15 +41,6 @@ HICON hIconCautionSign; extern HINSTANCE hDllInstance; -// { iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 37476 products(2) filter-foundry(72) controls(2) slider(1) } -#define OID_SLIDER_WNDCLASS "1.3.6.1.4.1.37476.2.72.2.1" - -// { iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 37476 products(2) filter-foundry(72) controls(2) preview(2) } -#define OID_PREVIEW_WNDCLASS "1.3.6.1.4.1.37476.2.72.2.2" - -// { iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 37476 products(2) filter-foundry(72) controls(2) caution(3) } -#define OID_CAUTION_WNDCLASS "1.3.6.1.4.1.37476.2.72.2.3" - void DoAbout(AboutRecordPtr pb){ TCHAR* tmp1; TCHAR* filters = (TCHAR*)malloc(4096); diff --git a/ui_win.h b/ui_win.h new file mode 100644 index 0000000..1cffcbe --- /dev/null +++ b/ui_win.h @@ -0,0 +1,33 @@ +/* + This file is part of "Filter Foundry", a filter plugin for Adobe Photoshop + Copyright (C) 2003-2009 Toby Thain, toby@telegraphics.net + Copyright (C) 2018-2024 Daniel Marschall, ViaThinkSoft + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef UI_WIN_H_ +#define UI_WIN_H_ + +// { iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 37476 products(2) filter-foundry(72) controls(2) slider(1) } +#define OID_SLIDER_WNDCLASS "1.3.6.1.4.1.37476.2.72.2.1" + +// { iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 37476 products(2) filter-foundry(72) controls(2) preview(2) } +#define OID_PREVIEW_WNDCLASS "1.3.6.1.4.1.37476.2.72.2.2" + +// { iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) 37476 products(2) filter-foundry(72) controls(2) caution(3) } +#define OID_CAUTION_WNDCLASS "1.3.6.1.4.1.37476.2.72.2.3" + +#endif diff --git a/ui_win.rc b/ui_win.rc index f38931a..577a63c 100644 --- a/ui_win.rc +++ b/ui_win.rc @@ -24,7 +24,9 @@ #include "winuser.h" #include "commctrl.h" + #include "ui.h" +#include "ui_win.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL CAUTION_ICO ICON "caution.ico" @@ -47,8 +49,8 @@ FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK", IDOK, 260, 253, 42, 14 - /* "1.3.6.1.4.1.37476.2.72.2.2" (Preview) is a subclass of "Static", defined in ui_win.c */ - CONTROL "", PREVIEWITEM, "1.3.6.1.4.1.37476.2.72.2.2", SS_OWNERDRAW|SS_NOTIFY|SS_SUNKEN, 15,10, 100,100 + /* OID_PREVIEW_WNDCLASS (Preview) is a subclass of "Static", defined in ui_win.c */ + CONTROL "", PREVIEWITEM, OID_PREVIEW_WNDCLASS, SS_OWNERDRAW|SS_NOTIFY|SS_SUNKEN, 15,10, 100,100 CONTROL "+", ZOOMINITEM, "Button", BS_PUSHBUTTON | BS_CENTER | BS_FLAT | WS_CHILD | WS_VISIBLE, 102,115, 14,12 CONTROL "-", ZOOMOUTITEM, "Button", BS_PUSHBUTTON | BS_CENTER | BS_FLAT | WS_CHILD | WS_VISIBLE, 15,115, 14,12 @@ -63,14 +65,14 @@ BEGIN LTEXT "ctl(6)",FIRSTCTLLABELITEM+6, 129,100, 25,12 LTEXT "ctl(7)",FIRSTCTLLABELITEM+7, 129,115, 25,12 - CONTROL "",FIRSTCTLITEM, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,10, 105,10 - CONTROL "",FIRSTCTLITEM+1, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,25, 105,10 - CONTROL "",FIRSTCTLITEM+2, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,40, 105,10 - CONTROL "",FIRSTCTLITEM+3, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,55, 105,10 - CONTROL "",FIRSTCTLITEM+4, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,70, 105,10 - CONTROL "",FIRSTCTLITEM+5, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,85, 105,10 - CONTROL "",FIRSTCTLITEM+6, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,100, 105,10 - CONTROL "",FIRSTCTLITEM+7, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,115, 105,10 + CONTROL "",FIRSTCTLITEM, OID_SLIDER_WNDCLASS, 0, 154,10, 105,10 + CONTROL "",FIRSTCTLITEM+1, OID_SLIDER_WNDCLASS, 0, 154,25, 105,10 + CONTROL "",FIRSTCTLITEM+2, OID_SLIDER_WNDCLASS, 0, 154,40, 105,10 + CONTROL "",FIRSTCTLITEM+3, OID_SLIDER_WNDCLASS, 0, 154,55, 105,10 + CONTROL "",FIRSTCTLITEM+4, OID_SLIDER_WNDCLASS, 0, 154,70, 105,10 + CONTROL "",FIRSTCTLITEM+5, OID_SLIDER_WNDCLASS, 0, 154,85, 105,10 + CONTROL "",FIRSTCTLITEM+6, OID_SLIDER_WNDCLASS, 0, 154,100, 105,10 + CONTROL "",FIRSTCTLITEM+7, OID_SLIDER_WNDCLASS, 0, 154,115, 105,10 EDITTEXT FIRSTCTLTEXTITEM, 273, 10, 24,12, ES_NUMBER|ES_RIGHT EDITTEXT FIRSTCTLTEXTITEM+1, 273, 25, 24,12, ES_NUMBER|ES_RIGHT @@ -86,11 +88,11 @@ BEGIN LTEXT "B =",FIRSTLABELITEM+2, 15,191, 13,12 LTEXT "A =",FIRSTLABELITEM+3, 15,219, 13,12 - /* "1.3.6.1.4.1.37476.2.72.2.3" (Caution icon) is a subclass of "Button", defined in ui_win.c */ - CONTROL "!",FIRSTICONITEM, "1.3.6.1.4.1.37476.2.72.2.3",BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,147, 16,16 - CONTROL "!",FIRSTICONITEM+1, "1.3.6.1.4.1.37476.2.72.2.3",BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,175, 16,16 - CONTROL "!",FIRSTICONITEM+2, "1.3.6.1.4.1.37476.2.72.2.3",BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,203, 16,16 - CONTROL "!",FIRSTICONITEM+3, "1.3.6.1.4.1.37476.2.72.2.3",BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,231, 16,16 + /* OID_CAUTION_WNDCLASS (Caution icon) is a subclass of "Button", defined in ui_win.c */ + CONTROL "!",FIRSTICONITEM, OID_CAUTION_WNDCLASS,BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,147, 16,16 + CONTROL "!",FIRSTICONITEM+1, OID_CAUTION_WNDCLASS,BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,175, 16,16 + CONTROL "!",FIRSTICONITEM+2, OID_CAUTION_WNDCLASS,BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,203, 16,16 + CONTROL "!",FIRSTICONITEM+3, OID_CAUTION_WNDCLASS,BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,231, 16,16 EDITTEXT FIRSTEXPRITEM, 35,135, 262, 24, ES_AUTOVSCROLL|ES_MULTILINE|ES_WANTRETURN|WS_VSCROLL EDITTEXT FIRSTEXPRITEM+1, 35,163, 262, 24, ES_AUTOVSCROLL|ES_MULTILINE|ES_WANTRETURN|WS_VSCROLL @@ -112,8 +114,8 @@ FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK", IDOK, 260, 253, 42, 14 - /* "1.3.6.1.4.1.37476.2.72.2.2" (Preview) is a subclass of "Static", defined in ui_win.c */ - CONTROL "", PREVIEWITEM, "1.3.6.1.4.1.37476.2.72.2.2", SS_OWNERDRAW|SS_NOTIFY|SS_SUNKEN, 15,10, 100,100 + /* OID_PREVIEW_WNDCLASS (Preview) is a subclass of "Static", defined in ui_win.c */ + CONTROL "", PREVIEWITEM, OID_PREVIEW_WNDCLASS, SS_OWNERDRAW|SS_NOTIFY|SS_SUNKEN, 15,10, 100,100 CONTROL "+", ZOOMINITEM, "Button", BS_PUSHBUTTON | BS_CENTER | BS_FLAT | WS_CHILD | WS_VISIBLE, 102,115, 14,12 CONTROL "-", ZOOMOUTITEM, "Button", BS_PUSHBUTTON | BS_CENTER | BS_FLAT | WS_CHILD | WS_VISIBLE, 15,115, 14,12 @@ -128,14 +130,14 @@ BEGIN LTEXT "ctl(6)",FIRSTCTLLABELITEM+6, 129,100, 25,12 LTEXT "ctl(7)",FIRSTCTLLABELITEM+7, 129,115, 25,12 - CONTROL "",FIRSTCTLITEM, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,10, 105,10 - CONTROL "",FIRSTCTLITEM+1, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,25, 105,10 - CONTROL "",FIRSTCTLITEM+2, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,40, 105,10 - CONTROL "",FIRSTCTLITEM+3, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,55, 105,10 - CONTROL "",FIRSTCTLITEM+4, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,70, 105,10 - CONTROL "",FIRSTCTLITEM+5, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,85, 105,10 - CONTROL "",FIRSTCTLITEM+6, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,100, 105,10 - CONTROL "",FIRSTCTLITEM+7, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,115, 105,10 + CONTROL "",FIRSTCTLITEM, OID_SLIDER_WNDCLASS, 0, 154,10, 105,10 + CONTROL "",FIRSTCTLITEM+1, OID_SLIDER_WNDCLASS, 0, 154,25, 105,10 + CONTROL "",FIRSTCTLITEM+2, OID_SLIDER_WNDCLASS, 0, 154,40, 105,10 + CONTROL "",FIRSTCTLITEM+3, OID_SLIDER_WNDCLASS, 0, 154,55, 105,10 + CONTROL "",FIRSTCTLITEM+4, OID_SLIDER_WNDCLASS, 0, 154,70, 105,10 + CONTROL "",FIRSTCTLITEM+5, OID_SLIDER_WNDCLASS, 0, 154,85, 105,10 + CONTROL "",FIRSTCTLITEM+6, OID_SLIDER_WNDCLASS, 0, 154,100, 105,10 + CONTROL "",FIRSTCTLITEM+7, OID_SLIDER_WNDCLASS, 0, 154,115, 105,10 EDITTEXT FIRSTCTLTEXTITEM, 273, 10, 24,12, ES_NUMBER|ES_RIGHT EDITTEXT FIRSTCTLTEXTITEM+1, 273, 25, 24,12, ES_NUMBER|ES_RIGHT @@ -151,11 +153,11 @@ BEGIN LTEXT "B =",FIRSTLABELITEM+2, 15,191, 13,12 LTEXT "A =",FIRSTLABELITEM+3, 15,219, 13,12 - /* "1.3.6.1.4.1.37476.2.72.2.3" (Caution icon) is a subclass of "Button", defined in ui_win.c */ - CONTROL "!",FIRSTICONITEM, "1.3.6.1.4.1.37476.2.72.2.3",BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,147, 16,16 - CONTROL "!",FIRSTICONITEM+1, "1.3.6.1.4.1.37476.2.72.2.3",BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,175, 16,16 - CONTROL "!",FIRSTICONITEM+2, "1.3.6.1.4.1.37476.2.72.2.3",BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,203, 16,16 - CONTROL "!",FIRSTICONITEM+3, "1.3.6.1.4.1.37476.2.72.2.3",BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,231, 16,16 + /* OID_CAUTION_WNDCLASS (Caution icon) is a subclass of "Button", defined in ui_win.c */ + CONTROL "!",FIRSTICONITEM, OID_CAUTION_WNDCLASS,BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,147, 16,16 + CONTROL "!",FIRSTICONITEM+1, OID_CAUTION_WNDCLASS,BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,175, 16,16 + CONTROL "!",FIRSTICONITEM+2, OID_CAUTION_WNDCLASS,BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,203, 16,16 + CONTROL "!",FIRSTICONITEM+3, OID_CAUTION_WNDCLASS,BS_PUSHBUTTON | BS_CENTER | BS_FLAT | BS_OWNERDRAW | WS_CHILD | WS_CLIPSIBLINGS, 15,231, 16,16 EDITTEXT FIRSTEXPRITEM, 35,135, 262, 24, ES_AUTOVSCROLL|ES_MULTILINE|ES_WANTRETURN|WS_VSCROLL EDITTEXT FIRSTEXPRITEM+1, 35,163, 262, 24, ES_AUTOVSCROLL|ES_MULTILINE|ES_WANTRETURN|WS_VSCROLL @@ -177,8 +179,8 @@ FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK", IDOK, 256,137, 42,14 - /* "1.3.6.1.4.1.37476.2.72.2.2" (Preview) is a subclass of "Static", defined in ui_win.c */ - CONTROL "", PREVIEWITEM, "1.3.6.1.4.1.37476.2.72.2.2",SS_OWNERDRAW|SS_NOTIFY|SS_SUNKEN, 15,10, 100,100 + /* OID_PREVIEW_WNDCLASS (Preview) is a subclass of "Static", defined in ui_win.c */ + CONTROL "", PREVIEWITEM, OID_PREVIEW_WNDCLASS,SS_OWNERDRAW|SS_NOTIFY|SS_SUNKEN, 15,10, 100,100 CONTROL "+", ZOOMINITEM, "Button", BS_PUSHBUTTON | BS_CENTER | BS_FLAT | WS_CHILD | WS_VISIBLE, 103,115, 12,12 CONTROL "-", ZOOMOUTITEM, "Button", BS_PUSHBUTTON | BS_CENTER | BS_FLAT | WS_CHILD | WS_VISIBLE, 15,115, 12,12 @@ -198,14 +200,14 @@ BEGIN LTEXT "map(2)",FIRSTMAPLABELITEM+2, 129, 78, 25,12 LTEXT "map(3)",FIRSTMAPLABELITEM+3, 129,108, 25,12 - CONTROL "",FIRSTCTLITEM, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 10, 100,10 - CONTROL "",FIRSTCTLITEM+1, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 25, 100,10 - CONTROL "",FIRSTCTLITEM+2, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 40, 100,10 - CONTROL "",FIRSTCTLITEM+3, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 55, 100,10 - CONTROL "",FIRSTCTLITEM+4, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 70, 100,10 - CONTROL "",FIRSTCTLITEM+5, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 85, 100,10 - CONTROL "",FIRSTCTLITEM+6, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,100, 100,10 - CONTROL "",FIRSTCTLITEM+7, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,115, 100,10 + CONTROL "",FIRSTCTLITEM, OID_SLIDER_WNDCLASS, 0, 154, 10, 100,10 + CONTROL "",FIRSTCTLITEM+1, OID_SLIDER_WNDCLASS, 0, 154, 25, 100,10 + CONTROL "",FIRSTCTLITEM+2, OID_SLIDER_WNDCLASS, 0, 154, 40, 100,10 + CONTROL "",FIRSTCTLITEM+3, OID_SLIDER_WNDCLASS, 0, 154, 55, 100,10 + CONTROL "",FIRSTCTLITEM+4, OID_SLIDER_WNDCLASS, 0, 154, 70, 100,10 + CONTROL "",FIRSTCTLITEM+5, OID_SLIDER_WNDCLASS, 0, 154, 85, 100,10 + CONTROL "",FIRSTCTLITEM+6, OID_SLIDER_WNDCLASS, 0, 154,100, 100,10 + CONTROL "",FIRSTCTLITEM+7, OID_SLIDER_WNDCLASS, 0, 154,115, 100,10 EDITTEXT FIRSTCTLTEXTITEM, 269, 10, 24,12, ES_NUMBER|ES_RIGHT EDITTEXT FIRSTCTLTEXTITEM+1, 269, 25, 24,12, ES_NUMBER|ES_RIGHT @@ -229,8 +231,8 @@ FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK", IDOK, 256,137, 42,14 - /* "1.3.6.1.4.1.37476.2.72.2.2" (Preview) is a subclass of "Static", defined in ui_win.c */ - CONTROL "", PREVIEWITEM, "1.3.6.1.4.1.37476.2.72.2.2",SS_OWNERDRAW|SS_NOTIFY|SS_SUNKEN, 15,10, 100,100 + /* OID_PREVIEW_WNDCLASS (Preview) is a subclass of "Static", defined in ui_win.c */ + CONTROL "", PREVIEWITEM, OID_PREVIEW_WNDCLASS,SS_OWNERDRAW|SS_NOTIFY|SS_SUNKEN, 15,10, 100,100 CONTROL "+", ZOOMINITEM, "Button", BS_PUSHBUTTON | BS_CENTER | BS_FLAT | WS_CHILD | WS_VISIBLE, 103,115, 12,12 CONTROL "-", ZOOMOUTITEM, "Button", BS_PUSHBUTTON | BS_CENTER | BS_FLAT | WS_CHILD | WS_VISIBLE, 15,115, 12,12 @@ -250,14 +252,14 @@ BEGIN LTEXT "map(2)",FIRSTMAPLABELITEM+2, 129, 78, 25,12 LTEXT "map(3)",FIRSTMAPLABELITEM+3, 129,108, 25,12 - CONTROL "",FIRSTCTLITEM, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 10, 100,10 - CONTROL "",FIRSTCTLITEM+1, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 25, 100,10 - CONTROL "",FIRSTCTLITEM+2, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 40, 100,10 - CONTROL "",FIRSTCTLITEM+3, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 55, 100,10 - CONTROL "",FIRSTCTLITEM+4, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 70, 100,10 - CONTROL "",FIRSTCTLITEM+5, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154, 85, 100,10 - CONTROL "",FIRSTCTLITEM+6, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,100, 100,10 - CONTROL "",FIRSTCTLITEM+7, "1.3.6.1.4.1.37476.2.72.2.1", 0, 154,115, 100,10 + CONTROL "",FIRSTCTLITEM, OID_SLIDER_WNDCLASS, 0, 154, 10, 100,10 + CONTROL "",FIRSTCTLITEM+1, OID_SLIDER_WNDCLASS, 0, 154, 25, 100,10 + CONTROL "",FIRSTCTLITEM+2, OID_SLIDER_WNDCLASS, 0, 154, 40, 100,10 + CONTROL "",FIRSTCTLITEM+3, OID_SLIDER_WNDCLASS, 0, 154, 55, 100,10 + CONTROL "",FIRSTCTLITEM+4, OID_SLIDER_WNDCLASS, 0, 154, 70, 100,10 + CONTROL "",FIRSTCTLITEM+5, OID_SLIDER_WNDCLASS, 0, 154, 85, 100,10 + CONTROL "",FIRSTCTLITEM+6, OID_SLIDER_WNDCLASS, 0, 154,100, 100,10 + CONTROL "",FIRSTCTLITEM+7, OID_SLIDER_WNDCLASS, 0, 154,115, 100,10 EDITTEXT FIRSTCTLTEXTITEM, 269, 10, 24,12, ES_NUMBER|ES_RIGHT EDITTEXT FIRSTCTLTEXTITEM+1, 269, 25, 24,12, ES_NUMBER|ES_RIGHT @@ -369,10 +371,10 @@ BEGIN CHECKBOX "Filter schützen",PROTECTITEM, 10,219, 67,12 - LTEXT "Kategorie:", 100, 10,10, 35,12 + LTEXT "Kategorie:", 100, 10,10, 35,12 LTEXT "Titel:", 101, 10,25, 35,12 LTEXT "Copyright:", 102, 10,40, 35,12 - LTEXT "Autor:", 103, 10,67, 35,12 + LTEXT "Autor:", 103, 10,67, 35,12 PUSHBUTTON "Abbrechen", IDCANCEL, 106,219, 42,14 END diff --git a/visual_studio/FilterFoundry.vcxproj b/visual_studio/FilterFoundry.vcxproj index f6cc943..6979554 100644 --- a/visual_studio/FilterFoundry.vcxproj +++ b/visual_studio/FilterFoundry.vcxproj @@ -274,6 +274,7 @@ foundry_3264_mixer.bat + diff --git a/visual_studio/FilterFoundry.vcxproj.filters b/visual_studio/FilterFoundry.vcxproj.filters index a263905..eb9f979 100644 --- a/visual_studio/FilterFoundry.vcxproj.filters +++ b/visual_studio/FilterFoundry.vcxproj.filters @@ -96,6 +96,9 @@ Headerdateien + + Headerdateien + diff --git a/visual_studio/nmake.mak b/visual_studio/nmake.mak index 71ec93f..db9681a 100644 --- a/visual_studio/nmake.mak +++ b/visual_studio/nmake.mak @@ -77,7 +77,7 @@ all : parser lexer $(EXEC).8bf clean : -del *.obj *.asm *.cod win_res.res $(EXEC).8bf $(EXEC).exp $(EXEC).lib $(EXEC).map -win_res.res : ..\win_res.rc ..\Scripting.rc ..\PiPL.rc ..\PiPL_body.rc ..\manifest.rc ..\version_win.rc ..\ui_win.rc ..\caution.ico ..\ui.h ..\version.h +win_res.res : ..\win_res.rc ..\Scripting.rc ..\PiPL.rc ..\PiPL_body.rc ..\manifest.rc ..\version_win.rc ..\ui_win.rc ..\caution.ico ..\ui.h ..\ui_win.h ..\version.h $(RC) $(RFLAGS) $(CPPFLAGS) -fowin_res.res ..\win_res.rc parser : ..\parser.y diff --git a/visual_studio/nmake64.mak b/visual_studio/nmake64.mak index 2a6da54..b1e80bf 100644 --- a/visual_studio/nmake64.mak +++ b/visual_studio/nmake64.mak @@ -77,7 +77,7 @@ all : parser lexer $(EXEC)64.8bf clean : -del *.obj *.asm *.cod win_res.res $(EXEC)64.8bf $(EXEC)64.exp $(EXEC)64.lib $(EXEC)64.map -win_res.res : ..\win_res.rc ..\Scripting.rc ..\PiPL.rc ..\PiPL_body.rc ..\manifest.rc ..\version_win.rc ..\ui_win.rc ..\caution.ico ..\ui.h ..\version.h +win_res.res : ..\win_res.rc ..\Scripting.rc ..\PiPL.rc ..\PiPL_body.rc ..\manifest.rc ..\version_win.rc ..\ui_win.rc ..\caution.ico ..\ui.h ..\ui_win.h ..\version.h $(RC) $(RFLAGS) $(CPPFLAGS) -fowin_res.res ..\win_res.rc parser : ..\parser.y diff --git a/wpj/filterfoundry.tgt b/wpj/filterfoundry.tgt index 39e9eb6..39dc142 100644 --- a/wpj/filterfoundry.tgt +++ b/wpj/filterfoundry.tgt @@ -90,7 +90,7 @@ WVList 0 22 WPickList -77 +78 23 MItem 3 @@ -1570,7 +1570,7 @@ WVList 358 MItem 11 -..\unistd.h +..\ui_win.h 359 WString 3 @@ -1587,8 +1587,8 @@ WVList 0 362 MItem -12 -..\version.h +11 +..\unistd.h 363 WString 3 @@ -1605,8 +1605,8 @@ WVList 0 366 MItem -27 -..\versioninfo_modify_win.h +12 +..\version.h 367 WString 3 @@ -1623,8 +1623,8 @@ WVList 0 370 MItem -10 -..\y.tab.h +27 +..\versioninfo_modify_win.h 371 WString 3 @@ -1641,93 +1641,111 @@ WVList 0 374 MItem +10 +..\y.tab.h +375 +WString +3 +NIL +376 +WVList +0 +377 +WVList +0 +214 +1 +1 +0 +378 +MItem 4 *.rc -375 +379 WString 5 NRESC -376 +380 WVList 4 -377 +381 MRState -378 +382 WString 3 WRC -379 +383 WString 32 ?????Single byte characters only 1 0 -380 +384 MRState -381 +385 WString 3 WRC -382 +386 WString 18 ?????Unicode UTF-8 1 1 -383 +387 MVState -384 +388 WString 3 WRC -385 +389 WString 23 n????Macro definitions: 1 -386 +390 WString 61 WIN32 _WIN32 __NT__ WIN_ENV=1 INSIDE_PHOTOSHOP=1 MSWindows=1 0 -387 +391 MVState -388 +392 WString 3 WRC -389 +393 WString 25 n????Include directories: 1 -390 +394 WString 73 $[:;$(%watcom)\h;$(%watcom)\h\nt;$(%PSAPI)\Photoshop;$(%PSAPI)\Pica_sp;.\ 0 -391 +395 WVList 0 -1 1 1 0 -392 +396 MItem 13 ..\win_res.rc -393 +397 WString 5 NRESC -394 +398 WVList 0 -395 +399 WVList 0 -374 +378 1 1 0 diff --git a/wpj/filterfoundry.wpj b/wpj/filterfoundry.wpj index 41b0283..2a213be 100644 --- a/wpj/filterfoundry.wpj +++ b/wpj/filterfoundry.wpj @@ -4,10 +4,10 @@ projectIdent VpeMain 1 WRect -864 -654 -7392 -8704 +10208 +-632 +7744 +7509 2 MProject 3 @@ -30,8 +30,8 @@ WVList VComponent 8 WRect -64 -56 +248 +28 6656 6656 0 @@ -40,6 +40,6 @@ WRect WFileName 17 filterfoundry.tgt -5 -26 +3 +35 7