summaryrefslogtreecommitdiff
path: root/plugins/Console
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-10 14:46:58 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-10 14:46:58 +0000
commit101ca36412b3e7b8851b6b48a4f6cbc17d9f9eff (patch)
treea846c60f7c2a7df17b694deba92e7f6df3bbb882 /plugins/Console
parenta3fdadd09f12f6b246b11a5156bf6f0358e9a5f8 (diff)
bitmap operations were removed from TopToolBar and replaced with IcoLib
git-svn-id: http://svn.miranda-ng.org/main/trunk@379 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Console')
-rw-r--r--plugins/Console/Console.c14
-rw-r--r--plugins/Console/Console.optbin49664 -> 0 bytes
-rw-r--r--plugins/Console/Console.plg49
-rw-r--r--plugins/Console/res/console_dn.bmpbin1014 -> 0 bytes
-rw-r--r--plugins/Console/res/console_dn.icobin0 -> 1086 bytes
-rw-r--r--plugins/Console/res/console_up.bmpbin1014 -> 0 bytes
-rw-r--r--plugins/Console/res/console_up.icobin0 -> 1086 bytes
-rw-r--r--plugins/Console/resource.h4
-rw-r--r--plugins/Console/resource.rc10
9 files changed, 6 insertions, 71 deletions
diff --git a/plugins/Console/Console.c b/plugins/Console/Console.c
index 7d08659a8b..eea28e711f 100644
--- a/plugins/Console/Console.c
+++ b/plugins/Console/Console.c
@@ -122,8 +122,6 @@ static int Openfile(TCHAR *outputFile, int selection);
////////////////////////////////////////////////////////////////////////////////
#ifdef TTB
-static HBITMAP BmpUp = NULL;
-static HBITMAP BmpDn = NULL;
static HANDLE hTTBButt = 0;
static INT_PTR HideConsoleButt(WPARAM wParam,LPARAM lParam)
@@ -149,12 +147,9 @@ static int OnTTBLoaded(WPARAM wParam,LPARAM lParam)
CreateServiceFunction("Console/Hide", HideConsoleButt);
CreateServiceFunction("Console/Show", ShowConsoleButt);
- BmpUp = LoadBitmap(hInst,MAKEINTRESOURCE(IDB_CONSOLE_UP));
- BmpDn = LoadBitmap(hInst,MAKEINTRESOURCE(IDB_CONSOLE_DOWN));
-
ttbb.cbSize = sizeof(ttbb);
- ttbb.hbBitmapUp = BmpUp;
- ttbb.hbBitmapDown = BmpDn;
+ ttbb.hIconUp = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONSOLE_UP));
+ ttbb.hIconDn = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONSOLE_DOWN));
ttbb.dwFlags=(state?TTBBF_PUSHED:0)|TTBBF_VISIBLE|TTBBF_SHOWTOOLTIP;
ttbb.pszServiceDown = "Console/Show";
ttbb.pszServiceUp = "Console/Hide";
@@ -1485,11 +1480,6 @@ void ShutdownConsole(void)
for(i = 0; i < SIZEOF(hIcons); i++) {
if (hIcons[i]) DestroyIcon(hIcons[i]);
}
-
-#ifdef TBB
- if (BmpUp) DeleteObject(BmpUp);
- if (BmpDn) DeleteObject(BmpDn);
-#endif
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Console/Console.opt b/plugins/Console/Console.opt
deleted file mode 100644
index 8c2c90007d..0000000000
--- a/plugins/Console/Console.opt
+++ /dev/null
Binary files differ
diff --git a/plugins/Console/Console.plg b/plugins/Console/Console.plg
deleted file mode 100644
index 60b675e88e..0000000000
--- a/plugins/Console/Console.plg
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: Console - Win32 Release Unicode--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"Release_Unicode/resource.res" /i "..\..\include" /d "NDEBUG" "D:\Sources\svn.miranda.im\console\trunk\resource.rc""
-Creating temporary file "C:\Temp\RSPB728.tmp" with contents
-[
-/nologo /MD /W3 /GX /Zi /O2 /I "../../include" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "Console_EXPORTS" /FR"Release_Unicode/" /Fo".\Release/" /Fd".\Release/" /c
-"D:\Sources\svn.miranda.im\console\trunk\Commonheaders.c"
-"D:\Sources\svn.miranda.im\console\trunk\Console.c"
-]
-Creating command line "cl.exe @C:\Temp\RSPB728.tmp"
-Creating temporary file "C:\Temp\RSPB729.tmp" with contents
-[
-/nologo /MD /W3 /Zi /Ox /Og /Gf /Gy /I "../../include" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "Console_EXPORTS" /Fr"Release_Unicode/" /Fo".\Release/" /Fd".\Release/" /c
-"D:\Sources\svn.miranda.im\console\trunk\init.c"
-]
-Creating command line "cl.exe @C:\Temp\RSPB729.tmp"
-Creating temporary file "C:\Temp\RSPB72A.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"Release_Unicode/Console.pdb" /map:"Release_Unicode/Console.map" /debug /machine:IX86 /out:"Release_Unicode\Plugins\Console.dll" /implib:".\Release/Console.lib"
-.\Release\Commonheaders.obj
-.\Release\Console.obj
-.\Release\init.obj
-.\Release_Unicode\resource.res
-]
-Creating command line "link.exe @C:\Temp\RSPB72A.tmp"
-<h3>Output Window</h3>
-Compiling resources...
-Compiling...
-Commonheaders.c
-Console.c
-Generating Code...
-Compiling...
-init.c
-Linking...
- Creating library .\Release/Console.lib and object .\Release/Console.exp
-
-
-
-<h3>Results</h3>
-Console.dll - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
diff --git a/plugins/Console/res/console_dn.bmp b/plugins/Console/res/console_dn.bmp
deleted file mode 100644
index 33bb07c0f2..0000000000
--- a/plugins/Console/res/console_dn.bmp
+++ /dev/null
Binary files differ
diff --git a/plugins/Console/res/console_dn.ico b/plugins/Console/res/console_dn.ico
new file mode 100644
index 0000000000..be752114a7
--- /dev/null
+++ b/plugins/Console/res/console_dn.ico
Binary files differ
diff --git a/plugins/Console/res/console_up.bmp b/plugins/Console/res/console_up.bmp
deleted file mode 100644
index 2cdbb8d0cc..0000000000
--- a/plugins/Console/res/console_up.bmp
+++ /dev/null
Binary files differ
diff --git a/plugins/Console/res/console_up.ico b/plugins/Console/res/console_up.ico
new file mode 100644
index 0000000000..2c8198b29c
--- /dev/null
+++ b/plugins/Console/res/console_up.ico
Binary files differ
diff --git a/plugins/Console/resource.h b/plugins/Console/resource.h
index e0b9ed225a..a8947819a4 100644
--- a/plugins/Console/resource.h
+++ b/plugins/Console/resource.h
@@ -2,8 +2,8 @@
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
-#define IDB_CONSOLE_UP 100
-#define IDB_CONSOLE_DOWN 101
+#define IDI_CONSOLE_UP 100
+#define IDI_CONSOLE_DOWN 101
#define IDD_MSG 111
#define IDD_CONSOLE 112
#define IDD_LOG 113
diff --git a/plugins/Console/resource.rc b/plugins/Console/resource.rc
index c67981d6d4..55f6382d2f 100644
--- a/plugins/Console/resource.rc
+++ b/plugins/Console/resource.rc
@@ -180,14 +180,8 @@ IDI_OUT ICON "Res\\out.ico"
IDI_ARROW ICON "Res\\arrow.ico"
IDI_INFO ICON "Res\\info.ico"
IDI_EMPTY ICON "Res\\empty.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_CONSOLE_UP BITMAP "res\\console_up.bmp"
-IDB_CONSOLE_DOWN BITMAP "res\\console_dn.bmp"
+IDI_CONSOLE_UP ICON "Res\\console_up.ico"
+IDI_CONSOLE_DOWN ICON "Res\\console_dn.ico"
/////////////////////////////////////////////////////////////////////////////
//
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 18:59:40 +0000