mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-12 14:05:59 +00:00
Applied Angus patch to compile on DEC C++ and to avoid name clashes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1830 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
b63ac8a6c3
commit
c5a0750890
@ -20,21 +20,22 @@
|
||||
#include "FormCopyrightDialogImpl.h"
|
||||
#undef emit
|
||||
|
||||
#include "../xforms/FormCredits.h"
|
||||
#include "../xforms/FormError.h"
|
||||
#include "../xforms/FormGraphics.h"
|
||||
#include "../xforms/FormPreferences.h"
|
||||
#include "../xforms/FormTabular.h"
|
||||
|
||||
#include "FormCharacter.h"
|
||||
#include "FormCitation.h"
|
||||
#include "FormCredits.h"
|
||||
#include "FormCopyright.h"
|
||||
//#include "FormDocument.h"
|
||||
#include "FormError.h"
|
||||
#include "FormGraphics.h"
|
||||
//#include "FormIndex.h"
|
||||
#include "FormParagraph.h"
|
||||
#include "FormPreferences.h"
|
||||
#include "FormPrint.h"
|
||||
//#include "FormRef.h"
|
||||
#include "FormSearch.h"
|
||||
#include "FormSplash.h"
|
||||
#include "FormTabular.h"
|
||||
#include "FormTabularCreate.h"
|
||||
//#include "FormToc.h"
|
||||
//#include "FormUrl.h"
|
||||
|
@ -9,13 +9,13 @@
|
||||
#include <config.h>
|
||||
|
||||
#include "LString.h"
|
||||
|
||||
#include <qapplication.h>
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qfiledialog.h>
|
||||
|
||||
|
||||
#include "QtLyXView.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
#include "FileDialog_private.h"
|
||||
|
||||
LyXFileDialog::LyXFileDialog(LyXView * lv, kb_action a, string const & p, string const & m, string const & t)
|
||||
@ -28,8 +28,8 @@ LyXFileDialog::LyXFileDialog(LyXView * lv, kb_action a, string const & p, string
|
||||
|
||||
void LyXFileDialog::done(int what)
|
||||
{
|
||||
lyxerr[Debug::GUI] << "Done FileDialog, value " << what << endl;
|
||||
|
||||
lyxerr[Debug::GUI] << "Done FileDialog, value " << what << std::endl;
|
||||
|
||||
if (action_ == LFUN_SELECT_FILE_SYNC) {
|
||||
QDialog::done(what);
|
||||
return;
|
||||
|
@ -1,120 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
/* This file is part of
|
||||
* ======================================================
|
||||
*
|
||||
* LyX, The Document Processor
|
||||
*
|
||||
* Copyright 2000 The LyX Team.
|
||||
*
|
||||
* ======================================================
|
||||
*
|
||||
* \author Angus Leeming <a.leeming@ic.ac.uk>
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation
|
||||
#endif
|
||||
|
||||
#include <qdialog.h>
|
||||
#undef emit
|
||||
|
||||
#include "Dialogs.h"
|
||||
#include "FormBase.h"
|
||||
#include "qt2BC.h"
|
||||
#include "support/LAssert.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
FormBase::FormBase(ControlBase & c, string const & t)
|
||||
: ViewBC<qt2BC>(c), title_(t)
|
||||
{}
|
||||
|
||||
|
||||
|
||||
void FormBase::show()
|
||||
{
|
||||
fprintf( stderr, "FormBase::show() 1\n" );
|
||||
if (!form()) {
|
||||
fprintf( stderr, "FormBase::show() 2\n" );
|
||||
build();
|
||||
fprintf( stderr, "FormBase::show() 3\n" );
|
||||
}
|
||||
fprintf( stderr, "FormBase::show() 4\n" );
|
||||
|
||||
update(); // make sure its up-to-date
|
||||
fprintf( stderr, "FormBase::show() 5\n" );
|
||||
|
||||
if (form()->isVisible()) {
|
||||
fprintf( stderr, "FormBase::show() 6\n" );
|
||||
form()->raise();
|
||||
fprintf( stderr, "FormBase::show() 7\n" );
|
||||
} else {
|
||||
fprintf( stderr, "FormBase::show() 8\n" );
|
||||
form()->setCaption( title_.c_str() );
|
||||
fprintf( stderr, "FormBase::show() 9\n" );
|
||||
form()->show();
|
||||
fprintf( stderr, "FormBase::show() 10\n" );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void FormBase::hide()
|
||||
{
|
||||
if (form() && form()->isVisible() )
|
||||
form()->hide();
|
||||
}
|
||||
|
||||
|
||||
// PENDING(kalle) Handle this with QValidator?
|
||||
// void FormBase::InputCB(FL_OBJECT * ob, long data)
|
||||
// {
|
||||
// bc().input(input(ob, data));
|
||||
// }
|
||||
|
||||
|
||||
ButtonPolicy::SMInput FormBase::input(QWidget*, long)
|
||||
{
|
||||
return ButtonPolicy::SMI_VALID;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void FormBase::slotWMHide()
|
||||
{
|
||||
CancelButton();
|
||||
}
|
||||
|
||||
|
||||
|
||||
void FormBase::slotApply()
|
||||
{
|
||||
ApplyButton();
|
||||
}
|
||||
|
||||
|
||||
void FormBase::slotOK()
|
||||
{
|
||||
OKButton();
|
||||
}
|
||||
|
||||
|
||||
void FormBase::slotCancel()
|
||||
{
|
||||
CancelButton();
|
||||
}
|
||||
|
||||
|
||||
void FormBase::slotRestore()
|
||||
{
|
||||
RestoreButton();
|
||||
}
|
||||
|
||||
|
||||
// PENDING(kalle) How to handle this?
|
||||
// extern "C" void C_FormBaseInputCB(FL_OBJECT * ob, long d)
|
||||
// {
|
||||
// GetForm(ob)->InputCB(ob, d);
|
||||
// }
|
@ -19,6 +19,7 @@
|
||||
#include "language.h"
|
||||
#include "support/lstrings.h"
|
||||
|
||||
using SigC::slot;
|
||||
using Liason::setMinibuffer;
|
||||
|
||||
FormCharacter::FormCharacter(LyXView *v, Dialogs *d)
|
||||
@ -43,9 +44,9 @@ void FormCharacter::apply()
|
||||
{
|
||||
if (!lv_->view()->available() || !dialog_)
|
||||
return;
|
||||
|
||||
|
||||
LyXFont font = dialog_->getChar();
|
||||
|
||||
|
||||
if (dialog_->langItem()==1)
|
||||
font.setLanguage(lv_->buffer()->params.language);
|
||||
|
||||
@ -71,7 +72,7 @@ void FormCharacter::show()
|
||||
h_ = d_->hideBufferDependent.connect(slot(this, &FormCharacter::hide));
|
||||
u_ = d_->updateBufferDependent.connect(slot(this, &FormCharacter::update));
|
||||
}
|
||||
|
||||
|
||||
dialog_->raise();
|
||||
dialog_->setActiveWindow();
|
||||
update();
|
||||
@ -92,9 +93,9 @@ void FormCharacter::hide()
|
||||
|
||||
void FormCharacter::update(bool)
|
||||
{
|
||||
|
||||
|
||||
if (!lv_->view()->available())
|
||||
return;
|
||||
|
||||
|
||||
dialog_->setReadOnly(lv_->buffer()->isReadonly());
|
||||
}
|
||||
|
@ -35,9 +35,11 @@
|
||||
#include <qmultilineedit.h>
|
||||
#include <qpushbutton.h>
|
||||
|
||||
using SigC::slot;
|
||||
using std::vector;
|
||||
using std::pair;
|
||||
using std::find;
|
||||
using std::sort;
|
||||
|
||||
FormCitation::FormCitation(LyXView *v, Dialogs *d)
|
||||
: dialog_(0), lv_(v), d_(d), inset_(0), ih_(0)
|
||||
@ -58,11 +60,11 @@ FormCitation::~FormCitation()
|
||||
void FormCitation::showCitation(InsetCommand * inset)
|
||||
{
|
||||
if (inset == 0) return; // maybe we should Assert this?
|
||||
|
||||
|
||||
// If connected to another inset, disconnect from it.
|
||||
if (inset_)
|
||||
ih_.disconnect();
|
||||
|
||||
|
||||
inset_ = inset;
|
||||
params = inset->params();
|
||||
ih_ = inset->hideDialog.connect(slot(this, &FormCitation::hide));
|
||||
@ -72,11 +74,11 @@ void FormCitation::showCitation(InsetCommand * inset)
|
||||
|
||||
void FormCitation::createCitation(string const & arg)
|
||||
{
|
||||
if (inset_) {
|
||||
if (inset_) {
|
||||
ih_.disconnect();
|
||||
inset_ = 0;
|
||||
}
|
||||
|
||||
|
||||
params.setFromString(arg);
|
||||
show();
|
||||
}
|
||||
@ -96,7 +98,7 @@ void FormCitation::show()
|
||||
dialog_ = new FormCitationDialogImpl(this, 0, _("LyX: Citation Reference"), false);
|
||||
|
||||
dialog_->show();
|
||||
|
||||
|
||||
update();
|
||||
}
|
||||
|
||||
@ -117,7 +119,7 @@ void FormCitation::update()
|
||||
blist.clear();
|
||||
|
||||
updateBrowser(dialog_->bibliographyKeysLB, bibkeys);
|
||||
|
||||
|
||||
// Ditto for the keys cited in this inset
|
||||
citekeys.clear();
|
||||
string tmp, keys(params.getContents());
|
||||
@ -161,7 +163,7 @@ void FormCitation::setCiteButtons(State status) const
|
||||
bool const activate = (status == ON);
|
||||
bool const activate_up = (activate && sel != 1);
|
||||
bool const activate_down = (activate && sel != maxline);
|
||||
|
||||
|
||||
dialog_->stopPB->setEnabled(activate);
|
||||
dialog_->upPB->setEnabled(activate_up);
|
||||
dialog_->downPB->setEnabled(activate_down);
|
||||
@ -180,7 +182,7 @@ void FormCitation::apply()
|
||||
|
||||
params.setContents(contents);
|
||||
params.setOptions( dialog_->textAfterED->text().latin1() );
|
||||
|
||||
|
||||
if (inset_ != 0) {
|
||||
// Only update if contents have changed
|
||||
if (params != inset_->params()) {
|
||||
@ -190,7 +192,7 @@ void FormCitation::apply()
|
||||
} else {
|
||||
lv_->getLyXFunc()->Dispatch(LFUN_CITATION_INSERT,
|
||||
params.getAsString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -60,11 +60,11 @@ private:
|
||||
/// create a Citation inset
|
||||
void createCitation(string const &);
|
||||
/// edit a Citation inset
|
||||
void showCitation(InsetCommand * const);
|
||||
void showCitation(InsetCommand* );
|
||||
|
||||
/// update a listbox
|
||||
void updateBrowser( QListBox* listbox,
|
||||
vector<string> const & keys) const;
|
||||
std::vector<string> const & keys) const;
|
||||
|
||||
/// Real GUI implementation.
|
||||
FormCitationDialog * dialog_;
|
||||
|
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* $Id: FormCitationDialogImpl.C,v 1.1 2001/03/16 17:20:06 kalle Exp $
|
||||
* $Id: FormCitationDialogImpl.C,v 1.2 2001/03/26 19:34:45 kalle Exp $
|
||||
*/
|
||||
|
||||
#include "FormCitationDialogImpl.h"
|
||||
@ -14,7 +14,10 @@
|
||||
#include "LyXView.h"
|
||||
#include "buffer.h"
|
||||
|
||||
// PENDING(kalle) Wire text before and citaiton style
|
||||
using std::vector;
|
||||
using std::find;
|
||||
|
||||
// PENDING(kalle) Wire text before and citation style
|
||||
|
||||
/*
|
||||
* Constructs a FormCitationDialogImpl which is a child of 'parent', with the
|
||||
@ -43,8 +46,8 @@ FormCitationDialogImpl::~FormCitationDialogImpl()
|
||||
void FormCitationDialogImpl::slotBibSelected( int sel )
|
||||
{
|
||||
insetKeysLB->clearSelection();
|
||||
|
||||
if( sel < 0 || sel > form_->bibkeys.size()-1)
|
||||
|
||||
if( sel < 0 || sel > form_->bibkeys.size()-1)
|
||||
return;
|
||||
|
||||
// Put into browser_info the additional info associated with
|
||||
@ -70,13 +73,13 @@ void FormCitationDialogImpl::slotBibSelected( int sel )
|
||||
form_->setCiteButtons(FormCitation::OFF);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
void FormCitationDialogImpl::slotInsetSelected( int sel )
|
||||
{
|
||||
if (sel < 0 || sel > form_->citekeys.size() -1 )
|
||||
if (sel < 0 || sel > form_->citekeys.size() -1 )
|
||||
return;
|
||||
|
||||
if (!form_->lv_->buffer()->isReadonly()) {
|
||||
@ -87,11 +90,11 @@ void FormCitationDialogImpl::slotInsetSelected( int sel )
|
||||
// Highlight the selected browser_cite key in browser_bib
|
||||
vector<string>::iterator it =
|
||||
::find(form_->bibkeys.begin(), form_->bibkeys.end(), form_->citekeys[sel]);
|
||||
|
||||
|
||||
if (it != form_->bibkeys.end()) {
|
||||
int n = static_cast<int>(it - form_->bibkeys.begin());
|
||||
bibliographyKeysLB->setSelected( n, true );
|
||||
|
||||
|
||||
// Put into browser_info the additional info associated with
|
||||
// the selected browser_cite key
|
||||
infoML->clear();
|
||||
@ -104,19 +107,19 @@ void FormCitationDialogImpl::slotAddClicked()
|
||||
{
|
||||
qDebug( "FormCitationDialogImpl::slotAddClicked()" );
|
||||
int sel = bibliographyKeysLB->currentItem();
|
||||
if (sel < 0 || sel > form_->bibkeys.size() -1 )
|
||||
if (sel < 0 || sel > form_->bibkeys.size() -1 )
|
||||
return;
|
||||
|
||||
qDebug( "sel = %d" );
|
||||
qDebug( "bibkeys.size() = %d", form_->bibkeys.size() );
|
||||
|
||||
|
||||
// Add the selected browser_bib key to browser_cite
|
||||
insetKeysLB->insertItem( form_->bibkeys[sel].c_str());
|
||||
form_->citekeys.push_back(form_->bibkeys[sel]);
|
||||
|
||||
int n = static_cast<int>(form_->citekeys.size());
|
||||
insetKeysLB->setSelected( n, true );
|
||||
|
||||
|
||||
form_->setBibButtons(FormCitation::OFF);
|
||||
form_->setCiteButtons(FormCitation::ON);
|
||||
}
|
||||
@ -125,13 +128,13 @@ void FormCitationDialogImpl::slotAddClicked()
|
||||
void FormCitationDialogImpl::slotDelClicked()
|
||||
{
|
||||
int sel = insetKeysLB->currentItem();
|
||||
if (sel < 0 || sel > form_->citekeys.size()-1)
|
||||
if (sel < 0 || sel > form_->citekeys.size()-1)
|
||||
return;
|
||||
|
||||
|
||||
// Remove the selected key from browser_cite
|
||||
insetKeysLB->removeItem( sel );
|
||||
form_->citekeys.erase(form_->citekeys.begin() + sel);
|
||||
|
||||
|
||||
form_->setBibButtons(FormCitation::ON);
|
||||
form_->setCiteButtons(FormCitation::OFF);
|
||||
}
|
||||
@ -140,16 +143,16 @@ void FormCitationDialogImpl::slotDelClicked()
|
||||
void FormCitationDialogImpl::slotUpClicked()
|
||||
{
|
||||
int sel = insetKeysLB->currentItem();
|
||||
if (sel < 1 || sel > form_->citekeys.size()-1)
|
||||
if (sel < 1 || sel > form_->citekeys.size()-1)
|
||||
return;
|
||||
|
||||
|
||||
// Move the selected key up one line
|
||||
vector<string>::iterator it = form_->citekeys.begin() + sel;
|
||||
string tmp = *it;
|
||||
|
||||
|
||||
insetKeysLB->removeItem( sel );
|
||||
form_->citekeys.erase(it);
|
||||
|
||||
|
||||
insetKeysLB->insertItem( tmp.c_str(), sel-1 );
|
||||
insetKeysLB->setSelected( sel-1, true );
|
||||
form_->citekeys.insert(it-1, tmp);
|
||||
@ -160,13 +163,13 @@ void FormCitationDialogImpl::slotUpClicked()
|
||||
void FormCitationDialogImpl::slotDownClicked()
|
||||
{
|
||||
int sel = insetKeysLB->currentItem();
|
||||
if (sel < 0 || sel > form_->citekeys.size()-2)
|
||||
if (sel < 0 || sel > form_->citekeys.size()-2)
|
||||
return;
|
||||
|
||||
|
||||
// Move the selected key down one line
|
||||
vector<string>::iterator it = form_->citekeys.begin() + sel;
|
||||
string tmp = *it;
|
||||
|
||||
|
||||
insetKeysLB->removeItem( sel );
|
||||
form_->citekeys.erase(it);
|
||||
|
||||
@ -177,13 +180,13 @@ void FormCitationDialogImpl::slotDownClicked()
|
||||
}
|
||||
|
||||
|
||||
void FormCitationDialogImpl::apply_adaptor()
|
||||
void FormCitationDialogImpl::apply_adaptor()
|
||||
{
|
||||
form_->apply();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void FormCitationDialogImpl::close_adaptor()
|
||||
|
||||
void FormCitationDialogImpl::close_adaptor()
|
||||
{
|
||||
form_->close();
|
||||
hide();
|
||||
|
@ -26,7 +26,7 @@
|
||||
#include "ControlCopyright.h"
|
||||
#include "FormCopyright.h"
|
||||
|
||||
typedef FormCB<ControlCopyright, FormDB<FormCopyrightDialogImpl> > base_class;
|
||||
typedef Qt2CB<ControlCopyright, Qt2DB<FormCopyrightDialogImpl> > base_class;
|
||||
|
||||
FormCopyright::FormCopyright( ControlCopyright& c ) :
|
||||
base_class( c, _( "Copyright and Warranty" ) )
|
||||
|
@ -18,7 +18,7 @@
|
||||
#ifndef FORMCOPYRIGHT_H
|
||||
#define FORMCOPYRIGHT_H
|
||||
|
||||
#include "FormBase.h"
|
||||
#include "Qt2Base.h"
|
||||
#include "boost/utility.hpp"
|
||||
|
||||
class Dialogs;
|
||||
@ -30,7 +30,7 @@ class ControlCopyright;
|
||||
@author Kalle Dalheimer
|
||||
*/
|
||||
class FormCopyright
|
||||
: public FormCB<ControlCopyright, FormDB<FormCopyrightDialogImpl> >
|
||||
: public Qt2CB<ControlCopyright, Qt2DB<FormCopyrightDialogImpl> >
|
||||
{
|
||||
public:
|
||||
FormCopyright( ControlCopyright& );
|
||||
|
@ -19,6 +19,7 @@
|
||||
#include "lyxtext.h"
|
||||
#include "debug.h"
|
||||
|
||||
using SigC::slot;
|
||||
using Liason::setMinibuffer;
|
||||
using std::endl;
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
FormSplash::FormSplash(LyXView *, Dialogs * d)
|
||||
: dialog_(0), d_(d)
|
||||
{
|
||||
c_ = d->showSplash.connect(slot(this, &FormSplash::show));
|
||||
c_ = d->showSplash.connect(SigC::slot(this, &FormSplash::show));
|
||||
}
|
||||
|
||||
|
||||
@ -39,10 +39,10 @@ void FormSplash::show()
|
||||
{
|
||||
if (!lyxrc.show_banner)
|
||||
return;
|
||||
|
||||
|
||||
if (!dialog_)
|
||||
dialog_ = new FormSplashBase( 0, "LyX");
|
||||
|
||||
|
||||
// show banner
|
||||
dialog_->show();
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* \file FormTabularCreate.C
|
||||
* Copyright 2001 LyX Team
|
||||
* see the file COPYING
|
||||
*
|
||||
*
|
||||
* \author John Levon, moz@compsoc.man.ac.uk
|
||||
*/
|
||||
|
||||
@ -14,9 +14,11 @@
|
||||
#include "gettext.h"
|
||||
#include "QtLyXView.h"
|
||||
#include "BufferView.h"
|
||||
#include "insets/insettabular.h"
|
||||
#include "insets/insettabular.h"
|
||||
#include "support/lstrings.h"
|
||||
|
||||
using SigC::slot;
|
||||
|
||||
FormTabularCreate::FormTabularCreate(LyXView *v, Dialogs *d)
|
||||
: dialog_(0), lv_(v), d_(d), h_(0)
|
||||
{
|
||||
@ -35,7 +37,7 @@ void FormTabularCreate::apply(int rows, int cols)
|
||||
{
|
||||
if (!lv_->view()->available())
|
||||
return;
|
||||
|
||||
|
||||
string tmp = tostr(rows) + " " + tostr(cols);
|
||||
lv_->getLyXFunc()->Dispatch(LFUN_INSET_TABULAR, tmp);
|
||||
}
|
||||
@ -44,14 +46,14 @@ void FormTabularCreate::show()
|
||||
{
|
||||
if (!dialog_)
|
||||
dialog_ = new TabularCreateDlgImpl(this, 0, _("LyX: Insert Table"));
|
||||
|
||||
|
||||
if (!dialog_->isVisible()) {
|
||||
h_ = d_->hideBufferDependent.connect(slot(this, &FormTabularCreate::hide));
|
||||
}
|
||||
|
||||
|
||||
dialog_->raise();
|
||||
dialog_->setActiveWindow();
|
||||
|
||||
|
||||
update();
|
||||
dialog_->show();
|
||||
}
|
||||
|
@ -5,14 +5,13 @@ noinst_LTLIBRARIES = libqt2.la
|
||||
BOOST_INCLUDES = -I$(top_srcdir)/boost
|
||||
INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \
|
||||
${SIGC_CFLAGS} ${FRONTEND_INCLUDES} $(BOOST_INCLUDES) \
|
||||
-I${top_srcdir}/src/frontends/xforms \
|
||||
-I$(top_srcdir)/src/frontends/controllers
|
||||
CXXFLAGS += -DQT_CLEAN_NAMESPACE -fno-rtti -fno-exceptions
|
||||
DEFINES += -DQT_CLEAN_NAMESPACE
|
||||
|
||||
# moc generated files
|
||||
BUILTSOURCES = \
|
||||
moc_FileDialog_private.C \
|
||||
moc_FormBase.C \
|
||||
moc_Qt2Base.C \
|
||||
moc_FormCitationDialog.C \
|
||||
moc_FormCitationDialogImpl.C \
|
||||
moc_FormCopyrightDialog.C \
|
||||
@ -100,8 +99,8 @@ libqt2_la_SOURCES = \
|
||||
chardlgimpl.h \
|
||||
FileDialog.C \
|
||||
FileDialog_private.C \
|
||||
FormBase.C \
|
||||
FormBase.h \
|
||||
Qt2Base.C \
|
||||
Qt2Base.h \
|
||||
FormCitation.C \
|
||||
FormCitation.h \
|
||||
FormCitationDialog.C \
|
||||
@ -161,7 +160,7 @@ dist-hook:
|
||||
done ; \
|
||||
done
|
||||
|
||||
moc_FormBase.C: FormBase.h
|
||||
moc_Qt2Base.C: Qt2Base.h
|
||||
$(MOC) -o $@ $<
|
||||
|
||||
FormCitation.C: FormCitationDialog.h
|
||||
|
110
src/frontends/qt2/Qt2Base.C
Normal file
110
src/frontends/qt2/Qt2Base.C
Normal file
@ -0,0 +1,110 @@
|
||||
// -*- C++ -*-
|
||||
/* This file is part of
|
||||
* ======================================================
|
||||
*
|
||||
* LyX, The Document Processor
|
||||
*
|
||||
* Copyright 2000 The LyX Team.
|
||||
*
|
||||
* ======================================================
|
||||
*
|
||||
* \author Angus Leeming <a.leeming@ic.ac.uk>
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation
|
||||
#endif
|
||||
|
||||
#include <qdialog.h>
|
||||
#undef emit
|
||||
|
||||
#include "Dialogs.h"
|
||||
#include "Qt2Base.h"
|
||||
#include "qt2BC.h"
|
||||
#include "support/LAssert.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
Qt2Base::Qt2Base(ControlBase & c, string const & t)
|
||||
: ViewBC<qt2BC>(c), title_(t)
|
||||
{}
|
||||
|
||||
|
||||
|
||||
void Qt2Base::show()
|
||||
{
|
||||
if (!form()) {
|
||||
build();
|
||||
}
|
||||
|
||||
update(); // make sure its up-to-date
|
||||
|
||||
if (form()->isVisible()) {
|
||||
form()->raise();
|
||||
} else {
|
||||
form()->setCaption( title_.c_str() );
|
||||
form()->show();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Qt2Base::hide()
|
||||
{
|
||||
if (form() && form()->isVisible() )
|
||||
form()->hide();
|
||||
}
|
||||
|
||||
|
||||
// PENDING(kalle) Handle this with QValidator?
|
||||
// void Qt2Base::InputCB(FL_OBJECT * ob, long data)
|
||||
// {
|
||||
// bc().input(input(ob, data));
|
||||
// }
|
||||
|
||||
|
||||
ButtonPolicy::SMInput Qt2Base::input(QWidget*, long)
|
||||
{
|
||||
return ButtonPolicy::SMI_VALID;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void Qt2Base::slotWMHide()
|
||||
{
|
||||
CancelButton();
|
||||
}
|
||||
|
||||
|
||||
|
||||
void Qt2Base::slotApply()
|
||||
{
|
||||
ApplyButton();
|
||||
}
|
||||
|
||||
|
||||
void Qt2Base::slotOK()
|
||||
{
|
||||
OKButton();
|
||||
}
|
||||
|
||||
|
||||
void Qt2Base::slotCancel()
|
||||
{
|
||||
CancelButton();
|
||||
}
|
||||
|
||||
|
||||
void Qt2Base::slotRestore()
|
||||
{
|
||||
RestoreButton();
|
||||
}
|
||||
|
||||
|
||||
// PENDING(kalle) How to handle this?
|
||||
// extern "C" void C_Qt2BaseInputCB(FL_OBJECT * ob, long d)
|
||||
// {
|
||||
// GetForm(ob)->InputCB(ob, d);
|
||||
// }
|
@ -11,8 +11,8 @@
|
||||
* \author Angus Leeming <a.leeming@ic.ac.uk>
|
||||
*/
|
||||
|
||||
#ifndef FORMBASE_H
|
||||
#define FORMBASE_H
|
||||
#ifndef QT2BASE_H
|
||||
#define QT2BASE_H
|
||||
|
||||
#include <boost/smart_ptr.hpp>
|
||||
|
||||
@ -33,14 +33,14 @@ class qt2BC;
|
||||
|
||||
/** This class is an Qt2 GUI base class.
|
||||
*/
|
||||
class FormBase : public QObject, public ViewBC<qt2BC>
|
||||
class Qt2Base : public QObject, public ViewBC<qt2BC>
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
///
|
||||
FormBase(ControlBase &, string const &);
|
||||
Qt2Base(ControlBase &, string const &);
|
||||
///
|
||||
virtual ~FormBase() {}
|
||||
virtual ~Qt2Base() {}
|
||||
|
||||
protected:
|
||||
/// Build the dialog
|
||||
@ -80,11 +80,11 @@ private:
|
||||
|
||||
|
||||
template <class Dialog>
|
||||
class FormDB: public FormBase
|
||||
class Qt2DB: public Qt2Base
|
||||
{
|
||||
protected:
|
||||
///
|
||||
FormDB(ControlBase &, string const &);
|
||||
Qt2DB(ControlBase &, string const &);
|
||||
/// Pointer to the actual instantiation of the Qt dialog
|
||||
virtual QDialog* form() const;
|
||||
/// Real GUI implementation.
|
||||
@ -93,37 +93,37 @@ protected:
|
||||
|
||||
|
||||
template <class Dialog>
|
||||
FormDB<Dialog>::FormDB(ControlBase & c, string const & t)
|
||||
: FormBase(c, t)
|
||||
Qt2DB<Dialog>::Qt2DB(ControlBase & c, string const & t)
|
||||
: Qt2Base(c, t)
|
||||
{}
|
||||
|
||||
|
||||
template <class Dialog>
|
||||
QDialog* FormDB<Dialog>::form() const
|
||||
QDialog* Qt2DB<Dialog>::form() const
|
||||
{
|
||||
return dialog_.get();
|
||||
}
|
||||
|
||||
|
||||
template <class Controller, class Base>
|
||||
class FormCB: public Base
|
||||
class Qt2CB: public Base
|
||||
{
|
||||
protected:
|
||||
///
|
||||
FormCB(ControlBase &, string const &);
|
||||
Qt2CB(ControlBase &, string const &);
|
||||
/// The parent controller
|
||||
Controller & controller() const;
|
||||
};
|
||||
|
||||
|
||||
template <class Controller, class Base>
|
||||
FormCB<Controller, Base>::FormCB(ControlBase & c, string const & t)
|
||||
Qt2CB<Controller, Base>::Qt2CB(ControlBase & c, string const & t)
|
||||
: Base(c, t)
|
||||
{}
|
||||
|
||||
|
||||
template <class Controller, class Base>
|
||||
Controller & FormCB<Controller, Base>::controller() const
|
||||
Controller & Qt2CB<Controller, Base>::controller() const
|
||||
{
|
||||
return static_cast<Controller &>(controller_);
|
||||
//return dynamic_cast<Controller &>(controller_);
|
@ -32,11 +32,11 @@ class CharDlgImpl : public CharDlg
|
||||
LyXFont getChar();
|
||||
|
||||
int langItem() {
|
||||
lang->currentItem();
|
||||
return lang->currentItem();
|
||||
};
|
||||
|
||||
bool toggleAll() {
|
||||
toggleall->isChecked();
|
||||
return toggleall->isChecked();
|
||||
};
|
||||
|
||||
void setReadOnly(bool);
|
||||
|
@ -1,13 +1,14 @@
|
||||
/****************************************************************************
|
||||
** Form implementation generated from reading ui file 'searchdlg.ui'
|
||||
**
|
||||
** Created: Sun Mar 4 21:52:22 2001
|
||||
** Created: Mon Mar 26 21:50:02 2001
|
||||
** by: The User Interface Compiler (uic)
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost!
|
||||
****************************************************************************/
|
||||
#include "searchdlg.h"
|
||||
|
||||
#include <config.h>
|
||||
#include <qcheckbox.h>
|
||||
#include <qcombobox.h>
|
||||
#include <qlabel.h>
|
||||
@ -29,7 +30,7 @@ SearchDlg::SearchDlg( QWidget* parent, const char* name, bool modal, WFlags fl
|
||||
{
|
||||
if ( !name )
|
||||
setName( "SearchDlg" );
|
||||
resize( 379, 168 );
|
||||
resize( 388, 168 );
|
||||
setCaption( tr( "Form1" ) );
|
||||
setSizeGripEnabled( TRUE );
|
||||
SearchDlgLayout = new QGridLayout( this );
|
||||
@ -43,9 +44,9 @@ SearchDlg::SearchDlg( QWidget* parent, const char* name, bool modal, WFlags fl
|
||||
|
||||
find = new QComboBox( FALSE, this, "find" );
|
||||
find->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, find->sizePolicy().hasHeightForWidth() ) );
|
||||
find->setFocusPolicy( QComboBox::StrongFocus );
|
||||
find->setEditable( TRUE );
|
||||
find->setDuplicatesEnabled( TRUE );
|
||||
find->setFocusPolicy( QComboBox::StrongFocus );
|
||||
|
||||
SearchDlgLayout->addMultiCellWidget( find, 0, 0, 1, 2 );
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
/****************************************************************************
|
||||
** Form interface generated from reading ui file 'searchdlg.ui'
|
||||
**
|
||||
** Created: Sun Mar 4 21:52:20 2001
|
||||
** Created: Mon Mar 26 21:48:19 2001
|
||||
** by: The User Interface Compiler (uic)
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost!
|
||||
|
@ -1,5 +1,6 @@
|
||||
<!DOCTYPE UI><UI>
|
||||
<class>SearchDlg</class>
|
||||
<include location="global">config.h</include>
|
||||
<widget>
|
||||
<class>QDialog</class>
|
||||
<property stdset="1">
|
||||
@ -11,7 +12,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>379</width>
|
||||
<width>388</width>
|
||||
<height>168</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -62,6 +63,10 @@
|
||||
<vsizetype>0</vsizetype>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>focusPolicy</name>
|
||||
<enum>StrongFocus</enum>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>editable</name>
|
||||
<bool>true</bool>
|
||||
@ -70,10 +75,6 @@
|
||||
<name>duplicatesEnabled</name>
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>focusPolicy</name>
|
||||
<enum>StrongFocus</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="1" column="0" >
|
||||
<class>QLabel</class>
|
||||
|
@ -1,11 +1,13 @@
|
||||
/**
|
||||
/**
|
||||
* \file searchdlgimpl.h
|
||||
* Copyright 2001 The LyX Team.
|
||||
* See the file COPYING.
|
||||
*
|
||||
*
|
||||
* \author Edwin Leuven
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "searchdlgimpl.h"
|
||||
|
||||
#include <qpushbutton.h>
|
||||
|
Loading…
Reference in New Issue
Block a user