summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inc/lang/en/lang.php7
-rw-r--r--inc/toolbar.php105
-rw-r--r--lib/images/toolbar/h.pngbin0 -> 370 bytes
-rw-r--r--lib/images/toolbar/hequal.pngbin0 -> 378 bytes
-rw-r--r--lib/images/toolbar/hminus.pngbin0 -> 359 bytes
-rw-r--r--lib/images/toolbar/hplus.pngbin0 -> 409 bytes
6 files changed, 77 insertions, 35 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index d62579fb1..e80e7d420 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -169,6 +169,13 @@ $lang['qb_h2'] = 'Level 2 Headline';
$lang['qb_h3'] = 'Level 3 Headline';
$lang['qb_h4'] = 'Level 4 Headline';
$lang['qb_h5'] = 'Level 5 Headline';
+
+$lang['qb_h'] = 'Headline';
+$lang['qb_hs'] = 'Select Headline';
+$lang['qb_hplus'] = 'Higher Headline';
+$lang['qb_hminus'] = 'Lower Headline';
+$lang['qb_hequal'] = 'Same Level Headline';
+
$lang['qb_link'] = 'Internal Link';
$lang['qb_extlink'] = 'External Link';
$lang['qb_hr'] = 'Horizontal Rule';
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 3188c9ac9..18bb806f6 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -69,46 +69,81 @@ function toolbar_JSdefines($varname){
'open' => '<del>',
'close' => '</del>',
),
+
+
array(
- 'type' => 'format',
- 'title' => $lang['qb_h1'],
- 'icon' => 'h1.png',
- 'key' => '1',
- 'open' => '====== ',
- 'close' => ' ======\n',
- ),
- array(
- 'type' => 'format',
- 'title' => $lang['qb_h2'],
- 'icon' => 'h2.png',
- 'key' => '2',
- 'open' => '===== ',
- 'close' => ' =====\n',
- ),
+ 'type' => 'autohead',
+ 'title' => $lang['qb_hplus'],
+ 'icon' => 'hplus.png',
+ 'key' => '',
+ 'text' => $lang['qb_h'],
+ 'mod' => -1
+ ),
array(
- 'type' => 'format',
- 'title' => $lang['qb_h3'],
- 'icon' => 'h3.png',
- 'key' => '3',
- 'open' => '==== ',
- 'close' => ' ====\n',
- ),
+ 'type' => 'autohead',
+ 'title' => $lang['qb_hequal'],
+ 'icon' => 'hequal.png',
+ 'key' => '',
+ 'text' => $lang['qb_h'],
+ 'mod' => 0
+ ),
array(
- 'type' => 'format',
- 'title' => $lang['qb_h4'],
- 'icon' => 'h4.png',
- 'key' => '4',
- 'open' => '=== ',
- 'close' => ' ===\n',
- ),
+ 'type' => 'autohead',
+ 'title' => $lang['qb_hminus'],
+ 'icon' => 'hminus.png',
+ 'key' => '',
+ 'text' => $lang['qb_h'],
+ 'mod' => 1
+ ),
+
array(
- 'type' => 'format',
- 'title' => $lang['qb_h5'],
- 'icon' => 'h5.png',
- 'key' => '5',
- 'open' => '== ',
- 'close' => ' ==\n',
+ 'type' => 'picker',
+ 'title' => $lang['qb_hs'],
+ 'icon' => 'h.png',
+ 'list' => array(
+ array(
+ 'type' => 'format',
+ 'title' => $lang['qb_h1'],
+ 'icon' => 'h1.png',
+ 'key' => '1',
+ 'open' => '====== ',
+ 'close' => ' ======\n',
+ ),
+ array(
+ 'type' => 'format',
+ 'title' => $lang['qb_h2'],
+ 'icon' => 'h2.png',
+ 'key' => '2',
+ 'open' => '===== ',
+ 'close' => ' =====\n',
+ ),
+ array(
+ 'type' => 'format',
+ 'title' => $lang['qb_h3'],
+ 'icon' => 'h3.png',
+ 'key' => '3',
+ 'open' => '==== ',
+ 'close' => ' ====\n',
+ ),
+ array(
+ 'type' => 'format',
+ 'title' => $lang['qb_h4'],
+ 'icon' => 'h4.png',
+ 'key' => '4',
+ 'open' => '=== ',
+ 'close' => ' ===\n',
+ ),
+ array(
+ 'type' => 'format',
+ 'title' => $lang['qb_h5'],
+ 'icon' => 'h5.png',
+ 'key' => '5',
+ 'open' => '== ',
+ 'close' => ' ==\n',
+ ),
+ )
),
+
array(
'type' => 'format',
'title' => $lang['qb_link'],
diff --git a/lib/images/toolbar/h.png b/lib/images/toolbar/h.png
new file mode 100644
index 000000000..353d58eef
--- /dev/null
+++ b/lib/images/toolbar/h.png
Binary files differ
diff --git a/lib/images/toolbar/hequal.png b/lib/images/toolbar/hequal.png
new file mode 100644
index 000000000..094fd6a8c
--- /dev/null
+++ b/lib/images/toolbar/hequal.png
Binary files differ
diff --git a/lib/images/toolbar/hminus.png b/lib/images/toolbar/hminus.png
new file mode 100644
index 000000000..69d7ea21a
--- /dev/null
+++ b/lib/images/toolbar/hminus.png
Binary files differ
diff --git a/lib/images/toolbar/hplus.png b/lib/images/toolbar/hplus.png
new file mode 100644
index 000000000..88eda1059
--- /dev/null
+++ b/lib/images/toolbar/hplus.png
Binary files differ