← Back to team overview

linuxdcpp-team team mailing list archive

  1. linuxdcpp-team team
  2. Mailing list archive
  3. Message #01815

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2220: add new icons; update the help menu links

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 2220
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Sun 2010-08-29 17:42:38 +0200
message:
  add new icons; update the help menu links
added:
  res/Changelog.ico
  res/Donate.ico
  res/GetStarted.ico
  res/Indexing.ico
  res/Links.ico
  res/Refresh.ico
  res/Slots.ico
modified:
  changelog.txt
  help/gen_changelog.py
  help/window_main.html
  win32/DCPlusPlus.rc
  win32/MainWindow.cpp
  win32/MainWindow.h
  win32/resource.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'changelog.txt'
--- changelog.txt	2010-08-25 12:54:08 +0000
+++ changelog.txt	2010-08-29 15:42:38 +0000
@@ -9,6 +9,10 @@
 * [L#606435] Prevent potential re-hashing (thanks vasily.n)
 * Automatic incoming connection type detection - enabled by default (emtee)
 * Add "Close all hubs" to Window menu (emtee)
+* Use boost's locking mechanisms (arnetheduck)
+* Use boost's timing functions (arnetheduck)
+* New icons
+* Update the links in the "Help" menu (poy)
 
 -- 0.770 2010-07-05 --
 * [L#550300] Catch more potential file corruptions (thanks bigmuscle)

=== modified file 'help/gen_changelog.py'
--- help/gen_changelog.py	2008-09-13 12:45:16 +0000
+++ help/gen_changelog.py	2010-08-29 15:42:38 +0000
@@ -11,7 +11,10 @@
 li { margin-left: auto; margin: 0em 0em 0em 0em; }
 </style>
 
-<h1>DC++ Changelog</h1>
+<h1>
+	<img src=\"Changelog.ico\" width=\"16\" height=\"16\" alt=\"DC++ Changelog\"/>
+	DC++ Changelog
+</h1>
 See the version history of DC++ below.
 
 """

=== modified file 'help/window_main.html'
--- help/window_main.html	2010-05-09 11:37:51 +0000
+++ help/window_main.html	2010-08-29 15:42:38 +0000
@@ -13,7 +13,7 @@
 	</h1>
 <h2>Main Menu bar (top)</h2>
 
-<dl id="filemenu" style="margin-left: 40px;">
+<dl id="filemenu" style="margin-left: 10px;">
 	<dt>File Menu</dt>
 	<dd>
 	    You can find the file input-output functions as well as the basic connection options and the settings in this menu.
@@ -35,7 +35,7 @@
 			<dd>You can open and check how your own file list looks like. Useful to see what's displayed to others when they get your file list.</dd>
 			<dt>Match downloaded lists</dt>
 			<dd>This function is used to match your download queue for already downloaded file lists (they stored in the FileLists directory in your DC++ program folder).</dd>
-			<dt>Refresh file list</dt>
+			<dt><img src="Refresh.ico" width="16" height="16" alt="Refresh file list"/> Refresh file list</dt>
 			<dd>This will immediately rescan your shared directories for new or changed content and updates your file list.</dd>
 			<dt><img src="OpenDLDir.ico" width="16" height="16" alt="Open downloads directory"/> Open downloads directory</dt>
 			<dd>Opens your downloads folder in Windows Explorer.</dd>
@@ -102,7 +102,7 @@
 			<dd><div>Open the <placeholder><a href="window_network_stats.html">Network Statistics</a></placeholder> window.</div>
 			<div>It displays a real-time chart of the average speed of data sent and received by DC++.</div></dd>
 
-			<dt>Indexing progress</dt>
+			<dt><img src="Indexing.ico" width="16" height="16" alt="Indexing progress"/> Indexing progress</dt>
 			<dd><div>Open the <placeholder><a href="dialog_indexing_progress.html">Indexing progess</a></placeholder> dialog.</div>
 			<div>It shows you the current state of file hashing operation and how much time there is left from it.</div></dd>
 
@@ -148,30 +148,47 @@
 		<dl style="margin-left: 30px;">
 			<dt><img src="Help.ico" width="16" height="16" alt="Help Contents"/> Help Contents</dt>
 			<dd>Opens the Overview page of the built-in Help.</dd>
-			<dt>Get started</dt>
+			<dt><img src="GetStarted.ico" width="16" height="16" alt="Get started"/> Get started</dt>
 			<dd>The best way to start here if you are new to DC++.</dd>
-			<dt>Change Log</dt>
+			<dt><img src="Changelog.ico" width="16" height="16" alt="Change Log"/> Change Log</dt>
 			<dd>You can follow what's been changed in the different DC++ versions since the development started.</dd>
 			<dt><img src="DCPlusPlus.png" width="16" height="16" alt="About DC++"/> About DC++</dt>
 			<dd>You can see the copyrights, list of all names who ever contributed to DC++ as well as some useful statistical information about your up/download ratio. The About box also shows you the version number of the current stable release of DC++.</dd>
-			<dt>DC++ Homepage</dt>
+			<dt><img src="Links.ico" width="16" height="16" alt="Links"/> Links</dt>
+			<dd>Web links that will open in your web browser.
+
+			<dl style="margin-left: 30px;">
+			<dt>Homepage</dt>
 			<dd>Opens the DC++ home page in your web browser.</dd>
 			<dt>Downloads</dt>
 			<dd>Opens the trusted DC++ download page in your web browser.</dd>
-			<dt>GeoIP database update</dt>
-			<dd>Opens a web page where the latest GeoIP database can be obtained. The database file called GeoIPCountryWhoIs.csv and should be saved to the DC++ program folder. GeoIP is used to show what country uploaders and downloaders are from in the <a href="window_connections.html">Connections</a> window. The database file is frequently updated on the web page - the newer your GeoIP file is the more exact country information will be displayed in the Connections window.</dd>
 			<dt>Frequently asked questions</dt>
-			<dd>Opens the official Direct Connect FAQ page in your web browser.</dd>
-			<dt>Help forum</dt>
+			<dd>Opens the DC++ FAQ page in your web browser.</dd>
+			<dt>Help center</dt>
 			<dd>Points to the DC++ support forum.</dd>
-			<dt>DC++ discussion forum</dt>
+			<dt>Discussion forum</dt>
 			<dd>Points to the DC++ discussion forum.</dd>
 			<dt>Request a feature</dt>
 			<dd>You can propose modifications or request new features here.</dd>
 			<dt>Report a bug</dt>
-			<dd>You can report problems (only) about DC++ here.</dd>
-			<dt>Donate (paypal)</dt>
-			<dd>Found this free program useful? Then you may consider donate the further development... You can do it here, through the author's Paypal account.</dd>
+			<dd>You can report problems about DC++ here.</dd>
+			<dt><img src="Donate.ico" width="16" height="16" alt="Donate (paypal)"/> Donate (paypal)</dt>
+			<dd>Found this free program useful? Then you please consider donating some money... You can do it here, through the author's Paypal account.</dd>
+			<dt>Blog</dt>
+			<dd>Opens the DC++ blog in your web browser.</dd>
+			<dt>Community news</dt>
+			<dd>Opens ADCPortal in your web browser.</dd>
+			<dt>GeoIP database update</dt>
+			<dd>Opens a web page where the latest GeoIP database can be obtained. The database file
+			is called GeoIPCountryWhoIs.csv and should be saved into the DC++ program folder. GeoIP
+			is used to determine the country of uploaders and downloaders in the
+			<a href="window_connections.html">Connections</a> window. The database file is
+			frequently updated; the newer your GeoIP file is, the more exact country information
+			will be in the Connections window.</dd>
+			</dl>
+
+			</dd>
+
 		</dl>
     </dd>
 </dl>
@@ -194,6 +211,7 @@
 <a href="#tb_recent" title="Recent windows"><img src="Recents.ico" width="20" height="20" alt="Recent windows"/></a>
 <a href="#tb_settings" title="Settings"><img src="Settings.ico" width="20" height="20" alt="Settings"/></a>
 <a href="window_notepad.html" title="Notepad"><img src="Notepad.ico" width="20" height="20" alt="Notepad"/></a>
+<a href="#tb_refresh" title="Refresh file list"><img src="Refresh.ico" width="20" height="20" alt="Refresh file list"/></a>
 <a href="#tb_whats_this" title="What's This?"><img src="WhatsThis.ico" width="20" height="20" alt="What's This?"/></a>
 </p>
 <p>The toolbar provides quick access to some regularly used parts and functions of DC++. You can customize the toolbar for yourself, 
@@ -261,6 +279,9 @@
     <dt>Notepad</dt>
 	<dd cshelp="IDH_TOOLBAR_NOTEPAD">Open the <placeholder><a href="window_notepad.html">Notepad</a></placeholder> window.</dd>
 
+	<dt id="tb_refresh">Refresh file list</dt>
+    <dd cshelp="IDH_TOOLBAR_REFRESH">This will immediately rescan your shared directories for new or changed content and updates your file list.</dd>
+
     <dt id="tb_whats_this">What's This?</dt>
     <dd cshelp="IDH_TOOLBAR_WHATS_THIS">
         You can get help on specific parts of DC++ by using the &quot;What's This?&quot; help button: click it once, and your mouse cursor will change into a help cursor; then click on the control you wish to get help for.

=== added file 'res/Changelog.ico'
Binary files res/Changelog.ico	1970-01-01 00:00:00 +0000 and res/Changelog.ico	2010-08-29 15:42:38 +0000 differ
=== added file 'res/Donate.ico'
Binary files res/Donate.ico	1970-01-01 00:00:00 +0000 and res/Donate.ico	2010-08-29 15:42:38 +0000 differ
=== added file 'res/GetStarted.ico'
Binary files res/GetStarted.ico	1970-01-01 00:00:00 +0000 and res/GetStarted.ico	2010-08-29 15:42:38 +0000 differ
=== added file 'res/Indexing.ico'
Binary files res/Indexing.ico	1970-01-01 00:00:00 +0000 and res/Indexing.ico	2010-08-29 15:42:38 +0000 differ
=== added file 'res/Links.ico'
Binary files res/Links.ico	1970-01-01 00:00:00 +0000 and res/Links.ico	2010-08-29 15:42:38 +0000 differ
=== added file 'res/Refresh.ico'
Binary files res/Refresh.ico	1970-01-01 00:00:00 +0000 and res/Refresh.ico	2010-08-29 15:42:38 +0000 differ
=== added file 'res/Slots.ico'
Binary files res/Slots.ico	1970-01-01 00:00:00 +0000 and res/Slots.ico	2010-08-29 15:42:38 +0000 differ
=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc	2010-06-18 12:19:12 +0000
+++ win32/DCPlusPlus.rc	2010-08-29 15:42:38 +0000
@@ -84,6 +84,13 @@
 IDI_WHATS_THIS          ICON                    "res/WhatsThis.ico"
 IDI_DOWNLOAD            ICON                    "res/Download.ico"
 IDI_UPLOAD              ICON                    "res/Upload.ico"
+IDI_CHANGELOG           ICON                    "res/Changelog.ico"
+IDI_DONATE              ICON                    "res/Donate.ico"
+IDI_GET_STARTED         ICON                    "res/GetStarted.ico"
+IDI_INDEXING            ICON                    "res/Indexing.ico"
+IDI_LINKS               ICON                    "res/Links.ico"
+IDI_REFRESH             ICON                    "res/Refresh.ico"
+IDI_SLOTS               ICON                    "res/Slots.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2010-08-29 12:27:09 +0000
+++ win32/MainWindow.cpp	2010-08-29 15:42:38 +0000
@@ -99,6 +99,8 @@
 	links.features = links.homepage + _T("featurereq/");
 	links.bugs = links.homepage + _T("bugs/");
 	links.donate = _T("https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=arnetheduck%40gmail%2ecom&item_name=DCPlusPlus&no_shipping=1&return=http%3a%2f%2fdcplusplus%2esf%2enet%2f&cancel_return=http%3a%2f%2fdcplusplus%2esf%2enet%2f&cn=Greeting&tax=0&currency_code=EUR&bn=PP%2dDonationsBF&charset=UTF%2d8";);
+	links.blog = _T("http://dcpp.wordpress.com";);
+	links.community = _T("http://www.adcportal.com";);
 
 	initWindow();
 	initTabs();
@@ -231,7 +233,7 @@
 		file->appendItem(T_("Open file list...\tCtrl+L"), std::bind(&MainWindow::handleOpenFileList, this), WinUtil::menuIcon(IDI_OPEN_FILE_LIST));
 		file->appendItem(T_("Open own list"), std::bind(&DirectoryListingFrame::openOwnList, getTabView()));
 		file->appendItem(T_("Match downloaded lists"), std::bind(&MainWindow::handleMatchAll, this));
-		file->appendItem(T_("Refresh file list\tF5"), std::bind(&MainWindow::handleRefreshFileList, this));
+		file->appendItem(T_("Refresh file list\tF5"), std::bind(&MainWindow::handleRefreshFileList, this), WinUtil::menuIcon(IDI_REFRESH));
 		file->appendItem(T_("Open downloads directory"), std::bind(&MainWindow::handleOpenDownloadsDir, this), WinUtil::menuIcon(IDI_OPEN_DL_DIR));
 		file->appendSeparator();
 
@@ -304,20 +306,26 @@
 		MenuPtr help = mainMenu->appendPopup(T_("&Help"));
 
 		help->appendItem(T_("Help &Contents\tF1"), std::bind(&WinUtil::help, this, IDH_INDEX), WinUtil::menuIcon(IDI_HELP));
-		help->appendItem(T_("Get started"), std::bind(&WinUtil::help, this, IDH_GET_STARTED));
+		help->appendItem(T_("Get started"), std::bind(&WinUtil::help, this, IDH_GET_STARTED), WinUtil::menuIcon(IDI_GET_STARTED));
 		help->appendSeparator();
-		help->appendItem(T_("Change Log"), std::bind(&WinUtil::help, this, IDH_CHANGELOG));
+		help->appendItem(T_("Change Log"), std::bind(&WinUtil::help, this, IDH_CHANGELOG), WinUtil::menuIcon(IDI_CHANGELOG));
 		help->appendItem(T_("About DC++"), std::bind(&MainWindow::handleAbout, this), WinUtil::menuIcon(IDI_DCPP));
 		help->appendSeparator();
-		help->appendItem(T_("DC++ Homepage"), std::bind(&WinUtil::openLink, std::cref(links.homepage)));
+
+		help = help->appendPopup(T_("Links"), WinUtil::menuIcon(IDI_LINKS));
+		help->appendItem(T_("Homepage"), std::bind(&WinUtil::openLink, std::cref(links.homepage)));
 		help->appendItem(T_("Downloads"), std::bind(&WinUtil::openLink, std::cref(links.downloads)));
-		help->appendItem(T_("GeoIP database update"), std::bind(&WinUtil::openLink, std::cref(links.geoipfile)));
 		help->appendItem(T_("Frequently asked questions"), std::bind(&WinUtil::openLink, std::cref(links.faq)));
-		help->appendItem(T_("Help forum"), std::bind(&WinUtil::openLink, std::cref(links.help)));
-		help->appendItem(T_("DC++ discussion forum"), std::bind(&WinUtil::openLink, std::cref(links.discuss)));
+		help->appendItem(T_("Help center"), std::bind(&WinUtil::openLink, std::cref(links.help)));
+		help->appendItem(T_("Discussion forum"), std::bind(&WinUtil::openLink, std::cref(links.discuss)));
 		help->appendItem(T_("Request a feature"), std::bind(&WinUtil::openLink, std::cref(links.features)));
 		help->appendItem(T_("Report a bug"), std::bind(&WinUtil::openLink, std::cref(links.bugs)));
-		help->appendItem(T_("Donate (paypal)"), std::bind(&WinUtil::openLink, std::cref(links.donate)));
+		help->appendItem(T_("Donate (paypal)"), std::bind(&WinUtil::openLink, std::cref(links.donate)), WinUtil::menuIcon(IDI_DONATE));
+		help->appendItem(T_("Blog"), std::bind(&WinUtil::openLink, std::cref(links.blog)));
+		help->appendItem(T_("Community news"), std::bind(&WinUtil::openLink, std::cref(links.community)));
+		help->appendSeparator();
+
+		help->appendItem(T_("GeoIP database update"), std::bind(&WinUtil::openLink, std::cref(links.geoipfile)));
 	}
 
 	mainMenu->setMenu();
@@ -362,6 +370,8 @@
 		std::bind(&MainWindow::handleSettings, this));
 	toolbar->addButton(NotepadFrame::id, toolbarIcon(IDI_NOTEPAD), 0, T_("Notepad"), IDH_TOOLBAR_NOTEPAD,
 		std::bind(&NotepadFrame::openWindow, getTabView()));
+	toolbar->addButton("Refresh", toolbarIcon(IDI_REFRESH), 0, T_("Refresh file list"), IDH_TOOLBAR_REFRESH,
+		std::bind(&MainWindow::handleRefreshFileList, this));
 	toolbar->addButton("CSHelp", toolbarIcon(IDI_WHATS_THIS), 0, T_("What's This?"), IDH_TOOLBAR_WHATS_THIS,
 		std::bind(&MainWindow::handleWhatsThis, this));
 
@@ -390,6 +400,7 @@
 			comma +
 			"Settings" + comma +
 			NotepadFrame::id + comma +
+			"Refresh" + comma +
 			comma +
 			"CSHelp");
 	}
@@ -420,6 +431,7 @@
 	status->setSize(STATUS_DUMMY, 32);
 
 	status->setIcon(STATUS_COUNTS, WinUtil::statusIcon(IDI_HUB));
+	status->setIcon(STATUS_SLOTS, WinUtil::statusIcon(IDI_SLOTS));
 	{
 		dwt::IconPtr icon_DL(WinUtil::statusIcon(IDI_DOWNLOAD));
 		dwt::IconPtr icon_UL(WinUtil::statusIcon(IDI_UPLOAD));
@@ -890,7 +902,9 @@
 	status->setText(STATUS_COUNTS, s);
 	status->setToolTip(STATUS_COUNTS, str(TF_("Hubs: %1%") % s));
 
-	status->setText(STATUS_SLOTS, str(TF_("Slots: %1%/%2%") % UploadManager::getInstance()->getFreeSlots() % (SETTING(SLOTS))), true);
+	s = str(TF_("%1%/%2%") % UploadManager::getInstance()->getFreeSlots() % (SETTING(SLOTS)));
+	status->setText(STATUS_SLOTS, s, true);
+	status->setToolTip(STATUS_SLOTS, str(TF_("Slots: %1%") % s));
 
 	s = Text::toT(Util::formatBytes(down));
 	status->setText(STATUS_DOWN_TOTAL, s);
@@ -1143,6 +1157,14 @@
 			if(xml.findChild("Forum")) {
 				links.discuss = Text::toT(xml.getChildData());
 			}
+			xml.resetCurrentChild();
+			if(xml.findChild("Blog")) {
+				links.blog = Text::toT(xml.getChildData());
+			}
+			xml.resetCurrentChild();
+			if(xml.findChild("Community")) {
+				links.community = Text::toT(xml.getChildData());
+			}
 			xml.stepOut();
 		}
 		xml.stepOut();

=== modified file 'win32/MainWindow.h'
--- win32/MainWindow.h	2010-08-23 16:04:27 +0000
+++ win32/MainWindow.h	2010-08-29 15:42:38 +0000
@@ -98,6 +98,8 @@
 		tstring features;
 		tstring bugs;
 		tstring donate;
+		tstring blog;
+		tstring community;
 	} links;
 
 	WidgetHPanedPtr paned;

=== modified file 'win32/resource.h'
--- win32/resource.h	2010-03-11 17:25:17 +0000
+++ win32/resource.h	2010-08-29 15:42:38 +0000
@@ -40,6 +40,13 @@
 #define IDI_WHATS_THIS 132
 #define IDI_DOWNLOAD 133
 #define IDI_UPLOAD 134
+#define IDI_CHANGELOG 135
+#define IDI_DONATE 136
+#define IDI_GET_STARTED 137
+#define IDI_INDEXING 138
+#define IDI_LINKS 139
+#define IDI_REFRESH 140
+#define IDI_SLOTS 141
 
 #define IDB_FOLDERS		151
 #define IDB_USERS		154
  Thread Previous • Date Previous • • Thread Next