Skip to content

Commit

Permalink
made delete in channel organiser smoother
Browse files Browse the repository at this point in the history
  • Loading branch information
aviaryan committed May 18, 2015
1 parent 75f2fe0 commit 229f4db
Show file tree
Hide file tree
Showing 12 changed files with 175 additions and 114 deletions.
2 changes: 1 addition & 1 deletion Clipjump.ahk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Clipjump
Copyright 2013-14 Avi Aryan
Copyright 2013-15 Avi Aryan
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
27 changes: 24 additions & 3 deletions lib/channelOrganizer.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ channelOrganizer(){
hkZ("^o", "chOrg_openPasteMode")
hkZ("^h", "chOrgEdit")
hkZ("Del", "chOrgDelete")
; hkZ("+tab", "chOrg_activateLB") ; NOT WORKING
;hkZ("+tab", "chOrg_activateLB") ; NOT WORKING
hkZ("!Up", "chOrgUp")
hkZ("!Down", "chOrgDown")
hkZ("!x", "chOrgCut")
Expand Down Expand Up @@ -218,9 +218,30 @@ chOrgDelete:
Sort, v, % "N R" ; reverse
v := Trim(v)
loop, parse, v, % "`n"
{
if (Trim(A_LoopField) == "")
continue
API.deleteClip(k, A_LoopField)
z := A_LoopField
lvgcb := LV_GetCount()
cons := 0
loop % lvgcb ; Silent delete
{
LV_GetText(tch, A_index+cons, 1)
if (tch != k)
continue
LV_GetText(tcl, A_index+cons, 2)
if (tcl < z)
continue
if (tcl == z){
LV_Delete(A_index)
cons := -1
continue
}
LV_Modify(A_index+cons, "Col2", tcl-1)
}
}
}
gosub chOrg_refresh
chOrg_notification(TXT.ORG_clpdelMsg)
}
else {
Expand Down Expand Up @@ -406,7 +427,7 @@ chOrg_Lv:
return

chOrg_activateLB:

PostMessage, 0x06, 0, 0, ListBox1, A
;gosub chOrg_Lb
return

Expand Down
2 changes: 1 addition & 1 deletion plugins/pformat.noformatting.ahk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;@Plugin-Name NO-FORMATTING
;@Plugin-Name Trim Formatting
;@Plugin-Description Strip off Formatting
;@Plugin-Author Avi
;@Plugin-Tags pformat
Expand Down
40 changes: 39 additions & 1 deletion website/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@

{% if page.rtype == "docs" %}
<style>
div#content {
div#content, header .menubar {
max-width: none;
width: 95%;
}
</style>
Expand Down Expand Up @@ -61,6 +62,43 @@ <h1>{{ page.title }}</h1><br>
</div>
</div>

{% if page.homepage == 1 %}
<footer>
<br><br>

<div id="fcontent">
<div style="float: left;">
<b><font size=+1>Helpful Links</font></b><br><br>
<a href="http://clipjump.sourceforge.net/screenshots.html">Screenshots</a><br>
<a href="docs/">Documentation</a><br>
<a href="http://clipjump.sourceforge.net/translations">Translations</a><br> <!-- online pages -->
<a href="http://www.avi-win-tips.blogspot.in/p/clipjump.html">Previous Clipjump page</a><br>
<a href="http://http://www.autohotkey.com/board/topic/91488-">AutoHotkey Forums - History of Clipjump development</a><br>
</div>

