anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Compiles and links again

Browse Source 
- Renamed document dialog to new naming scheme, but do not compile and link
  it yet, pending conversion of document form to MVC by Angus


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1855 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kalle Dalheimer 2001-03-29 15:02:19 +00:00
parent 6cc6ff3866
commit 41719bdb8a
9 changed files with 1549 additions and 1542 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt2/Dialogs.C
View File

@ -43,6 +43,7 @@
#include "BufferView.h"
#include "controllers/ControlCopyright.h"
#include "GUI.h"
#include "qt2BC.h"
@ -75,7 +76,8 @@ Dialogs::Dialogs(LyXView * lv)
// REMOVED THIS UNTIL CHANGED TO NEW SCHEME -- Kalle, 2001-03-23
// add(new FormError(lv, this));
add(new FormGraphics(lv, this));
// REMOVED THIS UNTIL CHANGED TO NEW SCHEME -- Kalle, 2001-03-28
// add(new FormGraphics(lv, this));
// add(new FormIndex(lv, this));
add(new FormParagraph(lv, this));
add(new FormPreferences(lv, this));
@ -86,7 +88,7 @@ Dialogs::Dialogs(LyXView * lv)
add(new FormTabularCreate(lv, this));
// add(new FormToc(lv, this));
// add(new FormUrl(lv, this));
// reduce the number of connections needed in
// dialogs by a simple connection here.
hideAll.connect(hideBufferDependent.slot());

1260
src/frontends/qt2/FormDocument.C
View File

File diff suppressed because it is too large Load Diff

271
src/frontends/qt2/FormDocument.h
View File

