# HG changeset patch
# User insilmaril
# Date 1147094746 0
# Node ID 866f79dfa6d70241df29a2eb4e39847ffbffcd81
# Parent  549bb67a8ab2b346539cf1794d845434a3932566
1.7.16 Small bugfixes

diff -r 549bb67a8ab2 -r 866f79dfa6d7 mapobj.h
--- a/mapobj.h	Mon May 08 13:25:46 2006 +0000
+++ b/mapobj.h	Mon May 08 13:25:46 2006 +0000
@@ -8,13 +8,14 @@
 
 using namespace std;
 
-#define Z_BBOX     0
-#define Z_XLINK   10
-#define Z_LINK    20
-#define Z_FRAME   50
-#define Z_SELBOX  60
-#define Z_ICON    80
-#define Z_TEXT   100
+#define Z_BBOX      0
+#define Z_XLINK    10
+#define Z_LINK     20
+#define Z_FRAME    50
+#define Z_SELBOX   60
+#define Z_FLOATIMG 65
+#define Z_ICON     80
+#define Z_TEXT    100
 
 class MapObj:public xmlObj {
 public:
diff -r 549bb67a8ab2 -r 866f79dfa6d7 texteditor.cpp
--- a/texteditor.cpp	Mon May 08 13:25:46 2006 +0000
+++ b/texteditor.cpp	Mon May 08 13:25:46 2006 +0000
@@ -325,7 +325,7 @@
     QToolBar *tb = new QToolBar( this );
     tb->setLabel( "Format Actions" );
     QPopupMenu *menu = new QPopupMenu( this );
-    menuBar()->insertItem( tr( "&Format" ), menu );
+    menuBar()->insertItem( tr( "F&ormat" ), menu );
 
     QAction *a;
 
@@ -374,7 +374,7 @@
     actionTextItalic->addTo( tb );
     actionTextItalic->addTo( menu );
     actionTextItalic->setToggleAction( true );
-    actionTextUnderline = new QAction( QPixmap (iconPath+"text_italic.png"), tr( "&Underline" ), CTRL + Key_U, this, "textUnderline" );
+    actionTextUnderline = new QAction( QPixmap (iconPath+"text_under.png"), tr( "&Underline" ), CTRL + Key_U, this, "textUnderline" );
     connect( actionTextUnderline, SIGNAL( activated() ), this, SLOT( textUnderline() ) );
     actionTextUnderline->addTo( tb );
     actionTextUnderline->addTo( menu );