<div style="float: right;">
<b><font size=+1>You may read about Clipjump at</font></b>
<ul>
<li><a href="http://webserver.computoredge.com/online.mvc?zone=NA&issue=3138&article=cover&src=linkref">ComputorEdge online</a>
<li><a href="http://www.pcadvisor.co.uk/downloads/3329616/clipjump-1063/">PC Advisor</a>
<li><a href="http://www.ghacks.net/2013/09/10/clipjump-turns-windows-clipboard-pro-clipboard/">GHacks Technology Blog</a>
<li><a href="http://www.maketecheasier.com/enhance-windows-clipboard-with-clipjump/2013/09/25">MakeTech Easier</a>
<li><a href="http://betanews.com/2014/01/14/instantly-enhance-the-windows-clipboard-with-clipjump/">BetaNews</a>
<li><a href="http://www.rgdot.com/bl/2013/11/26/clipjump-does-the-clipboard-well/">RgDot</a>
<li><a href="http://softpedia.com/get/Office-tools/Clipboard/ClipJump.shtml">Softpedia</a>
<li><a href="http://english.eazel.com/lv/group/view/kl231294/Clipjump.htm">Eazel</a>
<li><a href="http://www.giga.de/downloads/clipjump/">Giga (German)</a>
<li><a href="http://portablefreeware.com/index.php?id=2523">Portable Freeware</a>
</ul>
</div>

<span itemprop="author" itemscope itemtype="http://schema.org/Person">
<meta itemprop="name" content="Avi Aryan"></span>
<meta itemprop="operatingSystem" content="Windows">
<meta itemprop="image" content="http://clipjump.sourceforge.net/icon.png"></span>
</div>
</footer>
{% endif %}
</body>

</html>
66 changes: 53 additions & 13 deletions website/assets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ header .menubar {
font-size: 18px;
}

div#content {
width: 1050px;
div#content, header .banner, header .menubar {
max-width: 1050px;
margin-left: auto;
margin-right: auto;
}
Expand All @@ -40,10 +40,17 @@ div#realcontent {
}

footer {
margin-left: 5px;
margin-right: 5px;
font-size: 1em;
background-color: #88DBC5;
margin-left: 0px;
margin-right: 0px;
bottom: 0px;
height: 25em;
background-color: #cccccc;
}

div#fcontent {
margin-left: auto; margin-right: auto;
font-size: 16px;
max-width: 1050px;
}

