diff --git a/src/Report.py b/src/Report.py index 7c0b83230..5d8d0d4c2 100644 --- a/src/Report.py +++ b/src/Report.py @@ -379,6 +379,7 @@ class ReportDialog: """Set up the format frame of the dialog. This function relies on the make_doc_menu() function to do all the hard work.""" + self.topDialog.get_widget("format_frame").show() self.format_menu = self.topDialog.get_widget("format") self.make_doc_menu() @@ -389,6 +390,7 @@ class ReportDialog: the builds a menu of all the available styles for the user to choose from.""" self.style_frame = self.topDialog.get_widget("style_frame") + self.style_frame.show() self.style_menu = self.topDialog.get_widget("style_menu") # Build the default style set for this report. @@ -428,9 +430,8 @@ class ReportDialog: if pagecount_map: myMenu = utils.build_string_optmenu(pagecount_map, start_text) self.pagecount_menu.set_menu(myMenu) - else: - self.pagecount_menu.hide() - self.pagecount_label.hide() + self.pagecount_menu.show() + self.pagecount_label.show() def setup_html_frame(self): """Set up the html frame of the dialog. This sole purpose of @@ -445,29 +446,29 @@ class ReportDialog: this box. *All* of these items are optional, although the generations fields and the filter combo box are used in most (but not all) dialog boxes.""" + self.topDialog.get_widget("options_frame").show() # Set up the generations spin and page break checkbox (use_gen, use_break) = self.get_report_generations() self.generations_spinbox = self.topDialog.get_widget("generations") self.pagebreak_checkbox = self.topDialog.get_widget("pagebreak") if use_gen: + self.topDialog.get_widget("gen_label").show() self.generations_spinbox.set_value(use_gen) + self.generations_spinbox.show() else: - self.topDialog.get_widget("gen_label").hide() - self.generations_spinbox.hide() use_break = 0 - if not use_break: - self.pagebreak_checkbox.hide() + if use_break: + self.pagebreak_checkbox.show() # Now the filter combo self.filter_combo = self.topDialog.get_widget("filter_combo") filter_strings = self.get_report_filter_strings() if filter_strings: + self.topDialog.get_widget("filter_label").show() filter_strings.sort() self.filter_combo.set_popdown_strings(filter_strings) - else: - self.topDialog.get_widget("filter_label").hide() - self.filter_combo.hide() + self.filter_combo.show() # Now the "extra" option menu self.extra_menu_label = self.topDialog.get_widget("extra_menu_label") @@ -475,12 +476,11 @@ class ReportDialog: (label, extra_map, preset) = self.get_report_extra_menu_map() if extra_map: self.extra_menu_label.set_text(label) + self.extra_menu_label.show() myMenu = utils.build_string_optmenu(extra_map, preset) self.extra_menu.set_menu(myMenu) self.extra_menu.set_sensitive(len(extra_map) > 1) - else: - self.extra_menu_label.hide() - self.extra_menu.hide() + self.extra_menu.show() # Now the "extra" text box self.extra_textbox_label = self.topDialog.get_widget("extra_textbox_label") @@ -488,10 +488,9 @@ class ReportDialog: (label, string) = self.get_report_extra_textbox_string() if string: self.extra_textbox_label.set_text(label) + self.extra_textbox_label.show() self.extra_textbox.insert_defaults(string) - else: - self.extra_textbox_label.hide() - self.topDialog.get_widget("extra_scrolledwindow").hide() + self.topDialog.get_widget("extra_scrolledwindow").show() def setup_other_frames(self): """Do nothing. This sole purpose of this function is to give diff --git a/src/plugins/GraphViz.py b/src/plugins/GraphViz.py index 69a6b2384..c849ba81e 100644 --- a/src/plugins/GraphViz.py +++ b/src/plugins/GraphViz.py @@ -169,7 +169,7 @@ class GraphVizDialog(ReportDialog): #------------------------------------------------------------------------ def setup_style_frame(self): """The style frame is not used in this dialog.""" - self.topDialog.get_widget("style_frame").hide() + pass #------------------------------------------------------------------------ # diff --git a/src/plugins/IndivSummary.py b/src/plugins/IndivSummary.py index 64afacefa..9850ce8b3 100644 --- a/src/plugins/IndivSummary.py +++ b/src/plugins/IndivSummary.py @@ -393,7 +393,7 @@ class IndivSummaryDialog(TextReportDialog): #------------------------------------------------------------------------ def setup_report_options(self): """The 'Report Options' frame is not used in this dialog.""" - self.topDialog.get_widget("options_frame").hide() + pass #------------------------------------------------------------------------ # diff --git a/src/plugins/WebPage.py b/src/plugins/WebPage.py index a2cf649b6..3f8e4c21c 100644 --- a/src/plugins/WebPage.py +++ b/src/plugins/WebPage.py @@ -926,7 +926,6 @@ class WebReportDialog(ReportDialog): """The format frame is not used in this dialog. Hide it, and set the output notebook to always display the html template page.""" - self.topDialog.get_widget("format_frame").hide() self.output_notebook.set_page(1) def setup_other_frames(self): diff --git a/src/plugins/basicreport.glade b/src/plugins/basicreport.glade index b2f286a3e..1594def95 100644 --- a/src/plugins/basicreport.glade +++ b/src/plugins/basicreport.glade @@ -124,7 +124,7 @@ GtkFrame - format_frame + target_frame 4 0 @@ -193,6 +193,7 @@ GtkFrame format_frame 4 + False 0 GTK_SHADOW_ETCHED_IN @@ -217,6 +218,7 @@ GtkFrame style_frame 4 + False 0 GTK_SHADOW_ETCHED_IN @@ -403,6 +405,7 @@ GtkLabel pagecount_label + False GTK_JUSTIFY_CENTER False @@ -429,6 +432,7 @@ GtkOptionMenu pagecount_menu + False True Single (scaled) @@ -560,6 +564,7 @@ GtkFrame options_frame 4 + False 0 GTK_SHADOW_ETCHED_IN @@ -582,6 +587,7 @@ GtkCombo filter_combo 5 + False True True False @@ -618,6 +624,7 @@ GtkLabel filter_label + False GTK_JUSTIFY_CENTER False @@ -644,6 +651,7 @@ GtkLabel gen_label + False GTK_JUSTIFY_CENTER False @@ -670,6 +678,7 @@ GtkSpinButton generations + False True 1 0 @@ -702,6 +711,7 @@ GtkCheckButton pagebreak + False True False @@ -725,6 +735,7 @@ GtkLabel extra_menu_label + False GTK_JUSTIFY_CENTER False @@ -751,6 +762,7 @@ GtkLabel extra_textbox_label + False GTK_JUSTIFY_CENTER False @@ -778,6 +790,7 @@ GtkOptionMenu extra_menu 5 + False True default @@ -803,6 +816,7 @@ extra_scrolledwindow 5 80 + False GTK_POLICY_ALWAYS GTK_POLICY_ALWAYS GTK_UPDATE_CONTINUOUS diff --git a/src/plugins/webpage.glade b/src/plugins/webpage.glade index 970cf4ffa..6303c7c2e 100644 --- a/src/plugins/webpage.glade +++ b/src/plugins/webpage.glade @@ -124,7 +124,7 @@ GtkFrame - format_frame + target_frame 4 0 @@ -193,6 +193,7 @@ GtkFrame format_frame 4 + False 0 GTK_SHADOW_ETCHED_IN @@ -217,6 +218,7 @@ GtkFrame style_frame 4 + False 0 GTK_SHADOW_ETCHED_IN @@ -403,6 +405,7 @@ GtkLabel pagecount_label + False GTK_JUSTIFY_CENTER False @@ -429,6 +432,7 @@ GtkOptionMenu pagecount_menu + False True Single (scaled) @@ -560,6 +564,7 @@ GtkFrame options_frame 4 + False 0 GTK_SHADOW_ETCHED_IN @@ -582,6 +587,7 @@ GtkCombo filter_combo 5 + False True True False @@ -618,6 +624,7 @@ GtkLabel filter_label + False GTK_JUSTIFY_CENTER False @@ -644,6 +651,7 @@ GtkLabel gen_label + False GTK_JUSTIFY_CENTER False @@ -670,6 +678,7 @@ GtkSpinButton generations + False True 1 0 @@ -725,6 +734,7 @@ GtkCheckButton pagebreak + False True False @@ -748,6 +758,7 @@ GtkLabel extra_menu_label + False GTK_JUSTIFY_CENTER False @@ -771,36 +782,11 @@ - - GtkLabel - extra_textbox_label - - GTK_JUSTIFY_CENTER - False - 1 - 0 - 5 - 0 - - 0 - 1 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - GtkOptionMenu extra_menu 5 + False True default @@ -826,6 +812,7 @@ extra_scrolledwindow 5 80 + False GTK_POLICY_ALWAYS GTK_POLICY_ALWAYS GTK_UPDATE_CONTINUOUS @@ -853,6 +840,33 @@ + + + GtkLabel + extra_textbox_label + False + + GTK_JUSTIFY_CENTER + False + 1 + 0 + 5 + 0 + + 0 + 1 + 4 + 5 + 0 + 0 + False + False + False + False + True + True + +