kdetiny.diff
------------
just some small kde changes
doxygen.diff
------------
add some Makefile stuff for generating the source docs with doxygen. If
it's officially mandated, it had better be simple to get it up and running
:)
thanks
john
--
"If you can't say anything good about someone, sit right here by me."
- Alice Roosevelt Longworth
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/kde/ChangeLog,v
retrieving revision 1.1
diff -u -p -r1.1 ChangeLog
--- ChangeLog 2001/01/12 09:42:29 1.1
+++ ChangeLog 2001/01/12 13:25:15
@@ -0,0 +1,11 @@
+2000-01-12 John Levon <[EMAIL PROTECTED]>
+
+ * FormTabularCreate.C: use LFUN_INSET_TABULAR Dispatch
+ instead of creating by hand
+
+ * FormUrl.C: add accelerators for Close and Cancel
+
+ * paradlg.C: add accelerators for Close and Cancel,
+ clean the code up a little
+
+ * printdlg.C: add FIXME for later
Index: FormTabularCreate.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/kde/FormTabularCreate.C,v
retrieving revision 1.2
diff -u -p -r1.2 FormTabularCreate.C
--- FormTabularCreate.C 2000/12/06 09:49:52 1.2
+++ FormTabularCreate.C 2001/01/12 13:25:15
@@ -22,6 +22,7 @@
#include "QtLyXView.h"
#include "BufferView.h"
#include "insets/insettabular.h"
+#include "support/lstrings.h"
FormTabularCreate::FormTabularCreate(LyXView *v, Dialogs *d)
: dialog_(0), lv_(v), d_(d), h_(0)
@@ -42,9 +43,8 @@ void FormTabularCreate::apply(unsigned i
if (!lv_->view()->available())
return;
- InsetTabular * in = new InsetTabular(*lv_->buffer(), rows, cols);
- if (!lv_->view()->open_new_inset(in))
- delete in;
+ string tmp = tostr(rows) + " " + tostr(cols);
+ lv_->getLyXFunc()->Dispatch(LFUN_INSET_TABULAR, tmp);
}
void FormTabularCreate::show()
Index: FormUrl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/kde/FormUrl.C,v
retrieving revision 1.4
diff -u -p -r1.4 FormUrl.C
--- FormUrl.C 2000/10/17 08:27:34 1.4
+++ FormUrl.C 2001/01/12 13:25:15
@@ -83,14 +83,14 @@ void FormUrl::update(bool switched)
dialog_->urlname->setFocusPolicy(QWidget::NoFocus);
dialog_->url->setFocusPolicy(QWidget::NoFocus);
dialog_->buttonOk->setEnabled(false);
- dialog_->buttonCancel->setText(_("Close"));
+ dialog_->buttonCancel->setText(_("&Close"));
dialog_->htmlurl->setEnabled(false);
} else {
dialog_->urlname->setFocusPolicy(QWidget::StrongFocus);
dialog_->url->setFocusPolicy(QWidget::StrongFocus);
dialog_->url->setFocus();
dialog_->buttonOk->setEnabled(true);
- dialog_->buttonCancel->setText(_("Cancel"));
+ dialog_->buttonCancel->setText(_("&Cancel"));
dialog_->htmlurl->setEnabled(true);
}
}
Index: paradlg.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/kde/paradlg.C,v
retrieving revision 1.4
diff -u -p -r1.4 paradlg.C
--- paradlg.C 2000/12/06 09:49:52 1.4
+++ paradlg.C 2001/01/12 13:25:16
@@ -86,7 +86,7 @@ void ParaDialog::setReadOnly(bool readon
ok->setEnabled(!readonly);
apply->setEnabled(!readonly);
restore->setEnabled(!readonly);
- cancel->setText(readonly ? _("Close") : _("Cancel"));
+ cancel->setText(readonly ? _("&Close") : _("&Cancel"));
}
void ParaDialog::setLabelWidth(const char *text)
@@ -130,53 +130,30 @@ void ParaDialog::setChecks(bool labove,
void ParaDialog::setSpace(VSpace::vspace_kind kindabove, VSpace::vspace_kind
kindbelow, bool keepabove, bool keepbelow)
{
+ int item;
+
switch (kindabove) {
- case VSpace::NONE:
- generalpage->abovepage->spaceabove->setCurrentItem(0);
- break;
- case VSpace::DEFSKIP:
- generalpage->abovepage->spaceabove->setCurrentItem(1);
- break;
- case VSpace::SMALLSKIP:
- generalpage->abovepage->spaceabove->setCurrentItem(2);
- break;
- case VSpace::MEDSKIP:
- generalpage->abovepage->spaceabove->setCurrentItem(3);
- break;
- case VSpace::BIGSKIP:
- generalpage->abovepage->spaceabove->setCurrentItem(4);
- break;
- case VSpace::VFILL:
- generalpage->abovepage->spaceabove->setCurrentItem(5);
- break;
- case VSpace::LENGTH:
- generalpage->abovepage->spaceabove->setCurrentItem(6);
- break;
+ case VSpace::NONE: item = 0; break;
+ case VSpace::DEFSKIP: item = 1; break;
+ case VSpace::SMALLSKIP: item = 2; break;
+ case VSpace::MEDSKIP: item = 3; break;
+ case VSpace::BIGSKIP: item = 4; break;
+ case VSpace::VFILL: item = 5; break;
+ case VSpace::LENGTH: item = 6; break;
}
+ generalpage->abovepage->spaceabove->setCurrentItem(item);
+
switch (kindbelow) {
- case VSpace::NONE:
- generalpage->belowpage->spacebelow->setCurrentItem(0);
- break;
- case VSpace::DEFSKIP:
- generalpage->belowpage->spacebelow->setCurrentItem(1);
- break;
- case VSpace::SMALLSKIP:
- generalpage->belowpage->spacebelow->setCurrentItem(2);
- break;
- case VSpace::MEDSKIP:
- generalpage->belowpage->spacebelow->setCurrentItem(3);
- break;
- case VSpace::BIGSKIP:
- generalpage->belowpage->spacebelow->setCurrentItem(4);
- break;
- case VSpace::VFILL:
- generalpage->belowpage->spacebelow->setCurrentItem(5);
- break;
- case VSpace::LENGTH:
- generalpage->belowpage->spacebelow->setCurrentItem(6);
- break;
+ case VSpace::NONE: item = 0; break;
+ case VSpace::DEFSKIP: item = 1; break;
+ case VSpace::SMALLSKIP: item = 2; break;
+ case VSpace::MEDSKIP: item = 3; break;
+ case VSpace::BIGSKIP: item = 4; break;
+ case VSpace::VFILL: item = 5; break;
+ case VSpace::LENGTH: item = 6; break;
}
-
+ generalpage->belowpage->spacebelow->setCurrentItem(item);
+
generalpage->abovepage->spaceabovevalue->setEnabled(kindabove ==
VSpace::LENGTH);
generalpage->abovepage->spaceabovevalueunits->setEnabled(kindabove ==
VSpace::LENGTH);
generalpage->abovepage->spaceaboveplus->setEnabled(kindabove ==
VSpace::LENGTH);
Index: printdlg.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/kde/printdlg.C,v
retrieving revision 1.3
diff -u -p -r1.3 printdlg.C
--- printdlg.C 2000/12/06 09:49:52 1.3
+++ printdlg.C 2001/01/12 13:25:16
@@ -18,6 +18,8 @@
#define Inherited PrintDialogData
+/* FIXME: tab order is out of whack */
+
PrintDialog::PrintDialog(FormPrint *f, QWidget* parent, const char * name)
: PrintDialogData(parent, name), form_(f)
{
doxygen.diff.gz
