# # # patch "lib/ui/mtn-browse.glade" # from [0b0b5d1ad1ce334a5422bf67b73959e67369fa82] # to [d5d04f80d9eb81a77cbc18cca8fdf0bfc6687686] # # patch "mtn-browse" # from [7e2b1ca16f48f6642ef5de18ea1d1557cb433e3f] # to [66e8677c9d09665b46644d931eea12bf1db8475a] # ============================================================ --- lib/ui/mtn-browse.glade 0b0b5d1ad1ce334a5422bf67b73959e67369fa82 +++ lib/ui/mtn-browse.glade d5d04f80d9eb81a77cbc18cca8fdf0bfc6687686 @@ -1013,11 +1013,10 @@ or more search criteria True - Name of the file being displayed 1 1 - 0 0 118 10 106.2 118 - 0 0 17 10 15.3 17 + 0 0 118 10 106.199996948 118 + 0 0 17 10 15.3000001907 17 @@ -1075,11 +1074,10 @@ or more search criteria True - Date of when file was last changed 1 1 - 0 0 118 10 106.2 118 - 0 0 17 10 15.3 17 + 0 0 118 10 106.199996948 118 + 0 0 17 10 15.3000001907 17 @@ -1209,7 +1207,7 @@ updated with respect to this revision

5 - + True True GTK_POLICY_NEVER @@ -1218,16 +1216,15 @@ updated with respect to this revision

GTK_CORNER_TOP_LEFT - + True - File's unique id in database 1 1 - 0 0 122 10 109.8 122 - 0 0 17 10 15.3 17 + 0 0 122 10 109.800003052 122 + 0 0 17 10 15.3000001907 17 - + 0 0 True @@ -1235,7 +1232,7 @@ updated with respect to this revision

False - + 0 0 True @@ -1282,12 +1279,10 @@ updated with respect to this revision

True - Id of revision when -file was last changed 1 1 - 0 0 122 10 109.8 122 - 0 0 17 10 15.3 17 + 0 0 122 10 109.800003052 122 + 0 0 17 10 15.3000001907 17 @@ -1334,16 +1329,16 @@ file was last changed - + True - Id of file being displayed + Author of the file revision being displayed True False - + True - File id: + Author: False False GTK_JUSTIFY_LEFT ============================================================ --- mtn-browse 7e2b1ca16f48f6642ef5de18ea1d1557cb433e3f +++ mtn-browse 66e8677c9d09665b46644d931eea12bf1db8475a @@ -1471,6 +1471,9 @@ sub main_window_delete_event_cb($$$) hide_find_text($browser->{file_view_sv}); $browser->{window}->hide(); $browser->{mtn} = undef; + + # Flush out any cached information. + $browser->{branch_combo_details}->{preset} = 0; $browser->{revision_combo_details}->{preset} = 0; $browser->{directory_combo_details}->{preset} = 0; @@ -1567,7 +1570,7 @@ sub get_browser_window(;$$$$$) "manifest_browser_treeview", "file_view_scrolledwindow", "file_name_value_label", - "file_id_value_label", + "file_author_value_label", "last_update_value_label", "file_revision_id_value_label", "file_button_vbox", @@ -1728,6 +1731,7 @@ sub get_browser_window(;$$$$$) $browser->{revision_combo_details}->{preset} = 0; $browser->{directory_combo_details}->{preset} = 0; $browser->{file_being_viewed_preset_value} = ""; + $browser->{file_displayed_id} = ""; &{$browser->{update_handler}}($browser, ALL_CHANGED); } @@ -1752,6 +1756,7 @@ sub get_browser_window(;$$$$$) $browser->{revision_combo_details}->{preset} = 0; $browser->{directory_combo_details}->{preset} = 0; $browser->{file_being_viewed_preset_value} = ""; + $browser->{file_displayed_id} = ""; $browser->{manifest_browser_treeview}-> set_search_column(MLS_NAME_COLUMN); if ($user_preferences->{show_line_numbers}) @@ -2321,8 +2326,7 @@ sub update_browser_state($$) # Only do anything if the selected file has changed. - if ($browser->{file_id_value_label}->get_text() - ne $manifest_entry->{file_id}) + if ($browser->{file_displayed_id} ne $manifest_entry->{file_id}) { my($last_update, @@ -2371,12 +2375,15 @@ sub update_browser_state($$) $last_update =~ s/T/ /; set_label_value($browser->{file_name_value_label}, $manifest_entry->{name}); - set_label_value($browser->{file_id_value_label}, - $manifest_entry->{file_id}); + set_label_value($browser->{file_author_value_label}, + $manifest_entry->{author}); set_label_value($browser->{last_update_value_label}, $last_update); set_label_value($browser->{file_revision_id_value_label}, $manifest_entry->{last_changed_revision}); + + $browser->{file_displayed_id} = $manifest_entry->{file_id}; + } } @@ -2385,13 +2392,14 @@ sub update_browser_state($$) # Reset the file view buffer and the associated find text window. + $browser->{file_displayed_id} = ""; $browser->{file_button_vbox}->set_sensitive(FALSE); $browser->{file_view_svbuffer}-> place_cursor($browser->{file_view_svbuffer}->get_start_iter()); $browser->{file_view_svbuffer}->set_text(""); $browser->{file_view_svbuffer}->set("highlight", FALSE); set_label_value($browser->{file_name_value_label}, ""); - set_label_value($browser->{file_id_value_label}, ""); + set_label_value($browser->{file_author_value_label}, ""); set_label_value($browser->{last_update_value_label}, ""); set_label_value($browser->{file_revision_id_value_label}, ""); enable_find_text($browser->{file_view_sv}, 0);