+2001-09-06 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
+
+ * examples/da_splash.lyx: new translation from Claus Hindsgaul
+
+ * ui/default.ui: comment out reference manual from the help menu
+ (the reference manual is now obsolete).
+
+ * layouts/cv.layout: add ObsoletedBy version of SubSection
+
2001-09-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* kbd/koi8-r.kmap: update from Vitaly Lipatov
--- /dev/null
+#LyX 1.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 218
+\textclass article
+\language danish
+\inputencoding default
+\fontscheme default
+\graphics default
+\paperfontsize default
+\spacing single
+\papersize Default
+\paperpackage a4
+\use_geometry 0
+\use_amsmath 0
+\paperorientation portrait
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\defskip medskip
+\quotes_language english
+\quotes_times 2
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+
+\layout Title
+
+Velkommen til LyX!
+\layout Section*
+
+7 ting du bør vide om brugen af LyX
+\layout Enumerate
+
+LyX indeholder grundig dokumentation --- brug den! Start med
+\family sans
+\bar under
+H
+\bar default
+jælp\SpecialChar \menuseparator
+
+\bar under
+I
+\bar default
+ntroduktion
+\family default
+, som vil give dig et meget kort overblik over dokumentationen\SpecialChar \@.
+ Lær derefter
+ om LyX med
+\family sans
+
+\bar under
+H
+\bar default
+jælp\SpecialChar \menuseparator
+
+\bar under
+G
+\bar default
+ennemgang\SpecialChar \@.
+
+\layout Enumerate
+
+LyX er, hvad vi kalder en
+\begin_inset Quotes eld
+\end_inset
+
+dokument behandler
+\begin_inset Quotes erd
+\end_inset
+
+\SpecialChar \@.
+ Den er grundlæggende forskellig fra almindelige tekstbehandlere --- på
+ en måde letter det skrivning af dokumenter\SpecialChar \@.
+ Men bare rolig, den er kun en
+ smule anderledes\SpecialChar \@.
+ Dokumentationen vil gøre dette tydeligt for dig
+\begin_float footnote
+\layout Standard
+
+Fik vi nævnt, at du bør læse dokumentationen?
+\end_float
+.
+\layout Enumerate
+
+Resultaterne fra LyX ser fantastiske ud! Vælg
+\family sans
+\bar under
+V
+\bar default
+is\SpecialChar \menuseparator
+
+\bar under
+D
+\bar default
+VI
+\family default
+ nu, så kan du selv se.
+\layout Enumerate
+
+Ja, LyX kan efterligne (næsten) al LaTeX's funktioner\SpecialChar \@.
+ Og ja, LyX kan importere
+ LaTeX-filer\SpecialChar \@.
+ Erfarne LaTeX-brugere kan skimme resten af
+\emph on
+Gennemgangen
+\emph default
+ og derefter læse afsnittet
+\begin_inset Quotes eld
+\end_inset
+
+LyX for LaTeX-brugere
+\begin_inset Quotes erd
+\end_inset
+
+\SpecialChar \@.
+ (Alle andre: bare rolig, du behøver ikke at kende noget til LaTeX for at
+ kunne bruge LyX\SpecialChar \@.
+)
+\layout Enumerate
+
+Yes, LyX can mimic (almost) all LaTeX functionality.
+ And yes, LyX can import LaTeX files.
+ Experienced LaTeX users should skim the rest of the
+\emph on
+Tutorial
+\emph default
+, then read the
+\begin_inset Quotes eld
+\end_inset
+
+LyX for LaTeX Users
+\begin_inset Quotes erd
+\end_inset
+
+ chapter.
+ (Everyone else: don't worry, you don't need to know LaTeX to use LyX.)
+\layout Enumerate
+
+LyX har mange funktioner for dem, der læser eller skriver på andre sprog
+ end engelsk\SpecialChar \@.
+ Derover kan tastebindinger, værktøjslinie og mange andre egenskaber
+ kan ændres (de fleste ved at rette i
+\family typewriter
+lyxrc
+\family default
+-filen).
+ Se
+\family sans
+\bar under
+H
+\bar default
+jælp\SpecialChar \menuseparator
+
+\bar under
+P
+\bar default
+ersonliggørelse
+\family default
+ for detaljer\SpecialChar \@.
+
+\layout Enumerate
+
+LyX's hjemmeside er på
+\family typewriter
+
+\begin_inset LatexCommand \url{http://www.lyx.org/}
+
+\end_inset
+
+
+\family default
+\SpecialChar \@.
+ Find oplysninger om LyX, abonnér på LyX's postlister, tag en grafisk rundtur
+ m.m\SpecialChar \@.
+
+\the_end
LeftMargin MMM
End
+# we used to have this version with wrong case
+Style SubSection
+ ObsoletedBy Subsection
+End
+
# Topic style definition
Style Topic
Margin Manual
-# This is the default LyX user interface definition file. The syntax
-# should be straightforward enough. The menubar "main_nobuffer" (if it
-# exists) is used when there is no buffer open; otherwise, the menubar
-# "main" is used.
+# This is the default LyX user interface definition file. -*- text -*-
+# The syntax should be straightforward enough. The menubar
+# "main_nobuffer" (if it exists) is used when there is no buffer open;
+# otherwise, the menubar "main" is used.
Menuset
Item "User's Guide|U" "help-open UserGuide"
Item "Extended Features|E" "help-open Extended"
Item "Customization|C" "help-open Customization"
- Item "Reference Manual|R" "help-open Reference"
+# Item "Reference Manual|R" "help-open Reference"
Item "FAQ|F" "help-open FAQ"
Item "Table of Contents|a" "help-open TOC"
Item "Known Bugs|K" "help-open BUGS"
+2001-09-06 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
+
+ * Toolbar_pimpl.C (updateLayoutList): do not display obsolete
+ layouts
+ (layoutSelected): remove the numeric argument and use the text of
+ the combox entry instead.
+
+ * combox.C: lowercase a few remaining methods, rename select_text
+ to select
+ * several files: propagate these changes
+
2001-09-03 Angus Leeming <a.leeming@ic.ac.uk>
* FormPreferences.C: add fl_set_input_return to input_paperoption.
cit != language.end(); ++cit) {
combo_language2_->addto(*cit);
}
- combo_language2_->select_text(*language.begin());
+ combo_language2_->select(*language.begin());
// Manage the ok, apply and cancel/close buttons
bc().setApply(dialog_->button_apply);
pos = int(findPos(color_, controller().getColor()));
fl_set_choice(dialog_->choice_color, pos+1);
- combo_language2_->select_text(controller().getLanguage());
+ combo_language2_->select(controller().getLanguage());
fl_set_button(dialog_->check_toggle_all, controller().getToggleAll());
}
LyXTextClass const & tclass = textclasslist.TextClass(params.textclass);
- combo_doc_class->select_text(
+ combo_doc_class->select(
textclasslist.DescOfClass(params.textclass));
fl_set_choice_text(class_->choice_doc_fonts, params.fonts.c_str());
fl_clear_choice(class_->choice_doc_fontsize);
if (!language_.get())
return;
- combo_language->select_text(params.language->lang());
+ combo_language->select(params.language->lang());
fl_set_choice_text(language_->choice_inputenc, params.inputenc.c_str());
fl_set_choice(language_->choice_quotes_language, params.quotes_language + 1);
fl_set_button(language_->radio_single, 0);
fl_set_button(dialog_->check_use_kbmap,
lyxrc.use_kbmap);
- combo_default_lang->select_text(lyxrc.default_language);
+ combo_default_lang->select(lyxrc.default_language);
if (lyxrc.use_kbmap) {
fl_set_input(dialog_->input_kbmap1,
// this one is not "C" because combox callbacks are really C++ %-|
-void Toolbar::Pimpl::layoutSelectedCB(int sel, void * arg, Combox *)
+void Toolbar::Pimpl::layoutSelectedCB(int, void * arg, Combox *)
{
Toolbar::Pimpl * tb = reinterpret_cast<Toolbar::Pimpl *>(arg);
- tb->layoutSelected(sel);
+ tb->layoutSelected();
}
-void Toolbar::Pimpl::layoutSelected(int sel)
+void Toolbar::Pimpl::layoutSelected()
{
- string const tmp = tostr(sel);
- owner->getLyXFunc()->dispatch(LFUN_LAYOUTNO, tmp);
+ owner->getLyXFunc()->dispatch(LFUN_LAYOUT, combox->getline());
}
void Toolbar::Pimpl::setLayout(int layout) {
- if (combox)
- combox->select(layout+1);
+ if (combox) {
+ LyXTextClass const & tc =
+ textclasslist.TextClass(owner->buffer()->
+ params.textclass);
+ combox->select(tc[layout].name());
+ }
}
LyXTextClass::const_iterator end = tc.end();
for (LyXTextClass::const_iterator cit = tc.begin();
cit != end; ++cit) {
+ // ignore obsolete entries
if (cit->obsoleted_by().empty())
combox->addline(_(cit->name()));
- else
- combox->addline("@N" + _(cit->name()));
}
}
// we need to do this.
- combox->Redraw();
+ combox->redraw();
}
{
if (combox) {
combox->clear();
- combox->Redraw();
+ combox->redraw();
}
}
void Toolbar::Pimpl::openLayoutList()
{
if (combox)
- combox->Show();
+ combox->show();
}
void openLayoutList();
/// Erase the layout list
void clearLayoutList();
- /// and the non-static version
- void layoutSelected(int);
+ /// the non-static version of layoutSelectedCB
+ void layoutSelected();
///
struct toolbarItem
}
-bool Combox::select_text(string const & t)
+bool Combox::select(string const & t)
{
if (!browser || t.empty()) return false;
int const maxline = fl_get_browser_maxline(browser);
void Combox::add(int x, int y, int w, int hmin, int hmax,
FL_OBJECT * tabfolder1_, FL_OBJECT * tabfolder2_)
{
- // Store these for later use in working round an xforms bug in Show()
+ // Store these for later use in working round an xforms bug in show()
tabfolder1 = tabfolder1_;
tabfolder2 = tabfolder2_;
} // namespace anon
-void Combox::Redraw()
+void Combox::redraw()
{
if (browser) fl_redraw_object(browser);
if (button) fl_redraw_object(button);
if (label) fl_redraw_object(label);
}
-void Combox::Show()
+void Combox::show()
{
if (_pre) _pre();
XFlush(fl_get_display());
}
-void Combox::Hide(int who)
+void Combox::hide(int who)
{
if (!who && browser && label) {
sel = fl_get_browser(browser);
combo->cb_arg, combo);
break;
}
- default: combo->Show(); break;
+ default: combo->show(); break;
}
break;
}
case 2:
- combo->Hide();
+ combo->hide();
break;
}
}
static_cast<XEvent *>(xev)->xbutton.x - ob->x > ob->w ||
static_cast<XEvent *>(xev)->xbutton.y - ob->y < 0 ||
static_cast<XEvent *>(xev)->xbutton.y - ob->y > ob->h)) {
- combo->Hide(1);
+ combo->hide(1);
return 1;
}
fl_get_browser(combo->browser));
return 1;
case XK_Return:
- combo->Hide();
+ combo->hide();
return 1;
case XK_Escape:
- combo->Hide(1);
+ combo->hide(1);
return 1;
}
return 0;
/// Select an arbitrary item
void select(int);
///
- bool select_text(string const &);
+ bool select(string const &);
/// Clear all the list
void clear();
///
void shortcut(string const &, int);
///
- void Redraw();
+ void redraw();
///
- void Show();
+ void show();
///
static void combo_cb(FL_OBJECT *, long);
///
static int peek_event(FL_FORM *, void *);
protected:
/// At least Hide should not be public
- void Hide(int who = 0);
+ void hide(int who = 0);
///
FL_OBJECT * browser;
private:
projects / lyx.git / commitdiff