anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kde patch from Angus

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1235 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-11-22 18:38:31 +00:00
parent 5d196310e5
commit ff308c1722
7 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2000-11-22 Angus Leeming <a.leeming@ic.ac.uk>
* src/frontends/kde/Dialogs.C: added signal Dialogs::redrawGUI.
* src/frontends/kde/FormParagraph.C: added using directive.
* src/frontends/kde/paradlg.C: added config.h and using directive.
* src/frontends/kde/paradlg.h: added std::qualifier.
* src/frontends/kde/Makefile.am: added Color.lo to libkde_la_OBJADD.
2000-11-22 Lars Gullik Bjønnes <larsbj@lyx.org>
* configure.in (AC_OUTPUT): don't output src/xtl/Makefile

5
src/frontends/kde/Dialogs.C
View File

@ -25,6 +25,11 @@
extern void ShowCredits();
// Signal enabling all visible popups to be redrawn if so desired.
// E.g., when the GUI colours have been remapped.
Signal0<void> Dialogs::redrawGUI;
Dialogs::Dialogs(LyXView * lv)
{
dialogs_.push_back(new FormCitation(lv, this));

2
src/frontends/kde/FormParagraph.C
View File

@ -30,6 +30,8 @@
using Liason::setMinibuffer;
#endif
using std::endl;
FormParagraph::FormParagraph(LyXView *v, Dialogs *d)
: dialog_(0), lv_(v), d_(d), h_(0)
{

7
src/frontends/kde/Makefile.am
View File

@ -39,6 +39,8 @@ GENSOURCES = copyrightdlgdata.C \
DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
libkde_la_OBJADD = \
../xforms/ButtonController.lo \
../xforms/Color.lo \
../xforms/FormBase.lo \
../xforms/FormDocument.lo \
../xforms/form_document.lo \
@ -53,12 +55,11 @@ libkde_la_OBJADD = \
../xforms/form_tabular.lo \
../xforms/FormTabularCreate.lo \
../xforms/form_tabular_create.lo \
../xforms/ButtonController.lo \
../xforms/xform_helpers.lo \
../xforms/input_validators.lo \
../xforms/RadioButtonGroup.lo \
../xforms/Toolbar_pimpl.lo \
../xforms/Menubar_pimpl.lo
../xforms/Menubar_pimpl.lo \
../xforms/xform_helpers.lo
LIBS=
LDFLAGS= $(libkde_la_OBJADD)

6
src/frontends/kde/paradlg.C
View File

@ -13,13 +13,15 @@
* *
***************************************************************************/
#include <config.h>
#include "support/lstrings.h"
#include "paradlg.h"
#include "gettext.h"
#include "debug.h"
using std::endl;
/*
* This is the top-level dialog which contains the buttons, and the tab bar for adding
* the qtarch-designed child widget dialogs.

2
src/frontends/kde/paradlg.h
View File

@ -156,7 +156,7 @@ private:
case 5: return VSpace::VFILL;
case 6: return VSpace::LENGTH;
default:
lyxerr[Debug::GUI] << "Unknown kind combo entry " << val << endl;
lyxerr[Debug::GUI] << "Unknown kind combo entry " << val << std::endl;
}
return VSpace::NONE;
}

6
src/insets/insetbib.C
View File

@ -352,7 +352,7 @@ bool InsetBibtex::delDatabase(string const & db)
{
if (contains(getContents(), db)) {
string bd = db;
int n = tokenPos(getContents(), ',', bd);
int const n = tokenPos(getContents(), ',', bd);
if (n > 0) {
// Weird code, would someone care to explain this?(Lgb)
string tmp(", ");
@ -376,7 +376,7 @@ int bibitemMaxWidth(BufferView * bv, LyXFont const & font)
while (par) {
if (par->bibkey) {
int wx = par->bibkey->width(bv, font);
int const wx = par->bibkey->width(bv, font);
if (wx > w) w = wx;
}
par = par->next;
@ -397,7 +397,7 @@ string const bibitemWidest(Buffer const * buffer)
while (par) {
if (par->bibkey) {
int wx = par->bibkey->width(bv, font);
int const wx = par->bibkey->width(bv, font);
if (wx > w) {
w = wx;
bkey = par->bibkey;