improved user interface

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3343 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2004-01-01 17:39:21 +00:00
parent d97cc95c6c
commit 898401b262
11 changed files with 161 additions and 181 deletions

View file

@ -1,5 +1,6 @@
/*
Copyright (c) 2003 Sunil Kamath
Modified by Joost Verburg
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@ -48,42 +49,42 @@ void CreateToolBar()
static TBBUTTON tbButton[BUTTONCOUNT];
tbButton[TBB_LOADSCRIPT] = CreateToolBarButton(IDB_LOADSCRIPT, IDM_LOADSCRIPT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_SAVE] = CreateToolBarButton(IDB_SAVE, IDM_SAVE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_EXIT] = CreateToolBarButton(IDB_EXIT, IDM_EXIT, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_SEP1] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0);
tbButton[TBB_COPY] = CreateToolBarButton(IDB_COPY, IDM_COPY, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_FIND] = CreateToolBarButton(IDB_FIND, IDM_FIND, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_SEP2] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0);
tbButton[TBB_SETTINGS] = CreateToolBarButton(IDB_SETTINGS, IDM_SETTINGS, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_RECOMPILE] = CreateToolBarButton(IDB_RECOMPILE, IDM_RECOMPILE, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_COMPRESSOR] = CreateToolBarButton(IDB_COMPRESSOR, IDM_COMPRESSOR, TBSTATE_ENABLED, TBSTYLE_DROPDOWN, 0, 0);
tbButton[TBB_TEST] = CreateToolBarButton(IDB_TEST, IDM_TEST, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0);
// Added by Darren Owen (DrO) on 1/10/2003
tbButton[TBB_RECOMPILE_TEST] = CreateToolBarButton(IDB_RECOMPILE_TEST, IDM_RECOMPILE_TEST, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_EDITSCRIPT] = CreateToolBarButton(IDB_EDITSCRIPT, IDM_EDITSCRIPT, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_BROWSESCR] = CreateToolBarButton(IDB_BROWSESCR, IDM_BROWSESCR, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_CLEARLOG] = CreateToolBarButton(IDB_CLEARLOG, IDM_CLEARLOG, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_SEP3] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0);
tbButton[TBB_NSISHOME] = CreateToolBarButton(IDB_NSISHOME, IDM_NSISHOME, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_FORUM] = CreateToolBarButton(IDB_FORUM, IDM_FORUM, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_NSISUPDATE] = CreateToolBarButton(IDB_NSISUPDATE, IDM_NSISUPDATE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
tbButton[TBB_SEP4] = CreateToolBarButton(0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0, 0);
tbButton[TBB_DOCS] = CreateToolBarButton(IDB_DOCS, IDM_DOCS, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0);
g_toolbar.hwnd = CreateToolbarEx(g_sdata.hwnd,
WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT | TBSTYLE_FLAT,
TOOLBAR_ID,
NUMIMAGES,
g_sdata.hInstance,
IDB_TOOLBAR,
tbButton,
BUTTONCOUNT,
BUTTONWIDTH,
BUTTONHEIGHT,
IMAGEWIDTH,
IMAGEHEIGHT,
sizeof(TBBUTTON));
g_toolbar.hwnd = CreateWindowEx (
0L,
TOOLBARCLASSNAME,
"",
WS_CHILD | WS_VISIBLE | TBSTYLE_TRANSPARENT | TBSTYLE_FLAT,
0, 0, 0, 30,
g_sdata.hwnd,
(HMENU) TOOLBAR_ID,
g_sdata.hInstance,
NULL );
TBADDBITMAP tbBitmap;
tbBitmap.hInst = g_sdata.hInstance;
tbBitmap.nID = IDB_TOOLBAR;
SendMessage(g_toolbar.hwnd, TB_BUTTONSTRUCTSIZE, sizeof(tbButton[0]), 0);
SendMessage(g_toolbar.hwnd, TB_ADDBITMAP, IMAGECOUNT, (LONG) &tbBitmap);
SendMessage(g_toolbar.hwnd, TB_ADDBUTTONS, BUTTONCOUNT, (LONG) &tbButton);
SendMessage(g_toolbar.hwnd, TB_SETEXTENDEDSTYLE, 0, (LPARAM) (DWORD) TBSTYLE_EX_DRAWDDARROWS);
HMENU toolmenu = GetSubMenu(g_sdata.menu, TOOLS_MENU_INDEX);
HMENU toolmenu = GetSubMenu(g_sdata.menu, SCRIPT_MENU_INDEX);
g_toolbar.dropdownmenu = GetSubMenu(toolmenu, COMPRESSOR_MENU_INDEX);
RECT rect;
SendMessage(g_toolbar.hwnd, TB_GETITEMRECT, TBB_COMPRESSOR, (LPARAM) (LPRECT) &rect);
@ -167,21 +168,15 @@ void AddToolBarTooltips()
{
AddToolBarButtonTooltip(TBB_LOADSCRIPT, IDS_LOADSCRIPT);
AddToolBarButtonTooltip(TBB_SAVE, IDS_SAVE);
AddToolBarButtonTooltip(TBB_EXIT, IDS_EXIT);
AddToolBarButtonTooltip(TBB_COPY, IDS_COPY);
AddToolBarButtonTooltip(TBB_FIND, IDS_FIND);
AddToolBarButtonTooltip(TBB_SETTINGS, IDS_SETTINGS);
AddToolBarButtonTooltip(TBB_RECOMPILE, IDS_RECOMPILE);
AddToolBarButtonTooltip(TBB_COMPRESSOR, IDS_COMPRESSOR);
AddToolBarButtonTooltip(TBB_TEST, IDS_TEST);
// Added by Darren Owen (DrO) on 1/10/2003
AddToolBarButtonTooltip(TBB_RECOMPILE_TEST, IDS_RECOMPILE_TEST);
AddToolBarButtonTooltip(TBB_EDITSCRIPT, IDS_EDITSCRIPT);
AddToolBarButtonTooltip(TBB_BROWSESCR, IDS_BROWSESCR);
AddToolBarButtonTooltip(TBB_CLEARLOG, IDS_CLEARLOG);
AddToolBarButtonTooltip(TBB_NSISHOME, IDS_NSISHOME);
AddToolBarButtonTooltip(TBB_FORUM, IDS_FORUM);
AddToolBarButtonTooltip(TBB_NSISUPDATE, IDS_NSISUPDATE);
AddToolBarButtonTooltip(TBB_DOCS, IDS_DOCS);
}