X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormPreferences.C;fp=src%2Ffrontends%2Fxforms%2FFormPreferences.C;h=23cdc8237186f31c4bfae260ae33ef4b6fcc1dd7;hb=44a5cfc89ced180ed4411bf0f46d3df3756725e5;hp=f7f064f11cb97f8057a702677ea19ad75fd8a443;hpb=f6cf605786587b71953f90778e8962512a787a81;p=lyx.git diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index f7f064f11c..23cdc82371 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -2085,8 +2085,9 @@ void FormPreferences::OutputsMisc::apply(LyXRC & rc) const rc.view_dvi_paper_option = getString(dialog_->input_paperoption); rc.auto_reset_options = fl_get_button(dialog_->check_autoreset_classopt); -#if defined(__CYGWIN__) || defined(__CYGWIN32__) - rc.cygwin_path_fix = fl_get_button(dialog_->check_cygwin_path); +#if defined(__CYGWIN__) || defined(_WIN32) + rc.windows_style_tex_paths = + fl_get_button(dialog_->check_windows_style_tex_paths); #endif } @@ -2105,9 +2106,9 @@ void FormPreferences::OutputsMisc::build() fl_set_input_return(dialog_->input_index, FL_RETURN_CHANGED); fl_set_input_return(dialog_->input_paperoption, FL_RETURN_CHANGED); -#if defined(__CYGWIN__) || defined(__CYGWIN32__) +#if defined(__CYGWIN__) || defined(_WIN32) #else - setEnabled(dialog_->check_cygwin_path, false); + setEnabled(dialog_->check_windows_style_tex_paths, false); #endif fl_addto_choice(dialog_->choice_default_papersize, @@ -2124,8 +2125,8 @@ void FormPreferences::OutputsMisc::build() setPrehandler(dialog_->input_index); setPrehandler(dialog_->input_paperoption); setPrehandler(dialog_->check_autoreset_classopt); -#if defined(__CYGWIN__) || defined(__CYGWIN32__) - setPrehandler(dialog_->check_cygwin_path); +#if defined(__CYGWIN__) || defined(_WIN32) + setPrehandler(dialog_->check_windows_style_tex_paths); #endif } @@ -2151,13 +2152,12 @@ FormPreferences::OutputsMisc::feedback(FL_OBJECT const * const ob) const return LyXRC::getDescription(LyXRC::RC_VIEWDVI_PAPEROPTION); if (ob == dialog_->check_autoreset_classopt) return LyXRC::getDescription(LyXRC::RC_AUTORESET_OPTIONS); -#if defined(__CYGWIN__) || defined(__CYGWIN32__) - if (ob == dialog_->check_cygwin_path) - return _("Select if LyX should output Cygwin-style paths " - "rather than Windows-style paths. Useful if you're " - "using the Cygwin teTeX rather than a native Windows " - "MikTeX. Note, however, that you'll need to write " - "shell script wrappers for all your converters."); +#if defined(__CYGWIN__) || defined(_WIN32) + if (ob == dialog_->check_windows_style_tex_paths) + return _("Select if LyX should output Windows-style paths " + "rather than Posix-style paths to LaTeX files. " + "Useful if you're using the native Windows MikTeX " + "rather than the Cygwin teTeX."); #endif return string(); } @@ -2183,8 +2183,9 @@ void FormPreferences::OutputsMisc::update(LyXRC const & rc) rc.view_dvi_paper_option.c_str()); fl_set_button(dialog_->check_autoreset_classopt, rc.auto_reset_options); -#if defined(__CYGWIN__) || defined(__CYGWIN32__) - fl_set_button(dialog_->check_cygwin_path, rc.cygwin_path_fix); +#if defined(__CYGWIN__) || defined(_WIN32) + fl_set_button(dialog_->check_windows_style_tex_paths, + rc.windows_style_tex_paths); #endif }