removed #c default shortcut, v11.6.1

aviaryan · Aug 26, 2014 · 7b248ad · 7b248ad
1 parent af222c7
commit 7b248ad
Show file tree

Hide file tree

Showing 19 changed files with 157 additions and 67 deletions.
diff --git a/Clipjump.ahk b/Clipjump.ahk
@@ -134,7 +134,7 @@ else if (ini_Version != VERSION)
 global ini_IsImageStored , ini_Quality , ini_MaxClips , ini_Threshold , ini_IsChannelMin , ini_isMessage, CopyMessage
 		, Copyfolderpath_K, Copyfilepath_K, Copyfilepath_K, channel_K, onetime_K, paste_k, actionmode_k, ini_is_duplicate_copied, ini_formatting
 		, ini_CopyBeep , beepFrequency , ignoreWindows, ini_defEditor, ini_defImgEditor, ini_def_Pformat, pluginManager_k, holdClip_K, ini_PreserveClipPos
-		, chOrg_K, ini_startSearch, ini_revFormat2def, ini_pstMode_X, ini_pstMode_Y, ini_HisCloseOnInstaPaste
+		, chOrg_K, ini_startSearch, ini_revFormat2def, ini_pstMode_X, ini_pstMode_Y, ini_HisCloseOnInstaPaste, history_K
 
 ; (search) paste mode keys 
 global pastemodekey := {} , spmkey := {}
