summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2012-10-30 23:40:58 +0000
committerNorbert Preining <preining@logic.at>2012-10-30 23:40:58 +0000
commit0e321e4197e3036dd2fa0283c2d7c847f0fc5b00 (patch)
tree45334e67ea99e8de0f1f7be21b3bf9dd7ba56231
parent891b5e0e342aec09aeffae1904f412f6e00bc5c1 (diff)
split desktop_integration into menu_integration (creates menus)
and desktop_integration (desktop shortcuts) make menu_integration on by default and not changable git-svn-id: svn://tug.org/texlive/trunk@28129 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl9
-rw-r--r--Master/texmf/scripts/texlive/NEWS2
-rw-r--r--Master/texmf/scripts/texlive/tlmgrgui.pl2
3 files changed, 9 insertions, 4 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 1f168c4166f..98932f7b961 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -965,13 +965,11 @@ sub do_tlpdb_postactions {
# option settings already reflect portable- and in_place options.
my $usedtlpdb = $vars{'in_place'} ? $tlpdb : $localtlpdb;
- # For now the option_desktop_integrations maps to both desktop
- # and menu entries, but we can split that later
foreach my $package ($usedtlpdb->list_packages) {
&TeXLive::TLUtils::do_postaction("install",
$usedtlpdb->get_package($package),
$vars{'option_file_assocs'},
- $vars{'option_desktop_integration'},
+ $vars{'option_menu_integration'},
$vars{'option_desktop_integration'},
$vars{'option_post_code'});
}
@@ -1395,6 +1393,9 @@ END_EXPLICIT_MIRROR
&& ($tlpdb->option("paper") eq "letter" ? 1 : 0);
$vars{'option_desktop_integration'} = $tlpdb->option("desktop_integration");
$vars{'option_desktop_integration'} = 1 if win32();
+ # we unconditionally set the menu integration, this will be done in all
+ # cases but portable use, where we sanitize it away
+ $vars{'option_menu_integration'} = 1;
$vars{'option_path'} = $tlpdb->option("path");
$vars{'option_path'} = 0 if !defined($vars{'option_path'});
$vars{'option_path'} = 1 if win32();
@@ -1580,6 +1581,7 @@ sub sanitise_options {
$vars{'option_path'} &&= !$vars{'portable'};
$vars{'option_file_assocs'} &&= !$vars{'portable'};
$vars{'option_desktop_integration'} &&= !$vars{'portable'};
+ $vars{'option_menu_integration'} &&= !$vars{'portable'};
}
sub do_install_packages {
@@ -1710,6 +1712,7 @@ sub import_settings_from_old_tlpdb {
$previoustlpdb->option_pkg("00texlive.installation",
"create_formats");
$vars{'option_desktop_integration'} = 1 if win32();
+ $vars{'option_menu_integration'} = 1 if win32();
$vars{'option_path'} =
$previoustlpdb->option_pkg("00texlive.installation",
"path");
diff --git a/Master/texmf/scripts/texlive/NEWS b/Master/texmf/scripts/texlive/NEWS
index 5500214e3b5..7a0f984105d 100644
--- a/Master/texmf/scripts/texlive/NEWS
+++ b/Master/texmf/scripts/texlive/NEWS
@@ -2,6 +2,8 @@
Karl Berry, 2010.)
<p><b>tlmgr revision NNNN (released DDmmm12):</b><br>
+<li>menu shortcuts are installed unconditionally, the desktop_integration
+ option only controls shortcuts on the desktop (W32)
<p><b>tlmgr revision 27748 (released 25oct12):</b><br>
<li>support <tt>tlmgr repository list ...</tt> for listing of any repository
diff --git a/Master/texmf/scripts/texlive/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui.pl
index fcc8f877e33..b6aacb96860 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui.pl
@@ -1212,7 +1212,7 @@ sub do_general_settings {
if (win32()) {
push @config_set_l,
- $back_config_set->Label(-text => __("Create shortcuts in menu and on desktop"), -anchor => "w");
+ $back_config_set->Label(-text => __("Create shortcuts on the desktop"), -anchor => "w");
$settings_label{'desktop_integration'} = $back_config_set->Label(-textvariable => \$changeddefaults{"desktop_integration"}{'display'});
push @config_set_m, $settings_label{'desktop_integration'};
push @config_set_r,