Added a quick way to select images instead of autogenerated icons

ConX · Jun 16, 2011 · 7055e26 · 7055e26
1 parent 4600ef1
commit 7055e26
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 6 deletions.
diff --git a/action.php b/action.php
@@ -34,18 +34,25 @@ function makelist() {
         $conf = $this->loadCBData();
         $buttonlist = array();
         foreach ($conf as $button) {
+            $ico = '../../plugins/custombuttons/';
+            if(!$button['icon']){
+                $ico .= 'genpng.php?text='.$button["label"];
+            }else{
+                $ico .= 'ico/'.$button['icon'];
+            }
+
             if ($button["type"] == 1) {
                 $buttonlist[] =  array(
-                        'type' => 'format',
+                        'type'  => 'format',
                         'title' => $button["label"],
-                        'icon' => '../../plugins/custombuttons/genpng.php?text='.$button["label"],
-                        'open' => $button["pretag"],
+                        'icon'  => $ico,
+                        'open'  => $button["pretag"],
                         'close' => $button["posttag"]);
             } else {
                 $buttonlist[] =  array(
                         'type'   => 'insert',
                         'title'  =>  $button["label"],
-                        'icon'   =>  '../../plugins/custombuttons/genpng.php?text='.$button["label"],
+                        'icon'   =>  $ico,
                         'insert' => $button["code"],
                         'block'  => true);
             }

diff --git a/admin.php b/admin.php
@@ -51,7 +51,8 @@ function handle() {
                 "code" => $_REQUEST["code"],
                 "type" => $type,
                 "pretag" => $_REQUEST["pretag"],
-                "posttag" => $_REQUEST["posttag"]
+                "posttag" => $_REQUEST["posttag"],
+                "icon" => $_REQUEST["icon"],
             ));
             $this->saveCBData($conf);
             $this->reloadBar();
@@ -96,6 +97,16 @@ function html() {
         ptln('  <input type="hidden" name="page" value="'.$this->getPluginName().'" />');
         formSecurityToken();
         ptln('  <table>');
+        ptln('    <tr><th>Icon:</th><td>');
+        ptln('<select name="icon">');
+        ptln('<option value="">text only</option>');
+        $files = glob(dirname(__FILE__).'/ico/*.png');
+        foreach($files as $file){
+            $file = hsc(basename($file));
+            ptln('<option value="'.$file.'" style="padding-left: 18px; background: #fff url('.DOKU_BASE.'lib/plugins/custombuttons/ico/'.$file.') left center no-repeat">'.$file.'</option>');
+        }
+        ptln('</select>');
+        ptln('    </td></tr>');
         ptln('    <tr><th>Label:</th><td><input type="text" name="label" /></td></tr>');
         ptln('    <tr><th>Pre tag:</th><td><input type="text" name="pretag" /><b> *</b></td></tr>');
         ptln('    <tr><th>Post tag:</th><td><input type="text" name="posttag" /><b> *</b></td></tr>');

diff --git a/ico/add.png b/ico/add.png
diff --git a/ico/application.png b/ico/application.png
diff --git a/ico/asterisk_orange.png b/ico/asterisk_orange.png
diff --git a/ico/attach.png b/ico/attach.png
diff --git a/ico/book_open.png b/ico/book_open.png
diff --git a/ico/bullet_wrench.png b/ico/bullet_wrench.png
diff --git a/ico/cake.png b/ico/cake.png
diff --git a/ico/calendar.png b/ico/calendar.png
diff --git a/ico/car.png b/ico/car.png
diff --git a/ico/chart_bar.png b/ico/chart_bar.png
diff --git a/ico/chart_line.png b/ico/chart_line.png
diff --git a/ico/clock.png b/ico/clock.png
diff --git a/ico/comment.png b/ico/comment.png
diff --git a/ico/email.png b/ico/email.png
diff --git a/ico/map.png b/ico/map.png
diff --git a/ico/page_code.png b/ico/page_code.png
diff --git a/ico/page_white_text.png b/ico/page_white_text.png
diff --git a/ico/pilcrow.png b/ico/pilcrow.png
diff --git a/ico/script.png b/ico/script.png
diff --git a/ico/status_offline.png b/ico/status_offline.png
diff --git a/plugin.info.txt b/plugin.info.txt
@@ -1,7 +1,7 @@
 base   custombuttons
 author Constantinos Xanthopoulos
 email  conx@xanthopoulos.info
-date   2010-07-20
+date   2011-06-16
 name   custombuttons plugin
 desc   A plugin for adding custom buttons to the toolbar, to shortcut commonly used code blocks.
 url    http://www.dokuwiki.org/plugin:custombuttons