Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [1060] dcplusplus/trunk
|
From: <arn...@us...> - 2008-03-26 13:59:35
|
Revision: 1060
http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1060&view=rev
Author: arnetheduck
Date: 2008-03-26 06:59:32 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
"What's this?" icon in the toolbar, fix toolbar separators
Modified Paths:
--------------
dcplusplus/trunk/changelog.txt
dcplusplus/trunk/res/toolbar20-highlight.bmp
dcplusplus/trunk/res/toolbar20.bmp
dcplusplus/trunk/smartwin/source/widgets/WidgetToolbar.cpp
dcplusplus/trunk/win32/MainWindow.cpp
dcplusplus/trunk/win32/MainWindow.h
dcplusplus/trunk/win32/WinUtil.cpp
dcplusplus/trunk/win32/resource.h
Property Changed:
----------------
dcplusplus/trunk/
Property changes on: dcplusplus/trunk
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-03-24 17:56:50.601000071 +0100
committer: Jacek Sieka <arn...@gm...>
properties:
branch-nick: dcplusplus
+ timestamp: 2008-03-24 18:59:36.282999992 +0100
committer: zouzou123gen
properties:
branch-nick: bzr
Name: bzr:revision-id:v3-trunk1
- 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
+ 1027 arn...@gm...-20080323183926-schknwnkgeo7ivdn
1028 zouzou123gen-20080323220411-r8usuc3qxwuh7zsn
1029 zouzou123gen-20080323221249-0su72zaj13e706mk
1030 arn...@gm...-20080324140623-muba1dl46m000o8c
1031 zouzou123gen-20080324141933-qbgr93ugpe0297m6
1032 arn...@gm...-20080324153706-siidja05n84i00b1
1033 arn...@gm...-20080324153823-lhn3awurnu77riln
1034 arn...@gm...-20080324165650-zapppziji67yf5a2
1035 zouzou123gen-20080324175936-4mqc2kh0lo5wtdu2
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt 2008-03-26 13:56:28 UTC (rev 1059)
+++ dcplusplus/trunk/changelog.txt 2008-03-26 13:59:32 UTC (rev 1060)
@@ -5,6 +5,7 @@
* Fixed out of focus window when restoring from icon (poy)
* [L#203865] Fixed multiple instances (poy)
* Context-sensitive help (poy)
+* Fixed toolbar separators (poy)
-- 0.705 2008-03-14 --
* Several patches for better *nix compatibility of the core (thanks steven sheehy et al)
Modified: dcplusplus/trunk/res/toolbar20-highlight.bmp
===================================================================
(Binary files differ)
Modified: dcplusplus/trunk/res/toolbar20.bmp
===================================================================
(Binary files differ)
Modified: dcplusplus/trunk/smartwin/source/widgets/WidgetToolbar.cpp
===================================================================
--- dcplusplus/trunk/smartwin/source/widgets/WidgetToolbar.cpp 2008-03-26 13:56:28 UTC (rev 1059)
+++ dcplusplus/trunk/smartwin/source/widgets/WidgetToolbar.cpp 2008-03-26 13:59:32 UTC (rev 1060)
@@ -20,8 +20,6 @@
void WidgetToolbar::appendSeparator()
{
TBBUTTON tb = { 0 };
- tb.iBitmap = 1;
- tb.fsState = TBSTATE_ENABLED;
tb.fsStyle = BTNS_SEP;
if ( this->sendMessage(TB_ADDBUTTONS, 1, reinterpret_cast< LPARAM >( &tb ) ) == FALSE )
{
Modified: dcplusplus/trunk/win32/MainWindow.cpp
===================================================================
--- dcplusplus/trunk/win32/MainWindow.cpp 2008-03-26 13:56:28 UTC (rev 1059)
+++ dcplusplus/trunk/win32/MainWindow.cpp 2008-03-26 13:59:32 UTC (rev 1060)
@@ -280,6 +280,7 @@
int image = 0;
toolbar->appendItem(IDC_PUBLIC_HUBS, image++, T_("Public Hubs"));
+ toolbar->appendSeparator();
toolbar->appendItem(IDC_RECONNECT, image++, T_("Reconnect"));
toolbar->appendItem(IDC_FOLLOW, image++, T_("Follow last redirect"));
toolbar->appendSeparator();
@@ -296,8 +297,11 @@
toolbar->appendItem(IDC_SEARCH_SPY, image++, T_("Search Spy"));
toolbar->appendSeparator();
toolbar->appendItem(IDC_OPEN_FILE_LIST, image++, T_("Open file list..."));
+ toolbar->appendSeparator();
toolbar->appendItem(IDC_SETTINGS, image++, T_("Settings"));
toolbar->appendItem(IDC_NOTEPAD, image++, T_("Notepad"));
+ toolbar->appendSeparator();
+ toolbar->appendItem(IDC_WHATS_THIS, image++, T_("\"What's this?\" help"), std::tr1::bind(&MainWindow::handleWhatsThis, this));
}
void MainWindow::initStatusBar() {
@@ -1077,6 +1081,10 @@
}
}
+void MainWindow::handleWhatsThis() {
+ sendMessage(WM_SYSCOMMAND, SC_CONTEXTHELP);
+}
+
void MainWindow::on(HttpConnectionListener::Data, HttpConnection* /*conn*/, const uint8_t* buf, size_t len) throw() {
versionInfo += string((const char*)buf, len);
}
Modified: dcplusplus/trunk/win32/MainWindow.h
===================================================================
--- dcplusplus/trunk/win32/MainWindow.h 2008-03-26 13:56:28 UTC (rev 1059)
+++ dcplusplus/trunk/win32/MainWindow.h 2008-03-26 13:59:32 UTC (rev 1060)
@@ -156,6 +156,7 @@
void handleAbout();
void handleHashProgress();
void handleCloseWindows(unsigned id);
+ void handleWhatsThis();
void handleSize();
void handleActivate(bool active);
LRESULT handleEndSession();
Modified: dcplusplus/trunk/win32/WinUtil.cpp
===================================================================
--- dcplusplus/trunk/win32/WinUtil.cpp 2008-03-26 13:56:28 UTC (rev 1059)
+++ dcplusplus/trunk/win32/WinUtil.cpp 2008-03-26 13:59:32 UTC (rev 1060)
@@ -597,7 +597,7 @@
ids[0] = ctrlId;
ids[1] = helpId;
ids[2] = 0;
- ::HtmlHelp(hWnd, helpFile.c_str(), HH_TP_HELP_WM_HELP, (DWORD)ids);
+ ::HtmlHelp(hWnd, helpFile.c_str(), HH_TP_HELP_WM_HELP, reinterpret_cast<DWORD_PTR>(ids));
} else
::HtmlHelp(hWnd, helpFile.c_str(), helpId ? HH_HELP_CONTEXT : HH_DISPLAY_TOC, helpId);
}
Modified: dcplusplus/trunk/win32/resource.h
===================================================================
--- dcplusplus/trunk/win32/resource.h 2008-03-26 13:56:28 UTC (rev 1059)
+++ dcplusplus/trunk/win32/resource.h 2008-03-26 13:59:32 UTC (rev 1060)
@@ -138,6 +138,7 @@
#define IDC_CLOSE_WINDOW 1072
#define IDC_TRAY_SHOW 1073
#define IDC_TRAY_QUIT 1074
+#define IDC_WHATS_THIS 1075
#define IDC_ADD 2000
#define IDC_ADD_MENU 2001
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
