1.1 --- a/mapobj.h	Mon May 08 13:25:46 2006 +0000
     1.2 +++ b/mapobj.h	Mon May 08 13:25:46 2006 +0000
     1.3 @@ -8,13 +8,14 @@
     1.4  
     1.5  using namespace std;
     1.6  
     1.7 -#define Z_BBOX     0
     1.8 -#define Z_XLINK   10
     1.9 -#define Z_LINK    20
    1.10 -#define Z_FRAME   50
    1.11 -#define Z_SELBOX  60
    1.12 -#define Z_ICON    80
    1.13 -#define Z_TEXT   100
    1.14 +#define Z_BBOX      0
    1.15 +#define Z_XLINK    10
    1.16 +#define Z_LINK     20
    1.17 +#define Z_FRAME    50
    1.18 +#define Z_SELBOX   60
    1.19 +#define Z_FLOATIMG 65
    1.20 +#define Z_ICON     80
    1.21 +#define Z_TEXT    100
    1.22  
    1.23  class MapObj:public xmlObj {
    1.24  public:

     2.1 --- a/texteditor.cpp	Mon May 08 13:25:46 2006 +0000
     2.2 +++ b/texteditor.cpp	Mon May 08 13:25:46 2006 +0000
     2.3 @@ -325,7 +325,7 @@
     2.4      QToolBar *tb = new QToolBar( this );
     2.5      tb->setLabel( "Format Actions" );
     2.6      QPopupMenu *menu = new QPopupMenu( this );
     2.7 -    menuBar()->insertItem( tr( "&Format" ), menu );
     2.8 +    menuBar()->insertItem( tr( "F&ormat" ), menu );
     2.9  
    2.10      QAction *a;
    2.11  
    2.12 @@ -374,7 +374,7 @@
    2.13      actionTextItalic->addTo( tb );
    2.14      actionTextItalic->addTo( menu );
    2.15      actionTextItalic->setToggleAction( true );
    2.16 -    actionTextUnderline = new QAction( QPixmap (iconPath+"text_italic.png"), tr( "&Underline" ), CTRL + Key_U, this, "textUnderline" );
    2.17 +    actionTextUnderline = new QAction( QPixmap (iconPath+"text_under.png"), tr( "&Underline" ), CTRL + Key_U, this, "textUnderline" );
    2.18      connect( actionTextUnderline, SIGNAL( activated() ), this, SLOT( textUnderline() ) );
    2.19      actionTextUnderline->addTo( tb );
    2.20      actionTextUnderline->addTo( menu );