@@ -1191,11 +1191,11 @@ actionmode:
 init_actionmode() {
 	ACTIONMODE := {H: "history", S: "channelGUI", O: "channelOrganizer", C: "copyfile", X: "copyfolder", F: "CopyFileData", D: "disable_clipjump"
 		, P: "pitswap", T: "onetime", E: "settings", F1: "hlp", Esc: "Exit_actmd", M: "pluginManager_GUI()", F2: "OpenShortcutsHelp", L: "classTool"
-		, U: "API.runPlugin(updateClipjumpClipboard.ahk)"
+		, U: "API.runPlugin(updateClipjumpClipboard.ahk)", B: "holdclip"
 		, H_caption: TXT.HST__name, S_caption: TXT.SET_chnl, O_caption: TXT.SET_org, C_caption: TXT._cfilep, X_caption: TXT._cfolderp, F_caption: TXT._cfiled 
 		, D_caption: TXT.ACT_disable " " PROGNAME, P_caption: TXT._pitswp, T_caption: TXT._ot, E_caption: TXT.SET__name
 		, F1_caption: TXT.TRY_help, Esc_caption: TXT.ACT_exit, M_caption: TXT.PLG__name, F2_caption: TXT.try_pstmdshorts, L_caption: TXT.IGN__name
-		, U_caption: "Sync Clipjump Clipboard"}
+		, U_caption: TXT.PLG_sync_cb, B_caption: TXT.SET_holdclip}
 }		; use runPlugin so that user might delete plugin
 
 update_actionmode(){

diff --git a/chm_files/Contents.hhc b/chm_files/Contents.hhc
@@ -99,10 +99,6 @@
 			<param name="Name" value="Disable History keeping">
 			<param name="Local" value="docs/history.html#dis_his">
 			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Modify/Disable History tool shortcut">
-			<param name="Local" value="docs/history.html#his_short">
-			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Global Window Shortcuts">
 			<param name="Local" value="docs/history.html#shorts">

diff --git a/chm_files/Index.hhk b/chm_files/Index.hhk
@@ -177,10 +177,6 @@
 			<param name="Name" value="Edit Clip">
 			<param name="Local" value="docs/history.html#editclip">
 			</OBJECT>
-		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="Modify/Disable History tool shortcut">
-			<param name="Local" value="docs/history.html#his_short">
-			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Disable History keeping">
 			<param name="Local" value="docs/history.html#dis_his">

diff --git a/chm_files/changelog.html b/chm_files/changelog.html
@@ -9,6 +9,14 @@
 
 <body>
 
+<h2>11.6.1</h2>
+<h4>26/08/2014</h4>
+<ul>
+<li>Fixed a bug with hotpaste plugin adding content to clipjump when pasting
+<li>Added new common format UnHTML (thanks to derRaphael for the lib)
+<li>Removed default shortcut win+c for history tool
+</ul>
+
 <h2>11.6</h2>
 <h4>06/08/2014</h4>
 <ul>

diff --git a/chm_files/clipjump.html b/chm_files/clipjump.html
@@ -13,7 +13,7 @@
 
 <body>
 <h1>Clipjump</h1>
-v 11.6
+v 11.6.1
 <br><br>
 
 <b>Clipjump</b> is a Multiple-Clipboard management utility for Windows.

diff --git a/chm_files/contact.html b/chm_files/contact.html
@@ -11,18 +11,20 @@ <h1>Clipjump (c) 2014 by <strong>Avi Aryan</strong></h1>
 <h2>Links</h2>
 <h4>Clipjump's</h4>
 <a href="http://clipjump.sourceforge.net">Official Page</a><br>
+<a href="https://groups.google.com/forum/#!forum/clipjump">Google Group</a><br>
 <a href="http://aviaryan.github.io/blog/clipjump/">Blog</a><br>
 <a href="http://www.github.com/aviaryan/Clipjump">Github</a><br>
+<a href="http://aviaryan.github.io/donate.html"><b>Donate</b></a><br>
 <a href="http://www.autohotkey.com/board/topic/91488-">Autohotkey Topic</a>
 <br><br>
 
 <h4>Author's</h4>
 <a href="http://aviaryan.github.io">Web page</a><br>
 <a href="http://aviaryan.github.io/blog">Blog</a><br>
-<a href="http://www.github.com/aviaryan">Github Account</a>
+<a href="http://www.github.com/aviaryan">Github</a>
 <br><br>
 
-Support, issues, features requests @ <a href="mailto:avi.aryan123@gmail.com">Author's E-mail</a>
+Join <a href="https://groups.google.com/forum/#!forum/clipjump">clipjump</a>'s google group for support, issues and features requests.
 <br><br>
 
 <h2>Thanks</h2>
@@ -36,6 +38,7 @@ <h2>Thanks</h2>
 <li>tproli for better icons.
 <li>maksnogin for quick testing and reporting that helped Clipjump run on Russian systems.
 <li>tic for AutoHotkey GDI+ Library
+<li>derRaphael for his UnHTML function
 <li>All the <a href="docs/translate.html">translators</a>
 <li>Chris and Lexikos for creating Autohotkey without which this program wouldn't have been possible.
 </ul>

diff --git a/chm_files/docs/basic_help.html b/chm_files/docs/basic_help.html
@@ -82,7 +82,7 @@ <h2><a name=actmd>Action Mode</a></h2>
 <br><br><br>
 
 <!-- spmd -->
-<h2><a name=spmd>Search in Paste mode (Search-Paste Mode)</a></h2>
+<h2><a name=spm></a><a name=spmd>Search in Paste mode (Search-Paste Mode)</a></h2>
 <span class="ver">[v10.6+]</span> Press <kbd>F</kbd> to activate the Search feature in <a href="#pastemd">Paste mode</a> (This is <strong>Search-Paste Mode</strong>). A box should come above the tip.<br>
 From here, you can search for specific text among all the clips in all the channels. Here are the key points-
 <ul>
@@ -243,8 +243,9 @@ <h2><a name=holdclip>Copy Clipboard to Buffer (Hold Clip)</a></h2>
 the selected text/file/folder/<i>anything</i> to the buffer.<br>
 When copied, you will see a tip previewing the clip and all available options. Press <kbd>F2</kbd> to open clip in <a href="plugins\plugin_commonformats.html">Common 
 Formats GUI</a>, <kbd>Ins</kbd> to insert clip to channel and <kbd>Ctrl</kbd>+<kbd>V</kbd> to paste it. <br>
-<b>Note : </b> Pressing <span class="str">OK</span> in Common formats <b>exits</b> <strong>Hold Clip</strong>. So you can reuse Hold Clip on the output message box.
-<br>
+<b>Note : </b> Pressing <span class="str">OK</span> in Common formats GUI <b>exits</b> Hold Clip. So you can reuse Hold Clip when the output message box
+ is shown.
+<br><br>
 <span class="red">Tip</span> - Want HoldClip feature to cut rather than copy data to buffer. Try this <a href=custom.html>Customization</a> --
 <pre>[cut_to_buffer]
 bind = Ctrl + Win + X
@@ -253,7 +254,6 @@ <h2><a name=holdclip>Copy Clipboard to Buffer (Hold Clip)</a></h2>
 run = holdclip</pre>
 <br><br>
 
-
 <a name=beep><h2>Sound when copied</h2></a>
 <span class="ver">[v9.8.1+]</span> Clipjump can be configured to make system beep when some data is copied to it. The setting can be found in the Settings editor as 
 <span class="str">Beep when copied</span>. 

diff --git a/chm_files/docs/devList.html b/chm_files/docs/devList.html
@@ -42,7 +42,7 @@ <h2><a name=api>API functions</a></h2>
 	- Cut/Copy Clip from one channel to other. 'new_channel' is the new channel to place the clip in. Note that the clip will always be placed at clip 1 of new channel. <br>
 	If flag = 0 then cut , if flag = 1 then copy<br>
 	If channel is empty, active channel is used.<br>
-	If clip is empty, active clip in <a href=shorcuts.html#pstmd>[Paste-Mode]</a> (Clip x of y, "x") is used.
+	If clip is empty, active clip in <a href=shortcuts.html#pstmd>[Paste-Mode]</a> (Clip x of y, "x") is used.
 	<br>
 	<br>
 
@@ -74,7 +74,7 @@ <h2><a name=api>API functions</a></h2>
 	<br>
 
 	<li><code>showPasteTipAt(channel, clip)</code><br>
-	- Opens <a href=shorcuts.html#pstmd>[Paste-Mode]</a> with clip number 'clip' of channel 'channel' active. 
+	- Opens <a href=shortcuts.html#pstmd>[Paste-Mode]</a> with clip number 'clip' of channel 'channel' active. 
 	<br>
 	<br>
 
@@ -167,7 +167,7 @@ <h2><a name=funcs>More functions</a></h2>
 	<br>
 	<li><code>getClipboardFormat(type=1)</code><br>
 	- gets the type of data on Clipboard<br>
-	If 'type' = 1 , then the function returns the type of data a/c <a href=shorcuts.html#pstmd>Paste-Mode</a> i.e. "[Text]" for text data including HTML , "[File/Folder]" for file,folder copied data and (blank) for Picture type data.<br>
+	If 'type' = 1 , then the function returns the type of data a/c <a href=shortcuts.html#pstmd>Paste-Mode</a> i.e. "[Text]" for text data including HTML , "[File/Folder]" for file,folder copied data and (blank) for Picture type data.<br>
 	If 'type' = 0 , then the function returns the data type formats ID's on Clipboard as per the Microsoft list.
 	<br>
 	<br>

diff --git a/chm_files/docs/faq.html b/chm_files/docs/faq.html
@@ -14,21 +14,21 @@
 <dl>
 	<dt>Translating this HELP</dt>
 	<dd>A Translate Link powered by <b><a href=http://translate.google.com>Google Translate</a></b> has been added <b>at the bottom</b> of each page of this help file. <br>
-		Simply Click on the <code>Translate</code> link and you will see that page translated in your language. 
+		Simply Click on the <span class="str">Translate</span> link and you will see that page translated in your language. 
 	</dd>
 	<br><br>
 
 	<dt>How to change the language of Clipjump ?</dt>
-	<dd>Use the <b>About Clipjump</b> option in System Tray Menu. (<a href="translate.html#intro">Link</a>)
+	<dd>Use the <span class="str">About Clipjump</span> option in System Tray Menu. (<a href="translate.html#intro">Link</a>)
 	</dd>
 	<br><br>
 
 	<dt>The Clear History button in History Tool doesn't delete the recent Clips in Ctrl+V Paste Mode ?<br>
 		OR<br>
 		I delete a clip from Ctrl+V Paste Mode but it is still there in History Tool ?</dt>
 	<dd>The History Tool and the Paste-Mode are two different components and there clips are independent of each other. <br>
-		History Tool is meant for <b>history-keeping</b> whereas Ctrl+V Paste Mode is meant to show clips contained in different channel of Clipjump. The history of 
-		clips added to of any of the channels are shown in a single window i.e. <a href=history.html>History Tool</a>.
+		History Tool is meant for <b>history-keeping</b> whereas Ctrl+V Paste Mode is meant to show clips contained in different channels of Clipjump. The record of all 
+		clips added to any of the channels are shown in a single window i.e. <a href=history.html>History Tool</a>.
 		On the other hand, clips stored in channels can be managed from the <a href=organizer.html>Channel Organizer</a>.
 	</dd>
 	<br><br>
@@ -60,7 +60,7 @@
 	<dt>I had the copied the file/folder to Clipjump but when I paste it , nothing happens ?</dt>
 	<dd><li>Make sure that what you are pasting is a [FILE/FOLDER] and not it's path.
 		<li>Make sure that you are pasting it in a file manager such as Windows Explorer.
-		<li>Check that the path given by Clipjump's [PASTE MODE] tip exists . This means if Clipjump's tip contains <code>C:\test.txt</code> , then make 
+		<li>Check that the path given by Clipjump's [PASTE MODE] tip exists . This means if Clipjump's tip contains <em>C:\test.txt</em> , then make 
 			sure the file exists. 
 	</dd>
 	<br><br>
@@ -81,9 +81,9 @@
 	<dt>I copy an image from Windows Explorer but I don't see it's preview in the Paste Mode ?</dt>
 	<dd>The thing you copy when you press Ctrl+C on an image file in Windows Explorer is the link to the file and not the file's data . <br>
 		Similarly here, you are not copying the image but the link to the image file. To copy the image to Clipjump , you have 2 ways -
-		<li>Open the image in an Image editor such as MS Paint. Select a region and then from the Right click menu, select <code>Copy</code>.
+		<li>Open the image in an Image editor such as MS Paint. Select a region and then from the Right click menu, select <span class="str">Copy</span>.
 		<li>Use the <a href="basic_help.html#fdata">Copy File Data</a> feature and press its shortcut while selecting the image file in Explorer 
-			or any other file manager. You will notice the <code>Transferred to Clipjump</code> and then the (previewed) image will be available on Clipjump.
+			or any other file manager. You will notice the <span class="str">Transferred to Clipjump</span> and then the (previewed) image will be available on Clipjump.
 	</dd>
 
 	<br><br>

diff --git a/chm_files/docs/history.html b/chm_files/docs/history.html
@@ -17,20 +17,19 @@ <h1><a name=his>History Tool</a></h1>
 <li><a href=#export>Export Clip</a></li>
 <li><a href=#holdclip>Hold Clip</a></li></ul>
 <li><a href=#dis_his>Disable History keeping</a>
-<li><a href=#his_short>Change/disable History Tool shortcut(Win+C)</a></li>
 <br>
 <li><a href=#shorts>Global Window Shortcuts</a></li></ul>
 <br>
 
 <h2>Introduction</h2>
-Clipjump's Clipboard History tool can be a real life saver when it's time comes.<br>
-This tool stores record of all the clipboard items transfered to Clipjump in the last <var>x</var> days. The <var>x</var> days can be selected a/c your preference from
- the settings editor.<br><br>
-To open the Clipboard History tool , you can also use the <b>keyboard shortcut</b> <kbd>Win</kbd>+<kbd>C</kbd> other than the Tray Menu shortcut.<br>
-To load full-size clip from the list provided by History tool, double-click on the item.<br>
-To delete a history item , right-click on it and select "Delete".<br><br>
-
-<span class="red">Tip</span> - To view only Clipboard images in the History list, you can filter the listing something like <span class="str">[IMAGE]</span><br><br>
+Clipboard History tool stores record of all the clipboard items transfered to Clipjump in the last <var>x</var> days. It stores them as a listing in the order of recent first. 
+The <var>x</var> days can be selected a/c your preference from the settings editor.<br><br>
+To open the Clipboard History tool , you can also use the <kbd>H</kbd> key in <strong><a href="basic_help.html#actmd">Action Mode</a></strong> other than the Tray Menu shortcut. A system level shortcut for the tool can be created from the Settings Editor.<br>
+To load full-size clip from the list provided by History tool, double-click on the item. 
+To delete a history item , right-click on it and select <span class="str">Delete</span> or select and press <kbd>Del</kbd>.<br>
+<br>
+<span class="red">Tip</span> - To view only Clipboard images in the History list, you can filter the listing something like <span class="str">[IMAGE]</span><br>
+<span class="red">Note</span> - Old users should note that the default system level shortcut <code>Win+C</code> was discontinued from <span class="ver">v11.6.1</span><br><br>
 
 <h3><a name=partial>Partial Searching</a></h3>
 When the checkbox 'Partial' is checked , the History Tool follows a partial checking pattern. Now you will be able to filter the Histroy List with <em>Space</em> delimited terms and only those clips will be shown which have all those space delimited terms in them. 
@@ -75,20 +74,6 @@ <h4><a name=holdclip>Hold Clip</a></h4> <span class="ver">[v11.6+]</span> Hold C
 <a name=dis_his><h3>Disabling the History tool</h3></a> - Change the <span class="str">Number of days to keep items in History</span> setting to 0 to permanently 
 disable History tool. This will make Clipjump automatically start with the <b>Incognito Mode</b> on as a symbol to show that History is not captured. <br>
 Please note that disabling the history tool in the way as said above will not delete old history items unlike to the fact that if you change the <span class="str">Number of days to keep items in History</span> from 50 to 2, the history older than 2 days will be deleted by Clipjump.
-<br><br>
-
-<a name=his_short><h3>Changing History Tool shortcut</h3></a> - The History tool shortcut (Win + C) can be changed or disabled via the <em>Settings.ini</em> file. 
-Just open the file and search for the key <var>history_K</var> in section <em>[Advanced]</em>. <br>
-By default, you will see the history_K key with the value <code>Win + C</code>. Empty this value to disable shortcut for History Tool or change this value to a 
-preferred shortcut to change the History tool shortcut.<br>
-Example values of <var>history_K</var> are -
-<pre>Shift+C
-Win+Alt+H
-
-Ctrl+Home
-F9</pre>
-The 3rd value is kept blank to demonstrate the NULL value which disables the History Tool shortcut.
-
 <br><br><br>
 
 <a name=shorts></a><h2>Global Window Shortcuts</h2>

diff --git a/chm_files/docs/plugins/index.html b/chm_files/docs/plugins/index.html
@@ -46,6 +46,7 @@ <h2><a name=def>Officially Distributed Plugins</a></h2>
 	<ol><li><a href="plugin_hotpaste.html">Hotstring-Paste</a> - A very raw sample plugin that helps you to create Hotstrings to paste, i.e. you type a text and a clip stored by Clipjump is pasted.
 		<li>NoFormatting paste - Pastes current clipboard trimming off any formatting (like HTML).
 		<li>Delete [File/Folder] - Deletes clips of data type <code>[File/Folder]</code> from selected or all channels.
+		<li>Sync Clipjump Clipboard - Updates clipjump with the current system clipboard
 	</ol>
 	<li><a name=def_pformat>Paste Formats</a>
 	<ol><li><a href=plugin_commonformats.html>Common Formats</a>

diff --git a/chm_files/docs/shortcuts.html b/chm_files/docs/shortcuts.html
@@ -114,7 +114,7 @@ <h2><a name="actmd">Action Mode</a></h2>
 <kbd>F</kbd> - <a href=basic_help.html#fdata>Copy File Data</a>
 <kbd>F1</kbd> - Help
 <kbd>F2</kbd> - <a href=#pstmd>Paste Mode Shortcuts</a>
-<kbd>H</kbd> - <a href=history.html>Clipboard history</a> (also accessible via direct shortcut <kbd>Win</kbd> + <kbd>C</kbd>)
+<kbd>H</kbd> - <a href=history.html>Clipboard history</a>
 <kbd>L</kbd> - <a href=basic_help.html#ignorew>Ignore Windows Manager</a>
 <kbd>M</kbd> - Plugin Manager
 <kbd>0</kbd> - <a href=organizer.html>Channel Organizer</a>

diff --git a/languages/english.txt b/languages/english.txt
@@ -417,4 +417,11 @@ TIP_holdclip = Press Ctrl+V to paste
              = Press Esc to exit
 _output = Output
 TIP_copied_2 = Transferred to %PROGNAME%
-TIP_empty2_2 = %PROGNAME% is empty
+TIP_empty2_2 = %PROGNAME% is empty
+
+;====
+; 11.6.1
+;====
+
+SET_T_histshort = Shortcut for Clipboard History Tool
+PLG_sync_cb = Sync Clipjump Clipboard