#
#
# patch "Preferences.pm"
# from [e7a7991e6e5d4b6df1b5eb1e790989251e7c1829]
# to [199e203f675300a9a10358ebd96f686c6129fe18]
#
# patch "mtn-browse"
# from [fe58c0701ae849dd67f692545e201088a2d39b9f]
# to [d5042be9278254c1eea7d6b6db720f8b712e94e2]
#
# patch "mtn-browse.glade"
# from [ec7ec4bdb1b3d30d8d849e2b41d665727deb8904]
# to [23a19c867b3ad80fe4a5f0fbcf9432616a384ee7]
#
============================================================
--- Preferences.pm e7a7991e6e5d4b6df1b5eb1e790989251e7c1829
+++ Preferences.pm 199e203f675300a9a10358ebd96f686c6129fe18
@@ -60,7 +60,7 @@ use constant PREFERENCES_FILE_NAME => ".
# Constant for the preferences file's format version.
-use constant PREFERENCES_FORMAT_VERSION => 4;
+use constant PREFERENCES_FORMAT_VERSION => 5;
# Text viewable application mime types.
@@ -1007,6 +1007,9 @@ sub get_preferences_window($$)
# Appearance pane widgets.
"fonts_fontbutton",
+ "small_buttons_checkbutton",
+ "hide_text_checkbutton",
+ "fixed_checkbutton",
"comparison_pretty_print_checkbutton",
"annotation_prefix_1_foreground_colorbutton",
"annotation_prefix_1_background_colorbutton",
@@ -1227,6 +1230,15 @@ sub load_preferences_into_gui($)
$instance->{fonts_fontbutton}->
set_font_name($instance->{preferences}->{fixed_font});
+ $instance->{small_buttons_checkbutton}->
+ set_active($instance->{preferences}->{toolbar_settings}->
+ {small_buttons} ? TRUE : FALSE);
+ $instance->{hide_text_checkbutton}->
+ set_active($instance->{preferences}->{toolbar_settings}->{hide_text}
+ ? TRUE : FALSE);
+ $instance->{fixed_checkbutton}->
+ set_active($instance->{preferences}->{toolbar_settings}->{fixed}
+ ? TRUE : FALSE);
$instance->{comparison_pretty_print_checkbutton}->
set_active($instance->{preferences}->{coloured_diffs} ? TRUE : FALSE);
for my $item (@colour_mapping_table)
@@ -1385,6 +1397,12 @@ sub save_preferences_from_gui($)
$instance->{preferences}->{fixed_font} =
$instance->{fonts_fontbutton}->get_font_name();
+ $instance->{preferences}->{toolbar_settings}->{small_buttons} =
+ $instance->{small_buttons_checkbutton}->get_active() ? 1 : 0;
+ $instance->{preferences}->{toolbar_settings}->{hide_text} =
+ $instance->{hide_text_checkbutton}->get_active() ? 1 : 0;
+ $instance->{preferences}->{toolbar_settings}->{fixed} =
+ $instance->{fixed_checkbutton}->get_active() ? 1 : 0;
$instance->{preferences}->{coloured_diffs} =
$instance->{comparison_pretty_print_checkbutton}->get_active() ? 1 : 0;
for my $item (@colour_mapping_table)
@@ -1528,6 +1546,13 @@ sub upgrade_preferences($)
$preferences->{auto_select_head} = 0;
$preferences->{version} = 4;
}
+ if ($preferences->{version} == 4)
+ {
+ $preferences->{toolbar_settings} = {small_buttons => 0,
+ hide_text => 0,
+ fixed => 0};
+ $preferences->{version} = 5;
+ }
$preferences->{version} = PREFERENCES_FORMAT_VERSION;
@@ -1566,8 +1591,11 @@ sub initialise_preferences()
id => {limit => 200,
sort_cronologically => 1}},
diffs_application => "kompare '{file1}' '{file2}'",
- coloured_diffs => 1,
fixed_font => "monospace 10",
+ toolbar_settings => {small_buttons => 0,
+ hide_text => 0,
+ fixed => 0},
+ coloured_diffs => 1,
colours => {annotate_prefix_1 => {fg => "AliceBlue",
bg => "CadetBlue"},
annotate_text_1 => {fg => "MidnightBlue",
============================================================
--- mtn-browse fe58c0701ae849dd67f692545e201088a2d39b9f
+++ mtn-browse d5042be9278254c1eea7d6b6db720f8b712e94e2
@@ -1474,7 +1474,9 @@ sub get_browser_window(;$$$$$)
# Get the widgets that we are interested in.
$browser->{window} = $browser->{glade}->get_widget($window_type);
- foreach my $widget ("appbar",
+ foreach my $widget ("bonobodock",
+ "toolbar",
+ "appbar",
"main_vbox",
"browser_hpaned",
"close_toolbutton",
@@ -1501,6 +1503,20 @@ sub get_browser_window(;$$$$$)
$browser->{$widget} = $browser->{glade}->get_widget($widget);
}
+ # Setup the bonobodock and toolbar widgets according to the user's
+ # preferences.
+
+ # $browser->{bonobodock}->allow_floating_items(FALSE);
+ # if ($user_preferences->{toolbar_settings}->{fixed});
+ $browser->{toolbar}->set_icon_size("menu");
+ # if ($user_preferences->{toolbar_settings}->{small_buttons});
+ $browser->{toolbar}->unset_style();
+ print $browser->{toolbar}->get_style() . "\n";
+ $browser->{toolbar}->set_style("icons");
+ print $browser->{toolbar}->get_style() . "\n";
+ #if ($user_preferences->{toolbar_settings}->{hide_texts});
+ # $browser->{toolbar}->show_all();
+
# Setup button sensitivity groups.
$browser->{text_file_sensitive_group} = [];
============================================================
--- mtn-browse.glade ec7ec4bdb1b3d30d8d849e2b41d665727deb8904
+++ mtn-browse.glade 23a19c867b3ad80fe4a5f0fbcf9432616a384ee7
@@ -4435,7 +4435,7 @@ search patterns
GTK_WIN_POS_CENTER_ON_PARENT
True
970
- 440
+ 495
True
False
mtn-browse.png
@@ -5445,6 +5445,125 @@ make sure it is mono-spaced)
+
+ True
+ 0
+ 0.5
+ GTK_SHADOW_ETCHED_IN
+
+
+
+ True
+ 0.5
+ 0.5
+ 1
+ 1
+ 0
+ 0
+ 0
+ 0
+
+
+
+ 5
+ True
+ False
+ 5
+
+
+
+ True
+ Select if the toolbar buttons are to
+use small icons
+ True
+ Small buttons
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ Select if the toolbar buttons are to
+hide their text labels
+ True
+ Hide text
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ Select if the toolbars are to be fixed
+rather than movable
+ True
+ Fixed
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+ 0
+ False
+ False
+
+
+
+
+
+
+
+
+
+ True
+ <b>Toolbar Settings</b>
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ label_item
+
+
+
+
+ 0
+ False
+ True
+
+
+
+
True
0