From c81327992868a0e38852292b57d40aee98653e29 Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 7 Apr 2002 18:58:22 +0000 Subject: [PATCH] just a bit more --- pandaapp/src/indexify/indexImage.cxx | 8 +++++--- pandaapp/src/indexify/indexParameters.cxx | 1 + pandaapp/src/indexify/indexParameters.h | 3 +++ pandaapp/src/indexify/indexify.cxx | 7 ++++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pandaapp/src/indexify/indexImage.cxx b/pandaapp/src/indexify/indexImage.cxx index d7a1b882f7..a4e9a75052 100644 --- a/pandaapp/src/indexify/indexImage.cxx +++ b/pandaapp/src/indexify/indexImage.cxx @@ -466,9 +466,11 @@ generate_reduced_html(ostream &html, Photo *photo, int photo_index, int pi, << " height=" << photo->_reduced_y_size << " alt=\"" << photo->get_name() << "\">

\n"; - html - << "

View full size image (" - << photo->_full_x_size << " x " << photo->_full_y_size << ")

"; + if (!omit_full_links) { + html + << "

View full size image (" + << photo->_full_x_size << " x " << photo->_full_y_size << ")

"; + } generate_nav_buttons(html, prev_photo_filename, next_photo_filename, up_href); diff --git a/pandaapp/src/indexify/indexParameters.cxx b/pandaapp/src/indexify/indexParameters.cxx index 56d187a032..42bffde880 100644 --- a/pandaapp/src/indexify/indexParameters.cxx +++ b/pandaapp/src/indexify/indexParameters.cxx @@ -47,6 +47,7 @@ bool format_rose = false; bool dummy_mode = false; bool draw_frames = false; bool omit_roll_headers = false; +bool omit_full_links = false; bool caption_frame_numbers = false; diff --git a/pandaapp/src/indexify/indexParameters.h b/pandaapp/src/indexify/indexParameters.h index c7c51fc05b..8fed42bc8c 100644 --- a/pandaapp/src/indexify/indexParameters.h +++ b/pandaapp/src/indexify/indexParameters.h @@ -93,6 +93,9 @@ extern bool draw_frames; // it exists. extern bool omit_roll_headers; +// True to omit links to the full-size source images. +extern bool omit_full_links; + // True to caption photos with just a frame number instead of the // whole image basename. This only works if the photo image filenames // consist of the roll directory name concatenated with a frame number. diff --git a/pandaapp/src/indexify/indexify.cxx b/pandaapp/src/indexify/indexify.cxx index aff0816e03..c863533a01 100644 --- a/pandaapp/src/indexify/indexify.cxx +++ b/pandaapp/src/indexify/indexify.cxx @@ -131,11 +131,16 @@ Indexify() { &Indexify::dispatch_none, &_generate_icons); add_option - ("omitrh", "", 0, + ("omit-rh", "", 0, "Omits roll headers introducing each roll directory, including any " "headers defined in roll.cm files.", &Indexify::dispatch_none, &omit_roll_headers); + add_option + ("omit-full", "", 0, + "Omits links to the full-size images.", + &Indexify::dispatch_none, &omit_full_links); + add_option ("caption", "size[,spacing]", 0, "Specifies the font size in pixels of the thumbnail captions. If the "