? abi/src/Untitled1.abw.SAVED
Index: abi/src/af/xap/unix/xap_UnixDlg_Image.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixDlg_Image.cpp,v
retrieving revision 1.24
diff -u -r1.24 xap_UnixDlg_Image.cpp
--- abi/src/af/xap/unix/xap_UnixDlg_Image.cpp 6 Sep 2004 19:49:23 -0000 1.24
+++ abi/src/af/xap/unix/xap_UnixDlg_Image.cpp 16 Sep 2004 13:29:15 -0000
@@ -424,14 +424,14 @@
localizeLabel(glade_xml_get_widget(xml,"lbTitle"), pSS, XAP_STRING_ID_DLG_Image_LblTitle);
localizeLabel(glade_xml_get_widget(xml,"lbDescription"), pSS, XAP_STRING_ID_DLG_Image_LblDescription);
- localizeLabel(glade_xml_get_widget(xml,"lbInLine"), pSS, XAP_STRING_ID_DLG_Image_InLine);
- localizeLabel(glade_xml_get_widget(xml,"lbWrappedRight"), pSS, XAP_STRING_ID_DLG_Image_WrappedRight);
- localizeLabel(glade_xml_get_widget(xml,"lbWrappedLeft"), pSS, XAP_STRING_ID_DLG_Image_WrappedLeft);
- localizeLabel(glade_xml_get_widget(xml,"lbWrappedBoth"), pSS, XAP_STRING_ID_DLG_Image_WrappedBoth);
+ localizeButton(glade_xml_get_widget(xml,"rbInLine"), pSS, XAP_STRING_ID_DLG_Image_InLine);
+ localizeButton(glade_xml_get_widget(xml,"rbWrappedRight"), pSS, XAP_STRING_ID_DLG_Image_WrappedRight);
+ localizeButton(glade_xml_get_widget(xml,"rbWrappedLeft"), pSS, XAP_STRING_ID_DLG_Image_WrappedLeft);
+ localizeButton(glade_xml_get_widget(xml,"rbWrappedBoth"), pSS, XAP_STRING_ID_DLG_Image_WrappedBoth);
- localizeLabel(glade_xml_get_widget(xml,"lbPlaceParagraph"), pSS, XAP_STRING_ID_DLG_Image_PlaceParagraph);
- localizeLabel(glade_xml_get_widget(xml,"lbPlaceColumn"), pSS, XAP_STRING_ID_DLG_Image_PlaceColumn);
- localizeLabel(glade_xml_get_widget(xml,"lbPlacePage"), pSS, XAP_STRING_ID_DLG_Image_PlacePage);
+ localizeButton(glade_xml_get_widget(xml,"rbPlaceParagraph"), pSS, XAP_STRING_ID_DLG_Image_PlaceParagraph);
+ localizeButton(glade_xml_get_widget(xml,"rbPlaceColumn"), pSS, XAP_STRING_ID_DLG_Image_PlaceColumn);
+ localizeButton(glade_xml_get_widget(xml,"rbPlacePage"), pSS, XAP_STRING_ID_DLG_Image_PlacePage);
m_wPlaceTable = glade_xml_get_widget(xml,"tbPlacement");
m_wrbInLine = glade_xml_get_widget(xml,"rbInLine");
Index: abi/src/af/xap/unix/xap_UnixDlg_Image.glade
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixDlg_Image.glade,v
retrieving revision 1.6
diff -u -r1.6 xap_UnixDlg_Image.glade
--- abi/src/af/xap/unix/xap_UnixDlg_Image.glade 6 Sep 2004 19:49:23 -0000 1.6
+++ abi/src/af/xap/unix/xap_UnixDlg_Image.glade 16 Sep 2004 13:29:18 -0000
@@ -11,12 +11,7 @@
False
True
False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
+ False
@@ -37,7 +32,6 @@
gtk-cancel
True
GTK_RELIEF_NORMAL
- True
-6
@@ -50,7 +44,6 @@
gtk-ok
True
GTK_RELIEF_NORMAL
- True
-5
@@ -74,7 +67,7 @@
True
4
- 4
+ 5
False
0
0
@@ -105,9 +98,9 @@
-
+
True
-
+ Width:
False
False
GTK_JUSTIFY_LEFT
@@ -119,19 +112,19 @@
0
- 0
- 1
- 1
- 2
+ 1
+ 2
+ 2
+ 3
fill
-
+
True
-
+ Height:
False
False
GTK_JUSTIFY_LEFT
@@ -143,65 +136,61 @@
0
- 0
- 1
- 2
- 3
+ 1
+ 2
+ 1
+ 2
fill
-
+
+ 0
True
-
- False
- False
- GTK_JUSTIFY_LEFT
+ True
+ 1
+ 0
+ False
+ GTK_UPDATE_ALWAYS
+ False
False
- False
- 0
- 0.5
- 0
- 0
+ 1 0 100 1 10 10
- 0
- 1
- 3
- 4
- fill
+ 4
+ 5
+ 1
+ 2
-
+
+ 0
True
- Width:
- False
- False
- GTK_JUSTIFY_LEFT
+ True
+ 1
+ 0
+ False
+ GTK_UPDATE_ALWAYS
+ False
False
- False
- 0
- 0.5
- 0
- 0
+ 1 0 100 1 10 10
- 1
- 2
+ 4
+ 5
2
3
- fill
-
+
True
True
True
@@ -213,16 +202,16 @@
False
- 2
- 3
- 2
- 3
+ 3
+ 4
+ 1
+ 2
-
+
True
True
True
@@ -234,20 +223,20 @@
False
- 2
- 3
- 1
- 2
+ 3
+ 4
+ 2
+ 3
-
+
True
- Height:
+ <b>%s</b>
False
- False
+ True
GTK_JUSTIFY_LEFT
False
False
@@ -257,35 +246,35 @@
0
- 1
- 2
- 1
- 2
+ 0
+ 5
+ 0
+ 1
+ 2
fill
-
+
True
- <b>%s</b>
+
False
- True
+ False
GTK_JUSTIFY_LEFT
False
False
0
0.5
- 0
+ 6
0
- 0
- 4
- 0
- 1
- 2
+ 2
+ 3
+ 1
+ 2
fill
@@ -298,14 +287,13 @@
Preserve aspect ratio
True
GTK_RELIEF_NORMAL
- True
False
False
True
1
- 3
+ 5
3
4
2
@@ -315,47 +303,49 @@
-
- 0
+
True
- True
- 1
- 0
- False
- GTK_UPDATE_ALWAYS
- False
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
False
- 1 0 100 1 10 10
+ False
+ 0
+ 0.5
+ 6
+ 0
- 3
- 4
- 2
- 3
- shrink
+ 0
+ 1
+ 1
+ 2
+ fill
-
- 0
+
True
- True
- 1
- 0
- False
- GTK_UPDATE_ALWAYS
- False
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
False
- 1 0 100 1 10 10
+ False
+ 0
+ 0.5
+ 6
+ 0
- 3
- 4
- 1
- 2
- shrink
+ 2
+ 3
+ 2
+ 3
+ fill
@@ -371,7 +361,7 @@
True
3
- 3
+ 4
False
0
0
@@ -401,7 +391,31 @@
-
+
+ True
+ Title:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+
+ 1
+ 2
+ 1
+ 2
+ fill
+
+
+
+
+
+
True
True
True
@@ -413,16 +427,16 @@
False
- 2
- 3
- 2
- 3
+ 3
+ 4
+ 1
+ 2
-
+
True
True
True
@@ -434,20 +448,20 @@
False
- 2
- 3
- 1
- 2
+ 3
+ 4
+ 2
+ 3
-
+
True
- Title:
+ <b>%s</b>
False
- False
+ True
GTK_JUSTIFY_LEFT
False
False
@@ -457,17 +471,17 @@
0
- 1
- 2
- 1
- 2
- fill
+ 0
+ 4
+ 0
+ 1
+ 2
-
+
True
False
@@ -477,7 +491,7 @@
False
0
0.5
- 0
+ 6
0
@@ -485,54 +499,37 @@
1
1
2
- 6
-
+ fill
-
+
True
- <b>%s</b>
+
False
- True
+ False
GTK_JUSTIFY_LEFT
False
False
0
0.5
- 0
+ 6
0
- 0
+ 2
3
- 0
- 1
- 2
+ 1
+ 2
+ fill
-
-
- 6
- False
- False
-
-
-
-
-
- True
- 5
- 3
- False
- 0
- 0
-
+
True
False
@@ -542,77 +539,45 @@
False
0
0.5
- 0
- 0
-
-
- 0
- 1
- 1
- 2
- 6
- shrink
-
-
-
-
-
-
- True
- True
-
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
- 1
- 2
- 1
- 2
- shrink
-
-
-
-
-
-
- True
- Image placed in line
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
+ 6
0
2
3
- 1
- 2
+ 2
+ 3
+ fill
+
+
+ 6
+ True
+ False
+
+
+
+
+
+ True
+ 5
+ 2
+ False
+ 0
+ 0
True
True
-
+ Text wrapped to the right of Image
True
GTK_RELIEF_NORMAL
- True
False
False
True
- rbInLine
1
@@ -625,41 +590,16 @@
-
- True
- Text wrapped to the right of Image
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
-
-
- 2
- 3
- 2
- 3
- fill
-
-
-
-
-
True
True
-
+ Text wrapped to Left of Image
True
GTK_RELIEF_NORMAL
- True
False
False
True
- rbInLine
+ rbWrappedRight
1
@@ -672,46 +612,20 @@
-
- True
- Text wrapped to Left of Image
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
-
-
- 2
- 3
- 3
- 4
- fill
-
-
-
-
-
-
+
True
+ True
Text wrapped on both sizes of the image
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
+ True
+ GTK_RELIEF_NORMAL
+ False
+ False
+ True
+ rbWrappedRight
- 2
- 3
+ 1
+ 2
4
5
fill
@@ -735,7 +649,7 @@
0
- 3
+ 2
0
1
2
@@ -745,46 +659,29 @@
-
+
True
True
-
+ Image placed in line
True
GTK_RELIEF_NORMAL
- True
False
False
True
- rbInLine
+ rbWrappedRight
1
2
- 4
- 5
+ 1
+ 2
fill
-
-
- 6
- True
- True
-
-
-
-
-
- True
- 4
- 3
- False
- 0
- 0
-
+
True
False
@@ -794,7 +691,7 @@
False
0
0.5
- 0
+ 6
0
@@ -802,20 +699,34 @@
1
1
2
- 6
fill
+
+
+ 6
+ True
+ True
+
+
+
+
+
+ True
+ 4
+ 2
+ False
+ 0
+ 0
True
True
-
+ Position relative to nearest paragraph
True
GTK_RELIEF_NORMAL
- True
False
False
True
@@ -831,36 +742,34 @@
-
+
True
- Position relative to nearest paragraph
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
+ True
+ Position relative to its column
+ True
+ GTK_RELIEF_NORMAL
+ False
+ False
+ True
+ rbPlaceParagraph
- 2
- 3
- 1
- 2
+ 1
+ 2
+ 2
+ 3
+ fill
-
+
True
True
-
+ Position relative to its Page
True
GTK_RELIEF_NORMAL
- True
False
False
True
@@ -869,8 +778,8 @@
1
2
- 2
- 3
+ 3
+ 4
fill
@@ -892,7 +801,7 @@
0
- 3
+ 2
0
1
2
@@ -902,56 +811,9 @@
-
+
True
- Position relative to its column
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
-
-
- 2
- 3
- 2
- 3
- fill
-
-
-
-
-
-
- True
- True
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
- rbPlaceParagraph
-
-
- 1
- 2
- 3
- 4
- fill
-
-
-
-
-
-
- True
- Position relative to its Page
False
False
GTK_JUSTIFY_LEFT
@@ -959,14 +821,14 @@
False
0
0.5
- 0
+ 6
0
- 2
- 3
- 3
- 4
+ 0
+ 1
+ 1
+ 2
fill
Index: abi/src/af/xap/unix/xap_UnixFrameImpl.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/unix/xap_UnixFrameImpl.cpp,v
retrieving revision 1.81
diff -u -r1.81 xap_UnixFrameImpl.cpp
--- abi/src/af/xap/unix/xap_UnixFrameImpl.cpp 8 Sep 2004 14:36:45 -0000 1.81
+++ abi/src/af/xap/unix/xap_UnixFrameImpl.cpp 16 Sep 2004 13:29:21 -0000
@@ -1534,18 +1534,11 @@
return false;
}
- char buf[256];
- buf[0] = 0;
-
- const char * szAppName = m_pUnixApp->getApplicationTitleForTitleBar();
-
- int len = 256 - strlen(szAppName) - 4;
-
- const char * szTitle = getFrame()->getTitle(len);
-
- sprintf(buf, "%s - %s", szTitle, szAppName);
if(getFrame()->getFrameMode() == XAP_NormalFrame)
- gtk_window_set_title(GTK_WINDOW(m_wTopLevelWindow), buf);
+ {
+ const char * szTitle = getFrame()->getTitle(MAX_TITLE_LENGTH);
+ gtk_window_set_title(GTK_WINDOW(m_wTopLevelWindow), szTitle);
+ }
return true;
}
Index: abi/src/af/xap/xp/xap_FrameImpl.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/xp/xap_FrameImpl.cpp,v
retrieving revision 1.23
diff -u -r1.23 xap_FrameImpl.cpp
--- abi/src/af/xap/xp/xap_FrameImpl.cpp 11 Apr 2004 17:51:38 -0000 1.23
+++ abi/src/af/xap/xp/xap_FrameImpl.cpp 16 Sep 2004 13:29:23 -0000
@@ -84,7 +84,6 @@
-#define MAX_TITLE_LENGTH 256
bool XAP_FrameImpl::_updateTitle()
{
/*
@@ -102,7 +101,7 @@
m_pFrame->m_sNonDecoratedTitle = m_pFrame->m_sTitle;
if (m_pFrame->m_pDoc->isDirty())
- m_pFrame->m_sTitle += " *";
+ m_pFrame->m_sTitle = "*" + m_pFrame->m_sTitle;
return true;
}
@@ -113,7 +112,7 @@
if (szName && *szName)
{
- UT_UTF8String sUntruncatedString = szName;
+ UT_UTF8String sUntruncatedString(UT_basename(szName));
// WL_FIXME: we probably need a string truncation function, in the ut_utf8string class..
UT_UTF8Stringbuf::UTF8Iterator iter = sUntruncatedString.getIterator ();
iter = iter.start ();
@@ -143,7 +142,7 @@
// only for non-untitled documents
if (m_pFrame->m_pDoc->isDirty())
- m_pFrame->m_sTitle += " *";
+ m_pFrame->m_sTitle = "*" + m_pFrame->m_sTitle;
return true;
}
Index: abi/src/af/xap/xp/xap_FrameImpl.h
===================================================================
RCS file: /cvsroot/abi/src/af/xap/xp/xap_FrameImpl.h,v
retrieving revision 1.17
diff -u -r1.17 xap_FrameImpl.h
--- abi/src/af/xap/xp/xap_FrameImpl.h 23 Mar 2004 00:12:11 -0000 1.17
+++ abi/src/af/xap/xp/xap_FrameImpl.h 16 Sep 2004 13:29:23 -0000
@@ -27,6 +27,8 @@
#include "ut_vector.h"
#include "gr_Graphics.h"
+#define MAX_TITLE_LENGTH 256
+
class XAP_Frame;
class XAP_App;
class XAP_DialogFactory;