anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add button for default layout to the toolbar

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15946 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-11-16 08:17:48 +00:00
parent f5979da1d2
commit bb8c9253e4
5 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
development/scons/scons_manifest.py
View File

@ -1470,6 +1470,7 @@ lib_images_files = Split('''
footnote-insert.xpm
index-insert.xpm
label-insert.xpm
layout.xpm
layout-document.xpm
layout-paragraph.xpm
layout_Description.xpm

1
lib/Makefile.am
View File

@ -203,6 +203,7 @@ dist_images_DATA = \
images/footnote-insert.xpm \
images/index-insert.xpm \
images/label-insert.xpm \
images/layout.xpm \
images/layout-document.xpm \
images/layout-paragraph.xpm \
images/layout_Description.xpm \

25
lib/images/layout.xpm Normal file
View File

@ -0,0 +1,25 @@
/* XPM */
static char * layout_xpm[] = {
"20 20 2 1",
" c None",
". c #000000",
" ",
" ",
" ................. ",
" ",
" ",
" ................. ",
" ",
" ",
" ................. ",
" ",
" ",
" ................. ",
" ",
" ",
" ................. ",
" ",
" ",
" ................. ",
" ",
" "};

1
lib/ui/stdtoolbars.ui
View File

@ -63,6 +63,7 @@ Toolbar "standard" "Standard"
End
Toolbar "extra" "Extra"
Item "Default" "layout"
Item "Numbered list" "layout Enumerate"
Item "Itemized list" "layout Itemize"
Item "List" "layout List"

19
src/text3.C
View File

@ -809,24 +809,15 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
break;
case LFUN_LAYOUT: {
lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) "
<< to_utf8(cmd.argument()) << endl;
// This is not the good solution to the empty argument
// problem, but it will hopefully suffice for 1.2.0.
// The correct solution would be to augument the
// function list/array with information about what
// functions needs arguments and their type.
if (cmd.argument().empty()) {
cur.errorMessage(_("LyX function 'layout' needs an argument."));
break;
}
string layout = to_ascii(cmd.argument());
lyxerr[Debug::INFO] << "LFUN_LAYOUT: (arg) " << layout << endl;
// Derive layout number from given argument (string)
// and current buffer's textclass (number)
LyXTextClass const & tclass = bv->buffer()->params().getLyXTextClass();
bool hasLayout = tclass.hasLayout(to_utf8(cmd.argument()));
string layout = to_utf8(cmd.argument());
if (layout.empty())
layout = tclass.defaultLayoutName();
bool hasLayout = tclass.hasLayout(layout);
// If the entry is obsolete, use the new one instead.
if (hasLayout) {