p {
Expand Down Expand Up @@ -90,7 +97,7 @@ li {margin-top: 0.2em; margin-bottom: 0.2em; margin-left: -0.75em;}
a {text-decoration: none;}
a:link, a:active {color: #0000AA;}
a:visited {color: #AA00AA;}
a[href]:hover {text-decoration: underline; color: #6666CC;}
div#content a[href]:hover {text-decoration: underline; color: #6666CC;}
:not(a) b { color: #222222; }
.Indent {
margin-left: 2em;
Expand Down Expand Up @@ -171,7 +178,13 @@ h2 .ver {color: lightgray; font-size: 80%;}
border-color: black;
}

/** FOR USE WITH DOCS **/

/*********************
*
* FOR USE WITH DOCS
* BY AVI ARYAN
*
**********************/

/**
SOME INSTRUCTIONS
Expand All @@ -180,8 +193,11 @@ SOME INSTRUCTIONS
**/

dt{
font-size: 105%;
font-size: 110%;
background-color: #E4E4E4;
padding: 4px 10px 4px 10px;
margin-bottom: 5px;
border-radius: 7px;
}
dd{
font-size: 100%;
Expand All @@ -199,13 +215,28 @@ a strong, a code.key {
color: #0000AA;
}
span.ver {font-size: 90%;} /** version **/
.str {color: #63475B; text-decoration: underline; } /** gui string, fixed text, caption **/
samp, .str {color: #63475B; text-decoration: underline; } /** gui string, fixed text, caption **/
var { color: #478192; font-size: 110%;} /** variables in explanation **/
em {font-family: Courier New; font-size: 120%; font-style: normal;} /** other constants like file names OR code strings **/
.key {
font-family: Lucida Console; background-color: #FFFFFF; font-size: 110%;
} /** keywords **/

.dt {
color: #574747;
font-size: 16px;
font-weight: bold;
}

.downloadBtn {
padding: 15px;
font-size: 22px;
background-color: #999999;
border: solid 3px #666666;
border-radius: 10px;
color: white;
}

/* **** kbd.css **/

kbd, kbda {
Expand Down Expand Up @@ -247,9 +278,12 @@ kbd.inverse, kbda
}

div#content {
width: 100%;
margin-left: 8px;
margin-right: 2px;
margin-right: 8px;
}
div#fcontent {
padding-left: 8px;
padding-right: 8px;
}

header {
Expand All @@ -259,7 +293,13 @@ kbd.inverse, kbda
}

@media all and (max-width: 480px) {
header .banner {
/* header .banner {
display: none;
}*/
div#content {
margin-left: 3px; margin-right: 3px;
}
footer {
height: auto;
}
}
5 changes: 2 additions & 3 deletions website/clipjumpcontroller.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
layout: default
rtype: docs
title: Clipjump Controller v0.45
title: Clipjump Controller v0.45 ( Deprecated )
---

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>
The <a href=#exe>older standalone version</a> is still available.<br><br>
<span class="red">No further support/development is planned for this application. Inbuilt features and publicAPI has taken its place.</span><br><br>

Clipjump Controller is a standalone plugin/application to control Clipjump.<br />
It can control all aspects of Clipjump, even Clipjump's Clipboard Monitoring.
Expand Down
24 changes: 12 additions & 12 deletions website/docs/channels.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,42 +16,42 @@
<br>


<h2><a name=about>About</a></h2>
<h2><a name="about">About</a></h2>
Clipjump Channels are meant to group related clipboard items. So you can group all (copied) data about your ongoing project in one channel, office work in another channel and so on..
These channels have a name but are uniquely represented by their IDs. The default channel's id is 0 and is named as <span class="str">Default</span>.
These channels have a name but are uniquely represented by their IDs. The default channel's id is 0 and is named as <samp>Default</samp>.
You can use the <a href="organizer.html">Channel Organizer</a> to manage your channel and its contents. (accessible from the <a href="basic_help.html#actmd">Action Mode</a> with easy key <kbd>O</kbd>).
To activate a channel, you can either use <a name="chnlsel">Channel Organizer</a> or <a href="#chnljumps">Paste Mode</a>. We will see that later.
<br />

<h2><a name=using>How to Use</a></h2>
As said above, use the action mode shortcut or the Tray menu to open Channel Organizer window.<br />
On the top-center region, you will see <span class="str">Active Channel</span> list which will display the currently active channel. On a new installation, it should show <span class="str">Default</span> as the channel 0 is active. Try clicking on that list and you will find that the list has only one element. This is because there is only one channel created by default.<br>
On the top-center region, you will see <samp>Active Channel</samp> list which will display the currently active channel. On a new installation, it should show <samp>Default</samp> as the channel 0 is active. Try clicking on that list and you will find that the list has only one element. This is because there is only one channel created by default.<br>
Suppose you want to create a new channel named "office". On the left side of the window, you will see a list corresponding to the list of channels. Right click on an item in the list
(<span class="str">Default</span> for example) and select <span class="str">New</span>. <br>
A box will appear asking the name of the channel. Write "office" and then click OK. You will see <var>office</var> has been added to the channel list. If you select it, you will find that the clips pane is empty meaning the channel has no clips. On the other hand, the <span class="str">Active Channel</span> list is now showing <var>office</var> indicating that it is the currently active channel.<br>
(<samp>Default</samp> for example) and select <samp>New</samp>. <br>
A box will appear asking the name of the channel. Write "office" and then click OK. You will see <var>office</var> has been added to the channel list. If you select it, you will find that the clips pane is empty meaning the channel has no clips. On the other hand, the <samp>Active Channel</samp> list is now showing <var>office</var> indicating that it is the currently active channel.<br>
Another thing to notice here is that in the channel list, the number (<b>X</b>-office) before a channel's name is the ID given to it. ID starts from 0 and can go to infinity. Channels are ordered according to their ID's and not alphabetically. Now coming back, let's try copying something.<br><br>

When you copy/cut data, you will see the confirmation tip <span class="str">Transferred to Clipjump</span> to be preceded by the string <var>{office}</var> which will mean that the item you currently copied is going to <var>office</var> channel.<br>
When you copy/cut data, you will see the confirmation tip <samp>Transferred to Clipjump</samp> to be preceded by the string <var>{office}</var> which will mean that the item you currently copied is going to <var>office</var> channel.<br>

Now press <kbd>Ctrl</kbd> + <kbd>V</kbd> and release <kbda>V</kbda> to enter <a href="basic_help.html#pastemd">[Paste Mode]</a> . You will see a <var>{office}</var> also preceding the Clip number message <span class="str">Clip x of y</span> . As you have already guessed , this means that the clip is contained in the channel <var>office</var> and that it is currently active.<br>
Now press <kbd>Ctrl</kbd> + <kbd>V</kbd> and release <kbda>V</kbda> to enter <a href="basic_help.html#pastemd">[Paste Mode]</a> . You will see a <var>{office}</var> also preceding the Clip number message <samp>Clip x of y</samp> . As you have already guessed , this means that the clip is contained in the channel <var>office</var> and that it is currently active.<br>

<img src="../images/channelpaste.png" border="0">
<br /><br>
<span class="red">Note</span> - You can use as many as channels you want and give them any name you like.<br />
<br />

<h4><a name="channel_notes">IMPORTANT</a></h4>
Channel 0 <span class="str">Default</span> is the main channel of Clipjump. It is the only channel for which the
<span class="str">Minimum Number of Active Clips</span> setting is valid, all other channel have no minimum and thus store unlimited clips. <br>
Also the setting <span class="str">Retain Clipboard data upon Application restart</span> is invalid on channels other than 0 and so channels with (ID>0) store clips until they are deleted by the user.
Channel 0 <samp>Default</samp> is the main channel of Clipjump. It is the only channel for which the
<samp>Minimum Number of Active Clips</samp> setting is valid, all other channel have no minimum and thus store unlimited clips. <br>
Also the setting <samp>Retain Clipboard data upon Application restart</samp> is invalid on channels other than 0 and so channels with (ID>0) store clips until they are deleted by the user.
<br><br>

<h2><a name="chnljumps">Changing Channels in Paste Mode</a></h2>
<span class="ver">[v9.5+]</span> You can change channels in the <a href="basic_help.html#pastemd">Paste Mode</a> itself by using the Up-down keys . Use the <kbd>Up</kbd> arrow key to increment the channel by 1 and use the <kbd>Down</kbd> arrow key to decrement the channel by 1. Changing channels via this method works like a cycle , so if you press the Up arrow key with the last Channel (say #2) active , you will be jumped back to the first channel (#0).

<br><br>

<h2><a name=protected>Protected Channels</a></h2>
<h2><a name="protected">Protected Channels</a></h2>
Protected Channels are user defined special channels that require confirmation before each copy of clipboard data to them. <br>
If you copy some text while a protected channel is active, you will see a confirmation tip with a sharp beep to proceed further. Only after confirming that message, the clip will be
added to that channel.<br>
Expand All @@ -75,7 +75,7 @@ <h3><a name=pitswap>PitSwap</a></h3>
<h2><a name=tips>Tips for better productivity</a></h2>
<ul>
<li>For channel 0 to 9, you can also use <a href=basic_help.html#actmd>Action Mode</a> to change channels. See <a href=basic_help.html#actmd_num>How</a>.
<li>In Channel Organizer, don't forget to use <kbd>Ctrl</kbd> + <kbd>G</kbd> to quickly focus on the <span class="str">Active Channel</span> list and then use arrow keys to change channel.
<li>In Channel Organizer, don't forget to use <kbd>Ctrl</kbd> + <kbd>G</kbd> to quickly focus on the <samp>Active Channel</samp> list and then use arrow keys to change channel.
<!-- add about creating custom -->
</ul>
<br /><br />
Expand Down
3 changes: 2 additions & 1 deletion website/docs/custom.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ <h3><a name=change_mode_key><a name=2>Example 2 (changing paste-format key to Y)
pastemodekey.z=^y
</pre>
The above code changes the inbuilt variable <code>pastemodekey.z</code> to '^y'. <br>
If you remember, <kbd>Z</kbd> is the default key for toggling <a href="basic_help.html#pformat">Paste formats</a> in <strong><a href="basic_help.html#pstmd">Paste Mode</a></strong>. The above code changes it to <kbd>Y</kbd>.<br>
If you remember, <kbd>Z</kbd> is the default key for toggling <a href="basic_help.html#pformat">Paste formats</a> in <strong><a href="basic_help.html#pstmd">Paste Mode</a></strong>. The above code changes it to <kbd>Y</kbd>. It is mandatory to write <samp>pastemodekey</samp> in <code>pastemodekey.z</code> because pastemodekey is the object name which has
this setting.<br>
The Pastemode group has all variables as pastemodekey.<var>key</var> where <var>key</var> is the original key. Same is for <a href="shorcuts.html#spm">[Search-Paste Mode]</a>. It has all variables as spmkey.<var>key</var>. So the following code will change <code>Channel up</code>, <code>Channel down</code> and <code>paste-format</code> shortcut in <a href="shorcuts.html#pastemd">[Paste-Mode]</a> and <code>cancel</code> shortcut in <a href="shortcuts.html#spm">[Search-Paste Mode]</a>.
<pre class="brush: ini;">
[AutoRun]
Expand Down
10 changes: 1 addition & 9 deletions website/docs/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<br><br>

<dt>How to change the language of Clipjump ?</dt>
<dd>Use the <span class="str">About Clipjump</span> option in System Tray Menu. (<a href="translate.html#intro">Link</a>)
<dd>Use the <span class="str">About Clipjump</span> option in Clipjump's Tray Menu. (<a href="translate.html#intro">Link</a>)
</dd>
<br><br>

Expand Down Expand Up @@ -114,14 +114,6 @@
<dd>This happens because the zip file contents have temporary paths . <em>C:/file.zip/some.txt</em> refers to no browsable location and and so Clipjump is not able
to show the contents.</dd>

<br><br>

<dt>The Column Mode data in Notepad++ is not pasted properly ?</dt>
<dd>This is a known issue. You can also use the <em><a href=basic_help.html#disable>Disable Clipjump</a></em> option to take Clipjump out of the equation and make
the copy-paste process normal.<br>
<span class="ver">[v9.8.1+]</span> You may also <a href=basic_help.html#ignorew>automatically disable Clipjump for</a> Notepad++ .<br>
<span class="ver">[v9.8.9+]</span> The Column Mode paste will work if you paste just after copying column mode data.</dd>

<br><br>

<dt>I get the 'Pit Channel not found' message when I try to use the 'PitSwap' feature ?</dt>
Expand Down
3 changes: 2 additions & 1 deletion website/docs/organizer.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<span class="ver">[v11+]</span><br><br>

Channel Organizer shows data stored in various channels of Clipjump and performs basic functions to manage them.<br>
<a href="channels.html">Channel</a> Organizer shows data stored in various channels of Clipjump and performs basic functions to manage them.<br>
It can be activated from the <a href=basic_help.html#actmd>Action Mode</a> using the key <kbd>O</kbd> but the user can also create a system-level shortcut for it through the <a href=settings.html>Settings Editor</a>.<br><br>

The left side list shows all the channels you have created with their channel numbers. The topmost item in the list i.e. the blank item shows clips of all the
Expand Down Expand Up @@ -38,6 +38,7 @@ <h2>Preferences</h2>
<pre>
<kbd>F5</kbd> - Refresh
<kbd>Ctrl</kbd>+<kbd>N</kbd> - Create new clip
<kbd>Ctrl</kbd>+<kbd>Shift</kbd> + <kbd>N</kbd> - Create new channel
<kbd>Ctrl</kbd>+<kbd>G</kbd> - Set focus to Active Channel selector list
<kbd>Ctrl</kbd>+<kbd>F</kbd> - Set focus to search box
</pre>
Loading

0 comments on commit 229f4db

Please sign in to comment.