move api to folder

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@48 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

4 files changed, 16 insertions, 229 deletions

diff --git a/console/Console.vcproj b/console/Console.vcproj
index 3814d7b..782cda3 100644
--- a/console/Console.vcproj
+++ b/console/Console.vcproj
@@ -51,7 +51,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -74,7 +74,7 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;../ExternalAPI"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -151,7 +151,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="3"

 				InlineFunctionExpansion="2"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -174,7 +174,7 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;../ExternalAPI"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -249,7 +249,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;../ExternalAPI"

 				PreprocessorDefinitions="_UNICODE;WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -272,7 +272,7 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;../ExternalAPI"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -349,7 +349,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="3"

 				InlineFunctionExpansion="2"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;../ExternalAPI"

 				PreprocessorDefinitions="_UNICODE;WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -372,7 +372,7 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include;../ExternalAPI"

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

diff --git a/console/Console.vcxproj b/console/Console.vcxproj
index 9465ab7..3071999 100644
--- a/console/Console.vcxproj
+++ b/console/Console.vcxproj
@@ -94,7 +94,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -113,7 +113,7 @@
     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Culture>0x0409</Culture>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <OutputFile>../../Bin/Debug/plugins/Console.dll</OutputFile>

@@ -142,7 +142,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -161,7 +161,7 @@
     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Culture>0x0409</Culture>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalOptions>/ALIGN:4096 %(AdditionalOptions)</AdditionalOptions>

@@ -188,7 +188,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_UNICODE;WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -207,7 +207,7 @@
     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Culture>0x0409</Culture>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <OutputFile>../../Bin/Debug Unicode/plugins/Console.dll</OutputFile>

@@ -236,7 +236,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_UNICODE;WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -255,7 +255,7 @@
     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <Culture>0x0409</Culture>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalOptions>/ALIGN:4096 %(AdditionalOptions)</AdditionalOptions>

diff --git a/console/m_toolbar.h b/console/m_toolbar.h
deleted file mode 100644
index fc417cf..0000000
--- a/console/m_toolbar.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef M_TOOLBAR_H

-#define M_TOOLBAR_H

-

-#define TOOLBARBUTTON_ICONIDPREFIX "MTB_"

-#define TOOLBARBUTTON_ICONIDPRIMARYSUFFIX "_Primary"

-#define TOOLBARBUTTON_ICONIDSECONDARYSUFFIX "_Secondary"

-#define TOOLBARBUTTON_ICONNAMEPRESSEDSUFFIX "Pressed"

-

-//button flags

-#define TBBF_DISABLED			(1<<0)

-#define TBBF_VISIBLE			(1<<1) 

-#define TBBF_PUSHED				(1<<2)

-#define TBBF_SHOWTOOLTIP		(1<<3)

-#define TBBF_ISSEPARATOR		(1<<5)

-#define TBBF_ISLBUTTON			(1<<6)

-#define TBBF_FLEXSIZESEPARATOR  (TBBF_ISSEPARATOR|TBBF_PUSHED) 

-typedef struct _tagTBButton

-{

-	int cbSize;				 // size of structure

-	char * pszButtonID;		 // char id of button used to store button info in DB and know about icon 

-	char * pszButtonName;    // name of button (not translated)

-	char * pszServiceName;	 // service name to be executed

-	LPARAM lParam;			 // param of service to be called

-	char * pszTooltipUp, *pszTooltipDn;	

-	DWORD defPos;			 // default order pos of button (less values are nearer to edge).. please use values greater that 100. the default buttons has pos: 10,20..90

-	DWORD tbbFlags;			 // combine of TBBF_ flags above

-	void (*ParamDestructor)(void *); //will be called on parameters deletion

-	HANDLE hPrimaryIconHandle;

-	HANDLE hSecondaryIconHandle;

-}TBButton;

-

-//////////////////////////////////////////////////////////////////////////

-// Events

-// Only after this event module subscribers should register their buttons

-// wparam=lparam=0

-// don't forget to return 0 to continue processing

-#define ME_TB_MODULELOADED	 "ToolBar/ModuleLoaded"

-

-//////////////////////////////////////////////////////////////////////////

-// Services

-//

-//////////////////////////////////////////////////////////////////////////

-// Adding a button

-// WPARAM  = 0

-// LPARAM  = (TBButton *) &description

-// LRESULT = (HANDLE) hButton

-// in order to correctly process default icons via iconlib it should be

-// registered icolib icon with id named:

-// 'TBButton_'+pszButtonID+ 'Up' or +'Down' for Push (2-state) buttons

-#define MS_TB_ADDBUTTON "ToolBar/AddButton"

-

-//////////////////////////////////////////////////////////////////////////

-// Remove button

-// WPARAM = (HANDLE) hButton;

-// LPARAM = 0;

-#define MS_TB_REMOVEBUTTON "ToolBar/RemoveButton"

-

-//////////////////////////////////////////////////////////////////////////

-// SetState

-// WPARAM = (HANDLE) hButton;

-// LPARAM = one of below TBST_ states 

-// LRESULT= old state

-#define TBST_PUSHED			1

-#define TBST_RELEASED		0

-#define MS_TB_SETBUTTONSTATE "ToolBar/SetButtonState"

-

-//////////////////////////////////////////////////////////////////////////

-// SetStatebyId

