mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 05:25:26 +00:00
kde patch from Angus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1235 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5d196310e5
commit
ff308c1722
12
ChangeLog
12
ChangeLog
@ -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>
|
2000-11-22 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||||
|
|
||||||
* configure.in (AC_OUTPUT): don't output src/xtl/Makefile
|
* configure.in (AC_OUTPUT): don't output src/xtl/Makefile
|
||||||
|
@ -25,6 +25,11 @@
|
|||||||
extern void ShowCredits();
|
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::Dialogs(LyXView * lv)
|
||||||
{
|
{
|
||||||
dialogs_.push_back(new FormCitation(lv, this));
|
dialogs_.push_back(new FormCitation(lv, this));
|
||||||
|
@ -30,6 +30,8 @@
|
|||||||
using Liason::setMinibuffer;
|
using Liason::setMinibuffer;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
using std::endl;
|
||||||
|
|
||||||
FormParagraph::FormParagraph(LyXView *v, Dialogs *d)
|
FormParagraph::FormParagraph(LyXView *v, Dialogs *d)
|
||||||
: dialog_(0), lv_(v), d_(d), h_(0)
|
: dialog_(0), lv_(v), d_(d), h_(0)
|
||||||
{
|
{
|
||||||
|
@ -39,6 +39,8 @@ GENSOURCES = copyrightdlgdata.C \
|
|||||||
DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
|
DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
|
||||||
|
|
||||||
libkde_la_OBJADD = \
|
libkde_la_OBJADD = \
|
||||||
|
../xforms/ButtonController.lo \
|
||||||
|
../xforms/Color.lo \
|
||||||
../xforms/FormBase.lo \
|
../xforms/FormBase.lo \
|
||||||
../xforms/FormDocument.lo \
|
../xforms/FormDocument.lo \
|
||||||
../xforms/form_document.lo \
|
../xforms/form_document.lo \
|
||||||
@ -53,12 +55,11 @@ libkde_la_OBJADD = \
|
|||||||
../xforms/form_tabular.lo \
|
../xforms/form_tabular.lo \
|
||||||
../xforms/FormTabularCreate.lo \
|
../xforms/FormTabularCreate.lo \
|
||||||
../xforms/form_tabular_create.lo \
|
../xforms/form_tabular_create.lo \
|
||||||
../xforms/ButtonController.lo \
|
|
||||||
../xforms/xform_helpers.lo \
|
|
||||||
../xforms/input_validators.lo \
|
../xforms/input_validators.lo \
|
||||||
../xforms/RadioButtonGroup.lo \
|
../xforms/RadioButtonGroup.lo \
|
||||||
../xforms/Toolbar_pimpl.lo \
|
../xforms/Toolbar_pimpl.lo \
|
||||||
../xforms/Menubar_pimpl.lo
|
../xforms/Menubar_pimpl.lo \
|
||||||
|
../xforms/xform_helpers.lo
|
||||||
|
|
||||||
LIBS=
|
LIBS=
|
||||||
LDFLAGS= $(libkde_la_OBJADD)
|
LDFLAGS= $(libkde_la_OBJADD)
|
||||||
|
@ -13,13 +13,15 @@
|
|||||||
* *
|
* *
|
||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
#include "support/lstrings.h"
|
#include "support/lstrings.h"
|
||||||
|
|
||||||
#include "paradlg.h"
|
#include "paradlg.h"
|
||||||
|
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
||||||
|
using std::endl;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is the top-level dialog which contains the buttons, and the tab bar for adding
|
* This is the top-level dialog which contains the buttons, and the tab bar for adding
|
||||||
* the qtarch-designed child widget dialogs.
|
* the qtarch-designed child widget dialogs.
|
||||||
|
@ -156,7 +156,7 @@ private:
|
|||||||
case 5: return VSpace::VFILL;
|
case 5: return VSpace::VFILL;
|
||||||
case 6: return VSpace::LENGTH;
|
case 6: return VSpace::LENGTH;
|
||||||
default:
|
default:
|
||||||
lyxerr[Debug::GUI] << "Unknown kind combo entry " << val << endl;
|
lyxerr[Debug::GUI] << "Unknown kind combo entry " << val << std::endl;
|
||||||
}
|
}
|
||||||
return VSpace::NONE;
|
return VSpace::NONE;
|
||||||
}
|
}
|
||||||
|
@ -352,7 +352,7 @@ bool InsetBibtex::delDatabase(string const & db)
|
|||||||
{
|
{
|
||||||
if (contains(getContents(), db)) {
|
if (contains(getContents(), db)) {
|
||||||
string bd = db;
|
string bd = db;
|
||||||
int n = tokenPos(getContents(), ',', bd);
|
int const n = tokenPos(getContents(), ',', bd);
|
||||||
if (n > 0) {
|
if (n > 0) {
|
||||||
// Weird code, would someone care to explain this?(Lgb)
|
// Weird code, would someone care to explain this?(Lgb)
|
||||||
string tmp(", ");
|
string tmp(", ");
|
||||||
@ -376,7 +376,7 @@ int bibitemMaxWidth(BufferView * bv, LyXFont const & font)
|
|||||||
|
|
||||||
while (par) {
|
while (par) {
|
||||||
if (par->bibkey) {
|
if (par->bibkey) {
|
||||||
int wx = par->bibkey->width(bv, font);
|
int const wx = par->bibkey->width(bv, font);
|
||||||
if (wx > w) w = wx;
|
if (wx > w) w = wx;
|
||||||
}
|
}
|
||||||
par = par->next;
|
par = par->next;
|
||||||
@ -397,7 +397,7 @@ string const bibitemWidest(Buffer const * buffer)
|
|||||||
|
|
||||||
while (par) {
|
while (par) {
|
||||||
if (par->bibkey) {
|
if (par->bibkey) {
|
||||||
int wx = par->bibkey->width(bv, font);
|
int const wx = par->bibkey->width(bv, font);
|
||||||
if (wx > w) {
|
if (wx > w) {
|
||||||
w = wx;
|
w = wx;
|
||||||
bkey = par->bibkey;
|
bkey = par->bibkey;
|
||||||
|
Loading…
Reference in New Issue
Block a user