@ -1,165 +1,176 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
*
*
* LyX, The Document Processor
*
*
* Copyright (C) 2000 The LyX Team.
*
* @author Jürgen Vigna, Kalle Dalheimer
* @author Kalle Dalheimer
*
*======================================================*/
#ifndef FORM_DOCUMENT_H
#define FORM_DOCUMENT_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "FormBase.h"
#include <vector>
#include <boost/smart_ptr.hpp>
#include "Qt2Base.h"
#include "qt2BC.h"
#undef emit
#ifdef __GNUG_
#pragma interface
#endif
class ControlDocument;
class FormDocumentDialogImpl;
class BufferParams;
class LyXView;
class Dialogs;
class Combox;
class BufferParams;
class QWidget;
class FormDocumentDialog;
#ifdef SIGC_CXX_NAMESPACES
using SigC::Connection;
#endif
class QComboBox;
#include <qpixmap.h>
/** This class provides an Qt2 implementation of the FormDocument Popup.
The table-layout-form here changes values for latex-tabulars
@author Kalle Dalheimer
*/
class FormDocument : public DialogBase {
class FormDocument
: public Qt2CB<ControlDocument, Qt2DB<FormDocumentDialogImpl> >
{
public:
/// #FormDocument x(Communicator ..., Popups ...);#
FormDocument(LyXView *, Dialogs *);
///
~FormDocument();
///
enum EnumPopupStatus {
///
POPUP_UNMODIFIED,
///
POPUP_MODIFIED,
///
POPUP_READONLY
};
/// #FormDocument x(Communicator ..., Popups ...);#
FormDocument(LyXView *, Dialogs *);
private:
/// Show the dialog.
void show();
/// Hide the dialog.
void hide();
///
enum State {
///
INPUT,
///
CHECKCHOICECLASS,
///
CHOICEBULLETSIZE,
///
INPUTBULLETLATEX,
///
BULLETDEPTH1,
///
BULLETDEPTH2,
///
BULLETDEPTH3,
///
BULLETDEPTH4,
///
BULLETPANEL1,
///
BULLETPANEL2,
///
BULLETPANEL3,
///
BULLETPANEL4,
///
BULLETPANEL5,
///
BULLETPANEL6,
///
BULLETBMTABLE
};
/// Pointer to the actual instantiation of the ButtonController.
virtual qt2BC & bc();
/// Build the dialog
virtual void build();
// /// Filter the inputs
// virtual bool input( FL_OBJECT *, long );
/// Update the popup.
virtual void update();
/// Apply from popup
virtual void apply();
/// Cancel from popup
virtual void cancel();
void checkMarginValues();
///
void checkReadOnly();
///
void UpdateLayoutDocument(BufferParams const & params);
// ///
// virtual QDialog* form() const;
public:
///
void checkChoiceClass(QComboBox* cb);
// ///
bool checkDocumentInput(QWidget* w);
// ///
void bulletDepth( int );
///
void choiceBulletSize();
// ///
void inputBulletLaTeX();
// ///
void setBulletPics();
// ///
void bulletBMTable( int );
///
bool CheckDocumentInput(QWidget* ob, long);
///
void ChoiceBulletSize(QWidget* ob, long);
///
void InputBulletLaTeX(QWidget* ob, long);
///
void BulletDepth(QWidget* ob, State);
///
void BulletPanel(QWidget* ob, State);
///
void BulletBMTable(QWidget* ob, long);
///
void checkMarginValues();
///
void checkReadOnly();
///
void CheckChoiceClass(QWidget* ob, long);
///
void UpdateLayoutDocument(BufferParams const & params);
/// Update the popup.
void update();
///
void paper_update(BufferParams const &);
///
void class_update(BufferParams const &);
///
void language_update(BufferParams const &);
///
void options_update(BufferParams const &);
///
void bullets_update(BufferParams const &);
/// Apply from popup
void apply();
///
void paper_apply();
///
bool class_apply();
///
bool language_apply();
///
bool options_apply();
///
void bullets_apply();
/// Cancel from popup
void cancel();
/// Build the popup
void build();
/// Explicitly free the popup.
void free();
///
void paper_update(BufferParams const &);
///
void class_update(BufferParams const &);
///
void language_update(BufferParams const &);
///
void options_update(BufferParams const &);
///
void bullets_update(BufferParams const &);
// /// Typedefinitions from the fdesign produced Header file
// FD_form_tabbed_document * build_tabbed_document();
// ///
// FD_form_doc_paper * build_doc_paper();
// ///
// FD_form_doc_class * build_doc_class();
// ///
// FD_form_doc_language * build_doc_language();
// ///
// FD_form_doc_options * build_doc_options();
// ///
// FD_form_doc_bullet * build_doc_bullet();
///
void paper_apply();
///
bool class_apply();
///
bool language_apply();
///
bool options_apply();
///
void bullets_apply();
// /// Real GUI implementation.
FormDocumentDialog* dialog_;
/// Fdesign generated methods
QDialog* build_tabbed_document();
///
QDialog* build_doc_paper();
///
QDialog* build_doc_class();
///
QDialog* build_doc_language();
///
QDialog* build_doc_options();
///
QDialog* build_doc_bullet();
/// Which LyXView do we belong to?
LyXView * lv_;
///
Dialogs * d_;
/// Update connection.
Connection u_;
/// Hide connection.
Connection h_;
/// has form contents changed? Used to control OK/Apply
EnumPopupStatus status;
///
int ActCell;
///
int Confirmed;
///
int currentBulletPanel;
///
int currentBulletDepth;
///
QPixmap* standardpix;
QPixmap* amssymbpix;
QPixmap* psnfss1pix;
QPixmap* psnfss2pix;
QPixmap* psnfss3pix;
QPixmap* psnfss4pix;
QPixmap bulletpics[36];
/// Real GUI implementation.
boost::scoped_ptr<FormDocumentDialogImpl> dialog_;
///
int ActCell;
///
int Confirmed;
///
int current_bullet_panel;
///
int current_bullet_depth;
// ///
// FL_OBJECT * fbullet;
// ///
// boost::scoped_ptr<Combox> combo_language;
// ///
// boost::scoped_ptr<Combox> combo_doc_class;
/// The ButtonController
ButtonController<NoRepeatedApplyReadOnlyPolicy, qt2BC> bc_;
};
inline
qt2BC & FormDocument::bc()
{
return bc_;
}
#endif

1522
src/frontends/qt2/FormDocumentDialogBase.ui → src/frontends/qt2/FormDocumentDialog.ui
View File

File diff suppressed because it is too large Load Diff

0
src/frontends/qt2/FormDocumentDialog.C → src/frontends/qt2/FormDocumentDialogImpl.C
View File

12
src/frontends/qt2/FormDocumentDialog.h → src/frontends/qt2/FormDocumentDialogImpl.h
View File

@ -1,16 +1,16 @@
#ifndef FORMDOCUMENTDIALOG_H
#define FORMDOCUMENTDIALOG_H
#include "FormDocumentDialogBase.h"
#ifndef FORMDOCUMENTDIALOGIMPL_H
#define FORMDOCUMENTDIALOGIMPL_H
#include "FormDocumentDialog.h"
class FormDocument;
class FormDocumentDialog : public FormDocumentDialogBase
class FormDocumentDialogImpl : public FormDocumentDialog
{
Q_OBJECT
public:
FormDocumentDialog( FormDocument* form, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~FormDocumentDialog();
FormDocumentDialogImpl( FormDocument* form, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~FormDocumentDialogImpl();
public slots:
void slotApply();

2
src/frontends/qt2/Makefile.am
View File

@ -39,7 +39,7 @@ libqt2_la_OBJADD = \
../xforms/FormBibitem.lo \
../xforms/FormBibtex.lo \
../xforms/FormBrowser.lo \
../xforms/FormDocument.lo \
../xforms/FormDocument.lo \
../xforms/FormError.lo \
../xforms/FormExternal.lo \
../xforms/FormGraphics.lo \

14
src/frontends/qt2/Qt2Base.h
View File

@ -14,13 +14,13 @@
#ifndef QT2BASE_H
#define QT2BASE_H
#include <boost/smart_ptr.hpp>
class QDialog;
#include <qfont.h>
#include <qobject.h>
#include <boost/smart_ptr.hpp>
#ifdef __GNUG__
#pragma interface
#endif
@ -53,19 +53,19 @@ protected:
protected slots:
// dialog closed from WM
void slotWMHide();
// Apply button clicked
void slotApply();
// OK button clicked
void slotOK();
// Cancel button clicked
void slotCancel();
// Restore button clicked
void slotRestore();
private:
/// Pointer to the actual instantiation of xform's form
virtual QDialog* form() const = 0;

4
src/frontends/qt2/dialogs-qt2.txt
View File

@ -2,9 +2,9 @@ Dialog Maintainer MVC conversion
----------------------------------------------
Character Edwin
Citation Kalle
Copyright Kalle In progress
Copyright Kalle Done
Credits
Document Kalle
Document Kalle In progress
Error
File Edwin
Graphics