-// WPARAM = (char *) szButtonID;

-// LPARAM = one of below TBST_ states 

-// LRESULT= old state

-#define MS_TB_SETBUTTONSTATEBYID "ToolBar/SetButtonStateId"

-//////////////////////////////////////////////////////////////////////////

-// GetState

-// WPARAM = (HANLDE) hButton;

-// LPARAM = 0

-// LRESULT= current state

-#define MS_TB_GETBUTTONSTATE "ToolBar/GetButtonState"

-

-//////////////////////////////////////////////////////////////////////////

-// GetState

-// WPARAM = (char *) szButtonID;;

-// LPARAM = 0

-// LRESULT= current state

-#define MS_TB_GETBUTTONSTATEBYID "ToolBar/GetButtonStateId"

-

-

-#endif
\ No newline at end of file
diff --git a/console/m_toptoolbar.h b/console/m_toptoolbar.h
deleted file mode 100644
index 5628f68..0000000
--- a/console/m_toptoolbar.h
+++ /dev/null
@@ -1,125 +0,0 @@
-

-#ifndef M_TOPTOOLBAR_H

-#define M_TOPTOOLBAR_H

-

-//button flags

-#define TTBBF_DISABLED			1

-#define TTBBF_VISIBLE			2 

-#define TTBBF_PUSHED			4

-#define TTBBF_SHOWTOOLTIP		8

-#define TTBBF_DRAWBORDER		16//draw border for bitmap,bitmap must be WxH 16x12

-#define TTBBF_ISSEPARATOR		32

-

-//for internal launch buttons

-#define TTBBF_ISLBUTTON			64

-

-typedef struct {

-	int cbSize;

-	HBITMAP hbBitmapUp;

-	HBITMAP hbBitmapDown;

-	char *pszServiceUp;

-	char *pszServiceDown;

-	DWORD dwFlags;

-	LPARAM lParamUp;

-	WPARAM wParamUp;

-	LPARAM lParamDown;

-	WPARAM wParamDown;

-	char *name;

-

-} TTBButton, * lpTTBButton;

-

-typedef struct {

-	int cbSize;

-	HBITMAP hbBitmapUp;

-	HBITMAP hbBitmapDown;

-	char *pszServiceUp;

-	char *pszServiceDown;

-	DWORD dwFlags;

-	LPARAM lParamUp;

-	WPARAM wParamUp;

-	LPARAM lParamDown;

-	WPARAM wParamDown;

-	char *name;

-	HICON hIconUp,hIconDn;

-	char *tooltipUp;

-	char *tooltipDn;

-

-} TTBButtonV2, * lpTTBButtonV2;

-

-//=== EVENTS ===

-/*

-toptoolbar/moduleloaded event

-wParam = lParam = 0

-Called when the toolbar services are available

-

-!!!Warning you may work with TTB services only in this event or later.

-

-*/

-#define ME_TTB_MODULELOADED				"TopToolBar/ModuleLoaded"

-

-

-

-//=== SERVICES ===

-/*

-toptoolbar/addbutton service

-wparam = (TTBButton*)lpTTBButton

-lparam = 0

-returns: hTTBButton - handle of added button on success, -1 on failure.

-*/

-#define MS_TTB_ADDBUTTON						"TopToolBar/AddButton"

-

-/*

-toptoolbar/removebutton service

-wparam = (HANDLE)hTTButton

-lparam = 0

-returns: 0 on success, -1 on failure.

-*/

-#define MS_TTB_REMOVEBUTTON					"TopToolBar/RemoveButton"

-

-/*

-toptoolbar/setstate service

-wparam = (HANDLE)hTTButton

-lparam = (LPARAM) state

-returns: 0 on success, -1 on failure.

-*/

-#define TTBST_PUSHED			1

-#define TTBST_RELEASED			2

-

-#define MS_TTB_SETBUTTONSTATE					"TopToolBar/SetState"

-

-/*

-toptoolbar/getstate service

-wparam = (HANDLE)hTTButton

-lparam = 0

-returns: state on success, -1 on failure.

-*/

-#define MS_TTB_GETBUTTONSTATE					"TopToolBar/GetState"

-

-/*

-toptoolbar/getoptions service

-(HIWORD)wparam = (HANDLE)hTTButton

-(LOWORD)wparam = TTBO_FLAG

-lparam = 0,or lparam=lpTTBButton if flag=TTBO_ALLDATA

-returns: value on success, -1 on failure.

-*/

-#define TTBO_FLAGS				0     //get/set all flags

-#define TTBO_POS				1     //position

-#define TTBO_WIDTH				2     //not impemented

-#define TTBO_HEIGHT				3     //not impemented

-#define TTBO_TIPNAME			4     //tool tip name

-#define TTBO_ALLDATA			5     //change all data via lparam=lpTTBButton

-

-

-#define MS_TTB_GETBUTTONOPTIONS					"TopToolBar/GetOptions"

-

-/*

-toptoolbar/setoptions service

-(HIWORD)wparam = (HANDLE)hTTButton

-(LOWORD)wparam = TTBO_FLAG

-lparam = value

-returns: 1 on success, -1 on failure.

-*/

-#define MS_TTB_SETBUTTONOPTIONS					"TopToolBar/SetOptions"

-

-

-#endif
\ No newline at end of file