Skip to content

Commit 015bbf2

Browse files
committed
10.7.8 - fixed issues with netbeans, added image editing feature in history
1 parent 50e3bd6 commit 015bbf2

15 files changed

+177
-80
lines changed

Clipjump.ahk

+15-14
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
;@Ahk2Exe-SetName Clipjump
2020
;@Ahk2Exe-SetDescription Clipjump
21-
;@Ahk2Exe-SetVersion 10.7.5.1
21+
;@Ahk2Exe-SetVersion 10.7.8
2222
;@Ahk2Exe-SetCopyright Avi Aryan
2323
;@Ahk2Exe-SetOrigFilename Clipjump.exe
2424

@@ -42,7 +42,7 @@ global mainIconPath := FileExist("Clipjump.exe") ? "Clipjump.exe" : "icons/icon.
4242
; Capitalised variables (here and everywhere) indicate that they are global
4343

4444
global PROGNAME := "Clipjump"
45-
global VERSION := "10.7.5.1"
45+
global VERSION := "10.7.8"
4646
global CONFIGURATION_FILE := "settings.ini"
4747

4848
ini_LANG := ini_read("System", "lang")
@@ -133,7 +133,7 @@ else if (ini_Version != VERSION)
133133
;Global Ini declarations
134134
global ini_IsImageStored , ini_Quality , ini_MaxClips , ini_Threshold , ini_IsChannelMin := 1 , CopyMessage
135135
, Copyfolderpath_K, Copyfilepath_K, Copyfilepath_K, channel_K, onetime_K, paste_k, actionmode_k, ini_is_duplicate_copied, ini_formatting
136-
, ini_CopyBeep , beepFrequency , ignoreWindows, ini_defEditor, ini_def_Pformat, pluginManager_k
136+
, ini_CopyBeep , beepFrequency , ignoreWindows, ini_defEditor, ini_defImgEditor, ini_def_Pformat, pluginManager_k
137137

138138
; (search) paste mode keys
139139
global pastemodekey := {} , spmkey := {}
@@ -286,7 +286,7 @@ paste:
286286
{
287287
oldclip_exist := 1
288288
try oldclip_data := ClipboardAll
289-
catch temp {
289+
catch {
290290
makeClipboardAvailable(0) ; make clipbboard available in case it is blocked
291291
}
292292
}
@@ -297,8 +297,9 @@ paste:
297297
hkZ_pasteMode(1) , is_pstMode_active := 1
298298

299299
if !IScurCBACTIVE ;if the current clipboard is not asked for , then only load from file
300-
try FileRead, Clipboard, *c %A_WorkingDir%/%CLIPS_dir%/%TEMPSAVE%.avc
301-
try temp_clipboard := Clipboard ;temp_clipboard := CDS[CN.NG][TEMPSAVE]
300+
try_ClipboardfromFile(A_WorkingDir "/" CLIPS_dir "/" TEMPSAVE ".avc") ; gets file onto clipboard trying 100 times
301+
302+
temp_clipboard := trygetVar("Clipboard") ;gets variable with multiple tries
302303

303304
fixStatus := fixCheck()
304305
realclipno := CURSAVE - TEMPSAVE + 1
@@ -457,8 +458,8 @@ moveBack:
457458
TEMPSAVE := 1
458459
realActive := TEMPSAVE
459460
IScurCBACTIVE := 0 ;the key will be always pressed after V
460-
try FileRead, clipboard, *c %CLIPS_dir%/%TEMPSAVE%.avc
461-
try temp_clipboard := Clipboard
461+
try_ClipboardfromFile(CLIPS_dir "/" TEMPSAVE ".avc")
462+
temp_clipboard := trygetVar("Clipboard")
462463

463464
fixStatus := fixCheck()
464465
realClipNo := CURSAVE - TEMPSAVE + 1
@@ -786,7 +787,7 @@ ctrlCheck:
786787
STORE.ClipboardChanged := 0
787788
try Coutput := %curPfunction%(Clipboard)
788789
if STORE.ClipboardChanged
789-
try Clipboard := Coutput
790+
try Clipboard := Coutput , IScurCBACTIVE := 0
790791
else ONCLIPBOARD := 1
791792
API.blockMonitoring(0, 5)
792793
Critical, On
@@ -1021,10 +1022,10 @@ actionmode:
10211022

10221023
init_actionmode() {
10231024
ACTIONMODE := {H: "history", S: "channelGUI", C: "copyfile", X: "copyfolder", F: "CopyFileData", D: "disable_clipjump"
1024-
, P: "pitswap", O: "onetime", L: "classTool", E: "settings", F1: "hlp", Esc: "Exit_actmd", M: "pluginManager_GUI()"
1025-
, H_caption: TXT.HST__name, S_caption: TXT.CNL__name, C_caption: TXT._cfilep, X_caption: TXT._cfolderp, F_caption: cfiled
1026-
, D_caption: TXT.ACT_disable " " PROGNAME, P_caption: TXT._pitswp, O_caption: TXT._ot, L_caption: TXT.IGN__name, E_caption: TXT.SET__name
1027-
, F1_caption: TXT.TRY_help, Esc_caption: TXT.ACT_exit, M_caption: TXT.PLG__name}
1025+
, P: "pitswap", O: "onetime", E: "settings", F1: "hlp", Esc: "Exit_actmd", M: "pluginManager_GUI()", F2: "OpenShortcutsHelp"
1026+
, H_caption: TXT.HST__name, S_caption: TXT.SET_chnl, C_caption: TXT._cfilep, X_caption: TXT._cfolderp, F_caption: cfiled
1027+
, D_caption: TXT.ACT_disable " " PROGNAME, P_caption: TXT._pitswp, O_caption: TXT._ot, E_caption: TXT.SET__name
1028+
, F1_caption: TXT.TRY_help, Esc_caption: TXT.ACT_exit, M_caption: TXT.PLG__name, F2_caption: TXT.try_pstmdshorts}
10281029
}
10291030

