From e63f3009d539f2e04d496010b9eff58a2af341ef Mon Sep 17 00:00:00 2001 From: micio Date: Thu, 3 Nov 2011 09:05:17 +0000 Subject: [PATCH] Bazaar/HelpViewer : added Back and forward buttons, backlink to tree and window title git-svn-id: svn://ultimatepp.org/upp/trunk@4117 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/HelpViewer/HelpViewer.cpp | 386 +++++++++++++++++++------------ bazaar/HelpViewer/HelpViewer.h | 115 ++++----- bazaar/HelpViewer/HelpViewer.iml | 100 ++++++++ bazaar/HelpViewer/HelpViewer.upp | 4 +- 4 files changed, 392 insertions(+), 213 deletions(-) diff --git a/bazaar/HelpViewer/HelpViewer.cpp b/bazaar/HelpViewer/HelpViewer.cpp index 7cd89aab8..f2819b2bc 100644 --- a/bazaar/HelpViewer/HelpViewer.cpp +++ b/bazaar/HelpViewer/HelpViewer.cpp @@ -1,154 +1,232 @@ -#include "HelpViewer.h" - -/* -#define IMAGEFILE -#include -*/ - -const char *TOPICLINK = "^topic`:`/`/"; - -HelpViewer::HelpViewer() -{ - // setups splitter and its contents - Add(splitter); - splitter.Horz(tocPane, contentsPane).SetPos(2500); - contentsPane.AutoHideSb(); - contentsPane.SetZoom(Zoom(1,1)); - contentsPane.HMargins(20); - - tocPane.Add(mainTocTree.NoRoot().SizePos()); - - // setup TOC link callback - mainTocTree.WhenSel = THISBACK(tocLinkCb); - contentsPane.WhenLink << THISBACK(contentLinkCb); - - zoom.m = 160; - zoom.d = 1000; - - Sizeable().Zoomable(); -} - -// appends a treeCtrl to main tocCtrl -void HelpViewer::AppendTOC(TreeCtrl const &t, int curId, int destId) -{ - // adds root node of current level - int destChild = mainTocTree.Add(destId, t.GetNode(curId)); - - // recursively add all children - for(int i = 0; i < t.GetChildCount(curId); i++) - AppendTOC(t, t.GetChild(curId, i), destChild); - - // opens all content tree and display first item - mainTocTree.OpenDeep(0); - mainTocTree.SelectOne(2); - mainTocTree.SetCursor(2); - mainTocTree.WhenSel(); -} - -// Parses TOC and fills tocTree control -bool HelpViewer::LoadTOC(String const &tocLink) -{ - // TOC is composed by QTF lines with a TOC link and label text - // lines not containing the TOC link are simply ignored - // TOC level is represented by number of TABS contained - // inside a line; zero tabs means toplevel, id 0 of tocTree - Vectorids; - ids.Add(0); - int curLevel = 0; - int curId = 0; - TreeCtrl tocTree; - - Topic t = GetTopic(tocLink); - if(IsNull(t.text)) - return false; - - String label = t.label; - String topic = t.link; - - // sets toc root string from topic ticle - tocTree.SetRoot(Null, t.title); - - // converts QTF to RichTxt, easier to analyze - RichText txt = ParseQTF(t.text); - - // extract all paragraphs from RichTxt, skip other objects - for(int iPart = 0; iPart < txt.GetPartCount(); iPart++) - { - String tocLine; - String lineLink; - if(!txt.IsPara(iPart)) - continue; - RichPara p = txt.Get(iPart); - for(int iParaPart = 0; iParaPart < p.GetCount(); iParaPart++) - { - RichPara::Part ¶Part = p.part[iParaPart]; - if(paraPart.format.link != "") - lineLink = paraPart.format.link; - if(paraPart.NonText()) - continue; - tocLine += paraPart.text.ToString(); - } - // if part contains no text nor link to topic stuffs, simply skip it - if(tocLine == "" || lineLink == "" || !lineLink.StartsWith("topic:")) - continue; - - // now we should count tabls to get TOC indent level - int level = 0; - int j; - while( (j = tocLine.Find(0x09)) >= 0) - { - level++; - tocLine.Remove(j); - } - // allows just SINGLE UPPER level change, i.e., deeper ONE level from current - // for each step; backleveling is possible at any depth - if(level > curLevel+1) - return false; - if(level > curLevel) - { - ids.Add(curId); - curLevel++; - } - else while(curLevel > level) - { - curLevel--; - ids.Pop(); - } - - // add the line to correct tree node - curId = tocTree.Add(ids.Top(), Null, Value(lineLink), Value(tocLine)); - } - - // if the tree control is non empty, appends it to the main TOC TreeCtrl - if(tocTree.GetChildCount(0)) - AppendTOC(tocTree); - - return true; -} - -// reacts on link selection inside content pane -void HelpViewer::contentLinkCb(String const &link) -{ - Topic t = GetTopic(link); - if(!IsNull(t.text)) - { - String label = t.label; - RichText txt = ParseQTF(t.text); - contentsPane.Pick(txt, zoom); - contentsPane.GotoLabel(label, true); - current_link = link; - } -} - - -void HelpViewer::tocLinkCb() -{ - int id = mainTocTree.GetCursor(); - if(id < 0) - return; - - // gets link - String link = mainTocTree.Get(id); - - contentLinkCb(link); -} +#include "HelpViewer.h" + +#define IMAGECLASS HelpImg +#define IMAGEFILE +#include + +const char *TOPICLINK = "^topic`:`/`/"; + +HelpViewer::HelpViewer() +{ + // adds toolbar + AddFrame(toolBar); + + // setups splitter and its contents + Add(splitter); + splitter.Horz(tocPane, contentsPane).SetPos(2500); + contentsPane.AutoHideSb(); + contentsPane.SetZoom(Zoom(1,1)); + contentsPane.HMargins(20); + + tocPane.Add(mainTocTree.NoRoot().SizePos()); + + // setup TOC link callback + mainTocTree.WhenSel = THISBACK(tocLinkCb); + contentsPane.WhenLink << THISBACK(contentLinkCb); + + // initialize link stack + stack.Clear(); + tos = -1; + + Sizeable().Zoomable(); + + // loads toolbar + toolBar.Set(THISBACK(toolBarCb)); +} + +// appends a treeCtrl to main tocCtrl +void HelpViewer::AppendTOC(TreeCtrl const &t, int curId, int destId) +{ + // adds root node of current level + int destChild = mainTocTree.Add(destId, t.GetNode(curId)); + + // recursively add all children + for(int i = 0; i < t.GetChildCount(curId); i++) + AppendTOC(t, t.GetChild(curId, i), destChild); +} + +// Parses TOC and fills tocTree control +bool HelpViewer::LoadTOC(String const &tocLink) +{ + // TOC is composed by QTF lines with a TOC link and label text + // lines not containing the TOC link are simply ignored + // TOC level is represented by number of TABS contained + // inside a line; zero tabs means toplevel, id 0 of tocTree + Vectorids; + ids.Add(0); + int curLevel = 0; + int curId = 0; + TreeCtrl tocTree; + + Topic t = GetTopic(tocLink); + if(IsNull(t.text)) + return false; + + String label = t.label; + String topic = t.link; + + // sets toc root string from topic ticle + tocTree.SetRoot(Null, t.title); + + // converts QTF to RichTxt, easier to analyze + RichText txt = ParseQTF(t.text); + + // extract all paragraphs from RichTxt, skip other objects + for(int iPart = 0; iPart < txt.GetPartCount(); iPart++) + { + String tocLine; + String lineLink; + if(!txt.IsPara(iPart)) + continue; + RichPara p = txt.Get(iPart); + for(int iParaPart = 0; iParaPart < p.GetCount(); iParaPart++) + { + RichPara::Part ¶Part = p.part[iParaPart]; + if(paraPart.format.link != "") + lineLink = paraPart.format.link; + if(paraPart.NonText()) + continue; + tocLine += paraPart.text.ToString(); + } + // if part contains no text nor link to topic stuffs, simply skip it + if(tocLine == "" || lineLink == "" || !lineLink.StartsWith("topic:")) + continue; + + // now we should count tabls to get TOC indent level + int level = 0; + int j; + while( (j = tocLine.Find(0x09)) >= 0) + { + level++; + tocLine.Remove(j); + } + // allows just SINGLE UPPER level change, i.e., deeper ONE level from current + // for each step; backleveling is possible at any depth + if(level > curLevel+1) + return false; + if(level > curLevel) + { + ids.Add(curId); + curLevel++; + } + else while(curLevel > level) + { + curLevel--; + ids.Pop(); + } + + // add the line to correct tree node + curId = tocTree.Add(ids.Top(), Null, Value(lineLink), Value(tocLine)); + } + + // if the tree control is non empty, appends it to the main TOC TreeCtrl + if(tocTree.GetChildCount(0)) + AppendTOC(tocTree); + + + // opens all content tree and display first item + mainTocTree.OpenDeep(0); + mainTocTree.SetCursor(2); + + // stores first topic at top of stack + String curLink = mainTocTree.Get(); + stack.Clear(); + stack.Add(curLink); + tos = 0; + + return true; +} + +// go to a selected link +void HelpViewer::showLink(String const &link) +{ + Topic t = GetTopic(link); + if(!IsNull(t.text)) + { + Zoom zoom; + zoom.m = 160; + zoom.d = 1000; + + String label = t.label; + RichText txt = ParseQTF(t.text); + contentsPane.Pick(txt, zoom); + contentsPane.GotoLabel(label, true); + int tocId = mainTocTree.Find(link); + if(tocId >= 0) + { + // disable tocTree action on selecting cursor + // otherwise we've got a recursive call + mainTocTree.WhenSel.Clear(); + mainTocTree.SetCursor(tocId); + + // re-enable tocTree action + mainTocTree.WhenSel = THISBACK(tocLinkCb); + + // setup window title + Title(mainTocTree.GetValue()); + } + } +} + +// reacts on link selection inside content pane +void HelpViewer::contentLinkCb(String const &link) +{ + // clear forward buffer + stack.Trim(tos+1); + + // updates history + int tocId = mainTocTree.GetCursor(); + if(tocId > 0) + { + String curLink = mainTocTree.Get(); + stack.Add(curLink); + tos++; + toolBar.Set(THISBACK(toolBarCb)); + + } + + // shows link inside main pane + showLink(link); +} + + +void HelpViewer::tocLinkCb() +{ + int id = mainTocTree.GetCursor(); + if(id < 0) + return; + + // gets link + String link = mainTocTree.Get(id); + + // follow link + contentLinkCb(link); +} + +// go previous/next +void HelpViewer::backCb(void) +{ + if(--tos >= 0) + { + String link = stack[tos]; + showLink(link); + } + toolBar.Set(THISBACK(toolBarCb)); +} + +void HelpViewer::fwCb(void) +{ + if(tos < stack.GetCount() - 1) + { + String link = stack[++tos]; + showLink(link); + } + toolBar.Set(THISBACK(toolBarCb)); +} + +// toolbar construction +void HelpViewer::toolBarCb(Bar &bar) +{ + bar.Add(tos > 0, "Back", HelpImg::Back(), THISBACK(backCb)); + bar.Add(tos < stack.GetCount() - 1, "Forward", HelpImg::Forward(), THISBACK(fwCb)); +} diff --git a/bazaar/HelpViewer/HelpViewer.h b/bazaar/HelpViewer/HelpViewer.h index 15a861bd9..88c3f2cb7 100644 --- a/bazaar/HelpViewer/HelpViewer.h +++ b/bazaar/HelpViewer/HelpViewer.h @@ -1,57 +1,58 @@ -#ifndef _HelpViewer_HelpViewer_h -#define _HelpViewer_HelpViewer_h - -#include - -using namespace Upp; - -/* -#define IMAGEFILE -#include -*/ - -class HelpViewer : public TopWindow -{ - private: - Splitter splitter; - ParentCtrl tocPane; - RichTextView contentsPane; - TreeCtrl mainTocTree; - - // reacts on TOC link selection - void tocLinkCb(); - - // reacts on link selection inside content pane - void contentLinkCb(String const &link); - - ToolBar toolbar; - Zoom zoom; - - struct Pos : Moveable - { - String link; - int scy; - }; - - Vector back; - Vector forward; - String current_link; - - // appends a treeCtrl to main tocCtrl - void AppendTOC(TreeCtrl const &t, int curId = 0, int destId = 0); - - public: - typedef HelpViewer CLASSNAME; - - HelpViewer(); - - // loads TOC contents - bool LoadTOC(String const &toc); - - // clears contents - void Clear() { mainTocTree.Clear(); } - -}; - -#endif - +#ifndef _HelpViewer_HelpViewer_h +#define _HelpViewer_HelpViewer_h + +#include + +using namespace Upp; + +#define IMAGECLASS HelpImg +#define IMAGEFILE +#include + +class HelpViewer : public TopWindow +{ + private: + Splitter splitter; + ParentCtrl tocPane; + RichTextView contentsPane; + TreeCtrl mainTocTree; + + // go to a selected link + void showLink(String const &link); + + // reacts on TOC link selection + void tocLinkCb(); + + // reacts on link selection inside content pane + void contentLinkCb(String const &link); + + ToolBar toolBar; + + Vector stack; + int tos; + + // go previous/next + void backCb(void); + void fwCb(void); + + // toolbar construction + void toolBarCb(Bar &bar); + + // appends a treeCtrl to main tocCtrl + void AppendTOC(TreeCtrl const &t, int curId = 0, int destId = 0); + + public: + typedef HelpViewer CLASSNAME; + + HelpViewer(); + + // loads TOC contents + bool LoadTOC(String const &toc); + + // clears contents + void Clear() { mainTocTree.Clear(); } + +}; + +#endif + diff --git a/bazaar/HelpViewer/HelpViewer.iml b/bazaar/HelpViewer/HelpViewer.iml index a5b0ccf38..137e4de4e 100644 --- a/bazaar/HelpViewer/HelpViewer.iml +++ b/bazaar/HelpViewer/HelpViewer.iml @@ -1 +1,101 @@ PREMULTIPLIED +IMAGE_ID(Back) +IMAGE_ID(Forward) + +IMAGE_BEGIN_DATA +IMAGE_DATA(120,156,237,152,121,84,83,87,30,199,5,220,171,108,46,128,149,74,167,46,184,11,117,84,92,139,34,88,81,84,84,6) +IMAGE_DATA(69,41,136,2,34,24,130,236,107,88,2,9,4,76,128,132,29,196,64,216,49,134,93,217,145,53,128,136,74,221,79,109) +IMAGE_DATA(213,110,158,158,206,216,246,159,214,243,157,123,31,173,83,59,58,182,29,161,103,230,244,158,243,61,239,229,189,220,251,253) +IMAGE_DATA(113,239,229,229,125,190,99,12,198,24,140,249,179,189,222,54,121,170,150,206,130,197,198,107,213,212,198,142,27,109,239,169) +IMAGE_DATA(6,235,29,118,121,151,60,185,114,251,11,236,243,72,108,27,45,95,149,177,19,53,102,174,60,34,219,234,81,128,138,254) +IMAGE_DATA(71,232,127,240,4,198,135,210,49,26,222,19,180,222,54,209,55,11,187,199,22,93,68,243,221,175,208,120,247,107,70,250) +IMAGE_DATA(230,145,35,236,175,162,170,57,127,91,208,187,118,146,239,211,170,6,80,117,237,83,84,92,125,4,197,224,35,84,16,205) +IMAGE_DATA(218,228,51,98,254,106,147,180,222,156,181,193,171,201,38,176,4,133,151,110,161,168,235,46,163,194,206,59,140,138,136,116) +IMAGE_DATA(86,187,142,136,255,27,111,26,239,90,184,95,252,56,56,179,25,210,150,33,156,105,186,142,92,70,67,140,152,207,205,67) +IMAGE_DATA(152,110,116,232,181,250,171,168,141,155,52,195,216,94,108,198,42,131,176,188,7,41,213,125,72,173,233,71,90,237,101,164) +IMAGE_DATA(215,14,32,189,238,10,163,180,218,225,163,214,162,221,175,242,87,249,81,175,108,227,213,103,47,49,216,22,125,213,49,186) +IMAGE_DATA(10,194,178,14,156,38,18,158,235,66,162,188,7,73,138,94,36,43,250,144,92,209,255,47,145,207,26,243,204,161,181,112) +IMAGE_DATA(39,180,151,238,199,116,99,123,204,92,229,2,157,117,158,208,89,239,5,157,181,44,88,187,39,193,51,248,116,215,171,188) +IMAGE_DATA(53,230,110,113,51,182,207,249,206,39,185,6,81,103,235,17,157,215,4,126,65,43,226,138,218,17,95,210,137,132,178,110) +IMAGE_DATA(156,46,87,146,122,122,127,38,37,210,171,7,144,86,217,143,148,138,94,136,105,157,229,157,16,149,92,66,66,97,51,226) +IMAGE_DATA(242,27,16,155,119,17,134,230,167,94,58,71,170,227,167,76,211,93,199,146,91,176,100,240,77,146,35,48,165,2,33,25) +IMAGE_DATA(181,224,100,215,35,242,108,19,162,243,219,192,43,236,64,108,113,23,4,165,61,136,47,235,125,38,65,169,18,113,37,61) +IMAGE_DATA(224,23,117,33,70,214,142,40,105,11,56,57,141,164,127,29,2,82,42,225,147,120,14,126,73,229,208,54,118,124,161,255) +IMAGE_DATA(164,153,134,166,243,118,159,126,96,227,47,197,9,94,62,88,130,98,156,18,146,62,226,74,4,165,213,33,52,187,17,17) +IMAGE_DATA(185,173,224,230,119,32,166,160,27,252,98,234,215,135,184,210,126,70,177,228,156,95,164,68,52,185,23,41,109,39,222,45) +IMAGE_DATA(8,206,168,135,127,74,13,78,137,20,56,41,40,133,175,136,248,27,217,63,239,175,162,58,86,123,137,53,215,248,112,218) +IMAGE_DATA(211,3,254,25,248,32,56,3,71,56,57,112,229,230,195,61,174,4,108,225,121,248,138,107,16,152,222,128,176,156,86,68) +IMAGE_DATA(72,59,193,45,80,130,87,68,61,7,136,247,176,232,57,189,198,149,41,17,126,182,19,33,217,173,8,72,173,135,119,82) +IMAGE_DATA(53,78,198,203,225,26,83,4,127,50,7,218,43,236,158,243,159,181,129,93,191,193,73,140,253,236,68,70,54,94,73,176) +IMAGE_DATA(243,79,135,99,88,46,92,184,133,112,23,200,225,149,88,13,191,212,6,4,103,181,145,177,187,17,37,235,35,94,151,137) +IMAGE_DATA(231,21,226,61,200,136,158,199,20,13,48,247,56,228,59,65,153,109,240,149,52,192,83,88,141,227,252,114,184,197,20,35) +IMAGE_DATA(38,171,22,218,203,109,159,243,215,91,231,81,191,222,65,8,51,199,40,108,119,225,99,167,91,60,246,177,197,56,24,144) +IMAGE_DATA(13,71,142,12,46,49,229,56,153,80,13,111,113,3,2,51,219,17,150,219,131,168,252,126,226,79,189,175,65,80,62,196) +IMAGE_DATA(136,158,243,138,6,153,123,244,59,225,185,221,136,201,235,68,48,169,219,131,47,39,99,102,192,120,95,36,180,151,217,252) +IMAGE_DATA(219,252,107,204,183,136,124,231,253,208,31,102,153,56,99,222,22,22,86,237,231,192,252,152,16,251,188,179,225,192,41,198) +IMAGE_DATA(9,65,53,124,36,205,8,205,233,34,235,223,143,248,210,171,72,60,127,3,146,170,219,72,173,190,139,52,34,73,229,109) +IMAGE_DATA(136,228,55,16,91,116,149,236,147,62,176,68,173,176,9,86,192,210,51,31,166,199,210,176,250,96,60,86,217,242,136,255) +IMAGE_DATA(222,23,238,191,241,154,115,54,190,245,30,251,190,225,246,0,204,53,243,198,82,43,14,211,103,179,115,58,118,176,11,200) +IMAGE_DATA(88,21,112,136,174,199,241,132,75,240,146,40,17,152,61,8,78,222,13,112,11,111,131,91,116,7,17,178,155,8,62,115) +IMAGE_DATA(13,222,105,125,112,23,117,192,137,215,136,3,97,213,216,229,93,140,173,199,179,177,246,176,8,107,237,227,201,179,225,229) +IMAGE_DATA(207,40,149,177,19,180,180,23,91,21,47,179,14,199,95,73,173,107,15,145,117,113,205,98,198,160,99,57,241,155,224,145) +IMAGE_DATA(216,9,191,140,203,196,251,67,240,74,239,33,225,252,3,156,86,60,68,108,249,71,76,13,1,164,46,79,113,15,156,227) +IMAGE_DATA(90,112,40,162,14,214,126,229,176,112,207,197,6,135,100,172,119,20,65,123,137,213,43,159,209,19,103,24,58,206,51,103) +IMAGE_DATA(63,49,117,149,192,220,45,7,187,125,74,97,23,94,131,99,177,205,96,37,119,35,32,235,10,34,11,110,33,94,254,9) +IMAGE_DATA(36,117,95,32,245,226,99,8,43,31,130,47,255,8,97,133,55,224,155,51,0,143,148,46,28,77,104,129,29,183,6,123) +IMAGE_DATA(200,111,150,5,235,12,204,217,89,48,222,233,246,171,126,35,84,39,168,207,155,177,220,90,185,201,69,132,189,129,229,176) +IMAGE_DATA(227,252,194,95,118,11,2,249,199,16,215,126,142,148,186,47,33,172,253,20,58,75,222,131,230,59,107,160,57,111,35,180) +IMAGE_DATA(12,183,64,123,209,54,50,223,244,121,188,11,90,75,118,194,112,179,3,76,118,56,254,134,119,36,149,113,147,245,86,240) +IMAGE_DATA(150,88,7,60,61,192,173,100,214,148,174,173,111,58,217,227,210,33,196,20,223,133,224,220,199,204,60,196,86,126,2,205) +IMAGE_DATA(185,38,35,242,251,171,54,121,250,102,29,99,235,7,86,193,82,28,23,181,131,77,214,215,63,243,10,194,206,14,145,121) +IMAGE_DATA(184,201,172,69,120,217,29,104,46,216,48,98,239,31,42,170,227,166,77,210,91,94,190,210,62,12,46,146,118,102,143,249) +IMAGE_DATA(144,121,240,39,107,65,215,195,79,54,4,205,133,166,35,254,254,55,118,138,174,179,158,201,190,111,247,11,42,224,158,212) +IMAGE_DATA(133,147,68,44,34,143,156,203,208,92,108,54,42,239,159,228,221,215,112,178,190,113,255,26,143,4,28,73,186,132,163,177) +IMAGE_DATA(77,112,34,251,93,99,169,249,168,248,255,88,197,248,177,234,250,113,179,205,28,158,90,241,21,176,203,234,198,12,163,29) +IMAGE_DATA(163,232,255,83,21,234,102,83,12,214,60,180,224,229,96,161,229,209,191,143,182,255,112,17,106,234,154,179,231,29,28,251) +IMAGE_DATA(134,246,154,63,196,255,127,181,253,25,6,252,190,166,161,161,161,185,209,212,124,199,228,169,218,186,127,128,189,138,75,72) +IMAGE_DATA(86,247,192,173,207,177,209,37,239,9,13,0,70,187,0,10,250,67,159,125,3,121,239,3,152,121,20,128,6,1,52,16) +IMAGE_DATA(24,45,127,125,139,40,244,62,252,6,141,247,190,70,211,157,175,224,41,186,0,253,45,161,247,38,104,25,152,140,134,255) +IMAGE_DATA(172,77,190,104,185,243,24,149,215,62,99,84,117,253,51,164,86,13,226,93,59,241,247,228,101,54,136,62,145,70,210,95) +IMAGE_DATA(103,205,113,212,12,62,68,169,242,62,74,123,239,15,31,137,138,59,238,194,54,184,20,122,235,217,77,106,147,180,102,143) +IMAGE_DATA(148,63,5,253,178,238,123,200,191,116,155,81,30,85,27,213,45,200,200,121,88,78,27,22,217,136,31,211,224,224,119,12) +IMAGE_DATA(255,74,72,215,90,188,7,210,230,27,200,110,24,122,166,172,122,170,235,200,188,120,13,25,23,174,66,172,184,12,11,175) +IMAGE_DATA(115,160,1,2,13,18,126,173,57,59,68,216,101,237,158,136,153,4,216,25,112,95,207,198,204,213,174,4,232,63,96,224) +IMAGE_DATA(69,107,161,21,3,250,105,181,87,145,90,51,136,148,159,84,61,72,128,228,10,196,149,3,72,174,184,140,36,69,31,169) +IMAGE_DATA(161,15,174,130,139,120,123,123,244,85,26,40,252,26,127,10,232,178,11,125,144,156,235,128,68,222,5,201,249,30,34,37) +IMAGE_DATA(25,107,56,116,72,82,244,19,248,161,186,140,68,197,143,34,231,34,114,77,36,239,99,194,128,132,50,37,129,164,110,196) +IMAGE_DATA(21,119,130,95,112,9,161,89,205,88,229,36,253,142,6,11,175,242,167,128,206,203,189,128,192,212,42,210,239,2,129,169) +IMAGE_DATA(70,112,243,90,9,116,183,51,112,79,33,95,80,74,161,191,239,57,209,107,113,37,74,196,22,119,131,87,216,137,104,38) +IMAGE_DATA(4,104,35,253,155,17,150,77,224,57,243,34,172,3,206,65,119,61,75,78,131,134,151,250,19,64,15,146,40,224,37,148) +IMAGE_DATA(195,79,82,141,160,244,139,164,127,19,34,206,182,33,42,175,131,140,75,199,239,33,176,217,11,126,241,176,232,121,76,225) +IMAGE_DATA(48,252,115,243,59,135,3,128,51,173,8,37,253,130,210,105,8,80,11,159,228,74,50,230,121,56,69,149,99,209,190,196) +IMAGE_DATA(7,52,112,120,145,255,52,178,183,89,113,69,56,193,167,240,175,32,240,95,203,192,127,40,1,122,78,110,59,34,164,93) +IMAGE_DATA(4,114,123,24,208,143,46,232,5,151,138,156,211,107,244,30,39,183,131,128,106,27,1,240,102,248,167,214,195,71,92,7) +IMAGE_DATA(47,17,13,64,42,224,74,128,126,175,167,4,43,118,135,97,142,165,224,41,13,30,40,0,255,220,127,186,209,65,56,113) +IMAGE_DATA(114,113,52,66,134,19,177,231,192,22,81,248,173,71,96,70,11,66,178,59,8,92,119,35,92,74,188,242,148,136,204,235) +IMAGE_DATA(101,142,17,82,37,129,254,30,132,157,233,66,112,118,59,19,20,248,165,52,194,35,190,154,0,116,9,172,189,114,96,98) +IMAGE_DATA(39,192,178,93,225,88,96,17,128,57,155,60,161,187,218,133,60,51,67,160,183,129,93,255,115,255,25,70,182,48,57,16) +IMAGE_DATA(5,179,163,34,88,159,58,3,123,78,41,92,248,213,240,16,54,192,75,220,10,159,212,118,2,64,29,240,75,239,132,111) +IMAGE_DATA(90,39,188,83,58,192,78,190,4,15,81,11,217,235,141,112,140,174,131,77,208,121,6,90,223,63,41,133,153,75,38,3) +IMAGE_DATA(159,171,15,8,176,124,79,36,12,223,15,132,129,41,27,111,174,115,195,219,230,193,208,93,235,254,11,127,27,44,36,16) +IMAGE_DATA(190,194,58,138,233,183,141,192,235,30,223,82,216,134,86,193,62,234,2,142,196,52,48,32,232,34,104,33,106,101,142,244) +IMAGE_DATA(51,133,51,7,110,61,129,222,90,216,134,84,194,218,191,156,1,119,10,176,155,156,82,176,198,46,1,70,123,185,100,236) +IMAGE_DATA(96,44,178,12,194,92,203,136,31,52,230,155,71,254,114,254,103,24,237,35,47,178,129,228,187,209,76,63,26,32,236,15) +IMAGE_DATA(82,224,112,100,29,3,224,174,241,173,56,33,108,103,64,144,194,56,61,186,157,110,103,174,31,37,247,105,13,118,225,181) +IMAGE_DATA(76,31,58,7,219,60,206,50,1,132,9,129,249,149,127,227,17,197,64,127,163,231,125,26,56,188,104,255,205,48,178,134) +IMAGE_DATA(161,101,0,83,171,233,209,84,88,157,42,98,224,159,254,221,199,19,218,24,79,10,128,94,41,74,162,94,176,37,74,6) +IMAGE_DATA(138,105,29,174,241,109,76,141,116,158,232,124,237,241,45,195,246,147,121,76,136,97,234,156,130,21,251,163,104,64,89,76) +IMAGE_DATA(131,134,23,121,171,170,170,170,153,218,7,226,221,195,209,216,224,156,132,29,126,50,28,228,86,227,152,168,21,30,169,221) +IMAGE_DATA(240,38,144,229,47,29,68,144,236,58,2,178,175,16,8,29,96,194,8,239,212,62,6,8,105,13,206,100,61,104,80,114) +IMAGE_DATA(144,0,251,240,26,200,176,141,149,133,191,108,102,61,161,193,194,203,254,239,105,83,81,81,81,181,176,99,117,205,92,110) +IMAGE_DATA(133,169,11,182,65,221,112,251,176,230,111,133,250,59,155,48,213,96,45,166,188,181,18,186,203,76,193,41,184,137,144,220) +IMAGE_DATA(235,76,232,66,33,148,214,64,65,144,206,209,145,152,70,38,176,176,13,175,196,70,103,33,180,23,91,41,105,160,240,159) +IMAGE_DATA(188,127,75,155,190,196,20,81,101,119,153,16,130,134,64,180,6,191,140,1,178,22,61,204,94,160,107,112,144,87,133,5) +IMAGE_DATA(150,94,79,9,52,243,104,144,240,186,188,25,255,229,91,193,171,248,24,188,146,123,76,0,197,145,126,72,32,124,144,217) +IMAGE_DATA(19,238,146,110,88,250,231,96,218,98,203,7,52,56,120,157,190,207,252,141,183,67,80,251,41,226,229,195,53,68,228,223) +IMAGE_DATA(68,96,206,32,78,100,247,96,153,141,15,38,234,44,45,31,163,58,238,165,207,248,255,218,127,229,78,156,174,255,18,194) +IMAGE_DATA(138,135,224,151,125,4,78,209,109,216,10,43,9,0,91,126,75,3,130,145,242,253,169,77,91,181,11,137,205,95,65,84) +IMAGE_DATA(249,8,33,138,123,88,125,60,6,19,117,151,245,211,96,96,164,189,105,123,107,179,29,56,173,159,195,49,179,5,122,235) +IMAGE_DATA(108,158,170,169,235,199,81,20,31,13,111,210,84,76,220,34,254,177,206,61,10,19,244,140,30,210,0,96,148,124,159,181) +IMAGE_DATA(9,218,186,107,166,204,156,115,128,60,187,167,142,182,247,255,107,251,39,237,218,85,90,0,0,0,0,0,0,0,0,0) +IMAGE_END_DATA(3040, 2) diff --git a/bazaar/HelpViewer/HelpViewer.upp b/bazaar/HelpViewer/HelpViewer.upp index 570c873d5..0857df449 100644 --- a/bazaar/HelpViewer/HelpViewer.upp +++ b/bazaar/HelpViewer/HelpViewer.upp @@ -4,7 +4,7 @@ uses CtrlLib; file + HelpViewer.iml, HelpViewer.h, - HelpViewer.cpp, - HelpViewer.iml; + HelpViewer.cpp;