The attached re-organises the KDE frontend to be much nicer in terms
of number of files per directory. It also contains a full sync up to my
tree.
I have supplied a tarfile, as a diff would be completely unweildy in this
case. To apply :
patch -p0 <kdebig.diff
cd src/frontends
tar zxvf kdebig.tar.gz
sh reorg.script
This should do the correct cvs add/removes for you, and apply the small
bits needed outside of kde/.
Please apply
thanks
john
--
"An AMM performance has no beginning or ending. Sounds outside the performance
are distinguished from it only by individual sensibility."
- Victor Schonfield
#!/bin/sh
removeme="copyrightdlgdata.C indexdlgdata.C paraextradlgdata.C parageneraldlgdata.C
printdlgdata.C copyrightdlgdata.h indexdlgdata.h paraextradlgdata.h
parageneraldlgdata.h printdlgdata.h lyxgui.kdevprj dlg/copyright.dlg dlg/index.dlg
dlg/paraextra.dlg dlg/parageneral.dlg dlg/print.dlg"
addme="moc/Makefile.am dlg/Makefile.am dlg/copyrightdlgdata.C dlg/indexdlgdata.C
dlg/parabelowdlgdata.h dlg/paraextradlgdata.h dlg/printdlgdata.C dlg/tabstack.h
dlg/copyrightdlgdata.h dlg/indexdlgdata.h dlg/paradlgdata.C dlg/printdlgdata.h
dlg/emptytable.C dlg/paraabovedlgdata.C dlg/paradlgdata.h
dlg/parageneraldlgdata.C dlg/tabcreatedlgdata.C dlg/emptytable.h
dlg/paraabovedlgdata.h dlg/parageneraldlgdata.h dlg/tabcreatedlgdata.h
dlg/parabelowdlgdata.C dlg/paraextradlgdata.C dlg/tabstack.h dlg/tabstack.C
dlg/moc/Makefile.am dlg/dialogs/copyright.dlg dlg/dialogs/index.dlg
dlg/dialogs/paraextra.dlg dlg/dialogs/parageneral.dlg dlg/dialogs/print.dlg
dlg/dialogs/para.dlg dlg/dialogs/tabcreate.dlg dlg/dialogs/paraabove.dlg
dlg/dialogs/parabelow.dlg"
rm $removeme
cvs delete $removeme
cvs add $addme
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.709
diff -u -p -r1.709 ChangeLog
--- ChangeLog 2000/12/04 09:15:50 1.709
+++ ChangeLog 2000/12/04 13:58:23
@@ -1,3 +1,14 @@
+2000-12-04 John Levon <[EMAIL PROTECTED]>
+
+ * configure.in: add new KDE Makefiles
+ * src/vspace.h: return GlueLength not a normal one
+ * src/support/lstrings.h:
+ * src/support/lstrings.C: add isStrUnsignedInt(),
+ strToUnsignedInt()
+
+ * src/frontends/kde/*: big reorganisation, update
+ FormParagraph, add FormTabCreate
+
2000-11-30 Dekel Tsur <[EMAIL PROTECTED]>
* Several files: Allow compilation when the compiler doesn't
Index: configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.in,v
retrieving revision 1.56
diff -u -p -r1.56 configure.in
--- configure.in 2000/11/28 16:38:25 1.56
+++ configure.in 2000/12/04 13:58:23
@@ -297,6 +297,9 @@ AC_OUTPUT([Makefile \
src/frontends/support/Makefile \
src/frontends/xforms/Makefile \
src/frontends/kde/Makefile \
+ src/frontends/kde/moc/Makefile \
+ src/frontends/kde/dlg/Makefile \
+ src/frontends/kde/dlg/moc/Makefile \
src/frontends/gnome/Makefile \
], [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
diff -u -p -r1.13 vspace.h
--- src/vspace.h 2000/09/14 17:53:07 1.13
+++ src/vspace.h 2000/12/04 13:58:24
@@ -222,7 +222,7 @@ public:
// access functions
vspace_kind kind() const { return kin; }
///
- LyXLength length() const { return len; }
+ LyXGlueLength length() const { return len; }
// a flag that switches between \vspace and \vspace*
bool keep() const { return kp; }
diff -u -p -r1.33 lstrings.C
--- src/support/lstrings.C 2000/11/15 03:22:08 1.33
+++ src/support/lstrings.C 2000/12/04 13:58:30
@@ -95,9 +95,39 @@ bool isStrInt(string const & str)
}
+bool isStrUnsignedInt(string const & str)
+{
+ if (str.empty()) return false;
+
+ // Remove leading and trailing white space chars.
+ string const tmpstr = frontStrip(strip(str, ' '), ' ');
+ if (tmpstr.empty()) return false;
+
+ string::const_iterator cit = tmpstr.begin();
+ string::const_iterator end = tmpstr.end();
+ for (; cit != end; ++cit) {
+ if (!isdigit((*cit))) return false;
+ }
+ return true;
+}
+
+
int strToInt(string const & str)
{
if (isStrInt(str)) {
+ // Remove leading and trailing white space chars.
+ string const tmpstr = frontStrip(strip(str, ' '), ' ');
+ // Do the conversion proper.
+ return lyx::atoi(tmpstr);
+ } else {
+ return 0;
+ }
+}
+
+
+unsigned int strToUnsignedInt(string const & str)
+{
+ if (isStrUnsignedInt(str)) {
// Remove leading and trailing white space chars.
string const tmpstr = frontStrip(strip(str, ' '), ' ');
// Do the conversion proper.
Index: src/support/lstrings.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/lstrings.h,v
retrieving revision 1.25
diff -u -p -r1.25 lstrings.h
--- src/support/lstrings.h 2000/10/30 21:53:29 1.25
+++ src/support/lstrings.h 2000/12/04 13:58:30
@@ -44,8 +44,14 @@ int compare(char const * a, char const *
///
bool isStrInt(string const & str);
+/// does the string represent an unsigned integer value ?
+bool isStrUnsignedInt(string const & str);
+
///
int strToInt(string const & str);
+
+/// convert string to an unsigned integer
+unsigned int strToUnsignedInt(string const & str);
///
bool isStrDbl(string const & str);
kdebig.tar.gz