10301031
update_actionmode(){
@@ -1075,7 +1076,7 @@ CopyFileData:
10751076
else if temp_extension in cj,avc
10761077
{
10771078
API.blockMonitoring(1)
1078-
try Fileread, Clipboard, *c %selectedFile%
1079+
try_ClipboardfromFile(selectedFile)
10791080
ClipWait, 1, 1
10801081
oldclip := ClipboardAll
10811082
API.blockMonitoring(0)

NOTICE.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ More on redistribution (and editing) terms can be seen at (http://www.apache.org
1010
Contact ==================
1111

1212
13-
Site:- www.avi-win-tips.blogspot.com
14-
Site:- www.github.com/avi-aryan
13+
Site:- www.aviaryan.github.io
14+
Site:- www.github.com/aviaryan

chm_files/changelog.html

+10
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,16 @@
77

88
<body>
99

10+
<h4>10.7.8</h4>
11+
<i>27/03/2014</i>
12+
<li>Fixed paste-formats misbehaving with clip1 when pasting in different formats repeatedly
13+
<li>Fixed "clips not previewing" issue in presence of high-memory programs like Netbeans
14+
<li>Improvements in the hotPaste plugin
15+
<li>Added Image editing support in History Tool
16+
<li>Other Help File and Action Mode enhancements
17+
18+
<br><br>
19+
1020
<h4>10.7.5.1</h4>
1121
<i>24/03/2014</i>
1222
<li>Fixed a bug in ClipjumpCustom that arised in the previous version.

chm_files/clipjump.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<body>
1313
<h1>Clipjump</h1>
1414
<center><h2>A Magical Clipboard Manager</h2></center>
15-
<h3>v 10.7.5.1</h3>
15+
<h3>v 10.7.8</h3>
1616
<br><br>
1717
A Multiple-Clipboard management utility for Windows.<br>
1818
Allows you to simultaneously use multiple clipboards like never before.

chm_files/clipjumpcontroller.html

+40-32
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,39 @@
66
</head>
77

88
<body>
9-
<h1>Clipjump Controller v0.4</h1>
10-
Control Clipjump completely<br /><br />
11-
Clipjump Controller is a small-standalone application to control Clipjump.<br />
12-
It can control all aspects of Clipjump, even Clipjump's Clipboard Monitoring.
13-
The program is meant for <strong class="super">Clipjump 7.0 or above.</strong><br />
14-
<br />
15-
There are 2 modes in which the app can be used --<br />
16-
<ul>
17-
<li>Command-line Mode<br />
18-
<dd>You can call ClipjumpControl.exe as <code class=syntax> clipjumpcontrol.exe <\switch></code> to perform desired action.<br />
19-
</dd>
9+
<h1>Clipjump Controller v0.45</h1>
10+
Control Clipjump completely<br /><br />
11+
From Clipjump v10.7.5, Clipjump Controller is made available as an <a href=docs\plugins\basics.html#class_ext>external</a> <a href=docs\plugins\index.html>plugin</a>. <br>
12+
The <a href=#exe>older standalone version</a> is still available.<br><br>
13+
14+
Clipjump Controller is a standalone plugin/application to control Clipjump.<br />
15+
It can control all aspects of Clipjump, even Clipjump's Clipboard Monitoring.
16+
<br /><br>
17+
18+
There are 2 modes in which this plugin/application can be used --<br />
19+
<ul>
20+
<li>Command-line Mode<br />
21+
<dd>To run Controller plugin from commandline, you can use <code class=syntax>Clipjump.exe "plugins\external.controller.ahk" "parameter"</code> to perform desired action.
22+
<br>To run ClipjumpControl.exe (the standalone version), you can use <code class=syntax>clipjumpcontrol.exe "parameter"</code><br />
23+
</dd>
24+
25+
<li>GUI Mode<br />
26+
<dd>You can simply run Controller plugin from Plugin Manager or like <code class=syntax>Clipjump.exe "plugins\external.controller.ahk"</code> to open the GUI.
27+
Thus running Controller without parameter opens its GUI. <br>
28+
There you will get the whole set of options to control Clipjump.<br />
29+
</dd>
30+
</ul>
31+
<br /><br />
2032

21-
<li>GUI Mode<br />
22-
<dd>You can simply run ClipjumpControl.exe to access the GUI. There you will get the whole set of options to control Clipjump.<br />
23-
</dd>
24-
</ul>
25-
<br /><br />
2633
<h2>The Options</h2>
2734
There are 3 ways to control Clipjump --<br />
2835
<ol>
2936
<li>Selective Disable<br />
3037
<dd>As the title is, this will disable only the selected compenents of Clipjump and leave all other un-touched.<br />
31-
When you run ClipjumpControl.exe , you will see a GUI which will display all the components that can be disabled along with their codes.<br>
38+
When you run Controller plugin without any parameters , you will see a GUI which will display all the components that can be disabled along with their codes.<br>
3239
To disable multiple components through the GUI , select them and click OK . The Status Bar will display their summed code .
3340
To access this mode from the commandline, sum up the required codes and send it as the primary switch .<br />
34-
Code - <code>clipjumpcontrol.exe sum</code> where 'sum' is the summed up code.</dd>
41+
Code - <code>Clipjump.exe "plugins\external.controller.ahk" sum</code> OR <code>clipjumpcontrol.exe sum</code> where 'sum' is the summed up code.</dd>
3542
<br>
3643
Codes for disabling various functions are given below -
3744
<pre> Clipboard Monitoring - 2
@@ -44,23 +51,24 @@ <h2>The Options</h2>
4451
One Time Stop shortcut - 256</pre>
4552
<br><br>
4653

47-
<li>Total Disable<br />
54+
<li>Total Disable<br />
4855
<dd>This will disable all functionalities of Clipjump and it's code (1048576) will be constant for future versions of Clipjump<br />
4956
It's switch is <code class="Syntax">1048576</code><br />
50-
Code - <code>clipjumpcontrol.exe 1048576</code></dd>
51-
<br><br>
57+
Code - <code>Clipjump.exe "plugins\external.controller.ahk" 1048576</code></dd>
58+
<br><br>
5259

53-
<li>Enable<br />
54-
<dd>This will enable Clipjump with all the components.<br />
55-
It's code is 1<br />
56-
Switch = <code class="Syntax">1</code><br />
57-
Code - <code>clipjumpcontrol.exe 1</code></dd>
58-
</ol><br /><br />
59-
60-
<br /><br /><br />
61-
<font size=+3><center><a href="https://dl.dropboxusercontent.com/u/116215806/Products/Clipjump/ClipjumpControl.7z">DOWNLOAD</a></FONT>
62-
<br /></center>
63-
<br /><br />
60+
<li>Enable<br />
61+
<dd>This will enable Clipjump with all the components.<br />
62+
It's code is 1<br />
63+
Switch = <code class="Syntax">1</code><br />
64+
Code - <code>Clipjump.exe "plugins\external.controller.ahk" 1</code></dd>
65+
</ol><br /><br />
66+
67+
<br />
68+
<a name=exe><font size=+1>The Standalone Exe</font></a> can be downloaded from
69+
<a href="https://dl.dropboxusercontent.com/u/116215806/Products/Clipjump/ClipjumpControl.7z">here</a>
70+
<br />
71+
<br /><br />
6472

6573
<hr noshade=noshade size=5 color=yellow>
6674
<br>

chm_files/docs/basic_help.html

+24-17
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ <h3><a name=spm>Search in Paste mode</a></h3>
189189
<i>[v10.6+]</i> Press F to activate the Search feature in Paste mode. A box should come above the tip.<br>
190190
From here, you can search for specific text among all the clips in all the channels. Here are the key points-
191191
<ul>
192-
<li>When Search box is active, leave Ctrl and type your query . Don't worry paste will not be invoked.
192+
<li>When Search box is active, leave Ctrl and type your query . Don't worry, paste will not be invoked.
193193
<li>As you type, you will see the tip jump to the first matched point. First it searches the currently active channel and then goes in ascending order to the next channels. Use Up and down to move Up and down the results
194194
<li>Use Enter to paste if your result is in the underlying tip.
195195
<li>Use Home/Esc to cancel paste operation.
@@ -273,24 +273,31 @@ <h3><a name=reset>Resetting Clipjump</a></h3>
273273

274274
<h3><a name=short>Shortcut List</a></h3>
275275
<b>Paste Mode (Ctrl Held)</b><br>
276-
See <a href=custom.html#2>ClipjumpCustom.ini</a> example to change these keys<br><br>
277-
278-
V - Activate PASTE-MODE and move forward through Multiple Clipboards (from 1 to 2 , 2 to 3)<br>
279-
C - Move backwards through Multiple Clipboards (from 3 to 2 , 2 to 1) <br>
280-
S - Add current Clip to Windows Clipboard [Selective Windows Clipboard Option] <br>
281-
X - Toggle between, Cancel,Delete,Copy,Move,Delete All MODE <br>
282-
E - Export current clip<br>
283-
A - Jump to first clip<br>
284-
F - Activate Search<br>
285-
H - Edit Clip<br>
286-
Z - Toggle pasting formats <br>
287-
Space - Fix/un-fix a clipboard at its position (FIXATE) <br>
288-
Up - Change channel to 1 up (+1)<br>
289-
Down - Change channel to 1 down (-1)<br><br>
276+
See <a href=custom.html#2>ClipjumpCustom.ini</a> example to change these keys<br>
277+
278+
<pre>V - Activate PASTE-MODE and move forward through Multiple Clipboards (from 1 to 2 , 2 to 3)
279+
C - Move backwards through Multiple Clipboards (from 3 to 2 , 2 to 1)
280+
S - Add current <a href=#winclip>Clip to Windows Clipboard</a>
281+
X - Toggle between Cancel, Delete, Copy, Move and Delete All MODE
282+
E - <a href=#export>Export</a> current clip
283+
A - Jump to first clip
284+
F - Activate <a href=#spm>Search</a>
285+
H - <a href=#editclip>Edit Clip</a>
286+
Z - Toggle <a href=#pformat>pasting formats</a>
287+
Enter - Start <a href=#multipaste>Multiple Pasting</a> Session
288+
Space - <a href=#fx>Fix/un-fix</a> a clipboard at its position
289+
Up - Change channel to 1 up (+1)
290+
Down - Change channel to 1 down (-1)</pre><br>
291+
292+
<b>Search in Paste Mode(Ctrl released)</b><br>
293+
<pre>Enter - Paste
294+
Home/Esc - Cancel
295+
Up - Move one clip up (+1)
296+
Down -Move one clip down (-1)</pre><br>
290297

291298
<b>General (System Wide)</b><br>
292-
Ctrl+Shift+A - Action Mode<br>
293-
Win+C - Open Clipjump Clipboard History Tool<br><br>
299+
<pre>Ctrl+Shift+A - <a href=#actmd>Action Mode</a>
300+
Win+C - Open Clipjump Clipboard History Tool</pre><br><br>
294301

295302
<hr noshade=noshade size=5 color=yellow>
296303
<br>

chm_files/docs/channels.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,16 @@ <h2><a name=chnljumps>Changing Channels in Paste Mode</a></h2>
5656
<br><br><br>
5757

5858
<h2><a name=uses>Ideas on using</a></h2>
59-
One of the best uses of Clipjump Channels is using it as a top 10 repository for storing frequently used items. As said above , you can copy and thus save your signatures , blog links and avatar images in a channel and quickle access them when needed.
59+
One of the best uses of Clipjump Channels is using it as a top 10 repository for storing frequently used items. As said above , you can copy and thus save your signatures , blog links and avatar images in a channel and quickle access them when needed.<br>
60+
See Also: <a href=#protected>Protected Channels</a>
6061
<br><br /><br />
6162

6263
<h2><a name=pit>The "Pit" Channel</a></h2>
6364
The <code>Pit</code> channel is a reserved channel NAME with automatic Incognito feature. When a channel is named as <code>Pit</code>, the channel does not transfer
6465
it's clips to the Clipjump History thus creating a false <i>INCOGNITO MODE</i> situation. Note that when a channel named <code>Pit</code> is active, the INCOGNITO mode
6566
is physically not turned ON and so you don't see the Clipjump's tray icon being grayed out.<br>
6667
The "Pit" channel can be <b>quickly</b> used to capture <i>junk</i> or <i>confidential</i> data to Clipjump and then delete them all at once with the Delete ALL mode
67-
(Ctrl + V + X + X + X)
68+
(Ctrl + V + X(5 times))
6869
<br><br><br>
6970

7071
<h2><a name=protected>Protected Channels</a></h2>

chm_files/docs/devList.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ <h2><a name=vars>Variables</a></h2>
213213
<li><code>CALLER</code> - Holds 1 if Clipboard Monitoring is on by Clipjump and 0 if not.
214214
<br>
215215
<br>
216-
<li>pastemodekey and spmkey<br>
216+
<li><code>pastemodekey</code> and <code>spmkey</code><br>
217217
- Use as pastemodekey.(key) OR spmkey.(key) to change keys currently used in PasteMode and Search-PasteMode.<br>
218218
See <a href=custom.html#change_mode_key>here</a> for an example.
219219
<br>

chm_files/docs/history.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ <h3><a name=his>History Tool</a></h3><br><br>
5252
Right Click on an item in the Clipboard History list to view more options like Export Clip, Edit Clip and Delete Clip(s).
5353
<br><br>
5454
<strong class=super><a name=editclip>Edit Clip</a></strong> - With the Edit Clip option option, you can edit any clip with the
55-
<a href=basic_help.html#default_editor>default Editor</a>. When the editor window shows up, you can make any changes and save the file. The clip will be reloaded in the
56-
History List once you have closed the editor.
55+
<a href=basic_help.html#default_editor>default Editor</a> or the default Image Editor.
56+
When the editor window shows up, you can make any changes and save the file. The clip will be reloaded in the History List once you have closed the editor.<br>
57+
Note that this option works for images too.
5758
<br><br><br>
5859

5960
<a name=dis_his><strong class=super>Disabling the History tool</strong></a> - Change the <code>Number of days to keep items in History</code> setting to 0 to permanently

languages/english.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -275,4 +275,10 @@ SET_pformat = Default Paste-Format
275275
SET_T_pformat = The Paste format you would like to be active at Clipjump startup. '-original' is the default Clipjump pasting technique.
276276
SET_t_plugM = Shortcut to open Plugin Manager
277277
PLG_edit = Edit (F2)
278-
CUS_error = There was an error in a ClipjumpCustom.ini routine?
278+
CUS_error = There was an error in a ClipjumpCustom.ini routine?
279+
280+
;=====
281+
;10.7.8
282+
;=====
283+
284+
TRY_pstmdshorts = Paste Mode shortcuts

lib/History GUI Plug.ahk

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ history_clipboard:
142142
history_EditClip: ; label inside to call history_searchbox which uses local func variables
143143
Gui, History:Default
144144
LV_GetText(clip_file_path, LV_GetNext(0), hidden_date_no)
145-
runwait % ini_defEditor " """ A_WorkingDir "\cache\history\" clip_file_path """"
145+
runwait % ( Instr(clip_file_path, ".jpg") ? ini_defImgEditor : ini_defEditor ) " """ A_WorkingDir "\cache\history\" clip_file_path """"
146146
HISTORYOBJ[clip_file_path "_data"] := HISTORYOBJ[clip_file_path "_date"] := "" ; free to rebuild them
147147
gosub history_SearchBox
148148
return

lib/Settings GUI Plug.ahk

+3-1
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ load_Settings(all=false)
326326
;v10.7.3
327327
ini_def_pformat := ini_read("Main", "default_pformat")
328328
pluginManager_K := ini_read("Shortcuts", "pluginManager_K")
329+
ini_defImgEditor := (t:=ini_read("System", "default_image_editor")) ? t : "mspaint.exe"
329330
}
330331

331332
}
@@ -440,7 +441,6 @@ save_Default(full=1){
440441
ini_write(s, "beepFrequency", 1500)
441442
ini_write(s, "ignoreWindows", "")
442443

443-
;--v9.8.1 added
444444
ini_write("Main", "CopyBeep", "0")
445445
ini_write("Advanced", "cut_equalto_delete", cut_is_delete_windows)
446446
; delete removed v10.7.2.6
@@ -449,6 +449,8 @@ save_Default(full=1){
449449
; v10.7.3 added
450450
ini_write("Main", "default_pformat", "")
451451
ini_write("Shortcuts", "pluginManager_K", "")
452+
; v10.7.8
453+
ini_write("System", "default_image_editor", "mspaint.exe")
452454
}
453455

454456
Ini_write(section, key, value="", ifblank=true){

lib/aboutGUI.ahk

+9-1
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,10 @@ trayMenu(destroy=0){
113113
Menu, Tools_Tray, Add, % TXT.PLG__name "`t" Hparse_Rev(pluginManager_k), pluginManagerGUI
114114
Menu, Tools_Tray, Add, % TXT.SET__name, settings
115115
Menu, Tray, Add, % TXT.TRY_tools, :Tools_Tray
116+
Menu, Help_Tray, Add, % TXT.TRY_pstmdshorts, openShortcutsHelp
117+
Menu, Help_Tray, Add, % "Clipjump.chm", hlp
116118
Menu, Tray, Add
117-
Menu, Tray, Add, % TXT.TRY_help, hlp
119+
Menu, Tray, Add, % TXT.TRY_help, :Help_Tray
118120
Menu, Tray, Add
119121
Menu, Tray, Add, % TXT.TRY_restart, reload
120122
Menu, Tray, Add, % TXT.TRY_exit, exit
@@ -123,6 +125,12 @@ trayMenu(destroy=0){
123125

124126
}
125127

128+
openShortcutsHelp:
129+
try run hh.exe mk:@MSITStore:%A_WorkingDir%\Clipjump.chm::/docs/basic_help.html#short
130+
catch
131+
MsgBox, 16, Clipjump, There was a problem.`nPlease check that Clipjump.chm exists in the root folder.
132+
return
133+
126134
reload:
127135
OnExit,
128136
routines_Exit()

0 commit comments

Comments
 (0)