------------------------------------------------------------
revno: 3187
committer: poy <p...@123gen.com>
branch nick: trunk
timestamp: Thu 2013-01-24 23:53:46 +0100
message:
Add a toolbar button to open own file list
added:
res/OpenOwnFileList.ico
modified:
changelog.txt
dcpp/SettingsManager.cpp
dcpp/version.h
help/window_main.html
win32/DCPlusPlus.rc
win32/DirectoryListingFrame.h
win32/FinishedFrameBase.h
win32/MainWindow.cpp
win32/MainWindow.h
win32/SystemFrame.cpp
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 2013-01-24 21:51:00 +0000
+++ changelog.txt 2013-01-24 22:53:46 +0000
@@ -21,6 +21,7 @@
* [L#289713] Add a "Copy user information" menu item (poy)
* [ADC] Revise INF order in c-c connections as advised by ADC 1.0.2
* Add hublist.eu to default hub lists
+* Add a toolbar button to open own file list (poy)
Note: The hash registry will be upgraded when running this version for the
first time. Make sure all your drives are connected to avoid re-hashing.
=== modified file 'dcpp/SettingsManager.cpp'
--- dcpp/SettingsManager.cpp 2013-01-24 21:51:00 +0000
+++ dcpp/SettingsManager.cpp 2013-01-24 22:53:46 +0000
@@ -498,6 +498,12 @@
}
}
+ if(v <= 0.802) {
+ // added an "open own file list" button; let's see if we can squeeze it next to "open file list"...
+ if(isSet[TOOLBAR])
+ Util::replace("OpenFL", "OpenFL,OpenOwnFL", strSettings[TOOLBAR - STR_FIRST]);
+ }
+
if(SETTING(SET_MINISLOT_SIZE) < 512)
set(SET_MINISLOT_SIZE, 512);
if(SETTING(AUTODROP_INTERVAL) < 1)
=== modified file 'dcpp/version.h'
--- dcpp/version.h 2013-01-18 21:28:38 +0000
+++ dcpp/version.h 2013-01-24 22:53:46 +0000
@@ -21,8 +21,8 @@
#define APPNAME "DC++"
// don't forget to update the .rc file as well!
-#define VERSIONSTRING "0.802"
-#define VERSIONFLOAT 0.802
+#define VERSIONSTRING "0.810"
+#define VERSIONFLOAT 0.810
namespace dcpp {
extern const std::string fullVersionString;
=== modified file 'help/window_main.html'
--- help/window_main.html 2012-07-20 14:03:59 +0000
+++ help/window_main.html 2013-01-24 22:53:46 +0000
@@ -32,7 +32,7 @@
<dd>To reconnect (disconnect and connect again) the hub which is currently in the foreground. If the active window is not a hub, it does nothing.</dd>
<dt><img src="OpenFileList.ico" width="16" height="16" alt="Open file list..."/> Open file list...</dt>
<dd>This menu is for opening a previously downloaded filelist. It defaults to the FileLists folder inside the <a href="faq_settings_files.html">directory used to store DC++ settings files</a>.</dd>
- <dt>Open own list</dt>
+ <dt><img src="OpenOwnFileList.ico" width="16" height="16" alt="Open own list"/> Open own list</dt>
<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 folder inside the <a href="faq_settings_files.html">directory used to store DC++ settings files</a>).</dd>
@@ -210,10 +210,11 @@
<a href="window_adlsearch.html" title="ADL Search"><img src="ADLSearch.ico" width="20" height="20" alt="ADL Search"/></a>
<a href="window_network_stats.html" title="Network Statistics"><img src="NetStats.ico" width="20" height="20" alt="Network Statistics"/></a>
<a href="#tb_openfl" title="Open file list..."><img src="OpenFileList.ico" width="20" height="20" alt="Open file list..."/></a>
+<a href="#tb_openownfl" title="Open own list"><img src="OpenOwnFileList.ico" width="20" height="20" alt="Open own list"/></a>
<a href="#tb_recent" title="Recent windows"><img src="Recents.ico" width="20" height="20" alt="Recent windows"/></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_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,
@@ -264,6 +265,15 @@
Open a file list previously saved on your disk (a dialog will appear so you can pick the one you wish to open).
</dd>
+ <dt id="tb_openownfl">Open own list</dt>
+ <dd cshelp="IDH_TOOLBAR_OWN_FILE_LIST">
+ 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 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_recent">Recent windows</dt>
<dd cshelp="IDH_TOOLBAR_RECENT">
Open menus with <acronym title="Most Recently Used">MRU</acronym> lists of recently opened windows. The list is saved across DC++ restarts.
@@ -275,9 +285,6 @@
<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 "What's This?" 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/OpenOwnFileList.ico'
Binary files res/OpenOwnFileList.ico 1970-01-01 00:00:00 +0000 and res/OpenOwnFileList.ico 2013-01-24 22:53:46 +0000 differ
=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc 2013-01-18 21:28:38 +0000
+++ win32/DCPlusPlus.rc 2013-01-24 22:53:46 +0000
@@ -92,6 +92,7 @@
IDI_SOUND ICON "res/Sound.ico"
IDI_ULIMIT ICON "res/ULimit.ico"
IDI_DLIMIT ICON "res/DLimit.ico"
+IDI_OPEN_OWN_FILE_LIST ICON "res/OpenOwnFileList.ico"
IDI_PLUGINS ICON "res/Plugins.ico"
/////////////////////////////////////////////////////////////////////////////
//
@@ -99,8 +100,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,0,2
- PRODUCTVERSION 0,8,0,2
+ FILEVERSION 0,8,1,0
+ PRODUCTVERSION 0,8,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -117,12 +118,12 @@
BEGIN
VALUE "Comments", "http://dcplusplus.sourceforge.net";
VALUE "FileDescription", "DC++"
- VALUE "FileVersion", "0, 8, 0, 2"
+ VALUE "FileVersion", "0, 8, 1, 0"
VALUE "InternalName", "DC++"
VALUE "LegalCopyright", "Copyright 2001-2013 Jacek Sieka"
VALUE "OriginalFilename", "DCPlusPlus.exe"
VALUE "ProductName", "DC++"
- VALUE "ProductVersion", "0, 8, 0, 2"
+ VALUE "ProductVersion", "0, 8, 1, 0"
END
END
BLOCK "VarFileInfo"
=== modified file 'win32/DirectoryListingFrame.h'
--- win32/DirectoryListingFrame.h 2013-01-18 21:28:38 +0000
+++ win32/DirectoryListingFrame.h 2013-01-24 22:53:46 +0000
@@ -85,7 +85,7 @@
public:
static void openWindow(TabViewPtr parent, const HintedUser& aUser, const string& txt, int64_t aSpeed);
static void activateWindow(const HintedUser& aUser);
- static void openOwnList(TabViewPtr parent, const tstring& dir = Util::emptyStringT, Activation activate = FOLLOW_SETTING);
+ static void openOwnList(TabViewPtr parent, const tstring& dir = Util::emptyStringT, Activation activate = FORCE_ACTIVE);
static void closeAll();
WindowParams getWindowParams() const;
=== modified file 'win32/FinishedFrameBase.h'
--- win32/FinishedFrameBase.h 2013-01-21 18:43:48 +0000
+++ win32/FinishedFrameBase.h 2013-01-24 22:53:46 +0000
@@ -292,7 +292,7 @@
void open(TabViewPtr parent, const string& ownList) {
// see if we are opening our own file list.
if(in_UL && file == ownList) {
- DirectoryListingFrame::openOwnList(parent, Util::emptyStringT, DirectoryListingFrame::FORCE_ACTIVE);
+ DirectoryListingFrame::openOwnList(parent);
return;
}
=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp 2013-01-18 21:28:38 +0000
+++ win32/MainWindow.cpp 2013-01-24 22:53:46 +0000
@@ -295,7 +295,7 @@
file->appendSeparator();
file->appendItem(T_("Open file list...\tCtrl+L"), [this] { handleOpenFileList(); }, WinUtil::menuIcon(IDI_OPEN_FILE_LIST));
- file->appendItem(T_("Open own list"), [this] { DirectoryListingFrame::openOwnList(getTabView(), Util::emptyStringT, DirectoryListingFrame::FORCE_ACTIVE); });
+ file->appendItem(T_("Open own list"), [this] { DirectoryListingFrame::openOwnList(getTabView()); }, WinUtil::menuIcon(IDI_OPEN_OWN_FILE_LIST));
file->appendItem(T_("Match downloaded lists"), [this] { handleMatchAll(); });
file->appendItem(T_("Refresh file list\tF5"), [this] { handleRefreshFileList(); }, WinUtil::menuIcon(IDI_REFRESH));
file->appendSeparator();
@@ -444,6 +444,8 @@
IDH_TOOLBAR_NET_STATS, [this] { StatsFrame::openWindow(getTabView()); });
toolbar->addButton("OpenFL", WinUtil::toolbarIcon(IDI_OPEN_FILE_LIST), 0, T_("Open file list..."), false,
IDH_TOOLBAR_FILE_LIST, [this] { handleOpenFileList(); });
+ toolbar->addButton("OpenOwnFL", WinUtil::toolbarIcon(IDI_OPEN_OWN_FILE_LIST), 0, T_("Open own list"), false,
+ IDH_TOOLBAR_OWN_FILE_LIST, [this] { DirectoryListingFrame::openOwnList(getTabView()); });
toolbar->addButton("Recents", WinUtil::toolbarIcon(IDI_RECENTS), 0, T_("Recent windows"), false,
IDH_TOOLBAR_RECENT, nullptr, [this](const dwt::ScreenCoordinate& pt) { handleRecent(pt); });
toolbar->addButton("Settings", WinUtil::toolbarIcon(IDI_SETTINGS), 0, T_("Settings"), false,
@@ -475,11 +477,13 @@
StatsFrame::id + comma +
comma +
"OpenFL" + comma +
+ "OpenOwnFL" + comma +
+ "Refresh" + comma +
+ comma +
"Recents" + comma +
comma +
"Settings" + comma +
NotepadFrame::id + comma +
- "Refresh" + comma +
comma +
"CSHelp");
}
=== modified file 'win32/MainWindow.h'
--- win32/MainWindow.h 2013-01-18 21:28:38 +0000
+++ win32/MainWindow.h 2013-01-24 22:53:46 +0000
@@ -167,7 +167,6 @@
void handleQuickConnect();
void handleConnectFavHubGroup();
void handleOpenFileList();
- void handleOpenOwnList();
void handleRefreshFileList();
void handleMatchAll();
void handleOpenDownloadsDir();
=== modified file 'win32/SystemFrame.cpp'
--- win32/SystemFrame.cpp 2013-01-18 21:28:38 +0000
+++ win32/SystemFrame.cpp 2013-01-24 22:53:46 +0000
@@ -89,7 +89,7 @@
void SystemFrame::openFile(const string& path) const {
// see if we are opening our own file list.
if(path == ShareManager::getInstance()->getBZXmlFile()) {
- DirectoryListingFrame::openOwnList(getParent(), Util::emptyStringT, DirectoryListingFrame::FORCE_ACTIVE);
+ DirectoryListingFrame::openOwnList(getParent());
return;
}
=== modified file 'win32/resource.h'
--- win32/resource.h 2012-07-20 14:03:59 +0000
+++ win32/resource.h 2013-01-24 22:53:46 +0000
@@ -80,6 +80,7 @@
#define IDI_SOUND 174
#define IDI_ULIMIT 175
#define IDI_DLIMIT 176
+#define IDI_OPEN_OWN_FILE_LIST 177
#define IDI_PLUGINS 178
// Stuff that uses multiple id's
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
