Changeset 1048

Timestamp:

2000-03-31T15:04:32+12:00 (24 years ago)

Author:

nzdl

Message:

tidied up some of the browsing code - replaced DocumentImages,
DocumentTitles and DocumentHeading with DocumentIcon

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (4 diffs)
• documentaction.cpp (modified) (2 diffs)
• formattools.cpp (modified) (2 diffs)
• formattools.h (modified) (1 diff)
• pagedbrowserclass.cpp (modified) (2 diffs)
• vlistbrowserclass.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -29 +29 @@
 /*
    $Log$
+   Revision 1.40  2000/03/31 03:04:30  nzdl
+   tidied up some of the browsing code - replaced DocumentImages,
+   DocumentTitles and DocumentHeading with DocumentIcon
+
    Revision 1.39  2000/02/25 02:28:43  sjboddie
    caught up with assoc directory changes for displaying cover images
@@ -258 +262 @@
 
   format_t *formatlistptr = new format_t();
-  parse_formatstring (formatinfo.DocumentHeading, formatlistptr, metadata, getParents);
+  parse_formatstring (formatinfo.DocumentIcon, formatlistptr, metadata, getParents);
 
   if (!get_info (args["d"], args["c"], metadata, getParents, collectproto, response, logout))
@@ -665 +669 @@
   // if we're inside a book
   if ((!fulltoc) && (!args["d"].empty())) {
-    textout << "<p><table cellpadding=0 cellspacing=0><tr>\n";
-    textout << "<td valign=top";
+    textout << outconvert << disp 
+        << "<p><center><table width=_pagewidth_><tr>\n"
+        << "<td valign=top";
     if (formatinfo.DocumentContents) textout << " width=200>\n";
     else textout << " width=100%>\n";
-    if (formatinfo.DocumentImages) 
+    if (formatinfo.DocumentIcon == "true") 
       output_cover_image (args, collectproto, disp, outconvert, textout, logout);
-    else if (formatinfo.DocumentTitles)
+    else if (formatinfo.DocumentIcon != "false")
       output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
     output_controls (args, formatinfo.DocumentButtons, collectproto, disp, 
@@ -693 +698 @@
   }
 
-  if (havecontrols) textout << "</td></tr></table>\n";
-}
-
-
-
+  if (havecontrols) textout << "</td></tr></table></center>\n";
+}
+
+
+

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.35  2000/03/31 03:04:31  nzdl
+   tidied up some of the browsing code - replaced DocumentImages,
+   DocumentTitles and DocumentHeading with DocumentIcon
+
    Revision 1.34  2000/02/15 22:53:49  kjm18
    search history stuff added.
@@ -604 +608 @@
 
   while (format_here != format_end) {
-    if (((*format_here).first == "DocumentImages") && 
-    ((*format_here).second == "true"))
-      formatinfo.DocumentImages = true;
-    else if (((*format_here).first == "DocumentTitles") && 
-         ((*format_here).second == "false"))
-      formatinfo.DocumentTitles = false;
-    else if ((*format_here).first == "DocumentHeading") 
-      formatinfo.DocumentHeading = (*format_here).second;
+    if ((*format_here).first == "DocumentIcon")
+      formatinfo.DocumentIcon = (*format_here).second;
     else if (((*format_here).first == "DocumentContents") && 
          ((*format_here).second == "false"))

trunk/gsdl/src/recpt/formattools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.18  2000/03/31 03:04:31  nzdl
+   tidied up some of the browsing code - replaced DocumentImages,
+   DocumentTitles and DocumentHeading with DocumentIcon
+
    Revision 1.17  2000/01/26 20:10:31  sjboddie
    changed the default order of detach/expand/highlight buttons
@@ -124 +128 @@
 
 void formatinfo_t::clear() {
-  DocumentImages = false;
-  DocumentTitles = true;
-  DocumentHeading = "{Or}{[parent(Top):Title],[Title],untitled}<br>";
+  DocumentIcon = "{Or}{[parent(Top):Title],[Title],untitled}<br>";
   DocumentContents = true;
   DocumentArrowsBottom = true;

trunk/gsdl/src/recpt/formattools.h

@@ -76 +76 @@
   formatinfo_t () {clear();}
 
-  bool DocumentImages;
-  bool DocumentTitles;
-  text_t DocumentHeading;
+  text_t DocumentIcon;
   bool DocumentContents;
   bool DocumentArrowsBottom;

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.9  2000/03/31 03:04:32  nzdl
+   tidied up some of the browsing code - replaced DocumentImages,
+   DocumentTitles and DocumentHeading with DocumentIcon
+
    Revision 1.8  2000/02/17 20:54:00  sjboddie
    minor change to macro name
@@ -141 +145 @@
 
   // must be at top level to get to here!
-  textout << outconvert << disp << "<table><tr valign=top><td colspan=3><center><b>"
-      << section.metadata["Title"].values[0] << "_document:textintro_</b>\n";
+  textout << outconvert << disp << "<b>" << section.metadata["Title"].values[0] 
+      << "_document:textintro_</b>\n";
   
   return 0;

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.8  2000/03/31 03:04:32  nzdl
+   tidied up some of the browsing code - replaced DocumentImages,
+   DocumentTitles and DocumentHeading with DocumentIcon
+
    Revision 1.7  2000/02/17 02:33:09  sjboddie
    minor tidy up - made some function definitions virtual
@@ -100 +104 @@
 
   if (use_table || colnumber > 0) {
-    textout << "<table><tr>";
+    textout << "<table><tr valign=top>";
     // get tab size
     text_t tab; int itab;
@@ -134 +138 @@
 
   if (colnumber > 0) {
-    textout << "<table><tr>";
+    textout << "<table><tr valign=top>";
     // get tab size
     text_t tab; int itab;
@@ -158 +162 @@
       if (arg_cl == (*thissection).OID) highlight = true;
 
-    if (use_table || colnumber > 0) textout << "<tr>";
+    if (use_table || colnumber > 0) textout << "<tr valign=top>";
     textout << outconvert << disp << get_formatted_string (*thissection, formatlistptr, 
                                link, icon, highlight);