[geany/plugins.geany.org] 442bdd: Merge branch 'master' of github.com:geany/plugins.geany.org
Frank Lanitz
git-noreply at xxxxx
Sat May 14 10:10:40 UTC 2016
Branch: refs/heads/master
Author: Frank Lanitz <frank at frank.uvena.de>
Committer: Frank Lanitz <frank at frank.uvena.de>
Date: Sat, 14 May 2016 10:10:40 UTC
Commit: 442bdd7b427dcea28ed08bef36b4b14c66a5c1f4
https://github.com/geany/plugins.geany.org/commit/442bdd7b427dcea28ed08bef36b4b14c66a5c1f4
Log Message:
-----------
Merge branch 'master' of github.com:geany/plugins.geany.org
Modified Paths:
--------------
content/djynn.html
content/downloads.html
content/start.html
gencontent.sh
images/ForkMe_Blk.png
images/ForkMe_Wht.png
index.php
push.sh
Modified: content/djynn.html
203 lines changed, 150 insertions(+), 53 deletions(-)
===================================================================
@@ -1,81 +1,178 @@
<h2>Djynn</h2>
<h3>Introduction</h3>
-<p>Like everyone else, more or less I suppose, I tried using every other editor available for
-Linux. None except Geany worked the way I wanted, and with Geany everything was perfect — I
-even liked the name — everything except the project manager. I couldn't get any of the
-project-manager-plugins to do what I wanted, and I had something similar to Notepad++,
-Dev-C++, or CodeBlocks in mind. So I decided to see if I could make a plugin of my own.
-The TreeBrowser plugin was a good starting point. It went well, even better than expected
-and it was so much fun I decided to add more functionality, and so when I needed sorting
-that was added, and after that was added commenting with a slightly different behaviour of
-the built in commenting.</p>
-
-<p>The name Djynn is of course a play on words, like the name Geany, both being oriental
-spirits, but with a 'y' instead of 'ie'/'i'. Having added more functionality than a simple
-project manager, I couldn't just name the plugin "Project Manager" or similar, and so I
-thought of the name Geany, and obviously it refers to the three-wish-fulfilling flask-dwelling
-spirit "Genie" with a modified spelling, and I came to think of the other oriental spirit
-"Djinn", of which I suppose the name Genie comes, and thought "hey, that could be a good name!".</p>
+<p>The name <i>Djynn</i> is a play on words - like the name <i>Geany</i>; both being oriental
+spirits of mythology, but with a 'y' instead of 'ie'/'i'. Since it isn't a one-function-plugin
+but rather a set of various functionality, "Plugin manager" or similar wasn't appropriate in
+naming the project.</p>
+
+<p>The Djynn plugin project can be found at <a href="https://launchpad.net/djynn" target="_blank">Launchpad</a>.</p>
<h3>Features</h3>
-<p>Djynn is a plugin for the Geany IDE and adds sorting and commenting functionality as well
-as a simple projectmanager that integrates with the built in project handler of Geany.</p>
+<ol>
+ <li><a href="#project-manager">Project Manager</a></li>
+ <li><a href="#sort-lines">Sort Lines</a></li>
+ <li><a href="#comments">Comments</a></li>
+ <li><a href="#encoding">Encoding</a></li>
+ <li><a href="#keybindings">Keybindings</a></li>
+ <li><a href="#configure">Configuration</a></li>
+ <li><a href="#install">Install</a></li>
+</ol>
+
+<p><img src="http://i.imgur.com/oR5NywA.png" style="margin: 10px;box-shadow: 1px 2px 20px 2px #999999;" /></p>
+<!--p><img src="djynn-project-manager.png" style="margin: 10px;box-shadow: 1px 2px 20px 2px #999999;" /></p-->
+
+<a name="project-manager"></a><h4>Project Manager</h4>
+
+<p><i>Djynn</i> adds a simple projectmanager that integrates with the built in project handler
+of <i>Geany IDE</i>.</p>
+
+<p>The project manager inserts a page in the sidebar with a tree for the project files. Files
+can be read from a directory or added manually in each project, there can be any number of
+files but the manager is not designed for gigantic numbers of files; order files and folders in
+any way you like by dragging and dropping.</p>
+
+<p>Any number of workspaces can be created, and each workspace may contain any number of projects.
+Each project is stored in a separate config-file, and if two workspaces creates two projects of the
+same name the same project is shared between workspaces. Projects also integrates with the built in
+Geany projects, and for every Djynn project a Geany project is created automatically also.</p>
+
+<p>To make it easier working with many projects, a session handler has been added, and
+you can add more sessions in the menu. Each session maintains its open documents. When switching
+between sessions, all documents of the previous session are closed, and all documents of the new
+session are opened with the cursor at the stored position.</p>
+
+<p><img src="http://i.imgur.com/Sp9SMGs.png" /></p>
+<!--p><img src="djynn-workspaces-sessions.png" /></p-->
+
+<p>Create new Projects, Workspaces and Sessions in the Project->Project Manager menu:</p>
+
+<p><img src="http://i.imgur.com/cA53wWR.png" /></p>
+<!--p><img src="djynn-menu-project-manager.png" /></p-->
+
+<a name="sort-lines"></a><h4>Sort Lines</h4>
<p>Lines can be sorted in various ways, ascending, descending and reverse line order. If
-there is a selection, only the selected lines are sortered, otherwise the entire document is
-sorted.</p>
+there is a selection, only the selected lines are sorted, otherwise the entire document.</p>
+
+<p><img src="http://i.imgur.com/BJh7wd9.png" /></p>
+<!--p><img src="djynn-menu-sort-lines.png" /></p-->
+
+<a name="comments"></a><h4>Comments</h4>
-<p>The commenting differs slightly from the built in commenting of Geany. It's of course a
-matter of taste and personal programming style, better to have a few options to choose from.
-It toggles line- and block-commenting, and add doxygen comments.</p>
+<p>The commenting differs slightly from the built in commenting of <i>Geany</i>.
+It toggles line- and block-commenting, and add javadoc/doxygen comments. A function
+for stripping comments is available for a subset of Geany's supported filetypes.</p>
-<p>The project manager inserts a tree for the project files. Files are added manually in each
-project, there can be any number of files, order in any way you like, and it's also possible to
-read and insert files from a directory including subdirectories (only source files are read,
-and non-project directories such as '.svn' excluded).</p>
+<p>Line comments are placed at the beginning of the line, block comments at the beginning and
+end of the selected text - or if no selection, at the position of the cursor.</p>
-<p><img src="http://img35.imageshack.us/img35/7964/geanydjynn.png" /></p>
+<p>Javadoc/Doxygen comments have three formats depending on the selected text:</p>
-<p>In the project manager you can have any number of workspaces, and each workspace can contain
-any number of projects. Each project is stored in a separate config-file, and if two workspaces
-creates two projects of the same name the same project is shared between workspaces. Projects
-also integrates with the built in Geany projects, and for every Djynn project a Geany project is
-created also.</p>
+<ol>
+ <li>When the cursor is at a function definition, a comment is inserted in this format:
+<pre>/**
+ * @param a
+ * @param b
+ * @return
+ */
+int foo(unsigned char *a,int *b) {
+</pre></li>
+ <li>When a block of lines are selected starting and ending with one or more blank lines,
+a group comment is inserted:
+<pre>
+/** @name
+ * @{ */
+int foo(unsigned char *a,int *b);
+void bar(int c,const char *b);
+/** @} */
-<p>To make it easier working with many projects, a session handler has been added to Djynn, and
-you can easily add more sessions from the menu. Each session maintains its open documents, of
-course including position. When switching between sessions, all documents of the previous session
-are closed, and all documents of the new session opened. This way, you can work with one project,
-then another, then switch back, in the time it takes to close and open the documents.</p>
+</pre></li>
+ <li>When one or more lines are selected not starting and ending with a blank line,
+indented line comments are inserted:
+<pre>
+void foo(int a); //!<
+void bar(int b); //!<
+</pre></li>
+</ol>
-<p><img src="http://img15.imageshack.us/img15/495/geanydjynnwssess.png" /></p>
+<p><img src="http://i.imgur.com/bHQjBTF.png" /></p>
+<!--p><img src="djynn-menu-comments.png" /></p-->
-<p>Create new Workspaces and Sessions in the Djynn menu:</p>
+<a name="encoding"></a><h4>Encoding</h4>
-<p><img src="http://img841.imageshack.us/img841/1903/geanydjynnmenu.png" /></p>
+<p>Mark the text to convert, or the entire document will be encoded/decoded, and select format
+in the menu.</p>
-<h3>Installing Djynn</h3>
+<ol>
+ <li>Hexadecimal Encoding: Chars are converted to and from hexadecimal, so ' ' (space)
+ becomes '20' and 'abc' becomes '616263'.</li>
+ <li>Base58 Encoding: Convert text between base58.</li>
+ <li>Base64 Encoding: Convert text between base64.</li>
+ <li>C String Escape: Escape characters in text, e.g. newline is replaced by '\n'
+ etc. Also unicode characters are replaced by '\uXXXX'.</li>
+ <li>HTML Encoding: Replace HTML-entities, e.g. '&' is replaced by '&'.</li>
+ <li>URL Encoding: Format text for a URL.</li>
+</ol>
+
+<p><img src="http://i.imgur.com/gAETcCy.png" /></p>
+<!--p><img src="djynn-menu-encoding.png" /></p-->
+
+<a name="keybindings"></a><h4>Keybindings</h4>
+
+<p>Keybindings have been added to some of the features. To set keybindings, in the
+menu select: <i>Edit->Preferences->Keybindings</i> and scroll down the list to
+the section <i>Djynn</i>.</p>
+
+<a name="configure"></a><h4>Configuration</h4>
+
+<p>Configure the plugin to your liking:</p>
+
+<p><img src="http://i.imgur.com/78EoVPr.png" /></p>
+<!--p><img src="djynn-configure.png" /></p-->
+
+<hr />
+
+<a name="install"></a><h3>Install</h3>
+
+<h4>Ubuntu: Install from Launchpad's PPA</h4>
+
+<p>Run these commands in a terminal:
+<pre>
+sudo su
+add-apt-repository ppa:per-lowgren/repo
+apt-get update
+apt-get install geany-plugin-djynn
+exit
+</pre></p>
+
+<h4>Build from sources</h4>
<p>Djynn uses CMake, so you will need to install this, and you will of course need to install
GTK+, minimum 2.6. To build and install Djynn, open a terminal and enter the following commands:</p>
-<pre>svn checkout http://libamanita.googlecode.com/svn/trunk/ libamanita
-cd libamanita/src/plugin/djynn
-mkdir build
-cd build
+<p>Only Linux has been tested, though compiling for Windows with MinGW should work fine -
+provided all dependencies meet.</p>
+
+<pre>sudo su
+apt-get update && apt-get install cmake build-essential libgtk2.0-dev libglib2.0-dev gettext geany
+bzr branch lp:~per-lowgren/djynn/trunk /tmp/djynn
+mkdir /tmp/djynn/build && cd /tmp/djynn/build
cmake ..
make
-sudo make install</pre>
+sudo make install
+cd ../.. && rm -rf djynn
+exit
+</pre>
-<p>Restart Geany and you should be able to see Djynn in your Plugin Manager (see Tools menu).</p>
+<p>Restart Geany and you should be able to see Djynn in your Plugin Manager.</p>
-<p><img src="http://img11.imageshack.us/img11/9071/geanydjynnconfig.png" /></p>
+<p><img src="http://i.imgur.com/9yM89Cr.png" /></p>
+<!--p><img src="djynn-plugin-manager.png" /></p-->
-<p>Please, report any bugs!</p>
+<hr />
-<p>Suggestions on improvements are much welcome.</p>
+<p>Please, <a href="mailto:per.lowgren at gmail.com">report any bugs</a>!</p>
-<p>The Djynn plugin project can be found at
-<a href="http://code.google.com/p/libamanita/wiki/djynn" target="_blank">Google code</a>.</p>
+<p>The Djynn plugin project can be found at <a href="https://launchpad.net/djynn" target="_blank">Launchpad</a>.</p>
Modified: content/downloads.html
31 lines changed, 10 insertions(+), 21 deletions(-)
===================================================================
@@ -5,6 +5,7 @@
if($handle = opendir($dir))
{
$versions = Array();
+ $hash = isset($_GET['hash']) ? $_GET['hash'] : "md5";
while(false !== ($file = readdir($handle)))
{
@@ -37,7 +38,7 @@
echo " <th>";
// if sha1 is selected
- if ($_GET['hash'] != "md5")
+ if ($hash != "md5")
{
echo "<a href=\"?site=downloads&hash=md5\">MD5</a> ";
}
@@ -51,7 +52,7 @@
echo "/";
// if md5 is selected or nothing is selected
- if ( ( $hash = $_GET['hash'] ) != "sha1" || $hash == "" )
+ if ( $hash != "sha1" || $hash == "" )
{
echo " <a href=\"?site=downloads&hash=sha1\">SHA1</a> ";
}
@@ -71,7 +72,7 @@
echo " <td><a href=\"./geany-plugins/geany-plugins-" . $version . ".tar.gz\">geany-plugins-" . $version . ".tar.gz</a></td>";
echo " <td>Source Code</td>";
echo " <td><a href=\"./geany-plugins/geany-plugins-" . $version . ".tar.gz.sig\">GPG Signature</a></td>";
- if ($_GET['hash'] == "sha1")
+ if ($hash == "sha1")
{
echo " <td><pre>" . sha1_file($dir . "geany-plugins-" . $version . ".tar.gz") . "</pre></td>";
} else {
@@ -88,7 +89,7 @@
echo " <td><a href=\"./geany-plugins/geany-plugins-" . $version . ".tar.bz2\">geany-plugins-" . $version . ".tar.bz2</a></td>";
echo " <td>Source Code</td>";
echo " <td><a href=\"./geany-plugins/geany-plugins-" . $version . ".tar.bz2.sig\">GPG Signature</a></td>";
- if ($_GET['hash'] == "sha1")
+ if ($hash == "sha1")
{
echo " <td><pre>" . sha1_file($dir . "geany-plugins-" . $version . ".tar.bz2") . "</pre></td>";
} else {
@@ -105,7 +106,7 @@
echo " <td><a href=\"./geany-plugins/geany-plugins-" .$wversion . "_setup.exe\">geany-plugins-" . $wversion . "_setup.exe</a></td>";
echo " <td>Win32 Installer</td>";
echo " <td><a href=\"./geany-plugins/geany-plugins-" .$wversion . "_setup.exe.sig\">GPG Signature</a></td>";
- if ($_GET['hash'] == "sha1")
+ if ($hash == "sha1")
{
echo " <td><pre>" . sha1_file($dir . "geany-plugins-" . $wversion . "_setup.exe") . "</pre></td>";
} else {
@@ -135,8 +136,8 @@
<ul>
<li>Import the key via <code>gpg --recv-keys B5688B006F78F01E</code></li>
<li>Verify the downloaded archive either with
- <code>gpg --verify geany-plugins-1.25.tar.bz2.sig geany-plugins-1.25.tar.bz2</code> or
- <code>gpg --verify geany-plugins-1.25.tar.gz.sig geany-plugins-1.25.tar.gz</code>
+ <code>gpg --verify geany-plugins-1.26.tar.bz2.sig geany-plugins-1.26.tar.bz2</code> or
+ <code>gpg --verify geany-plugins-1.26.tar.gz.sig geany-plugins-1.26.tar.gz</code>
</li>
</ul>
@@ -148,7 +149,7 @@
<code>
wget http://download.geany.org/frlan-pubkey.txt<br />
gpg --import < frlan-pubkey.txt<br />
-gpg --verify geany-plugins-1.25.tar.bz2.sig geany-plugins-1.25.tar.bz2
+gpg --verify geany-plugins-1.26.tar.bz2.sig geany-plugins-1.26.tar.bz2
</code>
<h2>Download directly from version control</h2>
@@ -160,19 +161,7 @@
git clone git://github.com/geany/geany-plugins.git geany-plugins
</code>
-<p>You can build the plugins from those sources then using Waf:</p>
-<code>
-./waf configure<br />
-./waf build -p -k
-</code>
-
-<p>You can either copy the resulting .so files to ~/.config/geany/plugins/ or
-install them to /usr/share/geany/ with running following command as root:</p>
-<code>
-./waf install
-</code>
-
-<p>Or either do it the autotools way as well:</p>
+<p>Build and install all plugins:</p>
<code>
./autogen.sh # Note this already runs ./configure<br />
make<br >
Modified: content/start.html
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -30,7 +30,7 @@
"https://sourceforge.net/tracker/?group_id=222729&atid=1056532">report
issues</a> against the according plugin (or even this website) at <a href=
"https://sourceforge.net/tracker/?group_id=222729&atid=1056532">
-SourceForge</a>.<br />
+SourceForge</a> or <a href="https://github.com/geany/geany-plugins/issues">GitHub</a>.<br />
The <a href= "https://github.com/geany/plugins.geany.org" >source code of
this script</a> (including the whole source for the plugins.geany.org
Modified: gencontent.sh
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -219,6 +219,9 @@ function gen_html_from_readme()
# since tidy just outputs spaces, not tabs, we'll replace those spaces
# with tabs again ourself
sed -i "s/ /\t/g" .README.html
+ # remove hard-coded references to http://plugins.geany.org and make the links
+ # protocol-relative to not break SSL
+ sed -i "s,http://plugins.geany.org/,//plugins.geany.org/,g" .README.html
cp .README.html ${dir}${plugin}.html
echo -e "\n\n" >> ${LOGFILE}
}
Modified: images/ForkMe_Blk.png
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: images/ForkMe_Wht.png
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online
Modified: index.php
24 lines changed, 10 insertions(+), 14 deletions(-)
===================================================================
@@ -1,12 +1,12 @@
<?php
/*
- * index.php
- * Website plugins.geany.org
+ * index.php
+ * Website plugins.geany.org
*
- * (C) Copyright 2009 by Dominic Hopf <dmaphy at googlemail.com>
- * (C) Copyright 2010 by Michael Spahn <m.spahn at any0n3.de>
- * Version: 1.0.0
- * Last Change: 2010-7-24
+ * (C) Copyright 2009 by Dominic Hopf <dmaphy at googlemail.com>
+ * (C) Copyright 2010 by Michael Spahn <m.spahn at any0n3.de>
+ * Version: 1.0.0
+ * Last Change: 2010-7-24
*/
define('CONTENTPATH','./content/');
@@ -43,9 +43,10 @@
</head>
<body>
<a href="https://github.com/geany/geany-plugins">
- <img style="position: fixed; top: 0; left: 0; border: 0;"
- src="./images/ForkMe_Blk.png" alt="Fork me on GitHub"></a>
-
+ <img style="position: absolute; top: 0; left: 0; border: 0;"
+ src="https://camo.githubusercontent.com/8b6b8ccc6da3aa5722903da7b58eb5ab1081adee/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f6c6566745f6f72616e67655f6666373630302e706e67"
+ alt="Fork me on GitHub"
+ data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_orange_ff7600.png"></a>
<div id="header">
<a href="./">
<img src="./images/geany.png" alt="Geany Logo"
@@ -115,11 +116,6 @@
<div id="footer">
<p>
- <a href="http://sourceforge.net/projects/geany-plugins">
- <img src="http://sflogo.sourceforge.net/sflogo.php?group_id=222729&type=16"
- width="150" height="40" alt="Get geany-plugins at SourceForge.net.
- Fast, secure and Free Open Source software downloads" /></a>
-
<a href="https://github.com/geany/geany-plugins"
title="Geany-Plugins is on GitHub"
style="padding-left: 100px;">
Modified: push.sh
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -2,6 +2,7 @@
#~ set -x
+GIT_SOURCESDIR=${HOME}"/.tmp/geany-plugins/" # should be same as $SOURCESDIR in gencontent.sh
SOURCEDIR="/home/dmaphy/webroot/websites/plugins.geany.org/"
PREVIEWDIR="/home/dmaphy/plugins.geany.org_preview/"
STABLEDIR="/home/dmaphy/plugins.geany.org_stable/"
@@ -71,7 +72,9 @@ else
fi
rsync -avC $EXARG --delete $PREVIEWDIR $STABLEDIR
- ;;
+ # hack for images for the Markdown plugin
+ rsync -avC ${GIT_SOURCESDIR}markdown/docs/*.png $STABLEDIR
+ ;;
*)
echo "Usage: $0 [preview|stable]";
;;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Plugins-Commits
mailing list