Changeset 3168 for trunk/protemix/src/recpt/browsetools.cpp

Timestamp:

2002-06-23T22:58:30+12:00 (22 years ago)

Author:

sjboddie

Message:

* empty log message *

File:

• trunk/protemix/src/recpt/browsetools.cpp (modified) (4 diffs)

trunk/protemix/src/recpt/browsetools.cpp

@@ -23 +23 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
  *
  *********************************************************************/
@@ -38 +37 @@
               ostream &/*logout*/) {
 
-  if (args["u"] != "1") {
-    
-    FilterResponse_t response;
-    text_tarray metadata;
-    text_tarray buttons;
-    
-    text_tarray::const_iterator here = ibuttons.begin();
-    text_tarray::const_iterator end = ibuttons.end();
-    
-    while (here != end) {
-      
-      if (*here == "Detach")
-    buttons.push_back ("_document:imagedetach_");
-      else if (*here == "Highlight") {
-    if (args["hl"] == "1") 
-      buttons.push_back ("_document:imagenohighlight_");
-    else 
-      buttons.push_back ("_document:imagehighlight_");
-      } else if (*here == "Expand Contents") {
-    if (args["gc"] == "1")
-      buttons.push_back ("_document:imagecontracttoc_");
-    else 
-      buttons.push_back ("_document:imageexpandtoc_");
-      } else if (*here == "Expand Text") {
-    if (args.getintarg("gt"))
-      buttons.push_back ("_document:imagecontracttext_");
-    else 
-      buttons.push_back ("_document:imageexpandtext_");
-      }
-      here ++;
-    }
-    
-    here = buttons.begin();
-    end = buttons.end();
-    int count = 0;
-    while (here != end) {
-      if ((count != 0) && ((count % 2) == 0)) textout << "<br>\n";
-      textout << outconvert << disp << *here;
-      count ++;
-      here ++;
-    }
-  }
-}
-
+  textout << outconvert << disp
+      << "_document:imagepagepdf_"
+      << "_document:imagearticlepdf_"
+      << "_document:imagedetach_";
+  if (args["hl"] == "1") {
+    textout << outconvert << disp << "_document:imagenohighlight_";
+  } else {
+    textout << outconvert << disp << "_document:imagehighlight_";
+  }
+}
 
 // at the moment this just writes out the html to display 
@@ -765 +730 @@
   if ((!fulltoc) && (!args["d"].empty())) {
     textout << "<center>\n";
-    textout << outconvert << disp << "<p><table width=_pagewidth_ cellpadding=0 cellspacing=0><tr>\n";
-    textout << "<td valign=top align=left";
-    if (formatinfo.DocumentContents) textout << " width=200>\n";
-    else textout << " width=100%>\n";
-    if (formatinfo.DocumentImages) 
-      output_cover_image (args, collectproto, disp, outconvert, textout, logout);
-    else if (formatinfo.DocumentTitles)
-      output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
-    if (args["u"] != "1") {
-      output_controls (args, formatinfo.DocumentButtons, collectproto, disp, 
-               outconvert, textout, logout);
-    }
-    textout << "</td><td valign=top>\n";  
+    textout << outconvert << disp 
+        << "<p><table width=\"_pagewidth_\" cellpadding=\"0\" cellspacing=\"0\">\n"
+        << "<tr valign=\"top\">\n"
+        << "<td>\n";
+    output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
+    textout << "</td></tr>\n"
+        << "<tr><td>\n";
     havecontrols = true;
   }
@@ -800 +759 @@
   }
 
-  if (havecontrols) textout << "</td></tr></table></center>\n"; 
-
-  //if there is a format specified in the config file then
-  //try to display the related documents (may not be displayed
-  //if preference file does not indicate a wish to display
-  //related documents.
-  if (!formatinfo.RelatedDocuments.empty())
-    output_related_docs(args, collectproto, formatinfo, disp, outconvert, textout, logout);
- 
-}
-
+  if (havecontrols) {
+    textout << "</td></tr>\n"
+        << "<tr><td>\n";
+    output_controls (args, formatinfo.DocumentButtons, collectproto, disp, 
+             outconvert, textout, logout);
+    textout << "</td></tr></table></center>\n"; 
+  }
+}
+