From: John Levon Date: Mon, 2 Apr 2001 15:12:55 +0000 (+0000) Subject: Update to MVC. Ref,Toc and citation don't work at all currently. X-Git-Tag: 1.6.10~21355 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0a736a817a512458665f7cc7e21cff22e8ee4c1e;p=features.git Update to MVC. Ref,Toc and citation don't work at all currently. Some bugs still need squashing too, but at least it compiles. Also rename gui widgets consistently. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1873 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/kde/ChangeLog b/src/frontends/kde/ChangeLog index 0f76827b14..d1172f0590 100644 --- a/src/frontends/kde/ChangeLog +++ b/src/frontends/kde/ChangeLog @@ -1,3 +1,16 @@ +2001-04-02 John Levon + + * Dialogs.C: update for MVC + + * KFormBase.C: + * KFormBase.h: new template class which all Forms are derived from. + + * everything: update for MVC, KFormBase. Ref, Citation, and Toc not + functional at all currently though, and various fixes are needed, + but at least it compiles. + + * dlg/everything: make widget names consistent + 2001-03-29 Baruch Even * kdeBC.[Ch]: Changed to use the new GuiBC template. diff --git a/src/frontends/kde/Dialogs.C b/src/frontends/kde/Dialogs.C index 606720a218..1c1943491e 100644 --- a/src/frontends/kde/Dialogs.C +++ b/src/frontends/kde/Dialogs.C @@ -10,36 +10,99 @@ #include #include FORMS_H_LOCATION -#include "Dialogs.h" - #include "ControlBibitem.h" +#include "ControlBibtex.h" +#include "ControlCharacter.h" #include "ControlCitation.h" -#include "kdeBC.h" +#include "ControlCopyright.h" +#include "ControlCredits.h" +#include "ControlError.h" +#include "ControlExternal.h" +#include "ControlGraphics.h" +#include "ControlInclude.h" +#include "ControlIndex.h" +#include "ControlLog.h" +#include "ControlMinipage.h" +#include "ControlPreamble.h" +#include "ControlPrint.h" +#include "ControlRef.h" +#include "ControlSearch.h" +#include "ControlSplash.h" +#include "ControlTabularCreate.h" +#include "ControlUrl.h" +#include "ControlVCLog.h" + +#include "Dialogs.h" +#include "kdeBC.h" + +#include "GUI.h" + +// FIXME: how horrendous. It would help a little if we +// could rename ControlButton not to clash with stupid Qt ... Angus ? + #include "FormBibitem.h" #include "FormBibtex.h" +#include "FormCharacter.h" #include "FormCitation.h" -#include "citationdlg.h" #include "FormCopyright.h" #include "FormCredits.h" #include "FormDocument.h" #include "FormError.h" +#include "FormExternal.h" #include "FormGraphics.h" #include "FormInclude.h" #include "FormIndex.h" #include "FormLog.h" +#include "FormMinipage.h" +#include "FormMathsPanel.h" #include "FormParagraph.h" #include "FormPreamble.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 "FormToc.h" #include "FormUrl.h" #include "FormVCLog.h" +// we need all these in order to use scoped_ptr. how ugly ... +#include "combox.h" +#include "form_bibitem.h" +#include "form_bibtex.h" +#include "form_browser.h" +#include "form_character.h" +#include "form_credits.h" +#include "form_error.h" +#include "form_external.h" +#include "form_graphics.h" +#include "form_include.h" +#include "form_minipage.h" +#include "form_preamble.h" +#include "form_search.h" +#include "form_splash.h" +// Qt does it again. We can't include the dlg.h files *before* +// anything else because "ControlButton" is an enum value, +// and we can't include them *after* because it #errors on +// a #defined TrueColor ... *sigh* +#undef TrueColor +// FIXME: I don't even know where this one is coming from ! +#undef Unsorted +#include "citationdlg.h" +#include "copyrightdlg.h" +#include "indexdlg.h" +#include "logdlg.h" +#include "printdlg.h" +#include "refdlg.h" +#include "tabcreatedlg.h" +//#include "tocdlg.h" +#include "urldlg.h" +#include "vclogdlg.h" + + #ifdef __GNUG__ #pragma implementation #endif @@ -47,37 +110,40 @@ /* We don't implement this, but it's needed whilst we * still rely on xforms */ -Signal0 Dialogs::redrawGUI; +SigC::Signal0 Dialogs::redrawGUI; Dialogs::Dialogs(LyXView * lv) { - splash_.reset(new FormSplash(lv, this)); + splash_.reset(new GUISplash(*this)); add(new GUIBibitem(*lv, *this)); - add(new GUICitation(*lv, *this)); + add(new GUIBibtex(*lv, *this)); + add(new GUICharacter(*lv, *this)); + add(new GUICitation(*lv, *this)); + add(new GUICopyright(*lv, *this)); + add(new GUICredits(*lv, *this)); + add(new GUIError(*lv, *this)); + add(new GUIExternal(*lv, *this)); + add(new GUIGraphics(*lv, *this)); + add(new GUIInclude(*lv, *this)); + add(new GUIIndex(*lv, *this)); + add(new GUILog(*lv, *this)); + add(new GUIMinipage(*lv, *this)); + add(new GUIPreamble(*lv, *this)); + add(new GUIPrint(*lv, *this)); + add(new GUIRef(*lv, *this)); + add(new GUISearch(*lv, *this)); + add(new GUITabularCreate(*lv, *this)); + add(new GUIUrl(*lv, *this)); + add(new GUIVCLog(*lv, *this)); - add(new FormBibtex(lv, this)); - add(new FormCharacter(lv, this)); - add(new FormCopyright(lv, this)); - add(new FormCredits(lv, this)); add(new FormDocument(lv, this)); - add(new FormError(lv, this)); - add(new FormGraphics(lv, this)); - add(new FormInclude(lv, this)); - add(new FormIndex(lv, this)); - add(new FormLog(lv, this)); + add(new FormMathsPanel(lv, this)); add(new FormParagraph(lv, this)); - add(new FormPreamble(lv, this)); add(new FormPreferences(lv, this)); - add(new FormPrint(lv, this)); - add(new FormRef(lv, this)); - add(new FormSearch(lv, this)); add(new FormTabular(lv, this)); - add(new FormTabularCreate(lv, this)); - add(new FormToc(lv, this)); - add(new FormUrl(lv, this)); - add(new FormVCLog(lv, this)); - + //add(new FormToc(lv, this)); + // reduce the number of connections needed in // dialogs by a simple connection here. hideAll.connect(hideBufferDependent.slot()); diff --git a/src/frontends/kde/FileDialog.C b/src/frontends/kde/FileDialog.C index 83bf5cea4f..dd2b60de41 100644 --- a/src/frontends/kde/FileDialog.C +++ b/src/frontends/kde/FileDialog.C @@ -31,7 +31,8 @@ using std::endl; FileDialog::FileDialog(LyXView *lv, string const &t, kb_action s, Button b1, Button b2) : private_(0), lv_(lv), title_(t), success_(s) { - // FIXME + // FIXME - to get the icon menu working sensibly we need MVCise the operations + // so we can get told which icons to use ... } diff --git a/src/frontends/kde/FormCitation.C b/src/frontends/kde/FormCitation.C index 02d14f2b1b..60262fdf3d 100644 --- a/src/frontends/kde/FormCitation.C +++ b/src/frontends/kde/FormCitation.C @@ -4,49 +4,31 @@ * Read the file COPYING * * \author John Levon + * \author Angus Leeming */ #include - + #include -#include "ControlCitation.h" #include "FormCitation.h" +#include "ControlCitation.h" #include "citationdlg.h" #include "gettext.h" -#include "kdeBC.h" #include "support/lstrings.h" +#include "helper_funcs.h" using std::vector; using std::pair; using std::find; FormCitation::FormCitation(ControlCitation & c) - : ViewBC(c), + : KFormBase(c), keys(0), chosenkeys(0) -{} - - -ControlCitation & FormCitation::controller() const -{ - return static_cast(controller_); - //return dynamic_cast(controller_); -} - - -void FormCitation::show() { - if (!dialog_.get()) - build(); - - update(); - - dialog_->raise(); - dialog_->setActiveWindow(); - dialog_->show(); } - + void FormCitation::apply() { controller().params().setCmdName("cite"); @@ -61,8 +43,7 @@ void FormCitation::hide() selectedKey.erase(); selectedChosenKey.erase(); - if (dialog_.get() && dialog_->isVisible()) - dialog_->hide(); + KFormBase::hide(); } @@ -70,25 +51,30 @@ void FormCitation::build() { dialog_.reset(new CitationDialog(this, 0, "Citation", false)); + // FIXME: apply, restore buttons + // Manage the ok, apply, restore and cancel/close buttons bc().setOK(dialog_->buttonOk); //bc().setApply(dialog_->buttonApply); bc().setCancel(dialog_->buttonCancel); //bc().setUndoAll(dialog_->buttonRestore); - bc().refresh(); + bc().addReadOnly(dialog_->keys); + bc().addReadOnly(dialog_->chosen); + bc().addReadOnly(dialog_->after); bc().addReadOnly(dialog_->add); bc().addReadOnly(dialog_->remove); bc().addReadOnly(dialog_->up); bc().addReadOnly(dialog_->down); + // FIXME: when implemented, add these //bc().addReadOnly(dialog_->style); - //bc().addReadOnly(dialog_->labelbefore); - bc().addReadOnly(dialog_->labelafter); + //bc().addReadOnly(dialog_->before); } void FormCitation::update() { + /* FIXME keys = controller().getBibkeys(); updateAvailableList(); selectedKey.erase(); @@ -111,12 +97,12 @@ void FormCitation::update() dialog_->chosen->setFocusPolicy(QWidget::StrongFocus); dialog_->after->setFocusPolicy(QWidget::StrongFocus); } + */ } void FormCitation::updateButtons() { - // Can go once ButtonController is working? if (controller().isReadonly()) { dialog_->add->setEnabled(false); dialog_->remove->setEnabled(false); @@ -174,6 +160,7 @@ void FormCitation::selectChosen() } } + ButtonPolicy::SMInput FormCitation::add() { if (selectedKey.empty()) @@ -193,6 +180,7 @@ ButtonPolicy::SMInput FormCitation::add() return ButtonPolicy::SMI_VALID; } + ButtonPolicy::SMInput FormCitation::remove() { if (selectedChosenKey.empty()) @@ -211,6 +199,7 @@ ButtonPolicy::SMInput FormCitation::remove() return ButtonPolicy::SMI_VALID; } + ButtonPolicy::SMInput FormCitation::up() { if (selectedChosenKey.empty()) @@ -301,6 +290,7 @@ void FormCitation::highlight_chosen(char const * key) void FormCitation::highlight(char const * key, QListBox * lb, string & selected1, string & selected2) { + /* selected1.erase(); selected1 = key; @@ -321,4 +311,5 @@ void FormCitation::highlight(char const * key, QListBox * lb, dialog_->entry->setText(_("Key not found.")); updateButtons(); + */ } diff --git a/src/frontends/kde/FormCitation.h b/src/frontends/kde/FormCitation.h index 99aff1c506..1dacfbc3a7 100644 --- a/src/frontends/kde/FormCitation.h +++ b/src/frontends/kde/FormCitation.h @@ -4,42 +4,34 @@ * Read the file COPYING * * \author John Levon + * \author Angus Leeming */ #ifndef FORMCITATION_H #define FORMCITATION_H #include -#include -#ifdef __GNUG__ -#pragma interface -#endif +#include "KFormBase.h" -#include "ViewBase.h" -#include "ButtonPolicies.h" - -class kdeBC; class QListBox; class ControlCitation; class CitationDialog; -class FormCitation : public ViewBC { +class FormCitation : public KFormBase { public: FormCitation(ControlCitation &); - /// Functions accessible to the Controller. + // Functions accessible to the Controller - /// Set the Params variable for the Controller. + /// set the Params variable for the Controller virtual void apply(); - /// Set the Params variable for the Controller. + /// set the Params variable for the Controller virtual void build(); - /// Hide the dialog. - virtual void hide(); - /// Update dialog before/whilst showing it. + /// update dialog before/whilst showing it virtual void update(); - /// Create the dialog if necessary, update it and display it. - void show(); + /// hide the dialog + virtual void hide(); /// add a key ButtonPolicy::SMInput add(); @@ -56,9 +48,9 @@ public: /// a key has been double-clicked ButtonPolicy::SMInput select_key(char const * key); + friend class CitationDialog; + private: - /// The parent controller - ControlCitation & controller() const; /// update add,remove,up,down void updateButtons(); /// update the available keys list @@ -72,9 +64,6 @@ private: /// does the dirty work for updateAvailableList(), updateChosenList() void updateList(QListBox *, std::vector const &); - /// Real GUI implementation. - boost::scoped_ptr dialog_; - /// available citation keys std::vector keys; /// chosen citation keys diff --git a/src/frontends/kde/FormCopyright.C b/src/frontends/kde/FormCopyright.C index fafc9c54eb..bf7f045ab8 100644 --- a/src/frontends/kde/FormCopyright.C +++ b/src/frontends/kde/FormCopyright.C @@ -4,41 +4,32 @@ * Read the file COPYING * * \author Jürgen Vigna + * \author John Levon */ + #include -#include "Dialogs.h" #include "FormCopyright.h" +#include "ControlCopyright.h" #include "copyrightdlg.h" #include "gettext.h" +#include "dlg/helpers.h" -FormCopyright::FormCopyright(LyXView *v, Dialogs *d) - : dialog_(0), lv_(v), d_(d), h_(0) +FormCopyright::FormCopyright(ControlCopyright & c) + : KFormBase(c) { - d->showCopyright.connect(slot(this, &FormCopyright::show)); } -FormCopyright::~FormCopyright() +void FormCopyright::build() { - delete dialog_; -} + dialog_.reset(new CopyrightDialog(this, 0, _("LyX: Copyright and Warranty"))); + // FIXME: Qt is really badly dumb in resizing these strings if we + // use minimum size hint :/ + dialog_->label_copyright->setText(controller().getCopyright().c_str()); + dialog_->label_licence->setText(controller().getLicence().c_str()); + dialog_->label_disclaimer->setText(controller().getDisclaimer().c_str()); -void FormCopyright::show() -{ - if (!dialog_) - dialog_ = new CopyrightDialog(0, _("LyX: Copyright and Warranty")); - - if (!dialog_->isVisible()) - h_ = d_->hideAll.connect(slot(this, &FormCopyright::hide)); - - dialog_->show(); -} - - -void FormCopyright::hide() -{ - dialog_->hide(); - h_.disconnect(); + bc().setCancel(dialog_->button_cancel); } diff --git a/src/frontends/kde/FormCopyright.h b/src/frontends/kde/FormCopyright.h index da1a4dea46..8cea3600f8 100644 --- a/src/frontends/kde/FormCopyright.h +++ b/src/frontends/kde/FormCopyright.h @@ -4,39 +4,28 @@ * Read the file COPYING * * \author Jürgen Vigna + * \author John Levon */ #ifndef FORMCOPYRIGHT_H #define FORMCOPYRIGHT_H -#include "DialogBase.h" -#include "boost/utility.hpp" +#include "KFormBase.h" -class Dialogs; -class LyXView; +class ControlCopyright; class CopyrightDialog; -class FormCopyright : public DialogBase { +class FormCopyright : public KFormBase { public: - FormCopyright(LyXView *, Dialogs *); - - ~FormCopyright(); + /// + FormCopyright(ControlCopyright & c); private: - /// Create the dialog if necessary, update it and display it - void show(); - /// Hide the dialog - void hide(); - /// Not used but we've got to implement it - void update(bool) {} - - /// Real GUI implementation - CopyrightDialog * dialog_; - /// Which LyXFunc do we use ? - LyXView * lv_; - /// dialogs object - Dialogs * d_; - /// Hide connection. - Connection h_; + /// build the dialog + virtual void build(); + /// not used + virtual void apply() {} + /// not used + void update() {} }; #endif // FORMCOPYRIGHT_H diff --git a/src/frontends/kde/FormDocument.h b/src/frontends/kde/FormDocument.h index 921f27a9df..ad21a28cb8 100644 --- a/src/frontends/kde/FormDocument.h +++ b/src/frontends/kde/FormDocument.h @@ -53,7 +53,7 @@ private: Dialogs * d_; /// Hide connection. - Connection h_; + SigC::Connection h_; /// is the buffer readonly ? bool readonly; diff --git a/src/frontends/kde/FormIndex.C b/src/frontends/kde/FormIndex.C index c8ee2573dc..cd3ddb6d9e 100644 --- a/src/frontends/kde/FormIndex.C +++ b/src/frontends/kde/FormIndex.C @@ -8,113 +8,39 @@ #include -#include "Dialogs.h" +#include "QtLyXView.h" #include "FormIndex.h" +#include "indexdlg.h" +#include "ControlIndex.h" #include "gettext.h" -#include "buffer.h" -#include "LyXView.h" -#include "lyxfunc.h" -#include "indexdlg.h" -FormIndex::FormIndex(LyXView *v, Dialogs *d) - : dialog_(0), lv_(v), d_(d), inset_(0), h_(0), u_(0), ih_(0) +FormIndex::FormIndex(ControlIndex & c) + : KFormBase(c) { - d->showIndex.connect(slot(this, &FormIndex::showIndex)); - d->createIndex.connect(slot(this, &FormIndex::createIndex)); } -FormIndex::~FormIndex() +void FormIndex::build() { - delete dialog_; -} - - -void FormIndex::showIndex(InsetCommand * const inset) -{ - // FIXME: when could inset be 0 here ? - if (inset==0) - return; - - inset_ = inset; - readonly = lv_->buffer()->isReadonly(); - ih_ = inset_->hideDialog.connect(slot(this,&FormIndex::hide)); - params = inset->params(); - - show(); -} - - -void FormIndex::createIndex(string const & arg) -{ - // we could already be showing an index entry, clear it out - if (inset_) - close(); - - readonly = lv_->buffer()->isReadonly(); - params.setFromString(arg); - show(); -} - - -void FormIndex::update(bool switched) -{ - if (switched) { - hide(); - return; - } - - dialog_->setIndexText(params.getContents().c_str()); - dialog_->setReadOnly(readonly); -} + dialog_.reset(new IndexDialog(this, 0, _("LyX: Index"))); + // FIXME -void FormIndex::apply() -{ - if (readonly) - return; - - params.setContents(dialog_->getIndexText()); - - if (inset_ != 0) { - if (params != inset_->params()) { - inset_->setParams(params); - lv_->view()->updateInset(inset_, true); - } - } else - lv_->getLyXFunc()->Dispatch(LFUN_INDEX_INSERT, params.getAsString().c_str()); + //bc().setUndoAll(dialog_->buttonRestore); + bc().setOK(dialog_->button_ok); + //bc().setApply(dialog_->buttonApply); + bc().setCancel(dialog_->button_cancel); + bc().addReadOnly(dialog_->line_index); } - -void FormIndex::show() -{ - if (!dialog_) - dialog_ = new IndexDialog(this, 0, _("LyX: Index")); - - if (!dialog_->isVisible()) { - h_ = d_->hideBufferDependent.connect(slot(this, &FormIndex::hide)); - u_ = d_->updateBufferDependent.connect(slot(this, &FormIndex::update)); - } - dialog_->raise(); - dialog_->setActiveWindow(); - - update(); - dialog_->show(); -} - - -void FormIndex::close() +void FormIndex::update() { - h_.disconnect(); - u_.disconnect(); - ih_.disconnect(); - inset_ = 0; + dialog_->setIndexText(controller().params().getContents().c_str()); } -void FormIndex::hide() +void FormIndex::apply() { - dialog_->hide(); - close(); + controller().params().setContents(dialog_->getIndexText()); } diff --git a/src/frontends/kde/FormIndex.h b/src/frontends/kde/FormIndex.h index 65c15b966d..b990935147 100644 --- a/src/frontends/kde/FormIndex.h +++ b/src/frontends/kde/FormIndex.h @@ -9,60 +9,22 @@ #ifndef FORMINDEX_H #define FORMINDEX_H -#include "DialogBase.h" -#include "LString.h" -#include "boost/utility.hpp" -#include "insets/insetindex.h" +#include "KFormBase.h" -class Dialogs; -class LyXView; +class ControlIndex; class IndexDialog; -class FormIndex : public DialogBase { +class FormIndex : public KFormBase { public: - FormIndex(LyXView *, Dialogs *); + FormIndex(ControlIndex & c); - ~FormIndex(); - - /// Apply changes - void apply(); - /// close the connections - void close(); - private: - /// Create the dialog if necessary, update it and display it. - void show(); - /// Hide the dialog. - void hide(); - /// Update the dialog. - void update(bool = false); - - /// create an Index inset - void createIndex(string const &); - /// edit an Index inset - void showIndex(InsetCommand * const); - - /// Real GUI implementation. - IndexDialog * dialog_; - - /// the LyXView we belong to - LyXView * lv_; - - /// the Dialogs object we belong to - Dialogs * d_; - /// pointer to the inset if any - InsetCommand * inset_; - /// insets params - InsetCommandParams params; - /// is the inset we are reading from a readonly buffer ? - bool readonly; - - /// Hide connection. - Connection h_; - /// Update connection. - Connection u_; - /// Inset hide connection. - Connection ih_; + /// apply changes + virtual void apply(); + /// build the dialog + virtual void build(); + /// update the dialog + virtual void update(); }; #endif // FORMINDEX_H diff --git a/src/frontends/kde/FormLog.C b/src/frontends/kde/FormLog.C index 42850c9583..f32462d424 100644 --- a/src/frontends/kde/FormLog.C +++ b/src/frontends/kde/FormLog.C @@ -7,44 +7,25 @@ */ #include -#include +#include -#include "Dialogs.h" #include "FormLog.h" +#include "ControlLog.h" +#include "logdlg.h" #include "gettext.h" -#include "buffer.h" -#include "support/lstrings.h" -#include "LyXView.h" -#include "lyxfunc.h" -#include "logdlg.h" -#include "lyxrc.h" using std::ifstream; using std::getline; -FormLog::FormLog(LyXView *v, Dialogs *d) - : dialog_(0), lv_(v), d_(d), h_(0), u_(0) +FormLog::FormLog(ControlLog & c) + : KFormBase(c) { - d->showLogFile.connect(slot(this, &FormLog::show)); -} - - -FormLog::~FormLog() -{ - delete dialog_; } void FormLog::update() { - supdate(); -} - - -void FormLog::supdate(bool) -{ - std::pair const logfile - = lv_->view()->buffer()->getLogName(); + std::pair const logfile = controller().logfile(); if (logfile.first == Buffer::buildlog) dialog_->setCaption(_("Build log")); @@ -72,33 +53,9 @@ void FormLog::supdate(bool) } -void FormLog::show() +void FormLog::build() { - if (!dialog_) - dialog_ = new LogDialog(this, 0, _("LyX: LaTeX Log")); - - if (!dialog_->isVisible()) { - h_ = d_->hideBufferDependent.connect(slot(this, &FormLog::hide)); - u_ = d_->updateBufferDependent.connect(slot(this, &FormLog::supdate)); - } + dialog_.reset(new LogDialog(this, 0, _("LyX: LaTeX Log"))); - dialog_->raise(); - dialog_->setActiveWindow(); - - update(); - dialog_->show(); -} - - -void FormLog::close() -{ - h_.disconnect(); - u_.disconnect(); -} - - -void FormLog::hide() -{ - dialog_->hide(); - close(); + bc().setCancel(dialog_->button_cancel); } diff --git a/src/frontends/kde/FormLog.h b/src/frontends/kde/FormLog.h index eeb9005cc8..2fc79ac0b7 100644 --- a/src/frontends/kde/FormLog.h +++ b/src/frontends/kde/FormLog.h @@ -6,50 +6,26 @@ * \author John Levon */ - #ifndef FORMLOG_H #define FORMLOG_H -#include "DialogBase.h" -#include "LString.h" -#include "boost/utility.hpp" +#include "KFormBase.h" -class Dialogs; -class LyXView; +class ControlLog; class LogDialog; -class FormLog : public DialogBase { +class FormLog : public KFormBase { public: - FormLog(LyXView *, Dialogs *); + FormLog(ControlLog & c); - ~FormLog(); - - /// close the connections - virtual void close(); - /// Update the dialog + /// update the dialog virtual void update(); - /// Update the dialog from slot - virtual void supdate(bool = false); - -protected: - /// Create the dialog if necessary, update it and display it - virtual void show(); - /// Hide the dialog - virtual void hide(); - - /// Real GUI implementation. - LogDialog * dialog_; - - /// the LyXView we belong to - LyXView * lv_; - - /// the Dialogs object we belong to - Dialogs * d_; - - /// Hide connection. - Connection h_; - /// Update connection. - Connection u_; + + /// apply + virtual void apply() {}; + + /// build dialog + virtual void build(); }; #endif // FORMLOG_H diff --git a/src/frontends/kde/FormParagraph.C b/src/frontends/kde/FormParagraph.C index c74124b3ca..6da2829e8e 100644 --- a/src/frontends/kde/FormParagraph.C +++ b/src/frontends/kde/FormParagraph.C @@ -176,11 +176,13 @@ void FormParagraph::apply() lyxerr[Debug::GUI] << "Setting extrawidth \"" << width << "\"" << endl; lyxerr[Debug::GUI] << "Setting percent extrawidth \"" << widthp << "\"" << endl; + /* FIXME lv_->view()->text->SetParagraphExtraOpt(lv_->view(), dialog_->getExtraType(), width, widthp, dialog_->getExtraAlign(), dialog_->getHfillBetween(), dialog_->getStartNewMinipage()); + */ lv_->view()->update(lv_->view()->text, BufferView::SELECT | diff --git a/src/frontends/kde/FormParagraph.h b/src/frontends/kde/FormParagraph.h index c822b6b92b..7dfdeadaf3 100644 --- a/src/frontends/kde/FormParagraph.h +++ b/src/frontends/kde/FormParagraph.h @@ -46,7 +46,7 @@ private: Dialogs * d_; /// Hide connection. - Connection h_; + SigC::Connection h_; /// readonly file or not bool readonly; diff --git a/src/frontends/kde/FormPrint.C b/src/frontends/kde/FormPrint.C index e076d42862..81a6591896 100644 --- a/src/frontends/kde/FormPrint.C +++ b/src/frontends/kde/FormPrint.C @@ -9,43 +9,52 @@ #include #include "printdlg.h" -#include "Dialogs.h" -#include "FormPrint.h" -#include "gettext.h" -#include "buffer.h" -#include "lyxrc.h" #include "QtLyXView.h" -#include "PrinterParams.h" -#include "Liason.h" -#include "BufferView.h" +#include "PrinterParams.h" +#include "gettext.h" #include "support/lstrings.h" + +#include "FormPrint.h" +#include "ControlPrint.h" -#include - -using Liason::printBuffer; -using Liason::getPrinterParams; using std::max; -FormPrint::FormPrint(LyXView *v, Dialogs *d) - : dialog_(0), lv_(v), d_(d), h_(0), u_(0) +FormPrint::FormPrint(ControlPrint & c) + : KFormBase(c) { - d->showPrint.connect(SigC::slot(this, &FormPrint::show)); } -FormPrint::~FormPrint() +void FormPrint::build() { - delete dialog_; + dialog_.reset(new PrintDialog(this, 0, _("LyX: Print"))); + + bc().setOK(dialog_->button_ok); + bc().setCancel(dialog_->button_cancel); } - -// we can safely ignore the parameter because we can always update -void FormPrint::update(bool) + +void FormPrint::apply() { - if (!lv_->view()->available()) - return; + string from; + int to(0); - PrinterParams pp(getPrinterParams(lv_->buffer())); + if (strlen(dialog_->getFrom())) { + from = dialog_->getFrom(); + if (strlen(dialog_->getTo())) + to = strToInt(dialog_->getTo()); + } + + controller().params() = PrinterParams(dialog_->getTarget(), + dialog_->getPrinter(), dialog_->getFile(), + dialog_->getWhichPages(), from, to, dialog_->getReverse(), + dialog_->getSort(), max(strToInt(dialog_->getCount()), 1)); +} + + +void FormPrint::update() +{ + PrinterParams & pp(controller().params()); dialog_->setTarget(pp.target); dialog_->setPrinter(pp.printer_name.c_str()); @@ -66,66 +75,3 @@ void FormPrint::update(bool) dialog_->setTo(""); } } - - -void FormPrint::print() -{ - if (!lv_->view()->available()) - return; - - string from; - int to(0); - - if (strlen(dialog_->getFrom())) { - from = dialog_->getFrom(); - if (strlen(dialog_->getTo())) - to = strToInt(dialog_->getTo()); - } - - int retval = printBuffer(lv_->buffer(), PrinterParams(dialog_->getTarget(), - string(dialog_->getPrinter()), string(dialog_->getFile()), - dialog_->getWhichPages(), from, to, dialog_->getReverse(), - dialog_->getSort(), max(strToInt(dialog_->getCount()),1))); - - if (!retval) { - // FIXME: should have a utility class for this - string message(_("An error occured while printing.\n\n")); - message += _("Check the parameters are correct.\n"); - KMsgBox msg(0, _("LyX: Print Error"), message.c_str(), KMsgBox::EXCLAMATION, _("&OK")); - msg.raise(); - msg.setActiveWindow(); - msg.show(); - } -} - - -void FormPrint::show() -{ - if (!dialog_) - dialog_ = new PrintDialog(this, 0, _("LyX: Print")); - - if (!dialog_->isVisible()) { - h_ = d_->hideBufferDependent.connect(SigC::slot(this, &FormPrint::hide)); - u_ = d_->updateBufferDependent.connect(SigC::slot(this, &FormPrint::update)); - } - - dialog_->raise(); - dialog_->setActiveWindow(); - - update(); - dialog_->show(); -} - - -void FormPrint::close() -{ - h_.disconnect(); - u_.disconnect(); -} - - -void FormPrint::hide() -{ - dialog_->hide(); - close(); -} diff --git a/src/frontends/kde/FormPrint.h b/src/frontends/kde/FormPrint.h index 0ffb2cda12..9b70e9bad5 100644 --- a/src/frontends/kde/FormPrint.h +++ b/src/frontends/kde/FormPrint.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /** * \file FormPrint.h * Copyright 2001 the LyX Team @@ -10,49 +9,24 @@ #ifndef FORMPRINT_H #define FORMPRINT_H -#include "DialogBase.h" -#include "boost/utility.hpp" +#include "KFormBase.h" -class Dialogs; -class LyXView; +class ControlPrint; class PrintDialog; /// -class FormPrint : public DialogBase { +class FormPrint : public KFormBase { public: - /// - FormPrint(LyXView *, Dialogs *); /// - ~FormPrint(); + FormPrint(ControlPrint & c); - /// start print - void print(); - /// close - void close(); - private: - /// Create the dialog if necessary, update it and display it. - void show(); - /// Hide the dialog. - void hide(); - /// Update the dialog. - void update(bool = false); - - /// Real GUI implementation. - PrintDialog * dialog_; - - /// the LyXView we belong to - LyXView * lv_; - - /** Which Dialogs do we belong to? - Used so we can get at the signals we have to connect to. - */ - Dialogs * d_; - - /// Hide connection. - SigC::Connection h_; - /// Update connection. - SigC::Connection u_; + /// apply dialog + virtual void apply(); + /// build dialog + virtual void build(); + /// update dialog + virtual void update(); }; #endif // FORMPRINT_H diff --git a/src/frontends/kde/FormRef.C b/src/frontends/kde/FormRef.C index 8d35c75948..d704e347d4 100644 --- a/src/frontends/kde/FormRef.C +++ b/src/frontends/kde/FormRef.C @@ -8,58 +8,76 @@ #include -#include "Dialogs.h" +#include "support/lstrings.h" + #include "FormRef.h" +#include "ControlRef.h" #include "gettext.h" -#include "buffer.h" -#include "LyXView.h" -#include "lyxfunc.h" #include "refdlg.h" -#include "debug.h" #include "insets/insetref.h" #include using std::endl; -FormRef::FormRef(LyXView *v, Dialogs *d) - : dialog_(0), lv_(v), d_(d), inset_(0), h_(0), u_(0), ih_(0), - sort(0), gotowhere(GOTOREF), refs(0) +FormRef::FormRef(ControlRef & c) + : KFormBase(c), + sort_(0), gotowhere_(GOTOREF), refs_(0) { - d->showRef.connect(slot(this, &FormRef::showRef)); - d->createRef.connect(slot(this, &FormRef::createRef)); } -FormRef::~FormRef() +void FormRef::build() { - delete dialog_; -} + dialog_.reset(new RefDialog(this, 0, _("LyX: Cross Reference"), false)); + //bc().setUndoAll(dialog_->buttonRestore); + bc().setOK(dialog_->buttonOk); + //bc().setApply(dialog_->buttonApply); + bc().setCancel(dialog_->buttonCancel); + // FIXME +} -void FormRef::showRef(InsetCommand * const inset) + +void FormRef::update() { - // FIXME: when could inset be 0 here ? - if (inset==0) - return; - - inset_ = inset; - readonly = lv_->buffer()->isReadonly(); - ih_ = inset_->hideDialog.connect(slot(this,&FormRef::hide)); - params = inset->params(); - - show(); + dialog_->reference->setText(controller().params().getContents().c_str()); + dialog_->refname->setText(controller().params().getOptions().c_str()); + + dialog_->type->setCurrentItem(InsetRef::getType(controller().params().getCmdName())); + + // Name is irrelevant to LaTeX/Literate documents + dialog_->refname->setEnabled(controller().docType() != ControlRef::LATEX && + controller().docType() != ControlRef::LITERATE); + + // type is irrelevant to LinuxDoc/DocBook. + if (controller().docType() == ControlRef::LINUXDOC || + controller().docType() == ControlRef::DOCBOOK) { + dialog_->type->setCurrentItem(0); + dialog_->type->setEnabled(false); + } else + dialog_->type->setEnabled(true); + + dialog_->buttonGoto->setText(_("&Goto reference")); + QToolTip::remove(dialog_->buttonGoto); + QToolTip::add(dialog_->buttonGoto,_("Jump to selected reference")); + + gotowhere_ = GOTOREF; + + dialog_->sort->setChecked(sort_); + + do_ref_update(); + + //dialog_->buttonGoto->setEnabled(params.getContents()!=""); + //dialog_->buttonOk->setEnabled(params.getContents()!=""); } -void FormRef::createRef(string const & arg) +void FormRef::apply() { - if (inset_) - close(); - - readonly = lv_->buffer()->isReadonly(); - params.setFromString(arg); - show(); + controller().params().setCmdName(InsetRef::getName(dialog_->type->currentItem())); + controller().params().setContents(dialog_->reference->text()); + controller().params().setOptions(dialog_->refname->text()); } @@ -72,22 +90,18 @@ void FormRef::select(char const * text) void FormRef::highlight(char const * text) { - if (gotowhere==GOTOBACK) + // FIXME + if (gotowhere_==GOTOBACK) goto_ref(); dialog_->buttonGoto->setEnabled(true); - if (!readonly) { - dialog_->type->setEnabled(true); - dialog_->reference->setText(text); - dialog_->buttonOk->setEnabled(true); - } } void FormRef::set_sort(bool on) { - if (on != sort) { - sort=on; + if (on != sort_) { + sort_=on; dialog_->refs->clear(); updateRefs(); } @@ -96,7 +110,8 @@ void FormRef::set_sort(bool on) void FormRef::goto_ref() { - switch (gotowhere) { + /* FIXME + switch (gotowhere_) { case GOTOREF: lv_->getLyXFunc()->Dispatch(LFUN_REF_GOTO, dialog_->reference->text()); gotowhere=GOTOBACK; @@ -112,19 +127,20 @@ void FormRef::goto_ref() QToolTip::add(dialog_->buttonGoto,_("Jump to selected reference")); break; } + */ } void FormRef::updateRefs() { // list will be re-done, should go back if necessary - if (gotowhere == GOTOBACK) { + /* FIXME if (gotowhere == GOTOBACK) { lv_->getLyXFunc()->Dispatch(LFUN_BOOKMARK_GOTO, "0"); gotowhere = GOTOREF; dialog_->buttonGoto->setText(_("&Goto reference")); QToolTip::remove(dialog_->buttonGoto); QToolTip::add(dialog_->buttonGoto,_("Jump to selected reference")); - } + }*/ dialog_->refs->setAutoUpdate(false); @@ -132,9 +148,9 @@ void FormRef::updateRefs() // the first item inserted string tmp(dialog_->reference->text()); - for (vector< string >::const_iterator iter = refs.begin(); - iter != refs.end(); ++iter) { - if (sort) + for (vector::const_iterator iter = refs_.begin(); + iter != refs_.end(); ++iter) { + if (sort_) dialog_->refs->inSort(iter->c_str()); else dialog_->refs->insertItem(iter->c_str()); @@ -155,107 +171,10 @@ void FormRef::updateRefs() void FormRef::do_ref_update() { - refs.clear(); + refs_.clear(); dialog_->refs->clear(); - refs = lv_->buffer()->getLabelList(); - if (!refs.empty()) + refs_ = controller().getLabelList(); + if (!refs_.empty()) dialog_->sort->setEnabled(true); updateRefs(); } - - -void FormRef::update(bool switched) -{ - if (switched) { - hide(); - return; - } - - dialog_->reference->setText(params.getContents().c_str()); - dialog_->refname->setText(params.getOptions().c_str()); - - if (inset_) - dialog_->type->setCurrentItem(InsetRef::getType(params.getCmdName())); - - lv_->getLyXFunc()->Dispatch(LFUN_BOOKMARK_SAVE, "0"); - dialog_->buttonGoto->setText(_("&Goto reference")); - QToolTip::remove(dialog_->buttonGoto); - QToolTip::add(dialog_->buttonGoto,_("Jump to selected reference")); - - gotowhere = GOTOREF; - - dialog_->sort->setChecked(sort); - - do_ref_update(); - - dialog_->buttonGoto->setEnabled(params.getContents()!=""); - dialog_->buttonOk->setEnabled(params.getContents()!=""); - - dialog_->type->setEnabled(!readonly); - dialog_->sort->setEnabled(!readonly); - dialog_->refs->setEnabled(!readonly); - dialog_->buttonOk->setEnabled(!readonly); - dialog_->buttonUpdate->setEnabled(!readonly); - if (readonly) - dialog_->buttonCancel->setText(_("&Close")); - else - dialog_->buttonCancel->setText(_("&Cancel")); -} - - -void FormRef::apply() -{ - if (readonly) - return; - - if (!lv_->view()->available()) - return; - - params.setCmdName(InsetRef::getName(dialog_->type->currentItem())); - params.setContents(dialog_->reference->text()); - params.setOptions(dialog_->refname->text()); - - if (inset_ != 0) { - if (params != inset_->params()) { - inset_->setParams(params); - lv_->view()->updateInset(inset_, true); - } - } else { - lv_->getLyXFunc()->Dispatch(LFUN_REF_INSERT, params.getAsString().c_str()); - lv_->getLyXFunc()->Dispatch(LFUN_BOOKMARK_SAVE, "0"); - } -} - - -void FormRef::show() -{ - if (!dialog_) - dialog_ = new RefDialog(this, 0, _("LyX: Cross Reference"), false); - - if (!dialog_->isVisible()) { - h_ = d_->hideBufferDependent.connect(slot(this, &FormRef::hide)); - u_ = d_->updateBufferDependent.connect(slot(this, &FormRef::update)); - } - - dialog_->raise(); - dialog_->setActiveWindow(); - - update(); - dialog_->show(); -} - - -void FormRef::close() -{ - h_.disconnect(); - u_.disconnect(); - ih_.disconnect(); - inset_ = 0; -} - - -void FormRef::hide() -{ - dialog_->hide(); - close(); -} diff --git a/src/frontends/kde/FormRef.h b/src/frontends/kde/FormRef.h index 969cab5b27..590f7108ab 100644 --- a/src/frontends/kde/FormRef.h +++ b/src/frontends/kde/FormRef.h @@ -9,20 +9,14 @@ #ifndef FORMREF_H #define FORMREF_H -#include "DialogBase.h" -#include "LString.h" -#include "boost/utility.hpp" -#include "insets/insetcommand.h" +#include "KFormBase.h" -class Dialogs; -class LyXView; +class ControlRef; class RefDialog; -class FormRef : public DialogBase { +class FormRef : public KFormBase { public: - FormRef(LyXView *, Dialogs *); - - ~FormRef(); + FormRef(ControlRef & c); /// double-click a ref void select(char const *); @@ -32,64 +26,32 @@ public: void set_sort(bool); /// goto a ref (or back) void goto_ref(); - /// update dialog - void update(bool = false); /// update just the refs void do_ref_update(); - /// Apply changes - void apply(); - /// close the connections - void close(); private: enum GotoType { GOTOREF, GOTOBACK }; - - /// Create the dialog if necessary, update it and display it. - void show(); - /// Hide the dialog. - void hide(); - - /// create a Reference inset - void createRef(string const &); - /// edit a Reference inset - void showRef(InsetCommand * const); - + + /// apply changes + virtual void apply(); + /// build dialog + virtual void build(); + /// update dialog + virtual void update(); + /// update the keys list void updateRefs(void); - /// Real GUI implementation. - RefDialog * dialog_; - - /// the LyXView we belong to - LyXView * lv_; - - /// dialogs object - Dialogs * d_; - - /// pointer to the inset if any - InsetCommand * inset_; - /// insets params - InsetCommandParams params; - /// is the inset we are reading from a readonly buffer ? - bool readonly; - - /// Hide connection. - Connection h_; - /// Update connection. - Connection u_; - /// Inset hide connection. - Connection ih_; - /// to sort or not to sort - bool sort; + bool sort_; /// where to go - GotoType gotowhere; + GotoType gotowhere_; /// available references - std::vector< string > refs; + std::vector refs_; }; #endif // FORMREF_H diff --git a/src/frontends/kde/FormTabularCreate.C b/src/frontends/kde/FormTabularCreate.C index 89633f4139..8d8676f618 100644 --- a/src/frontends/kde/FormTabularCreate.C +++ b/src/frontends/kde/FormTabularCreate.C @@ -8,63 +8,31 @@ #include -#include "tabcreatedlg.h" -#include "Dialogs.h" -#include "FormTabularCreate.h" #include "gettext.h" -#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) -{ - d->showTabularCreate.connect(slot(this, &FormTabularCreate::show)); -} - - -FormTabularCreate::~FormTabularCreate() -{ - delete dialog_; -} - - -void FormTabularCreate::apply(unsigned int rows, unsigned cols) + +#include "FormTabularCreate.h" +#include "ControlTabularCreate.h" +#include "tabcreatedlg.h" + +FormTabularCreate::FormTabularCreate(ControlTabularCreate & c) + : KFormBase(c) { - if (!lv_->view()->available()) - return; - - string tmp = tostr(rows) + " " + tostr(cols); - lv_->getLyXFunc()->Dispatch(LFUN_INSET_TABULAR, tmp); } -void FormTabularCreate::show() +void FormTabularCreate::build() { - if (!dialog_) - dialog_ = new TabularCreateDialog(this, 0, _("LyX: Insert Table")); - - if (!dialog_->isVisible()) { - h_ = d_->hideBufferDependent.connect(slot(this, &FormTabularCreate::hide)); - } + dialog_.reset(new TabularCreateDialog(this, 0, _("LyX: Insert Table"))); - dialog_->raise(); - dialog_->setActiveWindow(); - - update(); - dialog_->show(); -} - - -void FormTabularCreate::close() -{ - h_.disconnect(); + bc().setOK(dialog_->button_ok); + bc().setCancel(dialog_->button_cancel); } -void FormTabularCreate::hide() +void FormTabularCreate::apply() { - dialog_->hide(); - close(); + // FIXME: angus, what's with this ? Why should the dialogs know about + // how LFUN represents the row, column ... this should be params(uint, uint) + controller().params() = tostr(dialog_->spin_rows->value()) + " " + tostr(dialog_->spin_cols->value()); } diff --git a/src/frontends/kde/FormTabularCreate.h b/src/frontends/kde/FormTabularCreate.h index 1339fcebde..82a3e4370a 100644 --- a/src/frontends/kde/FormTabularCreate.h +++ b/src/frontends/kde/FormTabularCreate.h @@ -9,40 +9,24 @@ #ifndef FORMTABULARCREATE_H #define FORMTABULARCREATE_H -#include "DialogBase.h" +#include "KFormBase.h" -class Dialogs; -class LyXView; +class ControlTabularCreate; class TabularCreateDialog; -class FormTabularCreate : public DialogBase { +/// +class FormTabularCreate : public KFormBase { public: - FormTabularCreate(LyXView *, Dialogs *); - - ~FormTabularCreate(); - - /// create the table - void apply(unsigned int rows, unsigned int cols); - /// close the connections - void close(); + /// + FormTabularCreate(ControlTabularCreate & c); private: - /// Create the dialog if necessary, update it and display it. - void show(); - /// Hide the dialog. - void hide(); - - /// Real GUI implementation. - TabularCreateDialog * dialog_; - - /// the LyXView we belong to - LyXView * lv_; - - /// Dialogs object - Dialogs * d_; - - /// Hide connection. - Connection h_; + /// apply dialog + virtual void apply(); + /// build dialog + virtual void build(); + /// not used + virtual void update() {}; }; #endif // FORMTABULARCREATE_H diff --git a/src/frontends/kde/FormToc.h b/src/frontends/kde/FormToc.h index 2cc6d6b7a5..d2c71837fb 100644 --- a/src/frontends/kde/FormToc.h +++ b/src/frontends/kde/FormToc.h @@ -67,11 +67,11 @@ private: InsetCommandParams params; /// Hide connection. - Connection h_; + SigC::Connection h_; /// Update connection. - Connection u_; + SigC::Connection u_; /// Inset hide connection. - Connection ih_; + SigC::Connection ih_; /// the toc list std::vector toclist; diff --git a/src/frontends/kde/FormUrl.C b/src/frontends/kde/FormUrl.C index 93eb9f8528..952db9f4f4 100644 --- a/src/frontends/kde/FormUrl.C +++ b/src/frontends/kde/FormUrl.C @@ -8,139 +8,47 @@ #include -#include "Dialogs.h" +#include "ControlUrl.h" #include "FormUrl.h" #include "gettext.h" -#include "buffer.h" -#include "LyXView.h" -#include "lyxfunc.h" #include "urldlg.h" -FormUrl::FormUrl(LyXView *v, Dialogs *d) - : dialog_(0), lv_(v), d_(d), inset_(0), h_(0), u_(0), ih_(0) +FormUrl::FormUrl(ControlUrl & c) + : KFormBase(c) { - d->showUrl.connect(slot(this, &FormUrl::showUrl)); - d->createUrl.connect(slot(this, &FormUrl::createUrl)); } -FormUrl::~FormUrl() +void FormUrl::update() { - delete dialog_; -} - - -void FormUrl::showUrl(InsetCommand * const inset) -{ - // FIXME: when could inset be 0 here ? - if (inset == 0) - return; + dialog_->url->setText(controller().params().getContents().c_str()); + dialog_->urlname->setText(controller().params().getOptions().c_str()); - inset_ = inset; - readonly = lv_->buffer()->isReadonly(); - ih_ = inset_->hideDialog.connect(slot(this,&FormUrl::hide)); - params = inset->params(); - - show(); -} - - -void FormUrl::createUrl(string const & arg) -{ - // we could already be showing a URL, clear it out - if (inset_) - close(); - - readonly = lv_->buffer()->isReadonly(); - params.setFromString(arg); - show(); -} - - -void FormUrl::update(bool switched) -{ - if (switched) { - hide(); - return; - } - - dialog_->url->setText(params.getContents().c_str()); - dialog_->urlname->setText(params.getOptions().c_str()); - - if (params.getCmdName() == "url") - dialog_->htmlurl->setChecked(0); - else - dialog_->htmlurl->setChecked(1); - - if (readonly) { - dialog_->urlname->setFocusPolicy(QWidget::NoFocus); - dialog_->url->setFocusPolicy(QWidget::NoFocus); - dialog_->buttonOk->setEnabled(false); - 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_->htmlurl->setEnabled(true); - } + dialog_->htmlurl->setChecked(controller().params().getCmdName() != "url"); } void FormUrl::apply() { - if (readonly) - return; - - params.setContents(dialog_->url->text()); - params.setOptions(dialog_->urlname->text()); + controller().params().setContents(dialog_->url->text()); + controller().params().setOptions(dialog_->urlname->text()); if (dialog_->htmlurl->isChecked()) - params.setCmdName("htmlurl"); + controller().params().setCmdName("htmlurl"); else - params.setCmdName("url"); - - if (inset_ != 0) { - if (params != inset_->params()) { - inset_->setParams(params); - lv_->view()->updateInset(inset_, true); - } - } else - lv_->getLyXFunc()->Dispatch(LFUN_INSERT_URL, params.getAsString().c_str()); + controller().params().setCmdName("url"); } -void FormUrl::show() +void FormUrl::build() { - if (!dialog_) - dialog_ = new UrlDialog(this, 0, _("LyX: Url"), false); + dialog_.reset(new UrlDialog(this, 0, _("LyX: Url"), false)); - if (!dialog_->isVisible()) { - h_ = d_->hideBufferDependent.connect(slot(this, &FormUrl::hide)); - u_ = d_->updateBufferDependent.connect(slot(this, &FormUrl::update)); - } + bc().setOK(dialog_->buttonOk); + bc().setCancel(dialog_->buttonCancel); - dialog_->raise(); - dialog_->setActiveWindow(); + bc().addReadOnly(dialog_->urlname); + bc().addReadOnly(dialog_->url); + bc().addReadOnly(dialog_->htmlurl); - update(); - dialog_->show(); -} - - -void FormUrl::close() -{ - h_.disconnect(); - u_.disconnect(); - ih_.disconnect(); - inset_ = 0; -} - - -void FormUrl::hide() -{ - dialog_->hide(); - close(); } diff --git a/src/frontends/kde/FormUrl.h b/src/frontends/kde/FormUrl.h index fa91ed977a..a298d06865 100644 --- a/src/frontends/kde/FormUrl.h +++ b/src/frontends/kde/FormUrl.h @@ -9,61 +9,22 @@ #ifndef FORMURL_H #define FORMURL_H -#include "DialogBase.h" -#include "LString.h" -#include "boost/utility.hpp" -#include "insets/inseturl.h" +#include "KFormBase.h" -class Dialogs; -class LyXView; +class ControlUrl; class UrlDialog; -class FormUrl : public DialogBase { +class FormUrl : public KFormBase { public: - FormUrl(LyXView *, Dialogs *); + FormUrl(ControlUrl & c); - ~FormUrl(); - - /// Apply changes - void apply(); - /// close the connections - void close(); - private: - /// Create the dialog if necessary, update it and display it. - void show(); - /// Hide the dialog. - void hide(); - /// Update the dialog. - void update(bool switched = false); - - /// create a URL inset - void createUrl(string const &); - /// edit a URL inset - void showUrl(InsetCommand * const); - - /// Real GUI implementation. - UrlDialog * dialog_; - - /// the LyXView we belong to - LyXView * lv_; - - /// Dialogs object - Dialogs * d_; - - /// pointer to the inset if any - InsetCommand * inset_; - /// insets params - InsetCommandParams params; - /// is the inset we are reading from a readonly buffer - bool readonly; - - /// Hide connection. - Connection h_; - /// Update connection. - Connection u_; - /// Inset hide connection. - Connection ih_; + /// apply dialog + virtual void apply(); + /// build dialog + virtual void build(); + /// update dialog + virtual void update(); }; #endif // FORMURL_H diff --git a/src/frontends/kde/FormVCLog.C b/src/frontends/kde/FormVCLog.C index 802e1a5791..4854f3b875 100644 --- a/src/frontends/kde/FormVCLog.C +++ b/src/frontends/kde/FormVCLog.C @@ -7,52 +7,35 @@ */ #include -#include +#include -#include "Dialogs.h" #include "FormVCLog.h" +#include "ControlVCLog.h" +#include "vclogdlg.h" #include "gettext.h" -#include "buffer.h" -#include "support/lstrings.h" -#include "LyXView.h" -#include "lyxfunc.h" -#include "logdlg.h" -#include "lyxvc.h" using std::ifstream; using std::getline; -FormVCLog::FormVCLog(LyXView *v, Dialogs *d) - : dialog_(0), lv_(v), d_(d), h_(0), u_(0) +FormVCLog::FormVCLog(ControlVCLog & c) + : KFormBase(c) { - d->showVCLogFile.connect(slot(this, &FormVCLog::show)); -} - - -FormVCLog::~FormVCLog() -{ - delete dialog_; } void FormVCLog::update() { - supdate(); -} - - -void FormVCLog::supdate(bool) -{ - const string logfile = lv_->view()->buffer()->lyxvc.getLogFile(); + const string logfile = controller().logfile(); - dialog_->setCaption(string(_("Version control log for ") + lv_->view()->buffer()->fileName()).c_str()); + // FIXME + //dialog_->setCaption(string(_("Version control log for ") + controller().filename()).c_str()); dialog_->setLogText(""); ifstream ifstr(logfile.c_str()); if (!ifstr) { dialog_->setLogText(_("No version control log file found")); - lyx::unlink(logfile); + // lyx::unlink(logfile); return; } @@ -64,37 +47,13 @@ void FormVCLog::supdate(bool) dialog_->setLogText(text); - lyx::unlink(logfile); + //lyx::unlink(logfile); } -void FormVCLog::show() +void FormVCLog::build() { - if (!dialog_) - dialog_ = new LogDialog(this, 0, _("LyX: Version Control Log")); - - if (!dialog_->isVisible()) { - h_ = d_->hideBufferDependent.connect(slot(this, &FormVCLog::hide)); - u_ = d_->updateBufferDependent.connect(slot(this, &FormVCLog::supdate)); - } + dialog_.reset(new VCLogDialog(this, 0, _("LyX: Version Control Log"))); - dialog_->raise(); - dialog_->setActiveWindow(); - - update(); - dialog_->show(); -} - - -void FormVCLog::close() -{ - h_.disconnect(); - u_.disconnect(); -} - - -void FormVCLog::hide() -{ - dialog_->hide(); - close(); + bc().setCancel(dialog_->button_cancel); } diff --git a/src/frontends/kde/FormVCLog.h b/src/frontends/kde/FormVCLog.h index 193a550e67..4d5060de9b 100644 --- a/src/frontends/kde/FormVCLog.h +++ b/src/frontends/kde/FormVCLog.h @@ -6,50 +6,26 @@ * \author John Levon */ - #ifndef FORMVCLOG_H #define FORMVCLOG_H -#include "DialogBase.h" -#include "LString.h" -#include "boost/utility.hpp" +#include "KFormBase.h" -class Dialogs; -class LyXView; -class LogDialog; +class ControlVCLog; +class VCLogDialog; -class FormVCLog : public DialogBase { +class FormVCLog : public KFormBase { public: - FormVCLog(LyXView *, Dialogs *); + FormVCLog(ControlVCLog & c); - ~FormVCLog(); - - /// close the connections - virtual void close(); - /// Update the dialog + /// update the dialog virtual void update(); - /// Update the dialog from slot - virtual void supdate(bool = false); - -protected: - /// Create the dialog if necessary, update it and display it - virtual void show(); - /// Hide the dialog - virtual void hide(); - - /// Real GUI implementation. - LogDialog * dialog_; - - /// the LyXView we belong to - LyXView * lv_; - - /// the Dialogs object we belong to - Dialogs * d_; - - /// Hide connection. - Connection h_; - /// Update connection. - Connection u_; + + /// apply + virtual void apply() {}; + + /// build dialog + virtual void build(); }; #endif // FORMVCLOG_H diff --git a/src/frontends/kde/KFormBase.C b/src/frontends/kde/KFormBase.C new file mode 100644 index 0000000000..81fe7de66b --- /dev/null +++ b/src/frontends/kde/KFormBase.C @@ -0,0 +1,47 @@ +/** + * \file KDEFormBase.C + * Copyright 2001 the LyX Team + * Read the file COPYING + * + * \author John Levon + */ + +#include + +#ifdef __GNUG__ +#pragma implementation +#endif + +#include "Dialogs.h" +#include "KFormBase.h" +#include "ControlButton.h" + +KFormDialogBase::KFormDialogBase(ControlButton & c) + : ViewBC(c) +{ +} + +// this HAS to go here because it has ControlButton as an enum value + +#include + +void KFormDialogBase::show() +{ + if (!dialog()) + build(); + + bc().refresh(); + + update(); + + dialog()->raise(); + dialog()->setActiveWindow(); + dialog()->show(); +} + + +void KFormDialogBase::hide() +{ + if (dialog()->isVisible()) + dialog()->hide(); +} diff --git a/src/frontends/kde/KFormBase.h b/src/frontends/kde/KFormBase.h new file mode 100644 index 0000000000..7a55b50826 --- /dev/null +++ b/src/frontends/kde/KFormBase.h @@ -0,0 +1,74 @@ +/** + * \file KDEFormBase.h + * Copyright 2001 the LyX Team + * Read the file COPYING + * + * \author John Levon + */ + +#ifndef KDEFORMBASE_H +#define KDEFORMBASE_H + +#ifdef __GNUG__ +#pragma interface +#endif + +#include "boost/smart_ptr.hpp" + +#include "ViewBase.h" +#include "ButtonPolicies.h" +#include "kdeBC.h" + +class QWidget; + +class KFormDialogBase : public ViewBC { +public: + /// + KFormDialogBase(ControlButton & c); + + // Functions accessible to the Controller + + /// build dialog + virtual void build() = 0; + /// create dialog if necessary, update and display + void show(); + /// hide dialog + virtual void hide(); + +private: + /// get dialog + virtual QWidget * dialog() const = 0; +}; + +template + class KFormBase : public KFormDialogBase { +public: + /// + KFormBase(ControlButton & c); + +protected: + /// parent controller + Controller & controller() const; + + /// get dialog + virtual QWidget * dialog() const { return dialog_.get(); }; + + /// dialog implemenation + boost::scoped_ptr dialog_; +}; + +template + KFormBase::KFormBase(ControlButton & c) + : KFormDialogBase(c) +{ +} + + +template + Controller & KFormBase::controller() const +{ + return static_cast(controller_); +} + + +#endif // KDEFORMBASE_H diff --git a/src/frontends/kde/Makefile.am b/src/frontends/kde/Makefile.am index 28f1bfc30d..3dc6fa83dc 100644 --- a/src/frontends/kde/Makefile.am +++ b/src/frontends/kde/Makefile.am @@ -18,29 +18,52 @@ libkde_la_OBJADD = \ dlg/libkdedlg.la \ dlg/moc/libkdedlgmoc.la \ ../xforms/FormBaseDeprecated.lo \ + ../xforms/FormBase.lo \ ../xforms/FormBibitem.lo \ ../xforms/form_bibitem.lo \ ../xforms/FormBibtex.lo \ ../xforms/form_bibtex.lo \ + ../xforms/FormCharacter.lo \ + ../xforms/form_character.lo \ ../xforms/FormCredits.lo \ ../xforms/form_credits.lo \ ../xforms/FormError.lo \ ../xforms/form_error.lo \ + ../xforms/FormExternal.lo \ + ../xforms/form_external.lo \ ../xforms/FormGraphics.lo \ ../xforms/form_graphics.lo \ ../xforms/FormInclude.lo \ ../xforms/form_include.lo \ ../xforms/FormInset.lo \ + ../xforms/FormMathsBitmap.lo \ + ../xforms/FormMathsDeco.lo \ + ../xforms/form_maths_deco.lo \ + ../xforms/FormMathsDelim.lo \ + ../xforms/form_maths_delim.lo \ + ../xforms/FormMathsMatrix.lo \ + ../xforms/form_maths_matrix.lo \ + ../xforms/FormMathsPanel.lo \ + ../xforms/form_maths_panel.lo \ + ../xforms/FormMathsSpace.lo \ + ../xforms/form_maths_space.lo \ + ../xforms/FormMinipage.lo \ + ../xforms/form_minipage.lo \ ../xforms/FormPreamble.lo \ ../xforms/form_preamble.lo \ ../xforms/FormPreferences.lo \ ../xforms/form_preferences.lo \ + ../xforms/FormSearch.lo \ + ../xforms/form_search.lo \ ../xforms/FormSplash.lo \ ../xforms/form_splash.lo \ ../xforms/FormTabular.lo \ ../xforms/form_tabular.lo \ + ../xforms/MathsSymbols.lo \ ../xforms/xformsBC.lo \ + ../xforms/bmtable.lo \ ../xforms/Color.lo \ + ../xforms/combox.lo \ ../xforms/xforms_helpers.lo \ ../xforms/input_validators.lo \ ../xforms/RadioButtonGroup.lo \ @@ -61,6 +84,8 @@ libkde_la_SOURCES = \ Timeout_pimpl.h \ kdeBC.C \ kdeBC.h \ + KFormBase.C \ + KFormBase.h \ FormCitation.C \ FormCitation.h \ FormCopyright.C \ @@ -79,8 +104,6 @@ libkde_la_SOURCES = \ FormRef.h \ FormTabularCreate.C \ FormTabularCreate.h \ - FormToc.C \ - FormToc.h \ FormUrl.C \ FormUrl.h \ FormVCLog.C \ @@ -107,11 +130,17 @@ libkde_la_SOURCES = \ refdlg.h \ tabcreatedlg.C \ tabcreatedlg.h \ - tocdlg.C \ - tocdlg.h \ urldlg.C \ - urldlg.h + urldlg.h \ + vclogdlg.C \ + vclogdlg.h +# FIXME +# FormToc.C \ +# FormToc.h \ +# tocdlg.C \ +# tocdlg.h \ + moc/FileDialog_private_moc.C: FileDialog_private.C FileDialog_private.h moc/citationdlg_moc.C: citationdlg.C citationdlg.h moc/copyrightdlg_moc.C: copyrightdlg.C copyrightdlg.h @@ -126,3 +155,4 @@ moc/refdlg_moc.C: refdlg.C refdlg.h moc/tabcreatedlg_moc.C: tabcreatedlg.C tabcreatedlg.h moc/tocdlg_moc.C: tocdlg.C tocdlg.h moc/urldlg_moc.C: urldlg.C urldlg.h +moc/vclogdlg_moc.C: vclogdlg.C vclogdlg.h diff --git a/src/frontends/kde/citationdlg.C b/src/frontends/kde/citationdlg.C index 4a8826aa7c..8fe9611560 100644 --- a/src/frontends/kde/citationdlg.C +++ b/src/frontends/kde/citationdlg.C @@ -8,8 +8,8 @@ #include -#include "dlg/helpers.h" #include "citationdlg.h" +#include "dlg/helpers.h" using kde_helpers::setSizeHint; diff --git a/src/frontends/kde/citationdlg.h b/src/frontends/kde/citationdlg.h index 8c4cf2a3a6..68b61715f0 100644 --- a/src/frontends/kde/citationdlg.h +++ b/src/frontends/kde/citationdlg.h @@ -14,7 +14,6 @@ // to connect apply() and hide() #include "FormCitation.h" -#include "kdeBC.h" #include #include diff --git a/src/frontends/kde/copyrightdlg.C b/src/frontends/kde/copyrightdlg.C index fa718b43de..d43562475b 100644 --- a/src/frontends/kde/copyrightdlg.C +++ b/src/frontends/kde/copyrightdlg.C @@ -7,10 +7,12 @@ */ #include + +#include "FormCopyright.h" #include "copyrightdlg.h" -CopyrightDialog::CopyrightDialog(QWidget * parent, char const * name) - : CopyrightDialogData(parent, name) +CopyrightDialog::CopyrightDialog(FormCopyright * f, QWidget * parent, char const * name) + : CopyrightDialogData(parent, name), form_(f) { setCaption(name); } @@ -23,5 +25,5 @@ CopyrightDialog::~CopyrightDialog() void CopyrightDialog::clickedOK() { - hide(); + form_->OKButton(); } diff --git a/src/frontends/kde/copyrightdlg.h b/src/frontends/kde/copyrightdlg.h index 3072c1233d..9e61e582c3 100644 --- a/src/frontends/kde/copyrightdlg.h +++ b/src/frontends/kde/copyrightdlg.h @@ -11,18 +11,24 @@ #include "dlg/copyrightdlgdata.h" +// FIXME: closeEvent +class FormCopyright; + class CopyrightDialog : public CopyrightDialogData { Q_OBJECT public: - CopyrightDialog (QWidget * parent = NULL, char const * name = NULL); + CopyrightDialog (FormCopyright * f, QWidget * parent = NULL, char const * name = NULL); virtual ~CopyrightDialog(); protected slots: virtual void clickedOK(); + +private: + FormCopyright * form_; }; #endif // COPYRIGHTDIALOG_H diff --git a/src/frontends/kde/dlg/README b/src/frontends/kde/dlg/README index f01cadea42..b3c2f6b7aa 100644 --- a/src/frontends/kde/dlg/README +++ b/src/frontends/kde/dlg/README @@ -34,8 +34,21 @@ className field, though, has a special meaning. If it is blank, then qtarch will assume there is no derived class defined at all. Currently this has the effect of making mapped variables public access. If there is a name, then it assumes that a derived class exists, and leaves mapped variables protected. It's done like -this to avoid the rat's nest of friend declarations and un-necessary derived classes. - +this to avoid the rat's nest of friend declarations and un-necessary derived classes, +and because the new MVC architecture needs direct access to buttons etc. + +There is a naming scheme for any variabled widgets, similar to the xforms frontend : + +buttons - button_ +spinboxen - spin_ +tabstack - tabstack +comboboxen - combo_ +checkboxen - check_ +lengthentry - length_ +radio buttons - radio_ +line edits - line_ +emptytable - table + Some tips and guidelines for qtarch and the KDE frontend : o the default button should be the one that causes least harm, unless diff --git a/src/frontends/kde/dlg/copyrightdlgdata.C b/src/frontends/kde/dlg/copyrightdlgdata.C index e396ff4597..1af0e7cffd 100644 --- a/src/frontends/kde/dlg/copyrightdlgdata.C +++ b/src/frontends/kde/dlg/copyrightdlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: copyrightdlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 22:09:01 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -18,7 +18,6 @@ #define Inherited QDialog -#include CopyrightDialogData::CopyrightDialogData ( @@ -28,104 +27,101 @@ CopyrightDialogData::CopyrightDialogData : Inherited( parent, name, TRUE, 53248 ) { - buttonOk = new QPushButton( this, "PushButton_OK" ); - buttonOk->setGeometry( 157, 343, 151, 107 ); - buttonOk->setMinimumSize( 0, 0 ); - buttonOk->setMaximumSize( 32767, 32767 ); - connect( buttonOk, SIGNAL(clicked()), SLOT(clickedOK()) ); - buttonOk->setFocusPolicy( QWidget::TabFocus ); - buttonOk->setBackgroundMode( QWidget::PaletteBackground ); - buttonOk->setFontPropagation( QWidget::NoChildren ); - buttonOk->setPalettePropagation( QWidget::NoChildren ); - buttonOk->setText( _("&OK") ); - buttonOk->setAutoRepeat( false ); - buttonOk->setAutoResize( false ); - buttonOk->setToggleButton( false ); - buttonOk->setDefault( true ); - buttonOk->setAutoDefault( true ); - buttonOk->setIsMenuButton( false ); + button_cancel = new QPushButton( this, "button_cancel" ); + button_cancel->setGeometry( 157, 343, 151, 107 ); + button_cancel->setMinimumSize( 0, 0 ); + button_cancel->setMaximumSize( 32767, 32767 ); + connect( button_cancel, SIGNAL(clicked()), SLOT(clickedOK()) ); + button_cancel->setFocusPolicy( QWidget::TabFocus ); + button_cancel->setBackgroundMode( QWidget::PaletteBackground ); + button_cancel->setFontPropagation( QWidget::NoChildren ); + button_cancel->setPalettePropagation( QWidget::NoChildren ); + button_cancel->setText( _("&Close") ); + button_cancel->setAutoRepeat( false ); + button_cancel->setAutoResize( false ); + button_cancel->setToggleButton( false ); + button_cancel->setDefault( true ); + button_cancel->setAutoDefault( true ); + button_cancel->setIsMenuButton( false ); - QLabel* qtarch_Label_2; - qtarch_Label_2 = new QLabel( this, "Label_2" ); - qtarch_Label_2->setGeometry( 5, 5, 455, 108 ); - qtarch_Label_2->setMinimumSize( 0, 0 ); - qtarch_Label_2->setMaximumSize( 32767, 32767 ); - qtarch_Label_2->setFocusPolicy( QWidget::NoFocus ); - qtarch_Label_2->setBackgroundMode( QWidget::PaletteBackground ); - qtarch_Label_2->setFontPropagation( QWidget::NoChildren ); - qtarch_Label_2->setPalettePropagation( QWidget::NoChildren ); - qtarch_Label_2->setFrameStyle( 50 ); - qtarch_Label_2->setLineWidth( 1 ); - qtarch_Label_2->setMidLineWidth( 0 ); - qtarch_Label_2->QFrame::setMargin( 1 ); - qtarch_Label_2->setText( _("LyX is Copyright (C) 1995 by Matthias Ettrich, \n1995-2001 LyX Team") ); - qtarch_Label_2->setAlignment( 1316 ); - qtarch_Label_2->setMargin( -1 ); + label_copyright = new QLabel( this, "label_copyright" ); + label_copyright->setGeometry( 5, 5, 455, 108 ); + label_copyright->setMinimumSize( 0, 0 ); + label_copyright->setMaximumSize( 32767, 32767 ); + label_copyright->setFocusPolicy( QWidget::NoFocus ); + label_copyright->setBackgroundMode( QWidget::PaletteBackground ); + label_copyright->setFontPropagation( QWidget::NoChildren ); + label_copyright->setPalettePropagation( QWidget::NoChildren ); + label_copyright->setFrameStyle( 50 ); + label_copyright->setLineWidth( 1 ); + label_copyright->setMidLineWidth( 0 ); + label_copyright->QFrame::setMargin( 1 ); + label_copyright->setText( "" ); + label_copyright->setAlignment( 1316 ); + label_copyright->setMargin( -1 ); - QLabel* qtarch_Label_3; - qtarch_Label_3 = new QLabel( this, "Label_3" ); - qtarch_Label_3->setGeometry( 5, 118, 455, 107 ); - qtarch_Label_3->setMinimumSize( 0, 0 ); - qtarch_Label_3->setMaximumSize( 32767, 32767 ); - qtarch_Label_3->setFocusPolicy( QWidget::NoFocus ); - qtarch_Label_3->setBackgroundMode( QWidget::PaletteBackground ); - qtarch_Label_3->setFontPropagation( QWidget::NoChildren ); - qtarch_Label_3->setPalettePropagation( QWidget::NoChildren ); - qtarch_Label_3->setFrameStyle( 50 ); - qtarch_Label_3->setLineWidth( 1 ); - qtarch_Label_3->setMidLineWidth( 0 ); - qtarch_Label_3->QFrame::setMargin( 1 ); - qtarch_Label_3->setText( _("This program is free software; you can redistribute it\nand/or modify it under the terms of the GNU General\nPublic License as published by the Free Software\nFoundation; either version 2 of the License, or\n(at your option) any later version.") ); - qtarch_Label_3->setAlignment( 1316 ); - qtarch_Label_3->setMargin( -1 ); + label_licence = new QLabel( this, "label_licence" ); + label_licence->setGeometry( 5, 118, 455, 107 ); + label_licence->setMinimumSize( 0, 0 ); + label_licence->setMaximumSize( 32767, 32767 ); + label_licence->setFocusPolicy( QWidget::NoFocus ); + label_licence->setBackgroundMode( QWidget::PaletteBackground ); + label_licence->setFontPropagation( QWidget::NoChildren ); + label_licence->setPalettePropagation( QWidget::NoChildren ); + label_licence->setFrameStyle( 50 ); + label_licence->setLineWidth( 1 ); + label_licence->setMidLineWidth( 0 ); + label_licence->QFrame::setMargin( 1 ); + label_licence->setText( "" ); + label_licence->setAlignment( 1316 ); + label_licence->setMargin( -1 ); - QLabel* qtarch_Label_4; - qtarch_Label_4 = new QLabel( this, "Label_4" ); - qtarch_Label_4->setGeometry( 5, 230, 455, 108 ); - qtarch_Label_4->setMinimumSize( 0, 0 ); - qtarch_Label_4->setMaximumSize( 32767, 32767 ); - qtarch_Label_4->setFocusPolicy( QWidget::NoFocus ); - qtarch_Label_4->setBackgroundMode( QWidget::PaletteBackground ); - qtarch_Label_4->setFontPropagation( QWidget::NoChildren ); - qtarch_Label_4->setPalettePropagation( QWidget::NoChildren ); - qtarch_Label_4->setFrameStyle( 50 ); - qtarch_Label_4->setLineWidth( 1 ); - qtarch_Label_4->setMidLineWidth( 0 ); - qtarch_Label_4->QFrame::setMargin( 1 ); - qtarch_Label_4->setText( _("LyX is distributed in the hope that it will\nbe useful, but WITHOUT ANY WARRANTY;\nwithout even the implied warranty of MERCHANTABILITY\nor FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of\nthe GNU General Public License\nalong with this program; if not, write to\nthe Free Software Foundation, Inc., \n675 Mass Ave, Cambridge, MA 02139, USA.") ); - qtarch_Label_4->setAlignment( 1316 ); - qtarch_Label_4->setMargin( -1 ); + label_disclaimer = new QLabel( this, "label_disclaimer" ); + label_disclaimer->setGeometry( 5, 230, 455, 108 ); + label_disclaimer->setMinimumSize( 0, 0 ); + label_disclaimer->setMaximumSize( 32767, 32767 ); + label_disclaimer->setFocusPolicy( QWidget::NoFocus ); + label_disclaimer->setBackgroundMode( QWidget::PaletteBackground ); + label_disclaimer->setFontPropagation( QWidget::NoChildren ); + label_disclaimer->setPalettePropagation( QWidget::NoChildren ); + label_disclaimer->setFrameStyle( 50 ); + label_disclaimer->setLineWidth( 1 ); + label_disclaimer->setMidLineWidth( 0 ); + label_disclaimer->QFrame::setMargin( 1 ); + label_disclaimer->setText( "" ); + label_disclaimer->setAlignment( 1316 ); + label_disclaimer->setMargin( -1 ); - if (buttonOk->sizeHint().width()!=-1) - buttonOk->setMinimumWidth(buttonOk->sizeHint().width()); - if (buttonOk->sizeHint().height()!=-1) - buttonOk->setMinimumHeight(buttonOk->sizeHint().height()); - if (buttonOk->sizeHint().width()!=-1) - buttonOk->setMaximumWidth(buttonOk->sizeHint().width()); - if (buttonOk->sizeHint().height()!=-1) - buttonOk->setMaximumHeight(buttonOk->sizeHint().height()); - if (qtarch_Label_2->sizeHint().width()!=-1) - qtarch_Label_2->setMinimumWidth(qtarch_Label_2->sizeHint().width()); - if (qtarch_Label_2->sizeHint().height()!=-1) - qtarch_Label_2->setMinimumHeight(qtarch_Label_2->sizeHint().height()); - if (qtarch_Label_3->sizeHint().width()!=-1) - qtarch_Label_3->setMinimumWidth(qtarch_Label_3->sizeHint().width()); - if (qtarch_Label_3->sizeHint().height()!=-1) - qtarch_Label_3->setMinimumHeight(qtarch_Label_3->sizeHint().height()); - if (qtarch_Label_4->sizeHint().width()!=-1) - qtarch_Label_4->setMinimumWidth(qtarch_Label_4->sizeHint().width()); - if (qtarch_Label_4->sizeHint().height()!=-1) - qtarch_Label_4->setMinimumHeight(qtarch_Label_4->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMinimumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMinimumHeight(button_cancel->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMaximumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMaximumHeight(button_cancel->sizeHint().height()); + if (label_copyright->sizeHint().width()!=-1) + label_copyright->setMinimumWidth(label_copyright->sizeHint().width()); + if (label_copyright->sizeHint().height()!=-1) + label_copyright->setMinimumHeight(label_copyright->sizeHint().height()); + if (label_licence->sizeHint().width()!=-1) + label_licence->setMinimumWidth(label_licence->sizeHint().width()); + if (label_licence->sizeHint().height()!=-1) + label_licence->setMinimumHeight(label_licence->sizeHint().height()); + if (label_disclaimer->sizeHint().width()!=-1) + label_disclaimer->setMinimumWidth(label_disclaimer->sizeHint().width()); + if (label_disclaimer->sizeHint().height()!=-1) + label_disclaimer->setMinimumHeight(label_disclaimer->sizeHint().height()); QBoxLayout* qtarch_layout_1 = new QBoxLayout( this, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1->addStrut( 0 ); - qtarch_layout_1->addWidget( qtarch_Label_2, 1, 36 ); - qtarch_layout_1->addWidget( qtarch_Label_3, 1, 36 ); - qtarch_layout_1->addWidget( qtarch_Label_4, 1, 36 ); + qtarch_layout_1->addWidget( label_copyright, 1, 36 ); + qtarch_layout_1->addWidget( label_licence, 1, 36 ); + qtarch_layout_1->addWidget( label_disclaimer, 1, 36 ); QBoxLayout* qtarch_layout_1_4 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_4, 1 ); qtarch_layout_1_4->addStrut( 0 ); qtarch_layout_1_4->addStretch( 1 ); - qtarch_layout_1_4->addWidget( buttonOk, 1, 36 ); + qtarch_layout_1_4->addWidget( button_cancel, 1, 36 ); qtarch_layout_1_4->addStretch( 1 ); resize( 465,455 ); setMinimumSize( 200, 65 ); diff --git a/src/frontends/kde/dlg/copyrightdlgdata.h b/src/frontends/kde/dlg/copyrightdlgdata.h index b40e459d61..ddaa4596cc 100644 --- a/src/frontends/kde/dlg/copyrightdlgdata.h +++ b/src/frontends/kde/dlg/copyrightdlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: copyrightdlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 22:09:01 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -14,6 +14,7 @@ #define CopyrightDialogData_included #include +#include #include class CopyrightDialogData : public QDialog @@ -37,8 +38,11 @@ protected slots: virtual void clickedOK(); -protected: - QPushButton* buttonOk; +public: + QPushButton* button_cancel; + QLabel* label_copyright; + QLabel* label_licence; + QLabel* label_disclaimer; }; diff --git a/src/frontends/kde/dlg/dialogs/copyright.dlg b/src/frontends/kde/dlg/dialogs/copyright.dlg index f3ccca2e5f..58dde5eb20 100644 --- a/src/frontends/kde/dlg/dialogs/copyright.dlg +++ b/src/frontends/kde/dlg/dialogs/copyright.dlg @@ -2,7 +2,7 @@ DlgEdit:v1.2:Dialog: Dialog { ClassHeader {} ClassSource {} - ClassName {CopyrightDialog} + ClassName {} DataHeader {copyrightdlgdata.h} DataSource {copyrightdlgdata.C} DataName {CopyrightDialogData} @@ -22,12 +22,12 @@ PushButton { Default {true} AutoDefault {true} IsMenuButton {false} - Text {&OK} + Text {&Close} AutoRepeat {false} AutoResize {false} Rect {157 343 151 107} - Name {PushButton_OK} - Variable {buttonOk} + Name {button_cancel} + Variable {button_cancel} Signal {[Protected] clicked --> clickedOK ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -47,7 +47,7 @@ PushButton { PalettePropagation {NoChildren} } Label { - Text {LyX is Copyright (C) 1995 by Matthias Ettrich, \n1995-2001 LyX Team} + Text {} Alignment {1316} AutoResize {false} Margin {-1} @@ -56,7 +56,8 @@ Label { MidLineWidth {0} FrameMargin {1} Rect {5 5 455 108} - Name {Label_2} + Name {label_copyright} + Variable {label_copyright} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -75,7 +76,7 @@ Label { PalettePropagation {NoChildren} } Label { - Text {This program is free software; you can redistribute it\nand/or modify it under the terms of the GNU General\nPublic License as published by the Free Software\nFoundation; either version 2 of the License, or\n(at your option) any later version.} + Text {} Alignment {1316} AutoResize {false} Margin {-1} @@ -84,7 +85,8 @@ Label { MidLineWidth {0} FrameMargin {1} Rect {5 118 455 107} - Name {Label_3} + Name {label_licence} + Variable {label_licence} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -103,7 +105,7 @@ Label { PalettePropagation {NoChildren} } Label { - Text {LyX is distributed in the hope that it will\nbe useful, but WITHOUT ANY WARRANTY;\nwithout even the implied warranty of MERCHANTABILITY\nor FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.\nYou should have received a copy of\nthe GNU General Public License\nalong with this program; if not, write to\nthe Free Software Foundation, Inc., \n675 Mass Ave, Cambridge, MA 02139, USA.} + Text {} Alignment {1316} AutoResize {false} Margin {-1} @@ -112,7 +114,8 @@ Label { MidLineWidth {0} FrameMargin {1} Rect {5 230 455 108} - Name {Label_4} + Name {label_disclaimer} + Variable {label_disclaimer} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -140,17 +143,17 @@ Box_Layout-1{ Stretch {1} } Layout_Widget-1.1{ - Widget {Label_2} + Widget {label_copyright} BoxStretch {1} Alignment {36} } Layout_Widget-1.2{ - Widget {Label_3} + Widget {label_licence} BoxStretch {1} Alignment {36} } Layout_Widget-1.3{ - Widget {Label_4} + Widget {label_disclaimer} BoxStretch {1} Alignment {36} } @@ -166,7 +169,7 @@ Box_Stretch-1.4.1{ Stretch {1} } Layout_Widget-1.4.2{ - Widget {PushButton_OK} + Widget {button_cancel} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/dialogs/doc.dlg b/src/frontends/kde/dlg/dialogs/doc.dlg index 846dd1a02f..863f320d64 100644 --- a/src/frontends/kde/dlg/dialogs/doc.dlg +++ b/src/frontends/kde/dlg/dialogs/doc.dlg @@ -2,7 +2,7 @@ DlgEdit:v1.2:Dialog: Dialog { ClassHeader {} ClassSource {} - ClassName {DocDialog} + ClassName {} DataHeader {docdlgdata.h} DataSource {docdlgdata.C} DataName {DocDialogData} @@ -26,8 +26,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {73 555 69 55} - Name {OK} - Variable {ok} + Name {button_ok} + Variable {button_ok} Signal {[Protected] clicked --> ok_adaptor ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -55,8 +55,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {215 555 68 55} - Name {apply} - Variable {apply} + Name {button_apply} + Variable {button_apply} Signal {[Protected] clicked --> apply_adaptor ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -84,8 +84,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {357 555 68 55} - Name {restore} - Variable {restore} + Name {button_restore} + Variable {button_restore} Signal {[Protected] clicked --> restore_adaptor ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -113,8 +113,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {498 555 69 55} - Name {Cancel} - Variable {cancel} + Name {button_cancel} + Variable {button_cancel} Signal {[Protected] clicked --> cancel_adaptor ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -137,7 +137,7 @@ User { UserClassHeader {tabstack.h} UserClassName {TabStack} Rect {5 5 630 545} - Name {User_1} + Name {tabstack} Variable {tabstack} MinimumSize {0 0} MaximumSize {32767 32767} @@ -174,7 +174,7 @@ Box_Layout-1.1{ Stretch {10} } Layout_Widget-1.1.1{ - Widget {User_1} + Widget {tabstack} BoxStretch {1} Alignment {36} } @@ -190,7 +190,7 @@ Box_Stretch-1.2.1{ Stretch {1} } Layout_Widget-1.2.2{ - Widget {OK} + Widget {button_ok} BoxStretch {1} Alignment {36} } @@ -198,7 +198,7 @@ Box_Stretch-1.2.3{ Stretch {1} } Layout_Widget-1.2.4{ - Widget {apply} + Widget {button_apply} BoxStretch {1} Alignment {36} } @@ -206,7 +206,7 @@ Box_Stretch-1.2.5{ Stretch {1} } Layout_Widget-1.2.6{ - Widget {restore} + Widget {button_restore} BoxStretch {1} Alignment {36} } @@ -214,7 +214,7 @@ Box_Stretch-1.2.7{ Stretch {1} } Layout_Widget-1.2.8{ - Widget {Cancel} + Widget {button_cancel} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/dialogs/docextra.dlg b/src/frontends/kde/dlg/dialogs/docextra.dlg index df16f26fb0..3321b15529 100644 --- a/src/frontends/kde/dlg/dialogs/docextra.dlg +++ b/src/frontends/kde/dlg/dialogs/docextra.dlg @@ -25,7 +25,7 @@ GroupBox { MidLineWidth {0} FrameMargin {0} Rect {5 5 625 378} - Name {placementBox} + Name {group_placement} MinimumSize {25 30} MaximumSize {32767 32767} BackgroundPixmap {} @@ -51,8 +51,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {320 10 150 65} - Name {first} - Variable {first} + Name {combo_first} + Variable {combo_first} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -78,8 +78,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {320 80 150 66} - Name {second} - Variable {second} + Name {combo_second} + Variable {combo_second} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -105,8 +105,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {320 151 150 65} - Name {third} - Variable {third} + Name {combo_third} + Variable {combo_third} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -132,8 +132,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {320 221 150 65} - Name {fourth} - Variable {fourth} + Name {combo_fourth} + Variable {combo_fourth} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -157,8 +157,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {10 291 615 87} - Name {ignore} - Variable {ignore} + Name {check_ignore} + Variable {check_ignore} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -273,8 +273,8 @@ SpinBox { MidLineWidth {0} FrameMargin {0} Rect {320 388 153 58} - Name {sectiondepth} - Variable {sectiondepth} + Name {spin_sectiondepth} + Variable {spin_sectiondepth} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -305,8 +305,8 @@ SpinBox { MidLineWidth {0} FrameMargin {0} Rect {320 451 153 58} - Name {tocdepth} - Variable {tocdepth} + Name {spin_tocdepth} + Variable {spin_tocdepth} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -332,8 +332,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {320 514 153 58} - Name {psdriver} - Variable {psdriver} + Name {combo_psdriver} + Variable {combo_psdriver} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -357,8 +357,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {5 577 153 58} - Name {amsmath} - Variable {amsmath} + Name {check_amsmath} + Variable {check_amsmath} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -498,7 +498,7 @@ Box_Layout-1{ Stretch {1} } Layout_Widget-1.1{ - Widget {placementBox} + Widget {group_placement} BoxStretch {3} Alignment {36} } @@ -532,7 +532,7 @@ Layout_Widget-1.1.1.1.1.1{ Grid_Spacer-1.1.1.1.1.2{ } Layout_Widget-1.1.1.1.1.3{ - Widget {first} + Widget {combo_first} BoxStretch {1} Alignment {36} } @@ -550,7 +550,7 @@ Layout_Widget-1.1.1.1.2.1{ Grid_Spacer-1.1.1.1.2.2{ } Layout_Widget-1.1.1.1.2.3{ - Widget {second} + Widget {combo_second} BoxStretch {1} Alignment {36} } @@ -568,7 +568,7 @@ Layout_Widget-1.1.1.1.3.1{ Grid_Spacer-1.1.1.1.3.2{ } Layout_Widget-1.1.1.1.3.3{ - Widget {third} + Widget {combo_third} BoxStretch {1} Alignment {36} } @@ -586,7 +586,7 @@ Layout_Widget-1.1.1.1.4.1{ Grid_Spacer-1.1.1.1.4.2{ } Layout_Widget-1.1.1.1.4.3{ - Widget {fourth} + Widget {combo_fourth} BoxStretch {1} Alignment {36} } @@ -601,7 +601,7 @@ Box_Layout-1.1.1.2{ Stretch {1} } Layout_Widget-1.1.1.2.1{ - Widget {ignore} + Widget {check_ignore} BoxStretch {1} Alignment {36} } @@ -627,7 +627,7 @@ Layout_Widget-1.2.1.1{ Grid_Spacer-1.2.1.2{ } Layout_Widget-1.2.1.3{ - Widget {sectiondepth} + Widget {spin_sectiondepth} BoxStretch {1} Alignment {36} } @@ -645,7 +645,7 @@ Layout_Widget-1.2.2.1{ Grid_Spacer-1.2.2.2{ } Layout_Widget-1.2.2.3{ - Widget {tocdepth} + Widget {spin_tocdepth} BoxStretch {1} Alignment {36} } @@ -663,7 +663,7 @@ Layout_Widget-1.2.3.1{ Grid_Spacer-1.2.3.2{ } Layout_Widget-1.2.3.3{ - Widget {psdriver} + Widget {combo_psdriver} BoxStretch {1} Alignment {36} } @@ -674,7 +674,7 @@ Grid_Row-1.2.4{ Spacing {0} } Layout_Widget-1.2.4.1{ - Widget {amsmath} + Widget {check_amsmath} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/dialogs/docgeometry.dlg b/src/frontends/kde/dlg/dialogs/docgeometry.dlg index 606c7fcc35..ba4d871374 100644 --- a/src/frontends/kde/dlg/dialogs/docgeometry.dlg +++ b/src/frontends/kde/dlg/dialogs/docgeometry.dlg @@ -158,8 +158,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {108 25 94 35} - Name {papersize} - Variable {papersize} + Name {combo_papersize} + Variable {combo_papersize} Signal {[Protected] highlighted --> papersizeChanged (const char*)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -182,8 +182,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {10 140 285 35} - Name {width} - Variable {width} + Name {length_width} + Variable {length_width} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -205,8 +205,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {10 255 285 35} - Name {height} - Variable {height} + Name {length_height} + Variable {length_height} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -228,8 +228,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {310 85 285 28} - Name {headheight} - Variable {headheight} + Name {length_headheight} + Variable {length_headheight} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -251,8 +251,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {310 178 285 27} - Name {headsep} - Variable {headsep} + Name {length_headsep} + Variable {length_headsep} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -274,8 +274,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {310 270 285 28} - Name {footskip} - Variable {footskip} + Name {length_footskip} + Variable {length_footskip} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -581,8 +581,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {241 355 112 54} - Name {margins} - Variable {margins} + Name {combo_margins} + Variable {combo_margins} Signal {[Protected] highlighted --> marginsChanged (const char*)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -605,8 +605,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {204 468 211 41} - Name {top} - Variable {top} + Name {length_top} + Variable {length_top} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -628,8 +628,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {204 514 211 40} - Name {bottom} - Variable {bottom} + Name {length_bottom} + Variable {length_bottom} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -651,8 +651,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {204 559 211 41} - Name {left} - Variable {left} + Name {length_left} + Variable {length_left} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -674,8 +674,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {204 605 211 40} - Name {right} - Variable {right} + Name {length_right} + Variable {length_right} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -699,8 +699,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {481 412 1 57} - Name {portrait} - Variable {portrait} + Name {radio_portrait} + Variable {radio_portrait} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -724,8 +724,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {481 531 1 57} - Name {landscape} - Variable {landscape} + Name {radio_landscape} + Variable {radio_landscape} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -793,7 +793,7 @@ Box_Stretch-1.1.1.1.2.2{ Stretch {1} } Layout_Widget-1.1.1.1.2.3{ - Widget {papersize} + Widget {combo_papersize} BoxStretch {1} Alignment {33} } @@ -820,7 +820,7 @@ Box_Stretch-1.1.1.1.4.2{ Stretch {1} } Layout_Widget-1.1.1.1.5{ - Widget {width} + Widget {length_width} BoxStretch {1} Alignment {33} } @@ -844,7 +844,7 @@ Box_Stretch-1.1.1.1.7.2{ Stretch {1} } Layout_Widget-1.1.1.1.8{ - Widget {height} + Widget {length_height} BoxStretch {1} Alignment {33} } @@ -887,7 +887,7 @@ Box_Stretch-1.1.2.1.3.2{ Stretch {1} } Layout_Widget-1.1.2.1.4{ - Widget {headheight} + Widget {length_headheight} BoxStretch {1} Alignment {33} } @@ -911,7 +911,7 @@ Box_Stretch-1.1.2.1.6.2{ Stretch {1} } Layout_Widget-1.1.2.1.7{ - Widget {headsep} + Widget {length_headsep} BoxStretch {1} Alignment {33} } @@ -935,7 +935,7 @@ Box_Stretch-1.1.2.1.9.2{ Stretch {1} } Layout_Widget-1.1.2.1.10{ - Widget {footskip} + Widget {length_footskip} BoxStretch {1} Alignment {33} } @@ -983,7 +983,7 @@ Box_Stretch-1.2.1.1.2.2{ Stretch {1} } Layout_Widget-1.2.1.1.2.3{ - Widget {margins} + Widget {combo_margins} BoxStretch {1} Alignment {33} } @@ -1018,7 +1018,7 @@ Layout_Widget-1.2.1.1.4.1.2{ Grid_Spacer-1.2.1.1.4.1.3{ } Layout_Widget-1.2.1.1.4.1.4{ - Widget {top} + Widget {length_top} BoxStretch {1} Alignment {33} } @@ -1038,7 +1038,7 @@ Layout_Widget-1.2.1.1.4.2.2{ Grid_Spacer-1.2.1.1.4.2.3{ } Layout_Widget-1.2.1.1.4.2.4{ - Widget {bottom} + Widget {length_bottom} BoxStretch {1} Alignment {33} } @@ -1058,7 +1058,7 @@ Layout_Widget-1.2.1.1.4.3.2{ Grid_Spacer-1.2.1.1.4.3.3{ } Layout_Widget-1.2.1.1.4.3.4{ - Widget {left} + Widget {length_left} BoxStretch {1} Alignment {33} } @@ -1078,7 +1078,7 @@ Layout_Widget-1.2.1.1.4.4.2{ Grid_Spacer-1.2.1.1.4.4.3{ } Layout_Widget-1.2.1.1.4.4.4{ - Widget {right} + Widget {length_right} BoxStretch {1} Alignment {33} } @@ -1112,7 +1112,7 @@ Box_Layout-1.2.2.1.3{ Stretch {1} } Layout_Widget-1.2.2.1.3.1{ - Widget {portrait} + Widget {radio_portrait} BoxStretch {0} Alignment {33} } @@ -1131,7 +1131,7 @@ Box_Layout-1.2.2.1.5{ Stretch {1} } Layout_Widget-1.2.2.1.5.1{ - Widget {landscape} + Widget {radio_landscape} BoxStretch {0} Alignment {33} } diff --git a/src/frontends/kde/dlg/dialogs/doclanguage.dlg b/src/frontends/kde/dlg/dialogs/doclanguage.dlg index 844b66fe5b..f240f97ba7 100644 --- a/src/frontends/kde/dlg/dialogs/doclanguage.dlg +++ b/src/frontends/kde/dlg/dialogs/doclanguage.dlg @@ -53,8 +53,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {275 5 130 147} - Name {language} - Variable {language} + Name {combo_language} + Variable {combo_language} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -108,8 +108,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {275 157 130 146} - Name {encoding} - Variable {encoding} + Name {combo_encoding} + Variable {combo_encoding} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -163,8 +163,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {275 308 130 147} - Name {quotes} - Variable {quotes} + Name {combo_quotes} + Variable {combo_quotes} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -205,7 +205,7 @@ Layout_Widget-1.1.1{ Grid_Spacer-1.1.2{ } Layout_Widget-1.1.3{ - Widget {language} + Widget {combo_language} BoxStretch {1} Alignment {33} } @@ -223,7 +223,7 @@ Layout_Widget-1.2.1{ Grid_Spacer-1.2.2{ } Layout_Widget-1.2.3{ - Widget {encoding} + Widget {combo_encoding} BoxStretch {1} Alignment {33} } @@ -241,7 +241,7 @@ Layout_Widget-1.3.1{ Grid_Spacer-1.3.2{ } Layout_Widget-1.3.3{ - Widget {quotes} + Widget {combo_quotes} BoxStretch {1} Alignment {33} } diff --git a/src/frontends/kde/dlg/dialogs/docsettings.dlg b/src/frontends/kde/dlg/dialogs/docsettings.dlg index 5cb72caa78..0437ba1d30 100644 --- a/src/frontends/kde/dlg/dialogs/docsettings.dlg +++ b/src/frontends/kde/dlg/dialogs/docsettings.dlg @@ -163,8 +163,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {332 5 104 25} - Name {docclass} - Variable {docclass} + Name {combo_docclass} + Variable {combo_docclass} Signal {[Protected] highlighted --> classChanged (const char*)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -191,8 +191,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {332 35 104 25} - Name {pagestyle} - Variable {pagestyle} + Name {combo_pagestyle} + Variable {combo_pagestyle} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -218,8 +218,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {332 65 104 25} - Name {font} - Variable {font} + Name {combo_font} + Variable {combo_font} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -245,8 +245,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {332 95 104 25} - Name {fontsize} - Variable {fontsize} + Name {combo_fontsize} + Variable {combo_fontsize} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -270,8 +270,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {112 125 107 50} - Name {sides} - Variable {sides} + Name {check_sides} + Variable {check_sides} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -295,8 +295,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {331 125 107 50} - Name {columns} - Variable {columns} + Name {check_columns} + Variable {check_columns} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -490,8 +490,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {284 247 128 30} - Name {paraspacing} - Variable {paraspacing} + Name {combo_paraspacing} + Variable {combo_paraspacing} Signal {[Protected] highlighted --> paraspacingChanged (const char*)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -514,8 +514,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {188 294 174 30} - Name {paraspacingValue} - Variable {paraspacingValue} + Name {length_paraspacing} + Variable {length_paraspacing} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -537,8 +537,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {188 329 174 31} - Name {paraspacingStretch} - Variable {paraspacingStretch} + Name {length_paraspacingstretch} + Variable {length_paraspacingstretch} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -560,8 +560,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {188 365 174 30} - Name {paraspacingShrink} - Variable {paraspacingShrink} + Name {length_paraspacingshrink} + Variable {length_paraspacingshrink} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -587,8 +587,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {187 405 176 50} - Name {linespacing} - Variable {linespacing} + Name {combo_linespacing} + Variable {combo_linespacing} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -613,8 +613,8 @@ KDE::KRestrictedLine { MaxLength {32767} FrameShown {true} Rect {368 405 177 50} - Name {linespacingVal} - Variable {linespacingVal} + Name {line_linespacing} + Variable {line_linespacing} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -638,8 +638,8 @@ LineEdit { MaxLength {32767} FrameShown {true} Rect {278 460 267 50} - Name {extraoptions} - Variable {extraoptions} + Name {line_extraoptions} + Variable {line_extraoptions} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -663,8 +663,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {10 200 398 30} - Name {addspace} - Variable {addspace} + Name {check_addspace} + Variable {check_addspace} Signal {[Protected] toggled --> addspaceChanged (bool)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -717,7 +717,7 @@ Layout_Widget-1.1.1.2{ Grid_Spacer-1.1.1.3{ } Layout_Widget-1.1.1.4{ - Widget {docclass} + Widget {combo_docclass} BoxStretch {1} Alignment {33} } @@ -737,7 +737,7 @@ Layout_Widget-1.1.2.2{ Grid_Spacer-1.1.2.3{ } Layout_Widget-1.1.2.4{ - Widget {pagestyle} + Widget {combo_pagestyle} BoxStretch {1} Alignment {33} } @@ -757,7 +757,7 @@ Layout_Widget-1.1.3.2{ Grid_Spacer-1.1.3.3{ } Layout_Widget-1.1.3.4{ - Widget {font} + Widget {combo_font} BoxStretch {1} Alignment {33} } @@ -777,7 +777,7 @@ Layout_Widget-1.1.4.2{ Grid_Spacer-1.1.4.3{ } Layout_Widget-1.1.4.4{ - Widget {fontsize} + Widget {combo_fontsize} BoxStretch {1} Alignment {33} } @@ -795,7 +795,7 @@ Box_Stretch-1.2.1{ Stretch {1} } Layout_Widget-1.2.2{ - Widget {sides} + Widget {check_sides} BoxStretch {1} Alignment {33} } @@ -803,7 +803,7 @@ Box_Stretch-1.2.3{ Stretch {1} } Layout_Widget-1.2.4{ - Widget {columns} + Widget {check_columns} BoxStretch {1} Alignment {33} } @@ -858,7 +858,7 @@ Box_Stretch-1.3.1.3.2{ Stretch {1} } Layout_Widget-1.3.1.3.3{ - Widget {paraspacing} + Widget {combo_paraspacing} BoxStretch {1} Alignment {36} } @@ -884,7 +884,7 @@ Layout_Widget-1.3.1.4.1.1{ Alignment {33} } Layout_Widget-1.3.1.4.1.2{ - Widget {paraspacingValue} + Widget {length_paraspacing} BoxStretch {1} Alignment {33} } @@ -900,7 +900,7 @@ Layout_Widget-1.3.1.4.2.1{ Alignment {33} } Layout_Widget-1.3.1.4.2.2{ - Widget {paraspacingStretch} + Widget {length_paraspacingstretch} BoxStretch {1} Alignment {33} } @@ -916,7 +916,7 @@ Layout_Widget-1.3.1.4.3.1{ Alignment {33} } Layout_Widget-1.3.1.4.3.2{ - Widget {paraspacingShrink} + Widget {length_paraspacingshrink} BoxStretch {1} Alignment {33} } @@ -936,12 +936,12 @@ Layout_Widget-1.4.1{ Alignment {36} } Layout_Widget-1.4.2{ - Widget {linespacing} + Widget {combo_linespacing} BoxStretch {1} Alignment {36} } Layout_Widget-1.4.3{ - Widget {linespacingVal} + Widget {line_linespacing} BoxStretch {1} Alignment {36} } @@ -959,7 +959,7 @@ Layout_Widget-1.5.1{ Alignment {36} } Layout_Widget-1.5.2{ - Widget {extraoptions} + Widget {line_extraoptions} BoxStretch {1} Alignment {33} } diff --git a/src/frontends/kde/dlg/dialogs/index.dlg b/src/frontends/kde/dlg/dialogs/index.dlg index 954fca8575..45e682607d 100644 --- a/src/frontends/kde/dlg/dialogs/index.dlg +++ b/src/frontends/kde/dlg/dialogs/index.dlg @@ -2,7 +2,7 @@ DlgEdit:v1.2:Dialog: Dialog { ClassHeader {} ClassSource {} - ClassName {IndexDialog} + ClassName {} DataHeader {indexdlgdata.h} DataSource {indexdlgdata.C} DataName {IndexDialogData} @@ -27,8 +27,8 @@ Label { MidLineWidth {0} FrameMargin {0} Rect {5 15 60 25} - Name {Label_1} - Variable {labelindex} + Name {label_index} + Variable {label_index} MinimumSize {60 25} MaximumSize {60 25} BackgroundPixmap {} @@ -52,8 +52,8 @@ LineEdit { MaxLength {32767} FrameShown {true} Rect {70 15 175 25} - Name {LineEdit_1} - Variable {index} + Name {line_index} + Variable {line_index} MinimumSize {125 25} MaximumSize {32767 25} BackgroundPixmap {} @@ -80,8 +80,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {24 65 80 25} - Name {PushButton_OK} - Variable {buttonOk} + Name {button_ok} + Variable {button_ok} Signal {[Protected] clicked --> clickedOK ()} MinimumSize {80 25} MaximumSize {80 25} @@ -109,8 +109,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {146 65 80 25} - Name {PushButton_Cancel} - Variable {buttonCancel} + Name {button_cancel} + Variable {button_cancel} Signal {[Protected] clicked --> clickedCancel ()} MinimumSize {80 25} MaximumSize {80 25} @@ -150,12 +150,12 @@ Box_Layout-1.1.1{ Stretch {1} } Layout_Widget-1.1.1.1{ - Widget {Label_1} + Widget {label_index} BoxStretch {0} Alignment {36} } Layout_Widget-1.1.1.2{ - Widget {LineEdit_1} + Widget {line_index} BoxStretch {1} Alignment {36} } @@ -175,7 +175,7 @@ Box_Stretch-1.2.1.1{ Stretch {1} } Layout_Widget-1.2.1.2{ - Widget {PushButton_OK} + Widget {button_ok} BoxStretch {1} Alignment {36} } @@ -183,7 +183,7 @@ Box_Stretch-1.2.1.3{ Stretch {2} } Layout_Widget-1.2.1.4{ - Widget {PushButton_Cancel} + Widget {button_cancel} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/dialogs/log.dlg b/src/frontends/kde/dlg/dialogs/log.dlg index 34c1cc8639..bac9e75040 100644 --- a/src/frontends/kde/dlg/dialogs/log.dlg +++ b/src/frontends/kde/dlg/dialogs/log.dlg @@ -1,8 +1,8 @@ DlgEdit:v1.2:Dialog: Dialog { - ClassHeader {logdlg.h} - ClassSource {logdlg.C} - ClassName {LogDialog} + ClassHeader {} + ClassSource {} + ClassName {} DataHeader {logdlgdata.h} DataSource {logdlgdata.C} DataName {LogDialogData} @@ -27,8 +27,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {241 269 77 26} - Name {close} - Variable {close} + Name {button_cancel} + Variable {button_cancel} Signal {[Protected] clicked --> closePressed ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -56,8 +56,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {82 269 77 26} - Name {updateb} - Variable {updateb} + Name {button_update} + Variable {button_update} Signal {[Protected] clicked --> updatePressed ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -86,8 +86,8 @@ MultiLineEdit { MidLineWidth {0} FrameMargin {0} Rect {5 5 390 259} - Name {viewer} - Variable {viewer} + Name {line_viewer} + Variable {line_viewer} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -123,7 +123,7 @@ Box_Layout-1.1{ Stretch {10} } Layout_Widget-1.1.1{ - Widget {viewer} + Widget {line_viewer} BoxStretch {1} Alignment {36} } @@ -139,7 +139,7 @@ Box_Stretch-1.2.1{ Stretch {1} } Layout_Widget-1.2.2{ - Widget {updateb} + Widget {button_update} BoxStretch {1} Alignment {36} } @@ -147,7 +147,7 @@ Box_Stretch-1.2.3{ Stretch {1} } Layout_Widget-1.2.4{ - Widget {close} + Widget {button_cancel} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/dialogs/para.dlg b/src/frontends/kde/dlg/dialogs/para.dlg index 83f873cd21..61d8e30f70 100644 --- a/src/frontends/kde/dlg/dialogs/para.dlg +++ b/src/frontends/kde/dlg/dialogs/para.dlg @@ -2,7 +2,7 @@ DlgEdit:v1.2:Dialog: Dialog { ClassHeader {} ClassSource {} - ClassName {ParaDialog} + ClassName {} DataHeader {paradlgdata.h} DataSource {paradlgdata.C} DataName {ParaDialogData} @@ -26,8 +26,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {73 555 69 55} - Name {OK} - Variable {ok} + Name {button_ok} + Variable {button_ok} Signal {[Protected] clicked --> ok_adaptor ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -55,8 +55,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {215 555 68 55} - Name {apply} - Variable {apply} + Name {button_apply} + Variable {button_apply} Signal {[Protected] clicked --> apply_adaptor ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -84,8 +84,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {357 555 68 55} - Name {restore} - Variable {restore} + Name {button_restore} + Variable {button_restore} Signal {[Protected] clicked --> restore_adaptor ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -113,8 +113,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {498 555 69 55} - Name {Cancel} - Variable {cancel} + Name {button_cancel} + Variable {button_cancel} Signal {[Protected] clicked --> cancel_adaptor ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -137,7 +137,7 @@ User { UserClassHeader {tabstack.h} UserClassName {TabStack} Rect {5 5 630 545} - Name {User_1} + Name {tabstack} Variable {tabstack} MinimumSize {0 0} MaximumSize {32767 32767} @@ -174,7 +174,7 @@ Box_Layout-1.1{ Stretch {10} } Layout_Widget-1.1.1{ - Widget {User_1} + Widget {tabstack} BoxStretch {1} Alignment {36} } @@ -190,7 +190,7 @@ Box_Stretch-1.2.1{ Stretch {1} } Layout_Widget-1.2.2{ - Widget {OK} + Widget {button_ok} BoxStretch {1} Alignment {36} } @@ -198,7 +198,7 @@ Box_Stretch-1.2.3{ Stretch {1} } Layout_Widget-1.2.4{ - Widget {apply} + Widget {button_apply} BoxStretch {1} Alignment {36} } @@ -206,7 +206,7 @@ Box_Stretch-1.2.5{ Stretch {1} } Layout_Widget-1.2.6{ - Widget {restore} + Widget {button_restore} BoxStretch {1} Alignment {36} } @@ -214,7 +214,7 @@ Box_Stretch-1.2.7{ Stretch {1} } Layout_Widget-1.2.8{ - Widget {Cancel} + Widget {button_cancel} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/dialogs/paraabove.dlg b/src/frontends/kde/dlg/dialogs/paraabove.dlg index a8e8fb18f4..3ea5318a86 100644 --- a/src/frontends/kde/dlg/dialogs/paraabove.dlg +++ b/src/frontends/kde/dlg/dialogs/paraabove.dlg @@ -23,8 +23,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {5 5 228 67} - Name {pagebreakabove} - Variable {pagebreakabove} + Name {check_pagebreakabove} + Variable {check_pagebreakabove} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -48,8 +48,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {5 77 228 66} - Name {keepabove} - Variable {keepabove} + Name {check_keepabove} + Variable {check_keepabove} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -103,8 +103,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {235 148 113 67} - Name {spaceabove} - Variable {spaceabove} + Name {combo_spaceabove} + Variable {combo_spaceabove} Signal {[Protected] highlighted --> spaceaboveHighlighted (int)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -211,8 +211,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {217 220 187 67} - Name {spaceabovevalue} - Variable {spaceabovevalue} + Name {length_spaceabove} + Variable {length_spaceabove} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -234,8 +234,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {217 292 187 66} - Name {spaceaboveplus} - Variable {spaceaboveplus} + Name {length_spaceaboveplus} + Variable {length_spaceaboveplus} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -257,8 +257,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {217 363 187 67} - Name {spaceaboveminus} - Variable {spaceaboveminus} + Name {length_spaceaboveminus} + Variable {length_spaceaboveminus} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -294,7 +294,7 @@ Box_Layout-1.1{ Stretch {1} } Layout_Widget-1.1.1{ - Widget {pagebreakabove} + Widget {check_pagebreakabove} BoxStretch {1} Alignment {33} } @@ -310,7 +310,7 @@ Box_Layout-1.2{ Stretch {1} } Layout_Widget-1.2.1{ - Widget {keepabove} + Widget {check_keepabove} BoxStretch {1} Alignment {33} } @@ -334,7 +334,7 @@ Box_Stretch-1.3.2{ Stretch {1} } Layout_Widget-1.3.3{ - Widget {spaceabove} + Widget {combo_spaceabove} BoxStretch {1} Alignment {33} } @@ -366,7 +366,7 @@ Layout_Widget-1.4.1.2{ Grid_Spacer-1.4.1.3{ } Layout_Widget-1.4.1.4{ - Widget {spaceabovevalue} + Widget {length_spaceabove} BoxStretch {1} Alignment {33} } @@ -386,7 +386,7 @@ Layout_Widget-1.4.2.2{ Grid_Spacer-1.4.2.3{ } Layout_Widget-1.4.2.4{ - Widget {spaceaboveplus} + Widget {length_spaceaboveplus} BoxStretch {1} Alignment {33} } @@ -406,7 +406,7 @@ Layout_Widget-1.4.3.2{ Grid_Spacer-1.4.3.3{ } Layout_Widget-1.4.3.4{ - Widget {spaceaboveminus} + Widget {length_spaceaboveminus} BoxStretch {1} Alignment {33} } diff --git a/src/frontends/kde/dlg/dialogs/parabelow.dlg b/src/frontends/kde/dlg/dialogs/parabelow.dlg index 5b3c01709d..242893e076 100644 --- a/src/frontends/kde/dlg/dialogs/parabelow.dlg +++ b/src/frontends/kde/dlg/dialogs/parabelow.dlg @@ -23,8 +23,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {5 5 228 67} - Name {pagebreakbelow} - Variable {pagebreakbelow} + Name {check_pagebreakbelow} + Variable {check_pagebreakbelow} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -44,12 +44,12 @@ CheckBox { } CheckBox { Checked {false} - Text {Keep space when at bottom of page} + Text {Keep space when at top of page} AutoRepeat {false} AutoResize {false} Rect {5 77 228 66} - Name {keepbelow} - Variable {keepbelow} + Name {check_keepbelow} + Variable {check_keepbelow} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -103,8 +103,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {235 148 113 67} - Name {spacebelow} - Variable {spacebelow} + Name {combo_spacebelow} + Variable {combo_spacebelow} Signal {[Protected] highlighted --> spacebelowHighlighted (int)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -211,8 +211,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {217 220 187 67} - Name {spacebelowvalue} - Variable {spacebelowvalue} + Name {length_spacebelow} + Variable {length_spacebelow} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -234,8 +234,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {217 292 187 66} - Name {spacebelowplus} - Variable {spacebelowplus} + Name {length_spacebelowplus} + Variable {length_spacebelowplus} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -257,8 +257,8 @@ User { UserClassHeader {lengthentry.h} UserClassName {LengthEntry} Rect {217 363 187 67} - Name {spacebelowminus} - Variable {spacebelowminus} + Name {length_spacebelowminus} + Variable {length_spacebelowminus} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -294,7 +294,7 @@ Box_Layout-1.1{ Stretch {1} } Layout_Widget-1.1.1{ - Widget {pagebreakbelow} + Widget {check_pagebreakbelow} BoxStretch {1} Alignment {33} } @@ -310,7 +310,7 @@ Box_Layout-1.2{ Stretch {1} } Layout_Widget-1.2.1{ - Widget {keepbelow} + Widget {check_keepbelow} BoxStretch {1} Alignment {33} } @@ -334,7 +334,7 @@ Box_Stretch-1.3.2{ Stretch {1} } Layout_Widget-1.3.3{ - Widget {spacebelow} + Widget {combo_spacebelow} BoxStretch {1} Alignment {33} } @@ -366,7 +366,7 @@ Layout_Widget-1.4.1.2{ Grid_Spacer-1.4.1.3{ } Layout_Widget-1.4.1.4{ - Widget {spacebelowvalue} + Widget {length_spacebelow} BoxStretch {1} Alignment {33} } @@ -386,7 +386,7 @@ Layout_Widget-1.4.2.2{ Grid_Spacer-1.4.2.3{ } Layout_Widget-1.4.2.4{ - Widget {spacebelowplus} + Widget {length_spacebelowplus} BoxStretch {1} Alignment {33} } @@ -406,7 +406,7 @@ Layout_Widget-1.4.3.2{ Grid_Spacer-1.4.3.3{ } Layout_Widget-1.4.3.4{ - Widget {spacebelowminus} + Widget {length_spacebelowminus} BoxStretch {1} Alignment {33} } diff --git a/src/frontends/kde/dlg/dialogs/paraextra.dlg b/src/frontends/kde/dlg/dialogs/paraextra.dlg index 7600b059f1..f068b9d891 100644 --- a/src/frontends/kde/dlg/dialogs/paraextra.dlg +++ b/src/frontends/kde/dlg/dialogs/paraextra.dlg @@ -25,8 +25,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {5 65 265 54} - Name {type} - Variable {type} + Name {combo_type} + Variable {combo_type} Signal {[Protected] highlighted --> typeHighlighted (int)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -108,8 +108,8 @@ KDE::KRestrictedLine { MaxLength {32767} FrameShown {true} Rect {275 65 87 54} - Name {widthvalue} - Variable {widthvalue} + Name {line_widthvalue} + Variable {line_widthvalue} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -135,8 +135,8 @@ ComboBox { MaxCount {2147483647} AutoCompletion {false} Rect {367 65 173 54} - Name {widthvalueunits} - Variable {widthvalueunits} + Name {combo_widthvalueunits} + Variable {combo_widthvalueunits} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -188,8 +188,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {10 173 255 45} - Name {top} - Variable {top} + Name {radio_top} + Variable {radio_top} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -213,8 +213,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {10 267 255 45} - Name {middle} - Variable {middle} + Name {radio_middle} + Variable {radio_middle} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -238,8 +238,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {10 361 255 45} - Name {bottom} - Variable {bottom} + Name {radio_bottom} + Variable {radio_bottom} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -263,8 +263,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {275 189 265 65} - Name {hfillbetween} - Variable {hfillbetween} + Name {check_hfillbetween} + Variable {check_hfillbetween} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -288,8 +288,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {275 325 265 65} - Name {startnewminipage} - Variable {startnewminipage} + Name {check_startnewminipage} + Variable {check_startnewminipage} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -334,7 +334,7 @@ Layout_Widget-1.1.1.1{ Alignment {1} } Layout_Widget-1.1.1.2{ - Widget {type} + Widget {combo_type} BoxStretch {1} Alignment {36} } @@ -360,12 +360,12 @@ Box_Layout-1.1.2.2{ Stretch {1} } Layout_Widget-1.1.2.2.1{ - Widget {widthvalue} + Widget {line_widthvalue} BoxStretch {1} Alignment {36} } Layout_Widget-1.1.2.2.2{ - Widget {widthvalueunits} + Widget {combo_widthvalueunits} BoxStretch {2} Alignment {36} } @@ -390,7 +390,7 @@ Box_Stretch-1.2.1.1.1{ Stretch {1} } Layout_Widget-1.2.1.1.2{ - Widget {top} + Widget {radio_top} BoxStretch {1} Alignment {1} } @@ -398,7 +398,7 @@ Box_Stretch-1.2.1.1.3{ Stretch {1} } Layout_Widget-1.2.1.1.4{ - Widget {middle} + Widget {radio_middle} BoxStretch {1} Alignment {1} } @@ -406,7 +406,7 @@ Box_Stretch-1.2.1.1.5{ Stretch {1} } Layout_Widget-1.2.1.1.6{ - Widget {bottom} + Widget {radio_bottom} BoxStretch {1} Alignment {1} } @@ -425,7 +425,7 @@ Box_Stretch-1.2.2.1{ Stretch {1} } Layout_Widget-1.2.2.2{ - Widget {hfillbetween} + Widget {check_hfillbetween} BoxStretch {1} Alignment {1} } @@ -433,7 +433,7 @@ Box_Stretch-1.2.2.3{ Stretch {1} } Layout_Widget-1.2.2.4{ - Widget {startnewminipage} + Widget {check_startnewminipage} BoxStretch {1} Alignment {1} } diff --git a/src/frontends/kde/dlg/dialogs/parageneral.dlg b/src/frontends/kde/dlg/dialogs/parageneral.dlg index 6a12f012bd..0badca96d6 100644 --- a/src/frontends/kde/dlg/dialogs/parageneral.dlg +++ b/src/frontends/kde/dlg/dialogs/parageneral.dlg @@ -25,8 +25,8 @@ ComboBox { MaxCount {4} AutoCompletion {false} Rect {130 5 120 59} - Name {justification} - Variable {justification} + Name {combo_justification} + Variable {combo_justification} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -48,8 +48,8 @@ User { UserClassHeader {tabstack.h} UserClassName {TabStack} Rect {5 69 605 294} - Name {spacetab} - Variable {spacetab} + Name {tabstack} + Variable {tabstack} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -73,8 +73,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {5 368 298 39} - Name {lineabove} - Variable {lineabove} + Name {check_lineabove} + Variable {check_lineabove} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -98,8 +98,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {5 412 298 39} - Name {linebelow} - Variable {linebelow} + Name {check_linebelow} + Variable {check_linebelow} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -123,8 +123,8 @@ CheckBox { AutoRepeat {false} AutoResize {false} Rect {5 456 298 39} - Name {noindent} - Variable {noindent} + Name {check_noindent} + Variable {check_noindent} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -176,8 +176,8 @@ LineEdit { MaxLength {32767} FrameShown {true} Rect {462 368 148 127} - Name {labelwidth} - Variable {labelwidth} + Name {line_labelwidth} + Variable {line_labelwidth} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -246,7 +246,7 @@ Layout_Widget-1.1.1{ Alignment {36} } Layout_Widget-1.1.2{ - Widget {justification} + Widget {combo_justification} BoxStretch {1} Alignment {36} } @@ -262,7 +262,7 @@ Box_Layout-1.2{ Stretch {5} } Layout_Widget-1.2.1{ - Widget {spacetab} + Widget {tabstack} BoxStretch {5} Alignment {36} } @@ -283,17 +283,17 @@ Box_Layout-1.3.1{ Stretch {1} } Layout_Widget-1.3.1.1{ - Widget {lineabove} + Widget {check_lineabove} BoxStretch {1} Alignment {1} } Layout_Widget-1.3.1.2{ - Widget {linebelow} + Widget {check_linebelow} BoxStretch {1} Alignment {1} } Layout_Widget-1.3.1.3{ - Widget {noindent} + Widget {check_noindent} BoxStretch {1} Alignment {1} } @@ -311,7 +311,7 @@ Layout_Widget-1.3.2.1{ Alignment {36} } Layout_Widget-1.3.2.2{ - Widget {labelwidth} + Widget {line_labelwidth} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/dialogs/print.dlg b/src/frontends/kde/dlg/dialogs/print.dlg index 20e3249403..bfbbc020ae 100644 --- a/src/frontends/kde/dlg/dialogs/print.dlg +++ b/src/frontends/kde/dlg/dialogs/print.dlg @@ -2,7 +2,7 @@ DlgEdit:v1.2:Dialog: Dialog { ClassHeader {} ClassSource {} - ClassName {PrintDialog} + ClassName {} DataHeader {printdlgdata.h} DataSource {printdlgdata.C} DataName {PrintDialogData} @@ -163,8 +163,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {86 280 81 45} - Name {print} - Variable {print} + Name {button_ok} + Variable {button_ok} Signal {[Protected] clicked --> clickedPrint ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -192,8 +192,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {333 280 81 45} - Name {cancel} - Variable {cancel} + Name {button_cancel} + Variable {button_cancel} Signal {[Protected] clicked --> clickedCancel ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -218,8 +218,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {15 42 142 34} - Name {allpages} - Variable {allpages} + Name {radio_allpages} + Variable {radio_allpages} MinimumSize {80 20} MaximumSize {32767 32767} BackgroundPixmap {} @@ -243,8 +243,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {15 96 142 14} - Name {oddpages} - Variable {oddpages} + Name {radio_oddpages} + Variable {radio_oddpages} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -268,8 +268,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {15 130 142 14} - Name {evenpages} - Variable {evenpages} + Name {radio_evenpages} + Variable {radio_evenpages} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -293,8 +293,8 @@ KDE::KIntLineEdit { MaxLength {32767} FrameShown {true} Rect {113 169 49 30} - Name {from} - Variable {from} + Name {line_from} + Variable {line_from} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -318,8 +318,8 @@ KDE::KIntLineEdit { MaxLength {32767} FrameShown {true} Rect {113 204 49 31} - Name {to} - Variable {to} + Name {line_to} + Variable {line_to} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -343,8 +343,8 @@ CheckBox { AutoRepeat {false} AutoResize {true} Rect {10 240 152 30} - Name {reverse} - Variable {reverse} + Name {check_reverse} + Variable {check_reverse} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -368,8 +368,8 @@ KDE::KIntLineEdit { MaxLength {32767} FrameShown {true} Rect {334 17 50 46} - Name {count} - Variable {count} + Name {line_count} + Variable {line_count} Signal {[Protected] textChanged --> changedCount (const char*)} MinimumSize {0 0} MaximumSize {32767 32767} @@ -394,8 +394,8 @@ CheckBox { AutoRepeat {false} AutoResize {true} Rect {440 17 50 46} - Name {sort} - Variable {sort} + Name {check_sort} + Variable {check_sort} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -477,8 +477,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {189 120 142 23} - Name {toprinter} - Variable {toprinter} + Name {radio_toprinter} + Variable {radio_toprinter} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -502,8 +502,8 @@ RadioButton { AutoRepeat {false} AutoResize {false} Rect {189 170 142 23} - Name {tofile} - Variable {tofile} + Name {radio_tofile} + Variable {radio_tofile} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -527,8 +527,8 @@ LineEdit { MaxLength {32767} FrameShown {true} Rect {341 115 142 26} - Name {printername} - Variable {printername} + Name {line_printername} + Variable {line_printername} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -552,8 +552,8 @@ LineEdit { MaxLength {32767} FrameShown {true} Rect {341 172 142 26} - Name {filename} - Variable {filename} + Name {line_filename} + Variable {line_filename} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -580,8 +580,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {330 225 153 23} - Name {browse} - Variable {browse} + Name {button_browse} + Variable {button_browse} Signal {[Protected] clicked --> clickedBrowse ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -682,7 +682,7 @@ Box_Stretch-1.1.1.1.1.2.1.1{ Stretch {1} } Layout_Widget-1.1.1.1.1.2.1.2{ - Widget {allpages} + Widget {radio_allpages} BoxStretch {1} Alignment {1} } @@ -690,7 +690,7 @@ Box_Stretch-1.1.1.1.1.2.1.3{ Stretch {1} } Layout_Widget-1.1.1.1.1.2.1.4{ - Widget {oddpages} + Widget {radio_oddpages} BoxStretch {1} Alignment {1} } @@ -698,7 +698,7 @@ Box_Stretch-1.1.1.1.1.2.1.5{ Stretch {1} } Layout_Widget-1.1.1.1.1.2.1.6{ - Widget {evenpages} + Widget {radio_evenpages} BoxStretch {1} Alignment {1} } @@ -719,7 +719,7 @@ Layout_Widget-1.1.1.1.1.3.1{ Alignment {36} } Layout_Widget-1.1.1.1.1.3.2{ - Widget {from} + Widget {line_from} BoxStretch {1} Alignment {36} } @@ -737,12 +737,12 @@ Layout_Widget-1.1.1.1.1.4.1{ Alignment {36} } Layout_Widget-1.1.1.1.1.4.2{ - Widget {to} + Widget {line_to} BoxStretch {1} Alignment {36} } Layout_Widget-1.1.1.1.1.5{ - Widget {reverse} + Widget {check_reverse} BoxStretch {1} Alignment {36} } @@ -790,7 +790,7 @@ Box_Stretch-1.1.1.2.1.1.2.3{ Stretch {1} } Layout_Widget-1.1.1.2.1.1.2.4{ - Widget {count} + Widget {line_count} BoxStretch {1} Alignment {36} } @@ -798,7 +798,7 @@ Box_Stretch-1.1.1.2.1.1.2.5{ Stretch {1} } Layout_Widget-1.1.1.2.1.1.2.6{ - Widget {sort} + Widget {check_sort} BoxStretch {1} Alignment {36} } @@ -849,7 +849,7 @@ Box_Layout-1.1.1.2.2.1.3.2.1{ Stretch {1} } Layout_Widget-1.1.1.2.2.1.3.2.1.1{ - Widget {toprinter} + Widget {radio_toprinter} BoxStretch {1} Alignment {1} } @@ -857,7 +857,7 @@ Box_Stretch-1.1.1.2.2.1.3.2.1.2{ Stretch {1} } Layout_Widget-1.1.1.2.2.1.3.2.1.3{ - Widget {tofile} + Widget {radio_tofile} BoxStretch {1} Alignment {1} } @@ -870,7 +870,7 @@ Box_Layout-1.1.1.2.2.1.3.3{ Stretch {1} } Layout_Widget-1.1.1.2.2.1.3.3.1{ - Widget {printername} + Widget {line_printername} BoxStretch {1} Alignment {36} } @@ -878,7 +878,7 @@ Box_Stretch-1.1.1.2.2.1.3.3.2{ Stretch {1} } Layout_Widget-1.1.1.2.2.1.3.3.3{ - Widget {filename} + Widget {line_filename} BoxStretch {1} Alignment {36} } @@ -900,7 +900,7 @@ Box_Stretch-1.1.1.2.2.1.5.1{ Stretch {1} } Layout_Widget-1.1.1.2.2.1.5.2{ - Widget {browse} + Widget {button_browse} BoxStretch {1} Alignment {36} } @@ -926,7 +926,7 @@ Box_Stretch-1.2.1.1{ Stretch {1} } Layout_Widget-1.2.1.2{ - Widget {print} + Widget {button_ok} BoxStretch {1} Alignment {36} } @@ -934,7 +934,7 @@ Box_Stretch-1.2.1.3{ Stretch {2} } Layout_Widget-1.2.1.4{ - Widget {cancel} + Widget {button_cancel} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/dialogs/tabcreate.dlg b/src/frontends/kde/dlg/dialogs/tabcreate.dlg index 857cd051dd..99c6de424f 100644 --- a/src/frontends/kde/dlg/dialogs/tabcreate.dlg +++ b/src/frontends/kde/dlg/dialogs/tabcreate.dlg @@ -2,7 +2,7 @@ DlgEdit:v1.2:Dialog: Dialog { ClassHeader {} ClassSource {} - ClassName {TabularCreateDialog} + ClassName {} DataHeader {tabcreatedlgdata.h} DataSource {tabcreatedlgdata.C} DataName {TabularCreateDialogData} @@ -26,7 +26,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {64 249 59 21} - Name {Insert} + Name {button_ok} + Variable {button_ok} Signal {[Protected] clicked --> clickedInsert ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -54,7 +55,8 @@ PushButton { AutoRepeat {false} AutoResize {false} Rect {187 249 59 21} - Name {Cancel} + Name {button_cancel} + Variable {button_cancel} Signal {[Protected] clicked --> clickedCancel ()} MinimumSize {0 0} MaximumSize {32767 32767} @@ -165,8 +167,8 @@ SpinBox { MidLineWidth {0} FrameMargin {0} Rect {91 5 41 21} - Name {rows} - Variable {rows} + Name {spin_rows} + Variable {spin_rows} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -197,8 +199,8 @@ SpinBox { MidLineWidth {0} FrameMargin {0} Rect {224 5 40 21} - Name {cols} - Variable {cols} + Name {spin_cols} + Variable {spin_cols} MinimumSize {0 0} MaximumSize {32767 32767} BackgroundPixmap {} @@ -242,7 +244,7 @@ Layout_Widget-1.1.2{ Alignment {36} } Layout_Widget-1.1.3{ - Widget {rows} + Widget {spin_rows} BoxStretch {1} Alignment {36} } @@ -255,7 +257,7 @@ Layout_Widget-1.1.5{ Alignment {36} } Layout_Widget-1.1.6{ - Widget {cols} + Widget {spin_cols} BoxStretch {1} Alignment {36} } @@ -279,7 +281,7 @@ Box_Stretch-1.3.1{ Stretch {1} } Layout_Widget-1.3.2{ - Widget {Insert} + Widget {button_ok} BoxStretch {1} Alignment {36} } @@ -287,7 +289,7 @@ Box_Stretch-1.3.3{ Stretch {1} } Layout_Widget-1.3.4{ - Widget {Cancel} + Widget {button_cancel} BoxStretch {1} Alignment {36} } diff --git a/src/frontends/kde/dlg/docbulletsdlgdata.C b/src/frontends/kde/dlg/docbulletsdlgdata.C index 41e199d43e..378cf8ab07 100644 --- a/src/frontends/kde/dlg/docbulletsdlgdata.C +++ b/src/frontends/kde/dlg/docbulletsdlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docbulletsdlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:22 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. diff --git a/src/frontends/kde/dlg/docbulletsdlgdata.h b/src/frontends/kde/dlg/docbulletsdlgdata.h index ba93c382d7..1bfda8b658 100644 --- a/src/frontends/kde/dlg/docbulletsdlgdata.h +++ b/src/frontends/kde/dlg/docbulletsdlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docbulletsdlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:22 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. diff --git a/src/frontends/kde/dlg/docdlgdata.C b/src/frontends/kde/dlg/docdlgdata.C index 212de311ca..7f065123bb 100644 --- a/src/frontends/kde/dlg/docdlgdata.C +++ b/src/frontends/kde/dlg/docdlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docdlgdata.C - Last generated: Sat Feb 10 21:28:59 2001 + Last generated: Sat Mar 31 16:48:15 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -27,75 +27,75 @@ DocDialogData::DocDialogData : Inherited( parent, name, TRUE, 0 ) { - ok = new QPushButton( this, "OK" ); - ok->setGeometry( 73, 555, 69, 55 ); - ok->setMinimumSize( 0, 0 ); - ok->setMaximumSize( 32767, 32767 ); - connect( ok, SIGNAL(clicked()), SLOT(ok_adaptor()) ); - ok->setFocusPolicy( QWidget::TabFocus ); - ok->setBackgroundMode( QWidget::PaletteBackground ); - ok->setFontPropagation( QWidget::NoChildren ); - ok->setPalettePropagation( QWidget::NoChildren ); - ok->setText( _("&OK") ); - ok->setAutoRepeat( false ); - ok->setAutoResize( false ); - ok->setToggleButton( false ); - ok->setDefault( true ); - ok->setAutoDefault( false ); - ok->setIsMenuButton( false ); - - apply = new QPushButton( this, "apply" ); - apply->setGeometry( 215, 555, 68, 55 ); - apply->setMinimumSize( 0, 0 ); - apply->setMaximumSize( 32767, 32767 ); - connect( apply, SIGNAL(clicked()), SLOT(apply_adaptor()) ); - apply->setFocusPolicy( QWidget::TabFocus ); - apply->setBackgroundMode( QWidget::PaletteBackground ); - apply->setFontPropagation( QWidget::NoChildren ); - apply->setPalettePropagation( QWidget::NoChildren ); - apply->setText( _("&Apply") ); - apply->setAutoRepeat( false ); - apply->setAutoResize( false ); - apply->setToggleButton( false ); - apply->setDefault( false ); - apply->setAutoDefault( false ); - apply->setIsMenuButton( false ); - - restore = new QPushButton( this, "restore" ); - restore->setGeometry( 357, 555, 68, 55 ); - restore->setMinimumSize( 0, 0 ); - restore->setMaximumSize( 32767, 32767 ); - connect( restore, SIGNAL(clicked()), SLOT(restore_adaptor()) ); - restore->setFocusPolicy( QWidget::TabFocus ); - restore->setBackgroundMode( QWidget::PaletteBackground ); - restore->setFontPropagation( QWidget::NoChildren ); - restore->setPalettePropagation( QWidget::NoChildren ); - restore->setText( _("&Restore") ); - restore->setAutoRepeat( false ); - restore->setAutoResize( false ); - restore->setToggleButton( false ); - restore->setDefault( false ); - restore->setAutoDefault( false ); - restore->setIsMenuButton( false ); - - cancel = new QPushButton( this, "Cancel" ); - cancel->setGeometry( 498, 555, 69, 55 ); - cancel->setMinimumSize( 0, 0 ); - cancel->setMaximumSize( 32767, 32767 ); - connect( cancel, SIGNAL(clicked()), SLOT(cancel_adaptor()) ); - cancel->setFocusPolicy( QWidget::TabFocus ); - cancel->setBackgroundMode( QWidget::PaletteBackground ); - cancel->setFontPropagation( QWidget::NoChildren ); - cancel->setPalettePropagation( QWidget::NoChildren ); - cancel->setText( _("&Cancel") ); - cancel->setAutoRepeat( false ); - cancel->setAutoResize( false ); - cancel->setToggleButton( false ); - cancel->setDefault( false ); - cancel->setAutoDefault( false ); - cancel->setIsMenuButton( false ); - - tabstack = new TabStack( this, "User_1" ); + button_ok = new QPushButton( this, "button_ok" ); + button_ok->setGeometry( 73, 555, 69, 55 ); + button_ok->setMinimumSize( 0, 0 ); + button_ok->setMaximumSize( 32767, 32767 ); + connect( button_ok, SIGNAL(clicked()), SLOT(ok_adaptor()) ); + button_ok->setFocusPolicy( QWidget::TabFocus ); + button_ok->setBackgroundMode( QWidget::PaletteBackground ); + button_ok->setFontPropagation( QWidget::NoChildren ); + button_ok->setPalettePropagation( QWidget::NoChildren ); + button_ok->setText( _("&OK") ); + button_ok->setAutoRepeat( false ); + button_ok->setAutoResize( false ); + button_ok->setToggleButton( false ); + button_ok->setDefault( true ); + button_ok->setAutoDefault( false ); + button_ok->setIsMenuButton( false ); + + button_apply = new QPushButton( this, "button_apply" ); + button_apply->setGeometry( 215, 555, 68, 55 ); + button_apply->setMinimumSize( 0, 0 ); + button_apply->setMaximumSize( 32767, 32767 ); + connect( button_apply, SIGNAL(clicked()), SLOT(apply_adaptor()) ); + button_apply->setFocusPolicy( QWidget::TabFocus ); + button_apply->setBackgroundMode( QWidget::PaletteBackground ); + button_apply->setFontPropagation( QWidget::NoChildren ); + button_apply->setPalettePropagation( QWidget::NoChildren ); + button_apply->setText( _("&Apply") ); + button_apply->setAutoRepeat( false ); + button_apply->setAutoResize( false ); + button_apply->setToggleButton( false ); + button_apply->setDefault( false ); + button_apply->setAutoDefault( false ); + button_apply->setIsMenuButton( false ); + + button_restore = new QPushButton( this, "button_restore" ); + button_restore->setGeometry( 357, 555, 68, 55 ); + button_restore->setMinimumSize( 0, 0 ); + button_restore->setMaximumSize( 32767, 32767 ); + connect( button_restore, SIGNAL(clicked()), SLOT(restore_adaptor()) ); + button_restore->setFocusPolicy( QWidget::TabFocus ); + button_restore->setBackgroundMode( QWidget::PaletteBackground ); + button_restore->setFontPropagation( QWidget::NoChildren ); + button_restore->setPalettePropagation( QWidget::NoChildren ); + button_restore->setText( _("&Restore") ); + button_restore->setAutoRepeat( false ); + button_restore->setAutoResize( false ); + button_restore->setToggleButton( false ); + button_restore->setDefault( false ); + button_restore->setAutoDefault( false ); + button_restore->setIsMenuButton( false ); + + button_cancel = new QPushButton( this, "button_cancel" ); + button_cancel->setGeometry( 498, 555, 69, 55 ); + button_cancel->setMinimumSize( 0, 0 ); + button_cancel->setMaximumSize( 32767, 32767 ); + connect( button_cancel, SIGNAL(clicked()), SLOT(cancel_adaptor()) ); + button_cancel->setFocusPolicy( QWidget::TabFocus ); + button_cancel->setBackgroundMode( QWidget::PaletteBackground ); + button_cancel->setFontPropagation( QWidget::NoChildren ); + button_cancel->setPalettePropagation( QWidget::NoChildren ); + button_cancel->setText( _("&Cancel") ); + button_cancel->setAutoRepeat( false ); + button_cancel->setAutoResize( false ); + button_cancel->setToggleButton( false ); + button_cancel->setDefault( false ); + button_cancel->setAutoDefault( false ); + button_cancel->setIsMenuButton( false ); + + tabstack = new TabStack( this, "tabstack" ); tabstack->setGeometry( 5, 5, 630, 545 ); tabstack->setMinimumSize( 0, 0 ); tabstack->setMaximumSize( 32767, 32767 ); @@ -104,38 +104,38 @@ DocDialogData::DocDialogData tabstack->setFontPropagation( QWidget::NoChildren ); tabstack->setPalettePropagation( QWidget::NoChildren ); - if (ok->sizeHint().width()!=-1) - ok->setMinimumWidth(ok->sizeHint().width()); - if (ok->sizeHint().height()!=-1) - ok->setMinimumHeight(ok->sizeHint().height()); - if (ok->sizeHint().width()!=-1) - ok->setMaximumWidth(ok->sizeHint().width()); - if (ok->sizeHint().height()!=-1) - ok->setMaximumHeight(ok->sizeHint().height()); - if (apply->sizeHint().width()!=-1) - apply->setMinimumWidth(apply->sizeHint().width()); - if (apply->sizeHint().height()!=-1) - apply->setMinimumHeight(apply->sizeHint().height()); - if (apply->sizeHint().width()!=-1) - apply->setMaximumWidth(apply->sizeHint().width()); - if (apply->sizeHint().height()!=-1) - apply->setMaximumHeight(apply->sizeHint().height()); - if (restore->sizeHint().width()!=-1) - restore->setMinimumWidth(restore->sizeHint().width()); - if (restore->sizeHint().height()!=-1) - restore->setMinimumHeight(restore->sizeHint().height()); - if (restore->sizeHint().width()!=-1) - restore->setMaximumWidth(restore->sizeHint().width()); - if (restore->sizeHint().height()!=-1) - restore->setMaximumHeight(restore->sizeHint().height()); - if (cancel->sizeHint().width()!=-1) - cancel->setMinimumWidth(cancel->sizeHint().width()); - if (cancel->sizeHint().height()!=-1) - cancel->setMinimumHeight(cancel->sizeHint().height()); - if (cancel->sizeHint().width()!=-1) - cancel->setMaximumWidth(cancel->sizeHint().width()); - if (cancel->sizeHint().height()!=-1) - cancel->setMaximumHeight(cancel->sizeHint().height()); + if (button_ok->sizeHint().width()!=-1) + button_ok->setMinimumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMinimumHeight(button_ok->sizeHint().height()); + if (button_ok->sizeHint().width()!=-1) + button_ok->setMaximumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMaximumHeight(button_ok->sizeHint().height()); + if (button_apply->sizeHint().width()!=-1) + button_apply->setMinimumWidth(button_apply->sizeHint().width()); + if (button_apply->sizeHint().height()!=-1) + button_apply->setMinimumHeight(button_apply->sizeHint().height()); + if (button_apply->sizeHint().width()!=-1) + button_apply->setMaximumWidth(button_apply->sizeHint().width()); + if (button_apply->sizeHint().height()!=-1) + button_apply->setMaximumHeight(button_apply->sizeHint().height()); + if (button_restore->sizeHint().width()!=-1) + button_restore->setMinimumWidth(button_restore->sizeHint().width()); + if (button_restore->sizeHint().height()!=-1) + button_restore->setMinimumHeight(button_restore->sizeHint().height()); + if (button_restore->sizeHint().width()!=-1) + button_restore->setMaximumWidth(button_restore->sizeHint().width()); + if (button_restore->sizeHint().height()!=-1) + button_restore->setMaximumHeight(button_restore->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMinimumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMinimumHeight(button_cancel->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMaximumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMaximumHeight(button_cancel->sizeHint().height()); if (tabstack->sizeHint().width()!=-1) tabstack->setMinimumWidth(tabstack->sizeHint().width()); if (tabstack->sizeHint().height()!=-1) @@ -150,13 +150,13 @@ DocDialogData::DocDialogData qtarch_layout_1->addLayout( qtarch_layout_1_2, 1 ); qtarch_layout_1_2->addStrut( 0 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( ok, 1, 36 ); + qtarch_layout_1_2->addWidget( button_ok, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( apply, 1, 36 ); + qtarch_layout_1_2->addWidget( button_apply, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( restore, 1, 36 ); + qtarch_layout_1_2->addWidget( button_restore, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( cancel, 1, 36 ); + qtarch_layout_1_2->addWidget( button_cancel, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); resize( 640,615 ); setMinimumSize( 0, 0 ); diff --git a/src/frontends/kde/dlg/docdlgdata.h b/src/frontends/kde/dlg/docdlgdata.h index 078a45a991..8339c3c3c1 100644 --- a/src/frontends/kde/dlg/docdlgdata.h +++ b/src/frontends/kde/dlg/docdlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docdlgdata.h - Last generated: Sat Feb 10 21:28:59 2001 + Last generated: Sat Mar 31 16:48:15 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -41,11 +41,11 @@ protected slots: virtual void apply_adaptor(); virtual void cancel_adaptor(); -protected: - QPushButton* ok; - QPushButton* apply; - QPushButton* restore; - QPushButton* cancel; +public: + QPushButton* button_ok; + QPushButton* button_apply; + QPushButton* button_restore; + QPushButton* button_cancel; TabStack* tabstack; }; diff --git a/src/frontends/kde/dlg/docextradlgdata.C b/src/frontends/kde/dlg/docextradlgdata.C index 94b305a4b3..666ea20d6a 100644 --- a/src/frontends/kde/dlg/docextradlgdata.C +++ b/src/frontends/kde/dlg/docextradlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docextradlgdata.C - Last generated: Sat Feb 10 23:32:07 2001 + Last generated: Sat Mar 31 16:48:27 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -29,86 +29,86 @@ DocExtraDialogData::DocExtraDialogData : Inherited( parent, name, 0 ) { - QGroupBox* qtarch_placementBox; - qtarch_placementBox = new QGroupBox( this, "placementBox" ); - qtarch_placementBox->setGeometry( 5, 5, 625, 378 ); - qtarch_placementBox->setMinimumSize( 25, 30 ); - qtarch_placementBox->setMaximumSize( 32767, 32767 ); - qtarch_placementBox->setFocusPolicy( QWidget::NoFocus ); - qtarch_placementBox->setBackgroundMode( QWidget::PaletteBackground ); - qtarch_placementBox->setFontPropagation( QWidget::NoChildren ); - qtarch_placementBox->setPalettePropagation( QWidget::NoChildren ); - qtarch_placementBox->setFrameStyle( 49 ); - qtarch_placementBox->setLineWidth( 1 ); - qtarch_placementBox->setMidLineWidth( 0 ); - qtarch_placementBox->QFrame::setMargin( 0 ); - qtarch_placementBox->setTitle( _("Float Placement") ); - qtarch_placementBox->setAlignment( 1 ); + QGroupBox* qtarch_group_placement; + qtarch_group_placement = new QGroupBox( this, "group_placement" ); + qtarch_group_placement->setGeometry( 5, 5, 625, 378 ); + qtarch_group_placement->setMinimumSize( 25, 30 ); + qtarch_group_placement->setMaximumSize( 32767, 32767 ); + qtarch_group_placement->setFocusPolicy( QWidget::NoFocus ); + qtarch_group_placement->setBackgroundMode( QWidget::PaletteBackground ); + qtarch_group_placement->setFontPropagation( QWidget::NoChildren ); + qtarch_group_placement->setPalettePropagation( QWidget::NoChildren ); + qtarch_group_placement->setFrameStyle( 49 ); + qtarch_group_placement->setLineWidth( 1 ); + qtarch_group_placement->setMidLineWidth( 0 ); + qtarch_group_placement->QFrame::setMargin( 0 ); + qtarch_group_placement->setTitle( _("Float Placement") ); + qtarch_group_placement->setAlignment( 1 ); - first = new QComboBox( FALSE, qtarch_placementBox, "first" ); - first->setGeometry( 315, 5, 150, 65 ); - first->setMinimumSize( 0, 0 ); - first->setMaximumSize( 32767, 32767 ); - first->setFocusPolicy( QWidget::StrongFocus ); - first->setBackgroundMode( QWidget::PaletteBackground ); - first->setFontPropagation( QWidget::AllChildren ); - first->setPalettePropagation( QWidget::AllChildren ); - first->setSizeLimit( 10 ); - first->setAutoResize( false ); - first->setMaxCount( 2147483647 ); - first->setAutoCompletion( false ); + combo_first = new QComboBox( FALSE, qtarch_group_placement, "combo_first" ); + combo_first->setGeometry( 315, 5, 150, 65 ); + combo_first->setMinimumSize( 0, 0 ); + combo_first->setMaximumSize( 32767, 32767 ); + combo_first->setFocusPolicy( QWidget::StrongFocus ); + combo_first->setBackgroundMode( QWidget::PaletteBackground ); + combo_first->setFontPropagation( QWidget::AllChildren ); + combo_first->setPalettePropagation( QWidget::AllChildren ); + combo_first->setSizeLimit( 10 ); + combo_first->setAutoResize( false ); + combo_first->setMaxCount( 2147483647 ); + combo_first->setAutoCompletion( false ); - second = new QComboBox( FALSE, qtarch_placementBox, "second" ); - second->setGeometry( 315, 75, 150, 66 ); - second->setMinimumSize( 0, 0 ); - second->setMaximumSize( 32767, 32767 ); - second->setFocusPolicy( QWidget::StrongFocus ); - second->setBackgroundMode( QWidget::PaletteBackground ); - second->setFontPropagation( QWidget::AllChildren ); - second->setPalettePropagation( QWidget::AllChildren ); - second->setSizeLimit( 10 ); - second->setAutoResize( false ); - second->setMaxCount( 2147483647 ); - second->setAutoCompletion( false ); + combo_second = new QComboBox( FALSE, qtarch_group_placement, "combo_second" ); + combo_second->setGeometry( 315, 75, 150, 66 ); + combo_second->setMinimumSize( 0, 0 ); + combo_second->setMaximumSize( 32767, 32767 ); + combo_second->setFocusPolicy( QWidget::StrongFocus ); + combo_second->setBackgroundMode( QWidget::PaletteBackground ); + combo_second->setFontPropagation( QWidget::AllChildren ); + combo_second->setPalettePropagation( QWidget::AllChildren ); + combo_second->setSizeLimit( 10 ); + combo_second->setAutoResize( false ); + combo_second->setMaxCount( 2147483647 ); + combo_second->setAutoCompletion( false ); - third = new QComboBox( FALSE, qtarch_placementBox, "third" ); - third->setGeometry( 315, 146, 150, 65 ); - third->setMinimumSize( 0, 0 ); - third->setMaximumSize( 32767, 32767 ); - third->setFocusPolicy( QWidget::StrongFocus ); - third->setBackgroundMode( QWidget::PaletteBackground ); - third->setFontPropagation( QWidget::AllChildren ); - third->setPalettePropagation( QWidget::AllChildren ); - third->setSizeLimit( 10 ); - third->setAutoResize( false ); - third->setMaxCount( 2147483647 ); - third->setAutoCompletion( false ); + combo_third = new QComboBox( FALSE, qtarch_group_placement, "combo_third" ); + combo_third->setGeometry( 315, 146, 150, 65 ); + combo_third->setMinimumSize( 0, 0 ); + combo_third->setMaximumSize( 32767, 32767 ); + combo_third->setFocusPolicy( QWidget::StrongFocus ); + combo_third->setBackgroundMode( QWidget::PaletteBackground ); + combo_third->setFontPropagation( QWidget::AllChildren ); + combo_third->setPalettePropagation( QWidget::AllChildren ); + combo_third->setSizeLimit( 10 ); + combo_third->setAutoResize( false ); + combo_third->setMaxCount( 2147483647 ); + combo_third->setAutoCompletion( false ); - fourth = new QComboBox( FALSE, qtarch_placementBox, "fourth" ); - fourth->setGeometry( 315, 216, 150, 65 ); - fourth->setMinimumSize( 0, 0 ); - fourth->setMaximumSize( 32767, 32767 ); - fourth->setFocusPolicy( QWidget::StrongFocus ); - fourth->setBackgroundMode( QWidget::PaletteBackground ); - fourth->setFontPropagation( QWidget::AllChildren ); - fourth->setPalettePropagation( QWidget::AllChildren ); - fourth->setSizeLimit( 10 ); - fourth->setAutoResize( false ); - fourth->setMaxCount( 2147483647 ); - fourth->setAutoCompletion( false ); + combo_fourth = new QComboBox( FALSE, qtarch_group_placement, "combo_fourth" ); + combo_fourth->setGeometry( 315, 216, 150, 65 ); + combo_fourth->setMinimumSize( 0, 0 ); + combo_fourth->setMaximumSize( 32767, 32767 ); + combo_fourth->setFocusPolicy( QWidget::StrongFocus ); + combo_fourth->setBackgroundMode( QWidget::PaletteBackground ); + combo_fourth->setFontPropagation( QWidget::AllChildren ); + combo_fourth->setPalettePropagation( QWidget::AllChildren ); + combo_fourth->setSizeLimit( 10 ); + combo_fourth->setAutoResize( false ); + combo_fourth->setMaxCount( 2147483647 ); + combo_fourth->setAutoCompletion( false ); - ignore = new QCheckBox( qtarch_placementBox, "ignore" ); - ignore->setGeometry( 5, 286, 615, 87 ); - ignore->setMinimumSize( 0, 0 ); - ignore->setMaximumSize( 32767, 32767 ); - ignore->setFocusPolicy( QWidget::TabFocus ); - ignore->setBackgroundMode( QWidget::PaletteBackground ); - ignore->setFontPropagation( QWidget::NoChildren ); - ignore->setPalettePropagation( QWidget::NoChildren ); - ignore->setText( _("Ignore LaTeX placement rules") ); - ignore->setAutoRepeat( false ); - ignore->setAutoResize( false ); - ignore->setChecked( false ); + check_ignore = new QCheckBox( qtarch_group_placement, "check_ignore" ); + check_ignore->setGeometry( 5, 286, 615, 87 ); + check_ignore->setMinimumSize( 0, 0 ); + check_ignore->setMaximumSize( 32767, 32767 ); + check_ignore->setFocusPolicy( QWidget::TabFocus ); + check_ignore->setBackgroundMode( QWidget::PaletteBackground ); + check_ignore->setFontPropagation( QWidget::NoChildren ); + check_ignore->setPalettePropagation( QWidget::NoChildren ); + check_ignore->setText( _("Ignore LaTeX placement rules") ); + check_ignore->setAutoRepeat( false ); + check_ignore->setAutoResize( false ); + check_ignore->setChecked( false ); QLabel* qtarch_labelsectiondepth; qtarch_labelsectiondepth = new QLabel( this, "labelsectiondepth" ); @@ -161,72 +161,72 @@ DocExtraDialogData::DocExtraDialogData qtarch_labelPSDriver->setAlignment( 289 ); qtarch_labelPSDriver->setMargin( -1 ); - sectiondepth = new QSpinBox( this, "sectiondepth" ); - sectiondepth->setGeometry( 320, 388, 153, 58 ); - sectiondepth->setMinimumSize( 0, 0 ); - sectiondepth->setMaximumSize( 32767, 32767 ); - sectiondepth->setFocusPolicy( QWidget::StrongFocus ); - sectiondepth->setBackgroundMode( QWidget::PaletteBackground ); - sectiondepth->setFontPropagation( QWidget::NoChildren ); - sectiondepth->setPalettePropagation( QWidget::NoChildren ); - sectiondepth->setFrameStyle( 51 ); - sectiondepth->setLineWidth( 2 ); - sectiondepth->setMidLineWidth( 0 ); - sectiondepth->QFrame::setMargin( 0 ); - sectiondepth->setRange( -2, 5 ); - sectiondepth->setSteps( 1, 0 ); - sectiondepth->setPrefix( "" ); - sectiondepth->setSuffix( "" ); - sectiondepth->setSpecialValueText( "" ); - sectiondepth->setWrapping( false ); + spin_sectiondepth = new QSpinBox( this, "spin_sectiondepth" ); + spin_sectiondepth->setGeometry( 320, 388, 153, 58 ); + spin_sectiondepth->setMinimumSize( 0, 0 ); + spin_sectiondepth->setMaximumSize( 32767, 32767 ); + spin_sectiondepth->setFocusPolicy( QWidget::StrongFocus ); + spin_sectiondepth->setBackgroundMode( QWidget::PaletteBackground ); + spin_sectiondepth->setFontPropagation( QWidget::NoChildren ); + spin_sectiondepth->setPalettePropagation( QWidget::NoChildren ); + spin_sectiondepth->setFrameStyle( 51 ); + spin_sectiondepth->setLineWidth( 2 ); + spin_sectiondepth->setMidLineWidth( 0 ); + spin_sectiondepth->QFrame::setMargin( 0 ); + spin_sectiondepth->setRange( -2, 5 ); + spin_sectiondepth->setSteps( 1, 0 ); + spin_sectiondepth->setPrefix( "" ); + spin_sectiondepth->setSuffix( "" ); + spin_sectiondepth->setSpecialValueText( "" ); + spin_sectiondepth->setWrapping( false ); - tocdepth = new QSpinBox( this, "tocdepth" ); - tocdepth->setGeometry( 320, 451, 153, 58 ); - tocdepth->setMinimumSize( 0, 0 ); - tocdepth->setMaximumSize( 32767, 32767 ); - tocdepth->setFocusPolicy( QWidget::StrongFocus ); - tocdepth->setBackgroundMode( QWidget::PaletteBackground ); - tocdepth->setFontPropagation( QWidget::NoChildren ); - tocdepth->setPalettePropagation( QWidget::NoChildren ); - tocdepth->setFrameStyle( 51 ); - tocdepth->setLineWidth( 2 ); - tocdepth->setMidLineWidth( 0 ); - tocdepth->QFrame::setMargin( 0 ); - tocdepth->setRange( -1, 5 ); - tocdepth->setSteps( 1, 0 ); - tocdepth->setPrefix( "" ); - tocdepth->setSuffix( "" ); - tocdepth->setSpecialValueText( "" ); - tocdepth->setWrapping( false ); + spin_tocdepth = new QSpinBox( this, "spin_tocdepth" ); + spin_tocdepth->setGeometry( 320, 451, 153, 58 ); + spin_tocdepth->setMinimumSize( 0, 0 ); + spin_tocdepth->setMaximumSize( 32767, 32767 ); + spin_tocdepth->setFocusPolicy( QWidget::StrongFocus ); + spin_tocdepth->setBackgroundMode( QWidget::PaletteBackground ); + spin_tocdepth->setFontPropagation( QWidget::NoChildren ); + spin_tocdepth->setPalettePropagation( QWidget::NoChildren ); + spin_tocdepth->setFrameStyle( 51 ); + spin_tocdepth->setLineWidth( 2 ); + spin_tocdepth->setMidLineWidth( 0 ); + spin_tocdepth->QFrame::setMargin( 0 ); + spin_tocdepth->setRange( -1, 5 ); + spin_tocdepth->setSteps( 1, 0 ); + spin_tocdepth->setPrefix( "" ); + spin_tocdepth->setSuffix( "" ); + spin_tocdepth->setSpecialValueText( "" ); + spin_tocdepth->setWrapping( false ); - psdriver = new QComboBox( FALSE, this, "psdriver" ); - psdriver->setGeometry( 320, 514, 153, 58 ); - psdriver->setMinimumSize( 0, 0 ); - psdriver->setMaximumSize( 32767, 32767 ); - psdriver->setFocusPolicy( QWidget::StrongFocus ); - psdriver->setBackgroundMode( QWidget::PaletteBackground ); - psdriver->setFontPropagation( QWidget::AllChildren ); - psdriver->setPalettePropagation( QWidget::AllChildren ); - psdriver->setSizeLimit( 10 ); - psdriver->setAutoResize( true ); - psdriver->setMaxCount( 2147483647 ); - psdriver->setAutoCompletion( false ); + combo_psdriver = new QComboBox( FALSE, this, "combo_psdriver" ); + combo_psdriver->setGeometry( 320, 514, 153, 58 ); + combo_psdriver->setMinimumSize( 0, 0 ); + combo_psdriver->setMaximumSize( 32767, 32767 ); + combo_psdriver->setFocusPolicy( QWidget::StrongFocus ); + combo_psdriver->setBackgroundMode( QWidget::PaletteBackground ); + combo_psdriver->setFontPropagation( QWidget::AllChildren ); + combo_psdriver->setPalettePropagation( QWidget::AllChildren ); + combo_psdriver->setSizeLimit( 10 ); + combo_psdriver->setAutoResize( true ); + combo_psdriver->setMaxCount( 2147483647 ); + combo_psdriver->setAutoCompletion( false ); - amsmath = new QCheckBox( this, "amsmath" ); - amsmath->setGeometry( 5, 577, 153, 58 ); - amsmath->setMinimumSize( 0, 0 ); - amsmath->setMaximumSize( 32767, 32767 ); - amsmath->setFocusPolicy( QWidget::TabFocus ); - amsmath->setBackgroundMode( QWidget::PaletteBackground ); - amsmath->setFontPropagation( QWidget::NoChildren ); - amsmath->setPalettePropagation( QWidget::NoChildren ); - amsmath->setText( _("Use AMS Math") ); - amsmath->setAutoRepeat( false ); - amsmath->setAutoResize( false ); - amsmath->setChecked( false ); + check_amsmath = new QCheckBox( this, "check_amsmath" ); + check_amsmath->setGeometry( 5, 577, 153, 58 ); + check_amsmath->setMinimumSize( 0, 0 ); + check_amsmath->setMaximumSize( 32767, 32767 ); + check_amsmath->setFocusPolicy( QWidget::TabFocus ); + check_amsmath->setBackgroundMode( QWidget::PaletteBackground ); + check_amsmath->setFontPropagation( QWidget::NoChildren ); + check_amsmath->setPalettePropagation( QWidget::NoChildren ); + check_amsmath->setText( _("Use AMS Math") ); + check_amsmath->setAutoRepeat( false ); + check_amsmath->setAutoResize( false ); + check_amsmath->setChecked( false ); QLabel* qtarch_labelFirst; - qtarch_labelFirst = new QLabel( qtarch_placementBox, "labelFirst" ); + qtarch_labelFirst = new QLabel( qtarch_group_placement, "labelFirst" ); qtarch_labelFirst->setGeometry( 5, 5, 150, 65 ); qtarch_labelFirst->setMinimumSize( 0, 0 ); qtarch_labelFirst->setMaximumSize( 32767, 32767 ); @@ -243,7 +243,7 @@ DocExtraDialogData::DocExtraDialogData qtarch_labelFirst->setMargin( -1 ); QLabel* qtarch_labelSecond; - qtarch_labelSecond = new QLabel( qtarch_placementBox, "labelSecond" ); + qtarch_labelSecond = new QLabel( qtarch_group_placement, "labelSecond" ); qtarch_labelSecond->setGeometry( 5, 75, 150, 66 ); qtarch_labelSecond->setMinimumSize( 0, 0 ); qtarch_labelSecond->setMaximumSize( 32767, 32767 ); @@ -260,7 +260,7 @@ DocExtraDialogData::DocExtraDialogData qtarch_labelSecond->setMargin( -1 ); QLabel* qtarch_labelThird; - qtarch_labelThird = new QLabel( qtarch_placementBox, "labelThird" ); + qtarch_labelThird = new QLabel( qtarch_group_placement, "labelThird" ); qtarch_labelThird->setGeometry( 5, 146, 150, 65 ); qtarch_labelThird->setMinimumSize( 0, 0 ); qtarch_labelThird->setMaximumSize( 32767, 32767 ); @@ -277,7 +277,7 @@ DocExtraDialogData::DocExtraDialogData qtarch_labelThird->setMargin( -1 ); QLabel* qtarch_labelFourth; - qtarch_labelFourth = new QLabel( qtarch_placementBox, "labelFourth" ); + qtarch_labelFourth = new QLabel( qtarch_group_placement, "labelFourth" ); qtarch_labelFourth->setGeometry( 5, 216, 150, 65 ); qtarch_labelFourth->setMinimumSize( 0, 0 ); qtarch_labelFourth->setMaximumSize( 32767, 32767 ); @@ -293,42 +293,42 @@ DocExtraDialogData::DocExtraDialogData qtarch_labelFourth->setAlignment( 289 ); qtarch_labelFourth->setMargin( -1 ); - if (qtarch_placementBox->sizeHint().width()!=-1) - qtarch_placementBox->setMinimumWidth(qtarch_placementBox->sizeHint().width()); - if (qtarch_placementBox->sizeHint().height()!=-1) - qtarch_placementBox->setMinimumHeight(qtarch_placementBox->sizeHint().height()); - if (first->sizeHint().width()!=-1) - first->setMinimumWidth(first->sizeHint().width()); - if (first->sizeHint().height()!=-1) - first->setMinimumHeight(first->sizeHint().height()); - if (first->sizeHint().height()!=-1) - first->setMaximumHeight(first->sizeHint().height()); - if (second->sizeHint().width()!=-1) - second->setMinimumWidth(second->sizeHint().width()); - if (second->sizeHint().height()!=-1) - second->setMinimumHeight(second->sizeHint().height()); - if (second->sizeHint().height()!=-1) - second->setMaximumHeight(second->sizeHint().height()); - if (third->sizeHint().width()!=-1) - third->setMinimumWidth(third->sizeHint().width()); - if (third->sizeHint().height()!=-1) - third->setMinimumHeight(third->sizeHint().height()); - if (third->sizeHint().height()!=-1) - third->setMaximumHeight(third->sizeHint().height()); - if (fourth->sizeHint().width()!=-1) - fourth->setMinimumWidth(fourth->sizeHint().width()); - if (fourth->sizeHint().height()!=-1) - fourth->setMinimumHeight(fourth->sizeHint().height()); - if (fourth->sizeHint().height()!=-1) - fourth->setMaximumHeight(fourth->sizeHint().height()); - if (ignore->sizeHint().width()!=-1) - ignore->setMinimumWidth(ignore->sizeHint().width()); - if (ignore->sizeHint().height()!=-1) - ignore->setMinimumHeight(ignore->sizeHint().height()); - if (ignore->sizeHint().width()!=-1) - ignore->setMaximumWidth(ignore->sizeHint().width()); - if (ignore->sizeHint().height()!=-1) - ignore->setMaximumHeight(ignore->sizeHint().height()); + if (qtarch_group_placement->sizeHint().width()!=-1) + qtarch_group_placement->setMinimumWidth(qtarch_group_placement->sizeHint().width()); + if (qtarch_group_placement->sizeHint().height()!=-1) + qtarch_group_placement->setMinimumHeight(qtarch_group_placement->sizeHint().height()); + if (combo_first->sizeHint().width()!=-1) + combo_first->setMinimumWidth(combo_first->sizeHint().width()); + if (combo_first->sizeHint().height()!=-1) + combo_first->setMinimumHeight(combo_first->sizeHint().height()); + if (combo_first->sizeHint().height()!=-1) + combo_first->setMaximumHeight(combo_first->sizeHint().height()); + if (combo_second->sizeHint().width()!=-1) + combo_second->setMinimumWidth(combo_second->sizeHint().width()); + if (combo_second->sizeHint().height()!=-1) + combo_second->setMinimumHeight(combo_second->sizeHint().height()); + if (combo_second->sizeHint().height()!=-1) + combo_second->setMaximumHeight(combo_second->sizeHint().height()); + if (combo_third->sizeHint().width()!=-1) + combo_third->setMinimumWidth(combo_third->sizeHint().width()); + if (combo_third->sizeHint().height()!=-1) + combo_third->setMinimumHeight(combo_third->sizeHint().height()); + if (combo_third->sizeHint().height()!=-1) + combo_third->setMaximumHeight(combo_third->sizeHint().height()); + if (combo_fourth->sizeHint().width()!=-1) + combo_fourth->setMinimumWidth(combo_fourth->sizeHint().width()); + if (combo_fourth->sizeHint().height()!=-1) + combo_fourth->setMinimumHeight(combo_fourth->sizeHint().height()); + if (combo_fourth->sizeHint().height()!=-1) + combo_fourth->setMaximumHeight(combo_fourth->sizeHint().height()); + if (check_ignore->sizeHint().width()!=-1) + check_ignore->setMinimumWidth(check_ignore->sizeHint().width()); + if (check_ignore->sizeHint().height()!=-1) + check_ignore->setMinimumHeight(check_ignore->sizeHint().height()); + if (check_ignore->sizeHint().width()!=-1) + check_ignore->setMaximumWidth(check_ignore->sizeHint().width()); + if (check_ignore->sizeHint().height()!=-1) + check_ignore->setMaximumHeight(check_ignore->sizeHint().height()); if (qtarch_labelsectiondepth->sizeHint().width()!=-1) qtarch_labelsectiondepth->setMinimumWidth(qtarch_labelsectiondepth->sizeHint().width()); if (qtarch_labelsectiondepth->sizeHint().height()!=-1) @@ -353,32 +353,32 @@ DocExtraDialogData::DocExtraDialogData qtarch_labelPSDriver->setMaximumWidth(qtarch_labelPSDriver->sizeHint().width()); if (qtarch_labelPSDriver->sizeHint().height()!=-1) qtarch_labelPSDriver->setMaximumHeight(qtarch_labelPSDriver->sizeHint().height()); - if (sectiondepth->sizeHint().width()!=-1) - sectiondepth->setMinimumWidth(sectiondepth->sizeHint().width()); - if (sectiondepth->sizeHint().height()!=-1) - sectiondepth->setMinimumHeight(sectiondepth->sizeHint().height()); - if (sectiondepth->sizeHint().height()!=-1) - sectiondepth->setMaximumHeight(sectiondepth->sizeHint().height()); - if (tocdepth->sizeHint().width()!=-1) - tocdepth->setMinimumWidth(tocdepth->sizeHint().width()); - if (tocdepth->sizeHint().height()!=-1) - tocdepth->setMinimumHeight(tocdepth->sizeHint().height()); - if (tocdepth->sizeHint().height()!=-1) - tocdepth->setMaximumHeight(tocdepth->sizeHint().height()); - if (psdriver->sizeHint().width()!=-1) - psdriver->setMinimumWidth(psdriver->sizeHint().width()); - if (psdriver->sizeHint().height()!=-1) - psdriver->setMinimumHeight(psdriver->sizeHint().height()); - if (psdriver->sizeHint().height()!=-1) - psdriver->setMaximumHeight(psdriver->sizeHint().height()); - if (amsmath->sizeHint().width()!=-1) - amsmath->setMinimumWidth(amsmath->sizeHint().width()); - if (amsmath->sizeHint().height()!=-1) - amsmath->setMinimumHeight(amsmath->sizeHint().height()); - if (amsmath->sizeHint().width()!=-1) - amsmath->setMaximumWidth(amsmath->sizeHint().width()); - if (amsmath->sizeHint().height()!=-1) - amsmath->setMaximumHeight(amsmath->sizeHint().height()); + if (spin_sectiondepth->sizeHint().width()!=-1) + spin_sectiondepth->setMinimumWidth(spin_sectiondepth->sizeHint().width()); + if (spin_sectiondepth->sizeHint().height()!=-1) + spin_sectiondepth->setMinimumHeight(spin_sectiondepth->sizeHint().height()); + if (spin_sectiondepth->sizeHint().height()!=-1) + spin_sectiondepth->setMaximumHeight(spin_sectiondepth->sizeHint().height()); + if (spin_tocdepth->sizeHint().width()!=-1) + spin_tocdepth->setMinimumWidth(spin_tocdepth->sizeHint().width()); + if (spin_tocdepth->sizeHint().height()!=-1) + spin_tocdepth->setMinimumHeight(spin_tocdepth->sizeHint().height()); + if (spin_tocdepth->sizeHint().height()!=-1) + spin_tocdepth->setMaximumHeight(spin_tocdepth->sizeHint().height()); + if (combo_psdriver->sizeHint().width()!=-1) + combo_psdriver->setMinimumWidth(combo_psdriver->sizeHint().width()); + if (combo_psdriver->sizeHint().height()!=-1) + combo_psdriver->setMinimumHeight(combo_psdriver->sizeHint().height()); + if (combo_psdriver->sizeHint().height()!=-1) + combo_psdriver->setMaximumHeight(combo_psdriver->sizeHint().height()); + if (check_amsmath->sizeHint().width()!=-1) + check_amsmath->setMinimumWidth(check_amsmath->sizeHint().width()); + if (check_amsmath->sizeHint().height()!=-1) + check_amsmath->setMinimumHeight(check_amsmath->sizeHint().height()); + if (check_amsmath->sizeHint().width()!=-1) + check_amsmath->setMaximumWidth(check_amsmath->sizeHint().width()); + if (check_amsmath->sizeHint().height()!=-1) + check_amsmath->setMaximumHeight(check_amsmath->sizeHint().height()); if (qtarch_labelFirst->sizeHint().width()!=-1) qtarch_labelFirst->setMinimumWidth(qtarch_labelFirst->sizeHint().width()); if (qtarch_labelFirst->sizeHint().height()!=-1) @@ -413,8 +413,8 @@ DocExtraDialogData::DocExtraDialogData qtarch_labelFourth->setMaximumHeight(qtarch_labelFourth->sizeHint().height()); QBoxLayout* qtarch_layout_1 = new QBoxLayout( this, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1->addStrut( 0 ); - qtarch_layout_1->addWidget( qtarch_placementBox, 3, 36 ); - QBoxLayout* qtarch_layout_1_1 = new QBoxLayout( qtarch_placementBox, QBoxLayout::TopToBottom, 5, 5, NULL ); + qtarch_layout_1->addWidget( qtarch_group_placement, 3, 36 ); + QBoxLayout* qtarch_layout_1_1 = new QBoxLayout( qtarch_group_placement, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1_1->addStrut( 0 ); QGridLayout* qtarch_layout_1_1_1 = new QGridLayout( 4, 4, 5, NULL ); qtarch_layout_1_1->addLayout( qtarch_layout_1_1_1, 3 ); @@ -429,23 +429,23 @@ DocExtraDialogData::DocExtraDialogData qtarch_layout_1_1_1->addRowSpacing( 0, 0 ); qtarch_layout_1_1_1->setRowStretch( 0, 1 ); qtarch_layout_1_1_1->addWidget( qtarch_labelFirst, 0, 0, 36 ); - qtarch_layout_1_1_1->addWidget( first, 0, 2, 36 ); + qtarch_layout_1_1_1->addWidget( combo_first, 0, 2, 36 ); qtarch_layout_1_1_1->addRowSpacing( 1, 0 ); qtarch_layout_1_1_1->setRowStretch( 1, 1 ); qtarch_layout_1_1_1->addWidget( qtarch_labelSecond, 1, 0, 36 ); - qtarch_layout_1_1_1->addWidget( second, 1, 2, 36 ); + qtarch_layout_1_1_1->addWidget( combo_second, 1, 2, 36 ); qtarch_layout_1_1_1->addRowSpacing( 2, 0 ); qtarch_layout_1_1_1->setRowStretch( 2, 1 ); qtarch_layout_1_1_1->addWidget( qtarch_labelThird, 2, 0, 36 ); - qtarch_layout_1_1_1->addWidget( third, 2, 2, 36 ); + qtarch_layout_1_1_1->addWidget( combo_third, 2, 2, 36 ); qtarch_layout_1_1_1->addRowSpacing( 3, 0 ); qtarch_layout_1_1_1->setRowStretch( 3, 1 ); qtarch_layout_1_1_1->addWidget( qtarch_labelFourth, 3, 0, 36 ); - qtarch_layout_1_1_1->addWidget( fourth, 3, 2, 36 ); + qtarch_layout_1_1_1->addWidget( combo_fourth, 3, 2, 36 ); QBoxLayout* qtarch_layout_1_1_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_1->addLayout( qtarch_layout_1_1_2, 1 ); qtarch_layout_1_1_2->addStrut( 0 ); - qtarch_layout_1_1_2->addWidget( ignore, 1, 36 ); + qtarch_layout_1_1_2->addWidget( check_ignore, 1, 36 ); QGridLayout* qtarch_layout_1_2 = new QGridLayout( 4, 4, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2, 2 ); qtarch_layout_1_2->addColSpacing( 0, 5 ); @@ -459,18 +459,18 @@ DocExtraDialogData::DocExtraDialogData qtarch_layout_1_2->addRowSpacing( 0, 0 ); qtarch_layout_1_2->setRowStretch( 0, 1 ); qtarch_layout_1_2->addWidget( qtarch_labelsectiondepth, 0, 0, 36 ); - qtarch_layout_1_2->addWidget( sectiondepth, 0, 2, 36 ); + qtarch_layout_1_2->addWidget( spin_sectiondepth, 0, 2, 36 ); qtarch_layout_1_2->addRowSpacing( 1, 0 ); qtarch_layout_1_2->setRowStretch( 1, 1 ); qtarch_layout_1_2->addWidget( qtarch_labeltocdepth, 1, 0, 36 ); - qtarch_layout_1_2->addWidget( tocdepth, 1, 2, 36 ); + qtarch_layout_1_2->addWidget( spin_tocdepth, 1, 2, 36 ); qtarch_layout_1_2->addRowSpacing( 2, 0 ); qtarch_layout_1_2->setRowStretch( 2, 1 ); qtarch_layout_1_2->addWidget( qtarch_labelPSDriver, 2, 0, 36 ); - qtarch_layout_1_2->addWidget( psdriver, 2, 2, 36 ); + qtarch_layout_1_2->addWidget( combo_psdriver, 2, 2, 36 ); qtarch_layout_1_2->addRowSpacing( 3, 0 ); qtarch_layout_1_2->setRowStretch( 3, 1 ); - qtarch_layout_1_2->addWidget( amsmath, 3, 0, 36 ); + qtarch_layout_1_2->addWidget( check_amsmath, 3, 0, 36 ); resize( 635,640 ); setMinimumSize( 0, 0 ); setMaximumSize( 32767, 32767 ); diff --git a/src/frontends/kde/dlg/docextradlgdata.h b/src/frontends/kde/dlg/docextradlgdata.h index 9e0d7265ee..46f0e0a61b 100644 --- a/src/frontends/kde/dlg/docextradlgdata.h +++ b/src/frontends/kde/dlg/docextradlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docextradlgdata.h - Last generated: Sat Feb 10 23:32:07 2001 + Last generated: Sat Mar 31 16:48:27 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -39,15 +39,15 @@ protected slots: public: - QComboBox* first; - QComboBox* second; - QComboBox* third; - QComboBox* fourth; - QCheckBox* ignore; - QSpinBox* sectiondepth; - QSpinBox* tocdepth; - QComboBox* psdriver; - QCheckBox* amsmath; + QComboBox* combo_first; + QComboBox* combo_second; + QComboBox* combo_third; + QComboBox* combo_fourth; + QCheckBox* check_ignore; + QSpinBox* spin_sectiondepth; + QSpinBox* spin_tocdepth; + QComboBox* combo_psdriver; + QCheckBox* check_amsmath; }; diff --git a/src/frontends/kde/dlg/docgeometrydlgdata.C b/src/frontends/kde/dlg/docgeometrydlgdata.C index 5d597e54f3..3b6b9cc7c6 100644 --- a/src/frontends/kde/dlg/docgeometrydlgdata.C +++ b/src/frontends/kde/dlg/docgeometrydlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docgeometrydlgdata.C - Last generated: Sat Feb 10 21:35:53 2001 + Last generated: Sat Mar 31 16:48:30 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -112,64 +112,64 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_labelPapersize->setAlignment( 0 ); qtarch_labelPapersize->setMargin( -1 ); - papersize = new QComboBox( FALSE, qtarch_paperGroup, "papersize" ); - papersize->setGeometry( 103, 20, 94, 35 ); - papersize->setMinimumSize( 0, 0 ); - papersize->setMaximumSize( 32767, 32767 ); - connect( papersize, SIGNAL(highlighted(const char*)), SLOT(papersizeChanged(const char*)) ); - papersize->setFocusPolicy( QWidget::StrongFocus ); - papersize->setBackgroundMode( QWidget::PaletteBackground ); - papersize->setFontPropagation( QWidget::AllChildren ); - papersize->setPalettePropagation( QWidget::AllChildren ); - papersize->setSizeLimit( 30 ); - papersize->setAutoResize( true ); - papersize->setMaxCount( 2147483647 ); - papersize->setAutoCompletion( false ); - - width = new LengthEntry( qtarch_paperGroup, "width" ); - width->setGeometry( 5, 135, 285, 35 ); - width->setMinimumSize( 0, 0 ); - width->setMaximumSize( 32767, 32767 ); - width->setFocusPolicy( QWidget::NoFocus ); - width->setBackgroundMode( QWidget::PaletteBackground ); - width->setFontPropagation( QWidget::NoChildren ); - width->setPalettePropagation( QWidget::NoChildren ); - - height = new LengthEntry( qtarch_paperGroup, "height" ); - height->setGeometry( 5, 250, 285, 35 ); - height->setMinimumSize( 0, 0 ); - height->setMaximumSize( 32767, 32767 ); - height->setFocusPolicy( QWidget::NoFocus ); - height->setBackgroundMode( QWidget::PaletteBackground ); - height->setFontPropagation( QWidget::NoChildren ); - height->setPalettePropagation( QWidget::NoChildren ); - - headheight = new LengthEntry( qtarch_headfootGroup, "headheight" ); - headheight->setGeometry( 5, 80, 285, 28 ); - headheight->setMinimumSize( 0, 0 ); - headheight->setMaximumSize( 32767, 32767 ); - headheight->setFocusPolicy( QWidget::NoFocus ); - headheight->setBackgroundMode( QWidget::PaletteBackground ); - headheight->setFontPropagation( QWidget::NoChildren ); - headheight->setPalettePropagation( QWidget::NoChildren ); - - headsep = new LengthEntry( qtarch_headfootGroup, "headsep" ); - headsep->setGeometry( 5, 173, 285, 27 ); - headsep->setMinimumSize( 0, 0 ); - headsep->setMaximumSize( 32767, 32767 ); - headsep->setFocusPolicy( QWidget::NoFocus ); - headsep->setBackgroundMode( QWidget::PaletteBackground ); - headsep->setFontPropagation( QWidget::NoChildren ); - headsep->setPalettePropagation( QWidget::NoChildren ); - - footskip = new LengthEntry( qtarch_headfootGroup, "footskip" ); - footskip->setGeometry( 5, 265, 285, 28 ); - footskip->setMinimumSize( 0, 0 ); - footskip->setMaximumSize( 32767, 32767 ); - footskip->setFocusPolicy( QWidget::NoFocus ); - footskip->setBackgroundMode( QWidget::PaletteBackground ); - footskip->setFontPropagation( QWidget::NoChildren ); - footskip->setPalettePropagation( QWidget::NoChildren ); + combo_papersize = new QComboBox( FALSE, qtarch_paperGroup, "combo_papersize" ); + combo_papersize->setGeometry( 103, 20, 94, 35 ); + combo_papersize->setMinimumSize( 0, 0 ); + combo_papersize->setMaximumSize( 32767, 32767 ); + connect( combo_papersize, SIGNAL(highlighted(const char*)), SLOT(papersizeChanged(const char*)) ); + combo_papersize->setFocusPolicy( QWidget::StrongFocus ); + combo_papersize->setBackgroundMode( QWidget::PaletteBackground ); + combo_papersize->setFontPropagation( QWidget::AllChildren ); + combo_papersize->setPalettePropagation( QWidget::AllChildren ); + combo_papersize->setSizeLimit( 30 ); + combo_papersize->setAutoResize( true ); + combo_papersize->setMaxCount( 2147483647 ); + combo_papersize->setAutoCompletion( false ); + + length_width = new LengthEntry( qtarch_paperGroup, "length_width" ); + length_width->setGeometry( 5, 135, 285, 35 ); + length_width->setMinimumSize( 0, 0 ); + length_width->setMaximumSize( 32767, 32767 ); + length_width->setFocusPolicy( QWidget::NoFocus ); + length_width->setBackgroundMode( QWidget::PaletteBackground ); + length_width->setFontPropagation( QWidget::NoChildren ); + length_width->setPalettePropagation( QWidget::NoChildren ); + + length_height = new LengthEntry( qtarch_paperGroup, "length_height" ); + length_height->setGeometry( 5, 250, 285, 35 ); + length_height->setMinimumSize( 0, 0 ); + length_height->setMaximumSize( 32767, 32767 ); + length_height->setFocusPolicy( QWidget::NoFocus ); + length_height->setBackgroundMode( QWidget::PaletteBackground ); + length_height->setFontPropagation( QWidget::NoChildren ); + length_height->setPalettePropagation( QWidget::NoChildren ); + + length_headheight = new LengthEntry( qtarch_headfootGroup, "length_headheight" ); + length_headheight->setGeometry( 5, 80, 285, 28 ); + length_headheight->setMinimumSize( 0, 0 ); + length_headheight->setMaximumSize( 32767, 32767 ); + length_headheight->setFocusPolicy( QWidget::NoFocus ); + length_headheight->setBackgroundMode( QWidget::PaletteBackground ); + length_headheight->setFontPropagation( QWidget::NoChildren ); + length_headheight->setPalettePropagation( QWidget::NoChildren ); + + length_headsep = new LengthEntry( qtarch_headfootGroup, "length_headsep" ); + length_headsep->setGeometry( 5, 173, 285, 27 ); + length_headsep->setMinimumSize( 0, 0 ); + length_headsep->setMaximumSize( 32767, 32767 ); + length_headsep->setFocusPolicy( QWidget::NoFocus ); + length_headsep->setBackgroundMode( QWidget::PaletteBackground ); + length_headsep->setFontPropagation( QWidget::NoChildren ); + length_headsep->setPalettePropagation( QWidget::NoChildren ); + + length_footskip = new LengthEntry( qtarch_headfootGroup, "length_footskip" ); + length_footskip->setGeometry( 5, 265, 285, 28 ); + length_footskip->setMinimumSize( 0, 0 ); + length_footskip->setMaximumSize( 32767, 32767 ); + length_footskip->setFocusPolicy( QWidget::NoFocus ); + length_footskip->setBackgroundMode( QWidget::PaletteBackground ); + length_footskip->setFontPropagation( QWidget::NoChildren ); + length_footskip->setPalettePropagation( QWidget::NoChildren ); QLabel* qtarch_labelMargin; qtarch_labelMargin = new QLabel( qtarch_marginsGroup, "labelMargin" ); @@ -341,88 +341,88 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_labelFootskip->setAlignment( 0 ); qtarch_labelFootskip->setMargin( -1 ); - margins = new QComboBox( FALSE, qtarch_marginsGroup, "margins" ); - margins->setGeometry( 236, 20, 112, 54 ); - margins->setMinimumSize( 0, 0 ); - margins->setMaximumSize( 32767, 32767 ); - connect( margins, SIGNAL(highlighted(const char*)), SLOT(marginsChanged(const char*)) ); - margins->setFocusPolicy( QWidget::StrongFocus ); - margins->setBackgroundMode( QWidget::PaletteBackground ); - margins->setFontPropagation( QWidget::AllChildren ); - margins->setPalettePropagation( QWidget::AllChildren ); - margins->setSizeLimit( 30 ); - margins->setAutoResize( true ); - margins->setMaxCount( 2147483647 ); - margins->setAutoCompletion( false ); - - top = new LengthEntry( qtarch_marginsGroup, "top" ); - top->setGeometry( 199, 133, 211, 41 ); - top->setMinimumSize( 0, 0 ); - top->setMaximumSize( 32767, 32767 ); - top->setFocusPolicy( QWidget::NoFocus ); - top->setBackgroundMode( QWidget::PaletteBackground ); - top->setFontPropagation( QWidget::NoChildren ); - top->setPalettePropagation( QWidget::NoChildren ); - - bottom = new LengthEntry( qtarch_marginsGroup, "bottom" ); - bottom->setGeometry( 199, 179, 211, 40 ); - bottom->setMinimumSize( 0, 0 ); - bottom->setMaximumSize( 32767, 32767 ); - bottom->setFocusPolicy( QWidget::NoFocus ); - bottom->setBackgroundMode( QWidget::PaletteBackground ); - bottom->setFontPropagation( QWidget::NoChildren ); - bottom->setPalettePropagation( QWidget::NoChildren ); - - left = new LengthEntry( qtarch_marginsGroup, "left" ); - left->setGeometry( 199, 224, 211, 41 ); - left->setMinimumSize( 0, 0 ); - left->setMaximumSize( 32767, 32767 ); - left->setFocusPolicy( QWidget::NoFocus ); - left->setBackgroundMode( QWidget::PaletteBackground ); - left->setFontPropagation( QWidget::NoChildren ); - left->setPalettePropagation( QWidget::NoChildren ); - - right = new LengthEntry( qtarch_marginsGroup, "right" ); - right->setGeometry( 199, 270, 211, 40 ); - right->setMinimumSize( 0, 0 ); - right->setMaximumSize( 32767, 32767 ); - right->setFocusPolicy( QWidget::NoFocus ); - right->setBackgroundMode( QWidget::PaletteBackground ); - right->setFontPropagation( QWidget::NoChildren ); - right->setPalettePropagation( QWidget::NoChildren ); - - portrait = new QRadioButton( qtarch_orientation, "portrait" ); - portrait->setGeometry( 5, 77, 1, 57 ); - portrait->setMinimumSize( 0, 0 ); - portrait->setMaximumSize( 32767, 32767 ); - portrait->setFocusPolicy( QWidget::TabFocus ); - portrait->setBackgroundMode( QWidget::PaletteBackground ); - portrait->setFontPropagation( QWidget::NoChildren ); - portrait->setPalettePropagation( QWidget::NoChildren ); - portrait->setText( _("Portrait") ); - portrait->setAutoRepeat( false ); - portrait->setAutoResize( false ); - portrait->setChecked( true ); - - landscape = new QRadioButton( qtarch_orientation, "landscape" ); - landscape->setGeometry( 5, 196, 1, 57 ); - landscape->setMinimumSize( 0, 0 ); - landscape->setMaximumSize( 32767, 32767 ); - landscape->setFocusPolicy( QWidget::TabFocus ); - landscape->setBackgroundMode( QWidget::PaletteBackground ); - landscape->setFontPropagation( QWidget::NoChildren ); - landscape->setPalettePropagation( QWidget::NoChildren ); - landscape->setText( _("Landscape") ); - landscape->setAutoRepeat( false ); - landscape->setAutoResize( false ); - landscape->setChecked( false ); + combo_margins = new QComboBox( FALSE, qtarch_marginsGroup, "combo_margins" ); + combo_margins->setGeometry( 236, 20, 112, 54 ); + combo_margins->setMinimumSize( 0, 0 ); + combo_margins->setMaximumSize( 32767, 32767 ); + connect( combo_margins, SIGNAL(highlighted(const char*)), SLOT(marginsChanged(const char*)) ); + combo_margins->setFocusPolicy( QWidget::StrongFocus ); + combo_margins->setBackgroundMode( QWidget::PaletteBackground ); + combo_margins->setFontPropagation( QWidget::AllChildren ); + combo_margins->setPalettePropagation( QWidget::AllChildren ); + combo_margins->setSizeLimit( 30 ); + combo_margins->setAutoResize( true ); + combo_margins->setMaxCount( 2147483647 ); + combo_margins->setAutoCompletion( false ); + + length_top = new LengthEntry( qtarch_marginsGroup, "length_top" ); + length_top->setGeometry( 199, 133, 211, 41 ); + length_top->setMinimumSize( 0, 0 ); + length_top->setMaximumSize( 32767, 32767 ); + length_top->setFocusPolicy( QWidget::NoFocus ); + length_top->setBackgroundMode( QWidget::PaletteBackground ); + length_top->setFontPropagation( QWidget::NoChildren ); + length_top->setPalettePropagation( QWidget::NoChildren ); + + length_bottom = new LengthEntry( qtarch_marginsGroup, "length_bottom" ); + length_bottom->setGeometry( 199, 179, 211, 40 ); + length_bottom->setMinimumSize( 0, 0 ); + length_bottom->setMaximumSize( 32767, 32767 ); + length_bottom->setFocusPolicy( QWidget::NoFocus ); + length_bottom->setBackgroundMode( QWidget::PaletteBackground ); + length_bottom->setFontPropagation( QWidget::NoChildren ); + length_bottom->setPalettePropagation( QWidget::NoChildren ); + + length_left = new LengthEntry( qtarch_marginsGroup, "length_left" ); + length_left->setGeometry( 199, 224, 211, 41 ); + length_left->setMinimumSize( 0, 0 ); + length_left->setMaximumSize( 32767, 32767 ); + length_left->setFocusPolicy( QWidget::NoFocus ); + length_left->setBackgroundMode( QWidget::PaletteBackground ); + length_left->setFontPropagation( QWidget::NoChildren ); + length_left->setPalettePropagation( QWidget::NoChildren ); + + length_right = new LengthEntry( qtarch_marginsGroup, "length_right" ); + length_right->setGeometry( 199, 270, 211, 40 ); + length_right->setMinimumSize( 0, 0 ); + length_right->setMaximumSize( 32767, 32767 ); + length_right->setFocusPolicy( QWidget::NoFocus ); + length_right->setBackgroundMode( QWidget::PaletteBackground ); + length_right->setFontPropagation( QWidget::NoChildren ); + length_right->setPalettePropagation( QWidget::NoChildren ); + + radio_portrait = new QRadioButton( qtarch_orientation, "radio_portrait" ); + radio_portrait->setGeometry( 5, 77, 1, 57 ); + radio_portrait->setMinimumSize( 0, 0 ); + radio_portrait->setMaximumSize( 32767, 32767 ); + radio_portrait->setFocusPolicy( QWidget::TabFocus ); + radio_portrait->setBackgroundMode( QWidget::PaletteBackground ); + radio_portrait->setFontPropagation( QWidget::NoChildren ); + radio_portrait->setPalettePropagation( QWidget::NoChildren ); + radio_portrait->setText( _("Portrait") ); + radio_portrait->setAutoRepeat( false ); + radio_portrait->setAutoResize( false ); + radio_portrait->setChecked( true ); + + radio_landscape = new QRadioButton( qtarch_orientation, "radio_landscape" ); + radio_landscape->setGeometry( 5, 196, 1, 57 ); + radio_landscape->setMinimumSize( 0, 0 ); + radio_landscape->setMaximumSize( 32767, 32767 ); + radio_landscape->setFocusPolicy( QWidget::TabFocus ); + radio_landscape->setBackgroundMode( QWidget::PaletteBackground ); + radio_landscape->setFontPropagation( QWidget::NoChildren ); + radio_landscape->setPalettePropagation( QWidget::NoChildren ); + radio_landscape->setText( _("Landscape") ); + radio_landscape->setAutoRepeat( false ); + radio_landscape->setAutoResize( false ); + radio_landscape->setChecked( false ); if (qtarch_orientation->sizeHint().width()!=-1) qtarch_orientation->setMinimumWidth(qtarch_orientation->sizeHint().width()); if (qtarch_orientation->sizeHint().height()!=-1) qtarch_orientation->setMinimumHeight(qtarch_orientation->sizeHint().height()); - qtarch_orientation->insert( portrait ); - qtarch_orientation->insert( landscape ); + qtarch_orientation->insert( radio_portrait ); + qtarch_orientation->insert( radio_landscape ); if (qtarch_labelPapersize->sizeHint().width()!=-1) qtarch_labelPapersize->setMinimumWidth(qtarch_labelPapersize->sizeHint().width()); @@ -432,42 +432,42 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_labelPapersize->setMaximumWidth(qtarch_labelPapersize->sizeHint().width()); if (qtarch_labelPapersize->sizeHint().height()!=-1) qtarch_labelPapersize->setMaximumHeight(qtarch_labelPapersize->sizeHint().height()); - if (papersize->sizeHint().width()!=-1) - papersize->setMinimumWidth(papersize->sizeHint().width()); - if (papersize->sizeHint().height()!=-1) - papersize->setMinimumHeight(papersize->sizeHint().height()); - if (papersize->sizeHint().height()!=-1) - papersize->setMaximumHeight(papersize->sizeHint().height()); - if (width->sizeHint().width()!=-1) - width->setMinimumWidth(width->sizeHint().width()); - if (width->sizeHint().height()!=-1) - width->setMinimumHeight(width->sizeHint().height()); - if (width->sizeHint().height()!=-1) - width->setMaximumHeight(width->sizeHint().height()); - if (height->sizeHint().width()!=-1) - height->setMinimumWidth(height->sizeHint().width()); - if (height->sizeHint().height()!=-1) - height->setMinimumHeight(height->sizeHint().height()); - if (height->sizeHint().height()!=-1) - height->setMaximumHeight(height->sizeHint().height()); - if (headheight->sizeHint().width()!=-1) - headheight->setMinimumWidth(headheight->sizeHint().width()); - if (headheight->sizeHint().height()!=-1) - headheight->setMinimumHeight(headheight->sizeHint().height()); - if (headheight->sizeHint().height()!=-1) - headheight->setMaximumHeight(headheight->sizeHint().height()); - if (headsep->sizeHint().width()!=-1) - headsep->setMinimumWidth(headsep->sizeHint().width()); - if (headsep->sizeHint().height()!=-1) - headsep->setMinimumHeight(headsep->sizeHint().height()); - if (headsep->sizeHint().height()!=-1) - headsep->setMaximumHeight(headsep->sizeHint().height()); - if (footskip->sizeHint().width()!=-1) - footskip->setMinimumWidth(footskip->sizeHint().width()); - if (footskip->sizeHint().height()!=-1) - footskip->setMinimumHeight(footskip->sizeHint().height()); - if (footskip->sizeHint().height()!=-1) - footskip->setMaximumHeight(footskip->sizeHint().height()); + if (combo_papersize->sizeHint().width()!=-1) + combo_papersize->setMinimumWidth(combo_papersize->sizeHint().width()); + if (combo_papersize->sizeHint().height()!=-1) + combo_papersize->setMinimumHeight(combo_papersize->sizeHint().height()); + if (combo_papersize->sizeHint().height()!=-1) + combo_papersize->setMaximumHeight(combo_papersize->sizeHint().height()); + if (length_width->sizeHint().width()!=-1) + length_width->setMinimumWidth(length_width->sizeHint().width()); + if (length_width->sizeHint().height()!=-1) + length_width->setMinimumHeight(length_width->sizeHint().height()); + if (length_width->sizeHint().height()!=-1) + length_width->setMaximumHeight(length_width->sizeHint().height()); + if (length_height->sizeHint().width()!=-1) + length_height->setMinimumWidth(length_height->sizeHint().width()); + if (length_height->sizeHint().height()!=-1) + length_height->setMinimumHeight(length_height->sizeHint().height()); + if (length_height->sizeHint().height()!=-1) + length_height->setMaximumHeight(length_height->sizeHint().height()); + if (length_headheight->sizeHint().width()!=-1) + length_headheight->setMinimumWidth(length_headheight->sizeHint().width()); + if (length_headheight->sizeHint().height()!=-1) + length_headheight->setMinimumHeight(length_headheight->sizeHint().height()); + if (length_headheight->sizeHint().height()!=-1) + length_headheight->setMaximumHeight(length_headheight->sizeHint().height()); + if (length_headsep->sizeHint().width()!=-1) + length_headsep->setMinimumWidth(length_headsep->sizeHint().width()); + if (length_headsep->sizeHint().height()!=-1) + length_headsep->setMinimumHeight(length_headsep->sizeHint().height()); + if (length_headsep->sizeHint().height()!=-1) + length_headsep->setMaximumHeight(length_headsep->sizeHint().height()); + if (length_footskip->sizeHint().width()!=-1) + length_footskip->setMinimumWidth(length_footskip->sizeHint().width()); + if (length_footskip->sizeHint().height()!=-1) + length_footskip->setMinimumHeight(length_footskip->sizeHint().height()); + if (length_footskip->sizeHint().height()!=-1) + length_footskip->setMaximumHeight(length_footskip->sizeHint().height()); if (qtarch_labelMargin->sizeHint().width()!=-1) qtarch_labelMargin->setMinimumWidth(qtarch_labelMargin->sizeHint().width()); if (qtarch_labelMargin->sizeHint().height()!=-1) @@ -548,52 +548,52 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_labelFootskip->setMaximumWidth(qtarch_labelFootskip->sizeHint().width()); if (qtarch_labelFootskip->sizeHint().height()!=-1) qtarch_labelFootskip->setMaximumHeight(qtarch_labelFootskip->sizeHint().height()); - if (margins->sizeHint().width()!=-1) - margins->setMinimumWidth(margins->sizeHint().width()); - if (margins->sizeHint().height()!=-1) - margins->setMinimumHeight(margins->sizeHint().height()); - if (margins->sizeHint().height()!=-1) - margins->setMaximumHeight(margins->sizeHint().height()); - if (top->sizeHint().width()!=-1) - top->setMinimumWidth(top->sizeHint().width()); - if (top->sizeHint().height()!=-1) - top->setMinimumHeight(top->sizeHint().height()); - if (top->sizeHint().height()!=-1) - top->setMaximumHeight(top->sizeHint().height()); - if (bottom->sizeHint().width()!=-1) - bottom->setMinimumWidth(bottom->sizeHint().width()); - if (bottom->sizeHint().height()!=-1) - bottom->setMinimumHeight(bottom->sizeHint().height()); - if (bottom->sizeHint().height()!=-1) - bottom->setMaximumHeight(bottom->sizeHint().height()); - if (left->sizeHint().width()!=-1) - left->setMinimumWidth(left->sizeHint().width()); - if (left->sizeHint().height()!=-1) - left->setMinimumHeight(left->sizeHint().height()); - if (left->sizeHint().height()!=-1) - left->setMaximumHeight(left->sizeHint().height()); - if (right->sizeHint().width()!=-1) - right->setMinimumWidth(right->sizeHint().width()); - if (right->sizeHint().height()!=-1) - right->setMinimumHeight(right->sizeHint().height()); - if (right->sizeHint().height()!=-1) - right->setMaximumHeight(right->sizeHint().height()); - if (portrait->sizeHint().width()!=-1) - portrait->setMinimumWidth(portrait->sizeHint().width()); - if (portrait->sizeHint().height()!=-1) - portrait->setMinimumHeight(portrait->sizeHint().height()); - if (portrait->sizeHint().width()!=-1) - portrait->setMaximumWidth(portrait->sizeHint().width()); - if (portrait->sizeHint().height()!=-1) - portrait->setMaximumHeight(portrait->sizeHint().height()); - if (landscape->sizeHint().width()!=-1) - landscape->setMinimumWidth(landscape->sizeHint().width()); - if (landscape->sizeHint().height()!=-1) - landscape->setMinimumHeight(landscape->sizeHint().height()); - if (landscape->sizeHint().width()!=-1) - landscape->setMaximumWidth(landscape->sizeHint().width()); - if (landscape->sizeHint().height()!=-1) - landscape->setMaximumHeight(landscape->sizeHint().height()); + if (combo_margins->sizeHint().width()!=-1) + combo_margins->setMinimumWidth(combo_margins->sizeHint().width()); + if (combo_margins->sizeHint().height()!=-1) + combo_margins->setMinimumHeight(combo_margins->sizeHint().height()); + if (combo_margins->sizeHint().height()!=-1) + combo_margins->setMaximumHeight(combo_margins->sizeHint().height()); + if (length_top->sizeHint().width()!=-1) + length_top->setMinimumWidth(length_top->sizeHint().width()); + if (length_top->sizeHint().height()!=-1) + length_top->setMinimumHeight(length_top->sizeHint().height()); + if (length_top->sizeHint().height()!=-1) + length_top->setMaximumHeight(length_top->sizeHint().height()); + if (length_bottom->sizeHint().width()!=-1) + length_bottom->setMinimumWidth(length_bottom->sizeHint().width()); + if (length_bottom->sizeHint().height()!=-1) + length_bottom->setMinimumHeight(length_bottom->sizeHint().height()); + if (length_bottom->sizeHint().height()!=-1) + length_bottom->setMaximumHeight(length_bottom->sizeHint().height()); + if (length_left->sizeHint().width()!=-1) + length_left->setMinimumWidth(length_left->sizeHint().width()); + if (length_left->sizeHint().height()!=-1) + length_left->setMinimumHeight(length_left->sizeHint().height()); + if (length_left->sizeHint().height()!=-1) + length_left->setMaximumHeight(length_left->sizeHint().height()); + if (length_right->sizeHint().width()!=-1) + length_right->setMinimumWidth(length_right->sizeHint().width()); + if (length_right->sizeHint().height()!=-1) + length_right->setMinimumHeight(length_right->sizeHint().height()); + if (length_right->sizeHint().height()!=-1) + length_right->setMaximumHeight(length_right->sizeHint().height()); + if (radio_portrait->sizeHint().width()!=-1) + radio_portrait->setMinimumWidth(radio_portrait->sizeHint().width()); + if (radio_portrait->sizeHint().height()!=-1) + radio_portrait->setMinimumHeight(radio_portrait->sizeHint().height()); + if (radio_portrait->sizeHint().width()!=-1) + radio_portrait->setMaximumWidth(radio_portrait->sizeHint().width()); + if (radio_portrait->sizeHint().height()!=-1) + radio_portrait->setMaximumHeight(radio_portrait->sizeHint().height()); + if (radio_landscape->sizeHint().width()!=-1) + radio_landscape->setMinimumWidth(radio_landscape->sizeHint().width()); + if (radio_landscape->sizeHint().height()!=-1) + radio_landscape->setMinimumHeight(radio_landscape->sizeHint().height()); + if (radio_landscape->sizeHint().width()!=-1) + radio_landscape->setMaximumWidth(radio_landscape->sizeHint().width()); + if (radio_landscape->sizeHint().height()!=-1) + radio_landscape->setMaximumHeight(radio_landscape->sizeHint().height()); QBoxLayout* qtarch_layout_1 = new QBoxLayout( this, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1->addStrut( 0 ); QBoxLayout* qtarch_layout_1_1 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); @@ -608,7 +608,7 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_layout_1_1_1_2->addStrut( 0 ); qtarch_layout_1_1_1_2->addWidget( qtarch_labelPapersize, 0, 33 ); qtarch_layout_1_1_1_2->addStretch( 1 ); - qtarch_layout_1_1_1_2->addWidget( papersize, 1, 33 ); + qtarch_layout_1_1_1_2->addWidget( combo_papersize, 1, 33 ); qtarch_layout_1_1_1_2->addStretch( 1 ); qtarch_layout_1_1_1->addStretch( 1 ); QBoxLayout* qtarch_layout_1_1_1_4 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); @@ -616,14 +616,14 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_layout_1_1_1_4->addStrut( 0 ); qtarch_layout_1_1_1_4->addWidget( qtarch_labelWidth, 0, 33 ); qtarch_layout_1_1_1_4->addStretch( 1 ); - qtarch_layout_1_1_1->addWidget( width, 1, 33 ); + qtarch_layout_1_1_1->addWidget( length_width, 1, 33 ); qtarch_layout_1_1_1->addStretch( 1 ); QBoxLayout* qtarch_layout_1_1_1_7 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_1_1->addLayout( qtarch_layout_1_1_1_7, 1 ); qtarch_layout_1_1_1_7->addStrut( 0 ); qtarch_layout_1_1_1_7->addWidget( qtarch_labelHeight, 0, 33 ); qtarch_layout_1_1_1_7->addStretch( 1 ); - qtarch_layout_1_1_1->addWidget( height, 1, 33 ); + qtarch_layout_1_1_1->addWidget( length_height, 1, 33 ); qtarch_layout_1_1_1->addStretch( 1 ); qtarch_layout_1_1->addWidget( qtarch_headfootGroup, 1, 33 ); QBoxLayout* qtarch_layout_1_1_2 = new QBoxLayout( qtarch_headfootGroup, QBoxLayout::TopToBottom, 5, 5, NULL ); @@ -635,21 +635,21 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_layout_1_1_2_3->addStrut( 0 ); qtarch_layout_1_1_2_3->addWidget( qtarch_labelheadheight, 0, 33 ); qtarch_layout_1_1_2_3->addStretch( 1 ); - qtarch_layout_1_1_2->addWidget( headheight, 1, 33 ); + qtarch_layout_1_1_2->addWidget( length_headheight, 1, 33 ); qtarch_layout_1_1_2->addStretch( 1 ); QBoxLayout* qtarch_layout_1_1_2_6 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_1_2->addLayout( qtarch_layout_1_1_2_6, 1 ); qtarch_layout_1_1_2_6->addStrut( 0 ); qtarch_layout_1_1_2_6->addWidget( qtarch_labelHeadsep, 0, 33 ); qtarch_layout_1_1_2_6->addStretch( 1 ); - qtarch_layout_1_1_2->addWidget( headsep, 1, 33 ); + qtarch_layout_1_1_2->addWidget( length_headsep, 1, 33 ); qtarch_layout_1_1_2->addStretch( 1 ); QBoxLayout* qtarch_layout_1_1_2_9 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_1_2->addLayout( qtarch_layout_1_1_2_9, 1 ); qtarch_layout_1_1_2_9->addStrut( 0 ); qtarch_layout_1_1_2_9->addWidget( qtarch_labelFootskip, 0, 33 ); qtarch_layout_1_1_2_9->addStretch( 1 ); - qtarch_layout_1_1_2->addWidget( footskip, 1, 33 ); + qtarch_layout_1_1_2->addWidget( length_footskip, 1, 33 ); qtarch_layout_1_1_2->addStretch( 1 ); QBoxLayout* qtarch_layout_1_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2, 1 ); @@ -663,7 +663,7 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_layout_1_2_1_2->addStrut( 0 ); qtarch_layout_1_2_1_2->addWidget( qtarch_labelMargin, 1, 33 ); qtarch_layout_1_2_1_2->addStretch( 1 ); - qtarch_layout_1_2_1_2->addWidget( margins, 1, 33 ); + qtarch_layout_1_2_1_2->addWidget( combo_margins, 1, 33 ); qtarch_layout_1_2_1_2->addStretch( 1 ); qtarch_layout_1_2_1->addStretch( 1 ); QGridLayout* qtarch_layout_1_2_1_4 = new QGridLayout( 4, 5, 5, NULL ); @@ -681,19 +681,19 @@ DocGeometryDialogData::DocGeometryDialogData qtarch_layout_1_2_1_4->addRowSpacing( 0, 0 ); qtarch_layout_1_2_1_4->setRowStretch( 0, 1 ); qtarch_layout_1_2_1_4->addWidget( qtarch_labelTop, 0, 1, 33 ); - qtarch_layout_1_2_1_4->addWidget( top, 0, 3, 33 ); + qtarch_layout_1_2_1_4->addWidget( length_top, 0, 3, 33 ); qtarch_layout_1_2_1_4->addRowSpacing( 1, 0 ); qtarch_layout_1_2_1_4->setRowStretch( 1, 1 ); qtarch_layout_1_2_1_4->addWidget( qtarch_labelBottom, 1, 1, 33 ); - qtarch_layout_1_2_1_4->addWidget( bottom, 1, 3, 33 ); + qtarch_layout_1_2_1_4->addWidget( length_bottom, 1, 3, 33 ); qtarch_layout_1_2_1_4->addRowSpacing( 2, 0 ); qtarch_layout_1_2_1_4->setRowStretch( 2, 1 ); qtarch_layout_1_2_1_4->addWidget( qtarch_labelLeft, 2, 1, 33 ); - qtarch_layout_1_2_1_4->addWidget( left, 2, 3, 33 ); + qtarch_layout_1_2_1_4->addWidget( length_left, 2, 3, 33 ); qtarch_layout_1_2_1_4->addRowSpacing( 3, 0 ); qtarch_layout_1_2_1_4->setRowStretch( 3, 1 ); qtarch_layout_1_2_1_4->addWidget( qtarch_labelRight, 3, 1, 33 ); - qtarch_layout_1_2_1_4->addWidget( right, 3, 3, 33 ); + qtarch_layout_1_2_1_4->addWidget( length_right, 3, 3, 33 ); qtarch_layout_1_2->addWidget( qtarch_orientation, 1, 33 ); QBoxLayout* qtarch_layout_1_2_2 = new QBoxLayout( qtarch_orientation, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1_2_2->addStrut( 0 ); @@ -702,13 +702,13 @@ DocGeometryDialogData::DocGeometryDialogData QBoxLayout* qtarch_layout_1_2_2_3 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_2_2->addLayout( qtarch_layout_1_2_2_3, 1 ); qtarch_layout_1_2_2_3->addStrut( 0 ); - qtarch_layout_1_2_2_3->addWidget( portrait, 0, 33 ); + qtarch_layout_1_2_2_3->addWidget( radio_portrait, 0, 33 ); qtarch_layout_1_2_2_3->addStretch( 1 ); qtarch_layout_1_2_2->addStretch( 1 ); QBoxLayout* qtarch_layout_1_2_2_5 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_2_2->addLayout( qtarch_layout_1_2_2_5, 1 ); qtarch_layout_1_2_2_5->addStrut( 0 ); - qtarch_layout_1_2_2_5->addWidget( landscape, 0, 33 ); + qtarch_layout_1_2_2_5->addWidget( radio_landscape, 0, 33 ); qtarch_layout_1_2_2_5->addStretch( 1 ); qtarch_layout_1_2_2->addStretch( 1 ); resize( 605,655 ); diff --git a/src/frontends/kde/dlg/docgeometrydlgdata.h b/src/frontends/kde/dlg/docgeometrydlgdata.h index 13fdfd28a4..6700a5fa85 100644 --- a/src/frontends/kde/dlg/docgeometrydlgdata.h +++ b/src/frontends/kde/dlg/docgeometrydlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docgeometrydlgdata.h - Last generated: Sat Feb 10 21:35:53 2001 + Last generated: Sat Mar 31 16:48:30 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -41,19 +41,19 @@ protected slots: virtual void marginsChanged(const char*); public: - QComboBox* papersize; - LengthEntry* width; - LengthEntry* height; - LengthEntry* headheight; - LengthEntry* headsep; - LengthEntry* footskip; - QComboBox* margins; - LengthEntry* top; - LengthEntry* bottom; - LengthEntry* left; - LengthEntry* right; - QRadioButton* portrait; - QRadioButton* landscape; + QComboBox* combo_papersize; + LengthEntry* length_width; + LengthEntry* length_height; + LengthEntry* length_headheight; + LengthEntry* length_headsep; + LengthEntry* length_footskip; + QComboBox* combo_margins; + LengthEntry* length_top; + LengthEntry* length_bottom; + LengthEntry* length_left; + LengthEntry* length_right; + QRadioButton* radio_portrait; + QRadioButton* radio_landscape; }; diff --git a/src/frontends/kde/dlg/doclanguagedlgdata.C b/src/frontends/kde/dlg/doclanguagedlgdata.C index 771109bfe0..d601ac2d7b 100644 --- a/src/frontends/kde/dlg/doclanguagedlgdata.C +++ b/src/frontends/kde/dlg/doclanguagedlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: doclanguagedlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:33 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -45,18 +45,18 @@ DocLanguageDialogData::DocLanguageDialogData qtarch_labelLanguage->setAlignment( 290 ); qtarch_labelLanguage->setMargin( -1 ); - language = new QComboBox( FALSE, this, "language" ); - language->setGeometry( 275, 5, 130, 147 ); - language->setMinimumSize( 0, 0 ); - language->setMaximumSize( 32767, 32767 ); - language->setFocusPolicy( QWidget::StrongFocus ); - language->setBackgroundMode( QWidget::PaletteBackground ); - language->setFontPropagation( QWidget::AllChildren ); - language->setPalettePropagation( QWidget::AllChildren ); - language->setSizeLimit( 30 ); - language->setAutoResize( true ); - language->setMaxCount( 2147483647 ); - language->setAutoCompletion( false ); + combo_language = new QComboBox( FALSE, this, "combo_language" ); + combo_language->setGeometry( 275, 5, 130, 147 ); + combo_language->setMinimumSize( 0, 0 ); + combo_language->setMaximumSize( 32767, 32767 ); + combo_language->setFocusPolicy( QWidget::StrongFocus ); + combo_language->setBackgroundMode( QWidget::PaletteBackground ); + combo_language->setFontPropagation( QWidget::AllChildren ); + combo_language->setPalettePropagation( QWidget::AllChildren ); + combo_language->setSizeLimit( 30 ); + combo_language->setAutoResize( true ); + combo_language->setMaxCount( 2147483647 ); + combo_language->setAutoCompletion( false ); QLabel* qtarch_labelEncoding; qtarch_labelEncoding = new QLabel( this, "labelEncoding" ); @@ -75,18 +75,18 @@ DocLanguageDialogData::DocLanguageDialogData qtarch_labelEncoding->setAlignment( 290 ); qtarch_labelEncoding->setMargin( -1 ); - encoding = new QComboBox( FALSE, this, "encoding" ); - encoding->setGeometry( 275, 157, 130, 146 ); - encoding->setMinimumSize( 0, 0 ); - encoding->setMaximumSize( 32767, 32767 ); - encoding->setFocusPolicy( QWidget::StrongFocus ); - encoding->setBackgroundMode( QWidget::PaletteBackground ); - encoding->setFontPropagation( QWidget::AllChildren ); - encoding->setPalettePropagation( QWidget::AllChildren ); - encoding->setSizeLimit( 30 ); - encoding->setAutoResize( true ); - encoding->setMaxCount( 2147483647 ); - encoding->setAutoCompletion( false ); + combo_encoding = new QComboBox( FALSE, this, "combo_encoding" ); + combo_encoding->setGeometry( 275, 157, 130, 146 ); + combo_encoding->setMinimumSize( 0, 0 ); + combo_encoding->setMaximumSize( 32767, 32767 ); + combo_encoding->setFocusPolicy( QWidget::StrongFocus ); + combo_encoding->setBackgroundMode( QWidget::PaletteBackground ); + combo_encoding->setFontPropagation( QWidget::AllChildren ); + combo_encoding->setPalettePropagation( QWidget::AllChildren ); + combo_encoding->setSizeLimit( 30 ); + combo_encoding->setAutoResize( true ); + combo_encoding->setMaxCount( 2147483647 ); + combo_encoding->setAutoCompletion( false ); QLabel* qtarch_labelQuotes; qtarch_labelQuotes = new QLabel( this, "labelQuotes" ); @@ -105,18 +105,18 @@ DocLanguageDialogData::DocLanguageDialogData qtarch_labelQuotes->setAlignment( 290 ); qtarch_labelQuotes->setMargin( -1 ); - quotes = new QComboBox( FALSE, this, "quotes" ); - quotes->setGeometry( 275, 308, 130, 147 ); - quotes->setMinimumSize( 0, 0 ); - quotes->setMaximumSize( 32767, 32767 ); - quotes->setFocusPolicy( QWidget::StrongFocus ); - quotes->setBackgroundMode( QWidget::PaletteBackground ); - quotes->setFontPropagation( QWidget::AllChildren ); - quotes->setPalettePropagation( QWidget::AllChildren ); - quotes->setSizeLimit( 30 ); - quotes->setAutoResize( true ); - quotes->setMaxCount( 2147483647 ); - quotes->setAutoCompletion( false ); + combo_quotes = new QComboBox( FALSE, this, "combo_quotes" ); + combo_quotes->setGeometry( 275, 308, 130, 147 ); + combo_quotes->setMinimumSize( 0, 0 ); + combo_quotes->setMaximumSize( 32767, 32767 ); + combo_quotes->setFocusPolicy( QWidget::StrongFocus ); + combo_quotes->setBackgroundMode( QWidget::PaletteBackground ); + combo_quotes->setFontPropagation( QWidget::AllChildren ); + combo_quotes->setPalettePropagation( QWidget::AllChildren ); + combo_quotes->setSizeLimit( 30 ); + combo_quotes->setAutoResize( true ); + combo_quotes->setMaxCount( 2147483647 ); + combo_quotes->setAutoCompletion( false ); if (qtarch_labelLanguage->sizeHint().width()!=-1) qtarch_labelLanguage->setMinimumWidth(qtarch_labelLanguage->sizeHint().width()); @@ -126,12 +126,12 @@ DocLanguageDialogData::DocLanguageDialogData qtarch_labelLanguage->setMaximumWidth(qtarch_labelLanguage->sizeHint().width()); if (qtarch_labelLanguage->sizeHint().height()!=-1) qtarch_labelLanguage->setMaximumHeight(qtarch_labelLanguage->sizeHint().height()); - if (language->sizeHint().width()!=-1) - language->setMinimumWidth(language->sizeHint().width()); - if (language->sizeHint().height()!=-1) - language->setMinimumHeight(language->sizeHint().height()); - if (language->sizeHint().height()!=-1) - language->setMaximumHeight(language->sizeHint().height()); + if (combo_language->sizeHint().width()!=-1) + combo_language->setMinimumWidth(combo_language->sizeHint().width()); + if (combo_language->sizeHint().height()!=-1) + combo_language->setMinimumHeight(combo_language->sizeHint().height()); + if (combo_language->sizeHint().height()!=-1) + combo_language->setMaximumHeight(combo_language->sizeHint().height()); if (qtarch_labelEncoding->sizeHint().width()!=-1) qtarch_labelEncoding->setMinimumWidth(qtarch_labelEncoding->sizeHint().width()); if (qtarch_labelEncoding->sizeHint().height()!=-1) @@ -140,12 +140,12 @@ DocLanguageDialogData::DocLanguageDialogData qtarch_labelEncoding->setMaximumWidth(qtarch_labelEncoding->sizeHint().width()); if (qtarch_labelEncoding->sizeHint().height()!=-1) qtarch_labelEncoding->setMaximumHeight(qtarch_labelEncoding->sizeHint().height()); - if (encoding->sizeHint().width()!=-1) - encoding->setMinimumWidth(encoding->sizeHint().width()); - if (encoding->sizeHint().height()!=-1) - encoding->setMinimumHeight(encoding->sizeHint().height()); - if (encoding->sizeHint().height()!=-1) - encoding->setMaximumHeight(encoding->sizeHint().height()); + if (combo_encoding->sizeHint().width()!=-1) + combo_encoding->setMinimumWidth(combo_encoding->sizeHint().width()); + if (combo_encoding->sizeHint().height()!=-1) + combo_encoding->setMinimumHeight(combo_encoding->sizeHint().height()); + if (combo_encoding->sizeHint().height()!=-1) + combo_encoding->setMaximumHeight(combo_encoding->sizeHint().height()); if (qtarch_labelQuotes->sizeHint().width()!=-1) qtarch_labelQuotes->setMinimumWidth(qtarch_labelQuotes->sizeHint().width()); if (qtarch_labelQuotes->sizeHint().height()!=-1) @@ -154,12 +154,12 @@ DocLanguageDialogData::DocLanguageDialogData qtarch_labelQuotes->setMaximumWidth(qtarch_labelQuotes->sizeHint().width()); if (qtarch_labelQuotes->sizeHint().height()!=-1) qtarch_labelQuotes->setMaximumHeight(qtarch_labelQuotes->sizeHint().height()); - if (quotes->sizeHint().width()!=-1) - quotes->setMinimumWidth(quotes->sizeHint().width()); - if (quotes->sizeHint().height()!=-1) - quotes->setMinimumHeight(quotes->sizeHint().height()); - if (quotes->sizeHint().height()!=-1) - quotes->setMaximumHeight(quotes->sizeHint().height()); + if (combo_quotes->sizeHint().width()!=-1) + combo_quotes->setMinimumWidth(combo_quotes->sizeHint().width()); + if (combo_quotes->sizeHint().height()!=-1) + combo_quotes->setMinimumHeight(combo_quotes->sizeHint().height()); + if (combo_quotes->sizeHint().height()!=-1) + combo_quotes->setMaximumHeight(combo_quotes->sizeHint().height()); QGridLayout* qtarch_layout_1 = new QGridLayout( this, 3, 4, 5, 5, NULL ); qtarch_layout_1->addColSpacing( 0, 5 ); qtarch_layout_1->setColStretch( 0, 1 ); @@ -172,15 +172,15 @@ DocLanguageDialogData::DocLanguageDialogData qtarch_layout_1->addRowSpacing( 0, 0 ); qtarch_layout_1->setRowStretch( 0, 1 ); qtarch_layout_1->addWidget( qtarch_labelLanguage, 0, 0, 33 ); - qtarch_layout_1->addWidget( language, 0, 2, 33 ); + qtarch_layout_1->addWidget( combo_language, 0, 2, 33 ); qtarch_layout_1->addRowSpacing( 1, 0 ); qtarch_layout_1->setRowStretch( 1, 1 ); qtarch_layout_1->addWidget( qtarch_labelEncoding, 1, 0, 33 ); - qtarch_layout_1->addWidget( encoding, 1, 2, 33 ); + qtarch_layout_1->addWidget( combo_encoding, 1, 2, 33 ); qtarch_layout_1->addRowSpacing( 2, 0 ); qtarch_layout_1->setRowStretch( 2, 1 ); qtarch_layout_1->addWidget( qtarch_labelQuotes, 2, 0, 33 ); - qtarch_layout_1->addWidget( quotes, 2, 2, 33 ); + qtarch_layout_1->addWidget( combo_quotes, 2, 2, 33 ); resize( 545,460 ); setMinimumSize( 0, 0 ); setMaximumSize( 32767, 32767 ); diff --git a/src/frontends/kde/dlg/doclanguagedlgdata.h b/src/frontends/kde/dlg/doclanguagedlgdata.h index 733a811c2f..59d2c565e1 100644 --- a/src/frontends/kde/dlg/doclanguagedlgdata.h +++ b/src/frontends/kde/dlg/doclanguagedlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: doclanguagedlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:33 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -37,9 +37,9 @@ protected slots: public: - QComboBox* language; - QComboBox* encoding; - QComboBox* quotes; + QComboBox* combo_language; + QComboBox* combo_encoding; + QComboBox* combo_quotes; }; diff --git a/src/frontends/kde/dlg/docsettingsdlgdata.C b/src/frontends/kde/dlg/docsettingsdlgdata.C index 2a852253d9..54daf50c75 100644 --- a/src/frontends/kde/dlg/docsettingsdlgdata.C +++ b/src/frontends/kde/dlg/docsettingsdlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docsettingsdlgdata.C - Last generated: Sun Feb 11 00:57:35 2001 + Last generated: Sat Mar 31 16:48:38 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -113,84 +113,84 @@ DocSettingsDialogData::DocSettingsDialogData qtarch_labelClass->setAlignment( 289 ); qtarch_labelClass->setMargin( -1 ); - docclass = new QComboBox( FALSE, this, "docclass" ); - docclass->setGeometry( 332, 5, 104, 25 ); - docclass->setMinimumSize( 0, 0 ); - docclass->setMaximumSize( 32767, 32767 ); - connect( docclass, SIGNAL(highlighted(const char*)), SLOT(classChanged(const char*)) ); - docclass->setFocusPolicy( QWidget::StrongFocus ); - docclass->setBackgroundMode( QWidget::PaletteBackground ); - docclass->setFontPropagation( QWidget::AllChildren ); - docclass->setPalettePropagation( QWidget::AllChildren ); - docclass->setSizeLimit( 30 ); - docclass->setAutoResize( false ); - docclass->setMaxCount( 2147483647 ); - docclass->setAutoCompletion( false ); - - pagestyle = new QComboBox( FALSE, this, "pagestyle" ); - pagestyle->setGeometry( 332, 35, 104, 25 ); - pagestyle->setMinimumSize( 0, 0 ); - pagestyle->setMaximumSize( 32767, 32767 ); - pagestyle->setFocusPolicy( QWidget::StrongFocus ); - pagestyle->setBackgroundMode( QWidget::PaletteBackground ); - pagestyle->setFontPropagation( QWidget::AllChildren ); - pagestyle->setPalettePropagation( QWidget::AllChildren ); - pagestyle->setSizeLimit( 30 ); - pagestyle->setAutoResize( false ); - pagestyle->setMaxCount( 2147483647 ); - pagestyle->setAutoCompletion( false ); - - font = new QComboBox( FALSE, this, "font" ); - font->setGeometry( 332, 65, 104, 25 ); - font->setMinimumSize( 0, 0 ); - font->setMaximumSize( 32767, 32767 ); - font->setFocusPolicy( QWidget::StrongFocus ); - font->setBackgroundMode( QWidget::PaletteBackground ); - font->setFontPropagation( QWidget::AllChildren ); - font->setPalettePropagation( QWidget::AllChildren ); - font->setSizeLimit( 30 ); - font->setAutoResize( false ); - font->setMaxCount( 2147483647 ); - font->setAutoCompletion( false ); - - fontsize = new QComboBox( FALSE, this, "fontsize" ); - fontsize->setGeometry( 332, 95, 104, 25 ); - fontsize->setMinimumSize( 0, 0 ); - fontsize->setMaximumSize( 32767, 32767 ); - fontsize->setFocusPolicy( QWidget::StrongFocus ); - fontsize->setBackgroundMode( QWidget::PaletteBackground ); - fontsize->setFontPropagation( QWidget::AllChildren ); - fontsize->setPalettePropagation( QWidget::AllChildren ); - fontsize->setSizeLimit( 30 ); - fontsize->setAutoResize( false ); - fontsize->setMaxCount( 2147483647 ); - fontsize->setAutoCompletion( false ); - - sides = new QCheckBox( this, "sides" ); - sides->setGeometry( 112, 125, 107, 50 ); - sides->setMinimumSize( 0, 0 ); - sides->setMaximumSize( 32767, 32767 ); - sides->setFocusPolicy( QWidget::TabFocus ); - sides->setBackgroundMode( QWidget::PaletteBackground ); - sides->setFontPropagation( QWidget::NoChildren ); - sides->setPalettePropagation( QWidget::NoChildren ); - sides->setText( _("Two-sided") ); - sides->setAutoRepeat( false ); - sides->setAutoResize( false ); - sides->setChecked( false ); - - columns = new QCheckBox( this, "columns" ); - columns->setGeometry( 331, 125, 107, 50 ); - columns->setMinimumSize( 0, 0 ); - columns->setMaximumSize( 32767, 32767 ); - columns->setFocusPolicy( QWidget::TabFocus ); - columns->setBackgroundMode( QWidget::PaletteBackground ); - columns->setFontPropagation( QWidget::NoChildren ); - columns->setPalettePropagation( QWidget::NoChildren ); - columns->setText( _("Two column pages") ); - columns->setAutoRepeat( false ); - columns->setAutoResize( false ); - columns->setChecked( false ); + combo_docclass = new QComboBox( FALSE, this, "combo_docclass" ); + combo_docclass->setGeometry( 332, 5, 104, 25 ); + combo_docclass->setMinimumSize( 0, 0 ); + combo_docclass->setMaximumSize( 32767, 32767 ); + connect( combo_docclass, SIGNAL(highlighted(const char*)), SLOT(classChanged(const char*)) ); + combo_docclass->setFocusPolicy( QWidget::StrongFocus ); + combo_docclass->setBackgroundMode( QWidget::PaletteBackground ); + combo_docclass->setFontPropagation( QWidget::AllChildren ); + combo_docclass->setPalettePropagation( QWidget::AllChildren ); + combo_docclass->setSizeLimit( 30 ); + combo_docclass->setAutoResize( false ); + combo_docclass->setMaxCount( 2147483647 ); + combo_docclass->setAutoCompletion( false ); + + combo_pagestyle = new QComboBox( FALSE, this, "combo_pagestyle" ); + combo_pagestyle->setGeometry( 332, 35, 104, 25 ); + combo_pagestyle->setMinimumSize( 0, 0 ); + combo_pagestyle->setMaximumSize( 32767, 32767 ); + combo_pagestyle->setFocusPolicy( QWidget::StrongFocus ); + combo_pagestyle->setBackgroundMode( QWidget::PaletteBackground ); + combo_pagestyle->setFontPropagation( QWidget::AllChildren ); + combo_pagestyle->setPalettePropagation( QWidget::AllChildren ); + combo_pagestyle->setSizeLimit( 30 ); + combo_pagestyle->setAutoResize( false ); + combo_pagestyle->setMaxCount( 2147483647 ); + combo_pagestyle->setAutoCompletion( false ); + + combo_font = new QComboBox( FALSE, this, "combo_font" ); + combo_font->setGeometry( 332, 65, 104, 25 ); + combo_font->setMinimumSize( 0, 0 ); + combo_font->setMaximumSize( 32767, 32767 ); + combo_font->setFocusPolicy( QWidget::StrongFocus ); + combo_font->setBackgroundMode( QWidget::PaletteBackground ); + combo_font->setFontPropagation( QWidget::AllChildren ); + combo_font->setPalettePropagation( QWidget::AllChildren ); + combo_font->setSizeLimit( 30 ); + combo_font->setAutoResize( false ); + combo_font->setMaxCount( 2147483647 ); + combo_font->setAutoCompletion( false ); + + combo_fontsize = new QComboBox( FALSE, this, "combo_fontsize" ); + combo_fontsize->setGeometry( 332, 95, 104, 25 ); + combo_fontsize->setMinimumSize( 0, 0 ); + combo_fontsize->setMaximumSize( 32767, 32767 ); + combo_fontsize->setFocusPolicy( QWidget::StrongFocus ); + combo_fontsize->setBackgroundMode( QWidget::PaletteBackground ); + combo_fontsize->setFontPropagation( QWidget::AllChildren ); + combo_fontsize->setPalettePropagation( QWidget::AllChildren ); + combo_fontsize->setSizeLimit( 30 ); + combo_fontsize->setAutoResize( false ); + combo_fontsize->setMaxCount( 2147483647 ); + combo_fontsize->setAutoCompletion( false ); + + check_sides = new QCheckBox( this, "check_sides" ); + check_sides->setGeometry( 112, 125, 107, 50 ); + check_sides->setMinimumSize( 0, 0 ); + check_sides->setMaximumSize( 32767, 32767 ); + check_sides->setFocusPolicy( QWidget::TabFocus ); + check_sides->setBackgroundMode( QWidget::PaletteBackground ); + check_sides->setFontPropagation( QWidget::NoChildren ); + check_sides->setPalettePropagation( QWidget::NoChildren ); + check_sides->setText( _("Two-sided") ); + check_sides->setAutoRepeat( false ); + check_sides->setAutoResize( false ); + check_sides->setChecked( false ); + + check_columns = new QCheckBox( this, "check_columns" ); + check_columns->setGeometry( 331, 125, 107, 50 ); + check_columns->setMinimumSize( 0, 0 ); + check_columns->setMaximumSize( 32767, 32767 ); + check_columns->setFocusPolicy( QWidget::TabFocus ); + check_columns->setBackgroundMode( QWidget::PaletteBackground ); + check_columns->setFontPropagation( QWidget::NoChildren ); + check_columns->setPalettePropagation( QWidget::NoChildren ); + check_columns->setText( _("Two column pages") ); + check_columns->setAutoRepeat( false ); + check_columns->setAutoResize( false ); + check_columns->setChecked( false ); QLabel* qtarch_labelSpacing; qtarch_labelSpacing = new QLabel( this, "labelSpacing" ); @@ -294,100 +294,100 @@ DocSettingsDialogData::DocSettingsDialogData qtarch_paralabelStretch->setAlignment( 289 ); qtarch_paralabelStretch->setMargin( -1 ); - paraspacing = new QComboBox( FALSE, qtarch_paraspacingbox, "paraspacing" ); - paraspacing->setGeometry( 279, 67, 128, 30 ); - paraspacing->setMinimumSize( 0, 0 ); - paraspacing->setMaximumSize( 32767, 32767 ); - connect( paraspacing, SIGNAL(highlighted(const char*)), SLOT(paraspacingChanged(const char*)) ); - paraspacing->setFocusPolicy( QWidget::StrongFocus ); - paraspacing->setBackgroundMode( QWidget::PaletteBackground ); - paraspacing->setFontPropagation( QWidget::AllChildren ); - paraspacing->setPalettePropagation( QWidget::AllChildren ); - paraspacing->setSizeLimit( 30 ); - paraspacing->setAutoResize( false ); - paraspacing->setMaxCount( 2147483647 ); - paraspacing->setAutoCompletion( false ); - - paraspacingValue = new LengthEntry( qtarch_paraspacingbox, "paraspacingValue" ); - paraspacingValue->setGeometry( 183, 114, 174, 30 ); - paraspacingValue->setMinimumSize( 0, 0 ); - paraspacingValue->setMaximumSize( 32767, 32767 ); - paraspacingValue->setFocusPolicy( QWidget::NoFocus ); - paraspacingValue->setBackgroundMode( QWidget::PaletteBackground ); - paraspacingValue->setFontPropagation( QWidget::NoChildren ); - paraspacingValue->setPalettePropagation( QWidget::NoChildren ); - - paraspacingStretch = new LengthEntry( qtarch_paraspacingbox, "paraspacingStretch" ); - paraspacingStretch->setGeometry( 183, 149, 174, 31 ); - paraspacingStretch->setMinimumSize( 0, 0 ); - paraspacingStretch->setMaximumSize( 32767, 32767 ); - paraspacingStretch->setFocusPolicy( QWidget::NoFocus ); - paraspacingStretch->setBackgroundMode( QWidget::PaletteBackground ); - paraspacingStretch->setFontPropagation( QWidget::NoChildren ); - paraspacingStretch->setPalettePropagation( QWidget::NoChildren ); - - paraspacingShrink = new LengthEntry( qtarch_paraspacingbox, "paraspacingShrink" ); - paraspacingShrink->setGeometry( 183, 185, 174, 30 ); - paraspacingShrink->setMinimumSize( 0, 0 ); - paraspacingShrink->setMaximumSize( 32767, 32767 ); - paraspacingShrink->setFocusPolicy( QWidget::NoFocus ); - paraspacingShrink->setBackgroundMode( QWidget::PaletteBackground ); - paraspacingShrink->setFontPropagation( QWidget::NoChildren ); - paraspacingShrink->setPalettePropagation( QWidget::NoChildren ); - - linespacing = new QComboBox( FALSE, this, "linespacing" ); - linespacing->setGeometry( 187, 405, 176, 50 ); - linespacing->setMinimumSize( 0, 0 ); - linespacing->setMaximumSize( 32767, 32767 ); - linespacing->setFocusPolicy( QWidget::StrongFocus ); - linespacing->setBackgroundMode( QWidget::PaletteBackground ); - linespacing->setFontPropagation( QWidget::AllChildren ); - linespacing->setPalettePropagation( QWidget::AllChildren ); - linespacing->setSizeLimit( 30 ); - linespacing->setAutoResize( false ); - linespacing->setMaxCount( 2147483647 ); - linespacing->setAutoCompletion( false ); - - linespacingVal = new KRestrictedLine( this, "linespacingVal" ); - linespacingVal->setGeometry( 368, 405, 177, 50 ); - linespacingVal->setMinimumSize( 0, 0 ); - linespacingVal->setMaximumSize( 32767, 32767 ); - linespacingVal->setFocusPolicy( QWidget::StrongFocus ); - linespacingVal->setBackgroundMode( QWidget::PaletteBase ); - linespacingVal->setFontPropagation( QWidget::NoChildren ); - linespacingVal->setPalettePropagation( QWidget::NoChildren ); - linespacingVal->setText( "" ); - linespacingVal->setMaxLength( 32767 ); - linespacingVal->setFrame( QLineEdit::Normal ); - linespacingVal->setFrame( true ); - linespacingVal->setValidChars( "0123456789.," ); - - extraoptions = new QLineEdit( this, "extraoptions" ); - extraoptions->setGeometry( 278, 460, 267, 50 ); - extraoptions->setMinimumSize( 0, 0 ); - extraoptions->setMaximumSize( 32767, 32767 ); - extraoptions->setFocusPolicy( QWidget::StrongFocus ); - extraoptions->setBackgroundMode( QWidget::PaletteBase ); - extraoptions->setFontPropagation( QWidget::NoChildren ); - extraoptions->setPalettePropagation( QWidget::NoChildren ); - extraoptions->setText( "" ); - extraoptions->setMaxLength( 32767 ); - extraoptions->setFrame( QLineEdit::Normal ); - extraoptions->setFrame( true ); - - addspace = new QCheckBox( this, "addspace" ); - addspace->setGeometry( 10, 200, 398, 30 ); - addspace->setMinimumSize( 0, 0 ); - addspace->setMaximumSize( 32767, 32767 ); - connect( addspace, SIGNAL(toggled(bool)), SLOT(addspaceChanged(bool)) ); - addspace->setFocusPolicy( QWidget::TabFocus ); - addspace->setBackgroundMode( QWidget::PaletteBackground ); - addspace->setFontPropagation( QWidget::NoChildren ); - addspace->setPalettePropagation( QWidget::NoChildren ); - addspace->setText( _("Add space") ); - addspace->setAutoRepeat( false ); - addspace->setAutoResize( false ); - addspace->setChecked( false ); + combo_paraspacing = new QComboBox( FALSE, qtarch_paraspacingbox, "combo_paraspacing" ); + combo_paraspacing->setGeometry( 279, 67, 128, 30 ); + combo_paraspacing->setMinimumSize( 0, 0 ); + combo_paraspacing->setMaximumSize( 32767, 32767 ); + connect( combo_paraspacing, SIGNAL(highlighted(const char*)), SLOT(paraspacingChanged(const char*)) ); + combo_paraspacing->setFocusPolicy( QWidget::StrongFocus ); + combo_paraspacing->setBackgroundMode( QWidget::PaletteBackground ); + combo_paraspacing->setFontPropagation( QWidget::AllChildren ); + combo_paraspacing->setPalettePropagation( QWidget::AllChildren ); + combo_paraspacing->setSizeLimit( 30 ); + combo_paraspacing->setAutoResize( false ); + combo_paraspacing->setMaxCount( 2147483647 ); + combo_paraspacing->setAutoCompletion( false ); + + length_paraspacing = new LengthEntry( qtarch_paraspacingbox, "length_paraspacing" ); + length_paraspacing->setGeometry( 183, 114, 174, 30 ); + length_paraspacing->setMinimumSize( 0, 0 ); + length_paraspacing->setMaximumSize( 32767, 32767 ); + length_paraspacing->setFocusPolicy( QWidget::NoFocus ); + length_paraspacing->setBackgroundMode( QWidget::PaletteBackground ); + length_paraspacing->setFontPropagation( QWidget::NoChildren ); + length_paraspacing->setPalettePropagation( QWidget::NoChildren ); + + length_paraspacingstretch = new LengthEntry( qtarch_paraspacingbox, "length_paraspacingstretch" ); + length_paraspacingstretch->setGeometry( 183, 149, 174, 31 ); + length_paraspacingstretch->setMinimumSize( 0, 0 ); + length_paraspacingstretch->setMaximumSize( 32767, 32767 ); + length_paraspacingstretch->setFocusPolicy( QWidget::NoFocus ); + length_paraspacingstretch->setBackgroundMode( QWidget::PaletteBackground ); + length_paraspacingstretch->setFontPropagation( QWidget::NoChildren ); + length_paraspacingstretch->setPalettePropagation( QWidget::NoChildren ); + + length_paraspacingshrink = new LengthEntry( qtarch_paraspacingbox, "length_paraspacingshrink" ); + length_paraspacingshrink->setGeometry( 183, 185, 174, 30 ); + length_paraspacingshrink->setMinimumSize( 0, 0 ); + length_paraspacingshrink->setMaximumSize( 32767, 32767 ); + length_paraspacingshrink->setFocusPolicy( QWidget::NoFocus ); + length_paraspacingshrink->setBackgroundMode( QWidget::PaletteBackground ); + length_paraspacingshrink->setFontPropagation( QWidget::NoChildren ); + length_paraspacingshrink->setPalettePropagation( QWidget::NoChildren ); + + combo_linespacing = new QComboBox( FALSE, this, "combo_linespacing" ); + combo_linespacing->setGeometry( 187, 405, 176, 50 ); + combo_linespacing->setMinimumSize( 0, 0 ); + combo_linespacing->setMaximumSize( 32767, 32767 ); + combo_linespacing->setFocusPolicy( QWidget::StrongFocus ); + combo_linespacing->setBackgroundMode( QWidget::PaletteBackground ); + combo_linespacing->setFontPropagation( QWidget::AllChildren ); + combo_linespacing->setPalettePropagation( QWidget::AllChildren ); + combo_linespacing->setSizeLimit( 30 ); + combo_linespacing->setAutoResize( false ); + combo_linespacing->setMaxCount( 2147483647 ); + combo_linespacing->setAutoCompletion( false ); + + line_linespacing = new KRestrictedLine( this, "line_linespacing" ); + line_linespacing->setGeometry( 368, 405, 177, 50 ); + line_linespacing->setMinimumSize( 0, 0 ); + line_linespacing->setMaximumSize( 32767, 32767 ); + line_linespacing->setFocusPolicy( QWidget::StrongFocus ); + line_linespacing->setBackgroundMode( QWidget::PaletteBase ); + line_linespacing->setFontPropagation( QWidget::NoChildren ); + line_linespacing->setPalettePropagation( QWidget::NoChildren ); + line_linespacing->setText( "" ); + line_linespacing->setMaxLength( 32767 ); + line_linespacing->setFrame( QLineEdit::Normal ); + line_linespacing->setFrame( true ); + line_linespacing->setValidChars( "0123456789.," ); + + line_extraoptions = new QLineEdit( this, "line_extraoptions" ); + line_extraoptions->setGeometry( 278, 460, 267, 50 ); + line_extraoptions->setMinimumSize( 0, 0 ); + line_extraoptions->setMaximumSize( 32767, 32767 ); + line_extraoptions->setFocusPolicy( QWidget::StrongFocus ); + line_extraoptions->setBackgroundMode( QWidget::PaletteBase ); + line_extraoptions->setFontPropagation( QWidget::NoChildren ); + line_extraoptions->setPalettePropagation( QWidget::NoChildren ); + line_extraoptions->setText( "" ); + line_extraoptions->setMaxLength( 32767 ); + line_extraoptions->setFrame( QLineEdit::Normal ); + line_extraoptions->setFrame( true ); + + check_addspace = new QCheckBox( this, "check_addspace" ); + check_addspace->setGeometry( 10, 200, 398, 30 ); + check_addspace->setMinimumSize( 0, 0 ); + check_addspace->setMaximumSize( 32767, 32767 ); + connect( check_addspace, SIGNAL(toggled(bool)), SLOT(addspaceChanged(bool)) ); + check_addspace->setFocusPolicy( QWidget::TabFocus ); + check_addspace->setBackgroundMode( QWidget::PaletteBackground ); + check_addspace->setFontPropagation( QWidget::NoChildren ); + check_addspace->setPalettePropagation( QWidget::NoChildren ); + check_addspace->setText( _("Add space") ); + check_addspace->setAutoRepeat( false ); + check_addspace->setAutoResize( false ); + check_addspace->setChecked( false ); if (qtarch_paraspacingbox->sizeHint().width()!=-1) qtarch_paraspacingbox->setMinimumWidth(qtarch_paraspacingbox->sizeHint().width()); @@ -425,46 +425,46 @@ DocSettingsDialogData::DocSettingsDialogData qtarch_labelClass->setMaximumWidth(qtarch_labelClass->sizeHint().width()); if (qtarch_labelClass->sizeHint().height()!=-1) qtarch_labelClass->setMaximumHeight(qtarch_labelClass->sizeHint().height()); - if (docclass->sizeHint().width()!=-1) - docclass->setMinimumWidth(docclass->sizeHint().width()); - if (docclass->sizeHint().height()!=-1) - docclass->setMinimumHeight(docclass->sizeHint().height()); - if (docclass->sizeHint().height()!=-1) - docclass->setMaximumHeight(docclass->sizeHint().height()); - if (pagestyle->sizeHint().width()!=-1) - pagestyle->setMinimumWidth(pagestyle->sizeHint().width()); - if (pagestyle->sizeHint().height()!=-1) - pagestyle->setMinimumHeight(pagestyle->sizeHint().height()); - if (pagestyle->sizeHint().height()!=-1) - pagestyle->setMaximumHeight(pagestyle->sizeHint().height()); - if (font->sizeHint().width()!=-1) - font->setMinimumWidth(font->sizeHint().width()); - if (font->sizeHint().height()!=-1) - font->setMinimumHeight(font->sizeHint().height()); - if (font->sizeHint().height()!=-1) - font->setMaximumHeight(font->sizeHint().height()); - if (fontsize->sizeHint().width()!=-1) - fontsize->setMinimumWidth(fontsize->sizeHint().width()); - if (fontsize->sizeHint().height()!=-1) - fontsize->setMinimumHeight(fontsize->sizeHint().height()); - if (fontsize->sizeHint().height()!=-1) - fontsize->setMaximumHeight(fontsize->sizeHint().height()); - if (sides->sizeHint().width()!=-1) - sides->setMinimumWidth(sides->sizeHint().width()); - if (sides->sizeHint().height()!=-1) - sides->setMinimumHeight(sides->sizeHint().height()); - if (sides->sizeHint().width()!=-1) - sides->setMaximumWidth(sides->sizeHint().width()); - if (sides->sizeHint().height()!=-1) - sides->setMaximumHeight(sides->sizeHint().height()); - if (columns->sizeHint().width()!=-1) - columns->setMinimumWidth(columns->sizeHint().width()); - if (columns->sizeHint().height()!=-1) - columns->setMinimumHeight(columns->sizeHint().height()); - if (columns->sizeHint().width()!=-1) - columns->setMaximumWidth(columns->sizeHint().width()); - if (columns->sizeHint().height()!=-1) - columns->setMaximumHeight(columns->sizeHint().height()); + if (combo_docclass->sizeHint().width()!=-1) + combo_docclass->setMinimumWidth(combo_docclass->sizeHint().width()); + if (combo_docclass->sizeHint().height()!=-1) + combo_docclass->setMinimumHeight(combo_docclass->sizeHint().height()); + if (combo_docclass->sizeHint().height()!=-1) + combo_docclass->setMaximumHeight(combo_docclass->sizeHint().height()); + if (combo_pagestyle->sizeHint().width()!=-1) + combo_pagestyle->setMinimumWidth(combo_pagestyle->sizeHint().width()); + if (combo_pagestyle->sizeHint().height()!=-1) + combo_pagestyle->setMinimumHeight(combo_pagestyle->sizeHint().height()); + if (combo_pagestyle->sizeHint().height()!=-1) + combo_pagestyle->setMaximumHeight(combo_pagestyle->sizeHint().height()); + if (combo_font->sizeHint().width()!=-1) + combo_font->setMinimumWidth(combo_font->sizeHint().width()); + if (combo_font->sizeHint().height()!=-1) + combo_font->setMinimumHeight(combo_font->sizeHint().height()); + if (combo_font->sizeHint().height()!=-1) + combo_font->setMaximumHeight(combo_font->sizeHint().height()); + if (combo_fontsize->sizeHint().width()!=-1) + combo_fontsize->setMinimumWidth(combo_fontsize->sizeHint().width()); + if (combo_fontsize->sizeHint().height()!=-1) + combo_fontsize->setMinimumHeight(combo_fontsize->sizeHint().height()); + if (combo_fontsize->sizeHint().height()!=-1) + combo_fontsize->setMaximumHeight(combo_fontsize->sizeHint().height()); + if (check_sides->sizeHint().width()!=-1) + check_sides->setMinimumWidth(check_sides->sizeHint().width()); + if (check_sides->sizeHint().height()!=-1) + check_sides->setMinimumHeight(check_sides->sizeHint().height()); + if (check_sides->sizeHint().width()!=-1) + check_sides->setMaximumWidth(check_sides->sizeHint().width()); + if (check_sides->sizeHint().height()!=-1) + check_sides->setMaximumHeight(check_sides->sizeHint().height()); + if (check_columns->sizeHint().width()!=-1) + check_columns->setMinimumWidth(check_columns->sizeHint().width()); + if (check_columns->sizeHint().height()!=-1) + check_columns->setMinimumHeight(check_columns->sizeHint().height()); + if (check_columns->sizeHint().width()!=-1) + check_columns->setMaximumWidth(check_columns->sizeHint().width()); + if (check_columns->sizeHint().height()!=-1) + check_columns->setMaximumHeight(check_columns->sizeHint().height()); if (qtarch_labelSpacing->sizeHint().width()!=-1) qtarch_labelSpacing->setMinimumWidth(qtarch_labelSpacing->sizeHint().width()); if (qtarch_labelSpacing->sizeHint().height()!=-1) @@ -513,56 +513,56 @@ DocSettingsDialogData::DocSettingsDialogData qtarch_paralabelStretch->setMaximumWidth(qtarch_paralabelStretch->sizeHint().width()); if (qtarch_paralabelStretch->sizeHint().height()!=-1) qtarch_paralabelStretch->setMaximumHeight(qtarch_paralabelStretch->sizeHint().height()); - if (paraspacing->sizeHint().width()!=-1) - paraspacing->setMinimumWidth(paraspacing->sizeHint().width()); - if (paraspacing->sizeHint().height()!=-1) - paraspacing->setMinimumHeight(paraspacing->sizeHint().height()); - if (paraspacing->sizeHint().height()!=-1) - paraspacing->setMaximumHeight(paraspacing->sizeHint().height()); - if (paraspacingValue->sizeHint().width()!=-1) - paraspacingValue->setMinimumWidth(paraspacingValue->sizeHint().width()); - if (paraspacingValue->sizeHint().height()!=-1) - paraspacingValue->setMinimumHeight(paraspacingValue->sizeHint().height()); - if (paraspacingValue->sizeHint().height()!=-1) - paraspacingValue->setMaximumHeight(paraspacingValue->sizeHint().height()); - if (paraspacingStretch->sizeHint().width()!=-1) - paraspacingStretch->setMinimumWidth(paraspacingStretch->sizeHint().width()); - if (paraspacingStretch->sizeHint().height()!=-1) - paraspacingStretch->setMinimumHeight(paraspacingStretch->sizeHint().height()); - if (paraspacingStretch->sizeHint().height()!=-1) - paraspacingStretch->setMaximumHeight(paraspacingStretch->sizeHint().height()); - if (paraspacingShrink->sizeHint().width()!=-1) - paraspacingShrink->setMinimumWidth(paraspacingShrink->sizeHint().width()); - if (paraspacingShrink->sizeHint().height()!=-1) - paraspacingShrink->setMinimumHeight(paraspacingShrink->sizeHint().height()); - if (paraspacingShrink->sizeHint().height()!=-1) - paraspacingShrink->setMaximumHeight(paraspacingShrink->sizeHint().height()); - if (linespacing->sizeHint().width()!=-1) - linespacing->setMinimumWidth(linespacing->sizeHint().width()); - if (linespacing->sizeHint().height()!=-1) - linespacing->setMinimumHeight(linespacing->sizeHint().height()); - if (linespacing->sizeHint().height()!=-1) - linespacing->setMaximumHeight(linespacing->sizeHint().height()); - if (linespacingVal->sizeHint().width()!=-1) - linespacingVal->setMinimumWidth(linespacingVal->sizeHint().width()); - if (linespacingVal->sizeHint().height()!=-1) - linespacingVal->setMinimumHeight(linespacingVal->sizeHint().height()); - if (linespacingVal->sizeHint().height()!=-1) - linespacingVal->setMaximumHeight(linespacingVal->sizeHint().height()); - if (extraoptions->sizeHint().width()!=-1) - extraoptions->setMinimumWidth(extraoptions->sizeHint().width()); - if (extraoptions->sizeHint().height()!=-1) - extraoptions->setMinimumHeight(extraoptions->sizeHint().height()); - if (extraoptions->sizeHint().height()!=-1) - extraoptions->setMaximumHeight(extraoptions->sizeHint().height()); - if (addspace->sizeHint().width()!=-1) - addspace->setMinimumWidth(addspace->sizeHint().width()); - if (addspace->sizeHint().height()!=-1) - addspace->setMinimumHeight(addspace->sizeHint().height()); - if (addspace->sizeHint().width()!=-1) - addspace->setMaximumWidth(addspace->sizeHint().width()); - if (addspace->sizeHint().height()!=-1) - addspace->setMaximumHeight(addspace->sizeHint().height()); + if (combo_paraspacing->sizeHint().width()!=-1) + combo_paraspacing->setMinimumWidth(combo_paraspacing->sizeHint().width()); + if (combo_paraspacing->sizeHint().height()!=-1) + combo_paraspacing->setMinimumHeight(combo_paraspacing->sizeHint().height()); + if (combo_paraspacing->sizeHint().height()!=-1) + combo_paraspacing->setMaximumHeight(combo_paraspacing->sizeHint().height()); + if (length_paraspacing->sizeHint().width()!=-1) + length_paraspacing->setMinimumWidth(length_paraspacing->sizeHint().width()); + if (length_paraspacing->sizeHint().height()!=-1) + length_paraspacing->setMinimumHeight(length_paraspacing->sizeHint().height()); + if (length_paraspacing->sizeHint().height()!=-1) + length_paraspacing->setMaximumHeight(length_paraspacing->sizeHint().height()); + if (length_paraspacingstretch->sizeHint().width()!=-1) + length_paraspacingstretch->setMinimumWidth(length_paraspacingstretch->sizeHint().width()); + if (length_paraspacingstretch->sizeHint().height()!=-1) + length_paraspacingstretch->setMinimumHeight(length_paraspacingstretch->sizeHint().height()); + if (length_paraspacingstretch->sizeHint().height()!=-1) + length_paraspacingstretch->setMaximumHeight(length_paraspacingstretch->sizeHint().height()); + if (length_paraspacingshrink->sizeHint().width()!=-1) + length_paraspacingshrink->setMinimumWidth(length_paraspacingshrink->sizeHint().width()); + if (length_paraspacingshrink->sizeHint().height()!=-1) + length_paraspacingshrink->setMinimumHeight(length_paraspacingshrink->sizeHint().height()); + if (length_paraspacingshrink->sizeHint().height()!=-1) + length_paraspacingshrink->setMaximumHeight(length_paraspacingshrink->sizeHint().height()); + if (combo_linespacing->sizeHint().width()!=-1) + combo_linespacing->setMinimumWidth(combo_linespacing->sizeHint().width()); + if (combo_linespacing->sizeHint().height()!=-1) + combo_linespacing->setMinimumHeight(combo_linespacing->sizeHint().height()); + if (combo_linespacing->sizeHint().height()!=-1) + combo_linespacing->setMaximumHeight(combo_linespacing->sizeHint().height()); + if (line_linespacing->sizeHint().width()!=-1) + line_linespacing->setMinimumWidth(line_linespacing->sizeHint().width()); + if (line_linespacing->sizeHint().height()!=-1) + line_linespacing->setMinimumHeight(line_linespacing->sizeHint().height()); + if (line_linespacing->sizeHint().height()!=-1) + line_linespacing->setMaximumHeight(line_linespacing->sizeHint().height()); + if (line_extraoptions->sizeHint().width()!=-1) + line_extraoptions->setMinimumWidth(line_extraoptions->sizeHint().width()); + if (line_extraoptions->sizeHint().height()!=-1) + line_extraoptions->setMinimumHeight(line_extraoptions->sizeHint().height()); + if (line_extraoptions->sizeHint().height()!=-1) + line_extraoptions->setMaximumHeight(line_extraoptions->sizeHint().height()); + if (check_addspace->sizeHint().width()!=-1) + check_addspace->setMinimumWidth(check_addspace->sizeHint().width()); + if (check_addspace->sizeHint().height()!=-1) + check_addspace->setMinimumHeight(check_addspace->sizeHint().height()); + if (check_addspace->sizeHint().width()!=-1) + check_addspace->setMaximumWidth(check_addspace->sizeHint().width()); + if (check_addspace->sizeHint().height()!=-1) + check_addspace->setMaximumHeight(check_addspace->sizeHint().height()); QBoxLayout* qtarch_layout_1 = new QBoxLayout( this, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1->addStrut( 0 ); QGridLayout* qtarch_layout_1_1 = new QGridLayout( 4, 5, 5, NULL ); @@ -580,26 +580,26 @@ DocSettingsDialogData::DocSettingsDialogData qtarch_layout_1_1->addRowSpacing( 0, 0 ); qtarch_layout_1_1->setRowStretch( 0, 1 ); qtarch_layout_1_1->addWidget( qtarch_labelClass, 0, 1, 33 ); - qtarch_layout_1_1->addWidget( docclass, 0, 3, 33 ); + qtarch_layout_1_1->addWidget( combo_docclass, 0, 3, 33 ); qtarch_layout_1_1->addRowSpacing( 1, 0 ); qtarch_layout_1_1->setRowStretch( 1, 1 ); qtarch_layout_1_1->addWidget( qtarch_labelPagestyle, 1, 1, 33 ); - qtarch_layout_1_1->addWidget( pagestyle, 1, 3, 33 ); + qtarch_layout_1_1->addWidget( combo_pagestyle, 1, 3, 33 ); qtarch_layout_1_1->addRowSpacing( 2, 0 ); qtarch_layout_1_1->setRowStretch( 2, 1 ); qtarch_layout_1_1->addWidget( qtarch_labelFont, 2, 1, 33 ); - qtarch_layout_1_1->addWidget( font, 2, 3, 33 ); + qtarch_layout_1_1->addWidget( combo_font, 2, 3, 33 ); qtarch_layout_1_1->addRowSpacing( 3, 0 ); qtarch_layout_1_1->setRowStretch( 3, 1 ); qtarch_layout_1_1->addWidget( qtarch_labelFontSize, 3, 1, 33 ); - qtarch_layout_1_1->addWidget( fontsize, 3, 3, 33 ); + qtarch_layout_1_1->addWidget( combo_fontsize, 3, 3, 33 ); QBoxLayout* qtarch_layout_1_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2, 1 ); qtarch_layout_1_2->addStrut( 0 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( sides, 1, 33 ); + qtarch_layout_1_2->addWidget( check_sides, 1, 33 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( columns, 1, 33 ); + qtarch_layout_1_2->addWidget( check_columns, 1, 33 ); qtarch_layout_1_2->addStretch( 1 ); qtarch_layout_1->addWidget( qtarch_paraspacingbox, 3, 33 ); QBoxLayout* qtarch_layout_1_3 = new QBoxLayout( qtarch_paraspacingbox, QBoxLayout::TopToBottom, 5, 17, NULL ); @@ -614,7 +614,7 @@ DocSettingsDialogData::DocSettingsDialogData qtarch_layout_1_3_3->addStrut( 0 ); qtarch_layout_1_3_3->addWidget( qtarch_labelSkip, 1, 36 ); qtarch_layout_1_3_3->addStretch( 1 ); - qtarch_layout_1_3_3->addWidget( paraspacing, 1, 36 ); + qtarch_layout_1_3_3->addWidget( combo_paraspacing, 1, 36 ); qtarch_layout_1_3_3->addStretch( 1 ); QGridLayout* qtarch_layout_1_3_4 = new QGridLayout( 3, 3, 5, NULL ); qtarch_layout_1_3->addLayout( qtarch_layout_1_3_4, 3 ); @@ -627,26 +627,26 @@ DocSettingsDialogData::DocSettingsDialogData qtarch_layout_1_3_4->addRowSpacing( 0, 0 ); qtarch_layout_1_3_4->setRowStretch( 0, 1 ); qtarch_layout_1_3_4->addWidget( qtarch_labelparasize, 0, 0, 33 ); - qtarch_layout_1_3_4->addWidget( paraspacingValue, 0, 1, 33 ); + qtarch_layout_1_3_4->addWidget( length_paraspacing, 0, 1, 33 ); qtarch_layout_1_3_4->addRowSpacing( 1, 0 ); qtarch_layout_1_3_4->setRowStretch( 1, 1 ); qtarch_layout_1_3_4->addWidget( qtarch_paralabelStretch, 1, 0, 33 ); - qtarch_layout_1_3_4->addWidget( paraspacingStretch, 1, 1, 33 ); + qtarch_layout_1_3_4->addWidget( length_paraspacingstretch, 1, 1, 33 ); qtarch_layout_1_3_4->addRowSpacing( 2, 0 ); qtarch_layout_1_3_4->setRowStretch( 2, 1 ); qtarch_layout_1_3_4->addWidget( qtarch_paralabelShrink, 2, 0, 33 ); - qtarch_layout_1_3_4->addWidget( paraspacingShrink, 2, 1, 33 ); + qtarch_layout_1_3_4->addWidget( length_paraspacingshrink, 2, 1, 33 ); QBoxLayout* qtarch_layout_1_4 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_4, 1 ); qtarch_layout_1_4->addStrut( 0 ); qtarch_layout_1_4->addWidget( qtarch_labelSpacing, 1, 36 ); - qtarch_layout_1_4->addWidget( linespacing, 1, 36 ); - qtarch_layout_1_4->addWidget( linespacingVal, 1, 36 ); + qtarch_layout_1_4->addWidget( combo_linespacing, 1, 36 ); + qtarch_layout_1_4->addWidget( line_linespacing, 1, 36 ); QBoxLayout* qtarch_layout_1_5 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_5, 1 ); qtarch_layout_1_5->addStrut( 0 ); qtarch_layout_1_5->addWidget( qtarch_labelExtraoptions, 1, 36 ); - qtarch_layout_1_5->addWidget( extraoptions, 1, 33 ); + qtarch_layout_1_5->addWidget( line_extraoptions, 1, 33 ); setGeometry( 0,0, 550,515 ); setMinimumSize( 0, 0 ); setMaximumSize( 32767, 32767 ); diff --git a/src/frontends/kde/dlg/docsettingsdlgdata.h b/src/frontends/kde/dlg/docsettingsdlgdata.h index 4e5d0c0c53..0a322ec79d 100644 --- a/src/frontends/kde/dlg/docsettingsdlgdata.h +++ b/src/frontends/kde/dlg/docsettingsdlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: docsettingsdlgdata.h - Last generated: Sun Feb 11 00:57:35 2001 + Last generated: Sat Mar 31 16:48:38 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -44,20 +44,20 @@ protected slots: virtual void addspaceChanged(bool); public: - QComboBox* docclass; - QComboBox* pagestyle; - QComboBox* font; - QComboBox* fontsize; - QCheckBox* sides; - QCheckBox* columns; - QComboBox* paraspacing; - LengthEntry* paraspacingValue; - LengthEntry* paraspacingStretch; - LengthEntry* paraspacingShrink; - QComboBox* linespacing; - KRestrictedLine* linespacingVal; - QLineEdit* extraoptions; - QCheckBox* addspace; + QComboBox* combo_docclass; + QComboBox* combo_pagestyle; + QComboBox* combo_font; + QComboBox* combo_fontsize; + QCheckBox* check_sides; + QCheckBox* check_columns; + QComboBox* combo_paraspacing; + LengthEntry* length_paraspacing; + LengthEntry* length_paraspacingstretch; + LengthEntry* length_paraspacingshrink; + QComboBox* combo_linespacing; + KRestrictedLine* line_linespacing; + QLineEdit* line_extraoptions; + QCheckBox* check_addspace; }; diff --git a/src/frontends/kde/dlg/emptytable.h b/src/frontends/kde/dlg/emptytable.h index e2d6d65518..4fcef29914 100644 --- a/src/frontends/kde/dlg/emptytable.h +++ b/src/frontends/kde/dlg/emptytable.h @@ -25,7 +25,7 @@ * A simple widget for a quick "preview" in TabularCreateDialog. * The user can drag on the widget to change the table dimensions. */ -class EmptyTable : public QTableView, public noncopyable { +class EmptyTable : public QTableView, public boost::noncopyable { Q_OBJECT public: EmptyTable(QWidget * parent = 0, const char * name = 0); diff --git a/src/frontends/kde/dlg/indexdlgdata.C b/src/frontends/kde/dlg/indexdlgdata.C index 590d1d1cb0..c351aea81c 100644 --- a/src/frontends/kde/dlg/indexdlgdata.C +++ b/src/frontends/kde/dlg/indexdlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: indexdlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:44 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -27,99 +27,99 @@ IndexDialogData::IndexDialogData : Inherited( parent, name, TRUE, 53248 ) { - labelindex = new QLabel( this, "Label_1" ); - labelindex->setGeometry( 5, 15, 60, 25 ); - labelindex->setMinimumSize( 60, 25 ); - labelindex->setMaximumSize( 60, 25 ); - labelindex->setFocusPolicy( QWidget::NoFocus ); - labelindex->setBackgroundMode( QWidget::PaletteBackground ); - labelindex->setFontPropagation( QWidget::NoChildren ); - labelindex->setPalettePropagation( QWidget::NoChildren ); - labelindex->setFrameStyle( 0 ); - labelindex->setLineWidth( 1 ); - labelindex->setMidLineWidth( 0 ); - labelindex->QFrame::setMargin( 0 ); - labelindex->setText( _("Keyword:") ); - labelindex->setAlignment( 289 ); - labelindex->setMargin( -1 ); + label_index = new QLabel( this, "label_index" ); + label_index->setGeometry( 5, 15, 60, 25 ); + label_index->setMinimumSize( 60, 25 ); + label_index->setMaximumSize( 60, 25 ); + label_index->setFocusPolicy( QWidget::NoFocus ); + label_index->setBackgroundMode( QWidget::PaletteBackground ); + label_index->setFontPropagation( QWidget::NoChildren ); + label_index->setPalettePropagation( QWidget::NoChildren ); + label_index->setFrameStyle( 0 ); + label_index->setLineWidth( 1 ); + label_index->setMidLineWidth( 0 ); + label_index->QFrame::setMargin( 0 ); + label_index->setText( _("Keyword:") ); + label_index->setAlignment( 289 ); + label_index->setMargin( -1 ); - index = new QLineEdit( this, "LineEdit_1" ); - index->setGeometry( 70, 15, 175, 25 ); - index->setMinimumSize( 125, 25 ); - index->setMaximumSize( 32767, 25 ); - index->setFocusPolicy( QWidget::StrongFocus ); - index->setBackgroundMode( QWidget::PaletteBase ); - index->setFontPropagation( QWidget::NoChildren ); - index->setPalettePropagation( QWidget::NoChildren ); - index->setText( "" ); - index->setMaxLength( 32767 ); - index->setFrame( QLineEdit::Normal ); - index->setFrame( true ); + line_index = new QLineEdit( this, "line_index" ); + line_index->setGeometry( 70, 15, 175, 25 ); + line_index->setMinimumSize( 125, 25 ); + line_index->setMaximumSize( 32767, 25 ); + line_index->setFocusPolicy( QWidget::StrongFocus ); + line_index->setBackgroundMode( QWidget::PaletteBase ); + line_index->setFontPropagation( QWidget::NoChildren ); + line_index->setPalettePropagation( QWidget::NoChildren ); + line_index->setText( "" ); + line_index->setMaxLength( 32767 ); + line_index->setFrame( QLineEdit::Normal ); + line_index->setFrame( true ); - buttonOk = new QPushButton( this, "PushButton_OK" ); - buttonOk->setGeometry( 24, 65, 80, 25 ); - buttonOk->setMinimumSize( 80, 25 ); - buttonOk->setMaximumSize( 80, 25 ); - connect( buttonOk, SIGNAL(clicked()), SLOT(clickedOK()) ); - buttonOk->setFocusPolicy( QWidget::TabFocus ); - buttonOk->setBackgroundMode( QWidget::PaletteBackground ); - buttonOk->setFontPropagation( QWidget::NoChildren ); - buttonOk->setPalettePropagation( QWidget::NoChildren ); - buttonOk->setText( _("&OK") ); - buttonOk->setAutoRepeat( false ); - buttonOk->setAutoResize( false ); - buttonOk->setToggleButton( false ); - buttonOk->setDefault( false ); - buttonOk->setAutoDefault( true ); - buttonOk->setIsMenuButton( false ); + button_ok = new QPushButton( this, "button_ok" ); + button_ok->setGeometry( 24, 65, 80, 25 ); + button_ok->setMinimumSize( 80, 25 ); + button_ok->setMaximumSize( 80, 25 ); + connect( button_ok, SIGNAL(clicked()), SLOT(clickedOK()) ); + button_ok->setFocusPolicy( QWidget::TabFocus ); + button_ok->setBackgroundMode( QWidget::PaletteBackground ); + button_ok->setFontPropagation( QWidget::NoChildren ); + button_ok->setPalettePropagation( QWidget::NoChildren ); + button_ok->setText( _("&OK") ); + button_ok->setAutoRepeat( false ); + button_ok->setAutoResize( false ); + button_ok->setToggleButton( false ); + button_ok->setDefault( false ); + button_ok->setAutoDefault( true ); + button_ok->setIsMenuButton( false ); - buttonCancel = new QPushButton( this, "PushButton_Cancel" ); - buttonCancel->setGeometry( 146, 65, 80, 25 ); - buttonCancel->setMinimumSize( 80, 25 ); - buttonCancel->setMaximumSize( 80, 25 ); - connect( buttonCancel, SIGNAL(clicked()), SLOT(clickedCancel()) ); - buttonCancel->setFocusPolicy( QWidget::TabFocus ); - buttonCancel->setBackgroundMode( QWidget::PaletteBackground ); - buttonCancel->setFontPropagation( QWidget::NoChildren ); - buttonCancel->setPalettePropagation( QWidget::NoChildren ); - buttonCancel->setText( _("&Cancel") ); - buttonCancel->setAutoRepeat( false ); - buttonCancel->setAutoResize( false ); - buttonCancel->setToggleButton( false ); - buttonCancel->setDefault( false ); - buttonCancel->setAutoDefault( false ); - buttonCancel->setIsMenuButton( false ); + button_cancel = new QPushButton( this, "button_cancel" ); + button_cancel->setGeometry( 146, 65, 80, 25 ); + button_cancel->setMinimumSize( 80, 25 ); + button_cancel->setMaximumSize( 80, 25 ); + connect( button_cancel, SIGNAL(clicked()), SLOT(clickedCancel()) ); + button_cancel->setFocusPolicy( QWidget::TabFocus ); + button_cancel->setBackgroundMode( QWidget::PaletteBackground ); + button_cancel->setFontPropagation( QWidget::NoChildren ); + button_cancel->setPalettePropagation( QWidget::NoChildren ); + button_cancel->setText( _("&Cancel") ); + button_cancel->setAutoRepeat( false ); + button_cancel->setAutoResize( false ); + button_cancel->setToggleButton( false ); + button_cancel->setDefault( false ); + button_cancel->setAutoDefault( false ); + button_cancel->setIsMenuButton( false ); - if (labelindex->sizeHint().width()!=-1) - labelindex->setMinimumWidth(labelindex->sizeHint().width()); - if (labelindex->sizeHint().height()!=-1) - labelindex->setMinimumHeight(labelindex->sizeHint().height()); - if (labelindex->sizeHint().width()!=-1) - labelindex->setMaximumWidth(labelindex->sizeHint().width()); - if (labelindex->sizeHint().height()!=-1) - labelindex->setMaximumHeight(labelindex->sizeHint().height()); - if (index->sizeHint().width()!=-1) - index->setMinimumWidth(index->sizeHint().width()); - if (index->sizeHint().height()!=-1) - index->setMinimumHeight(index->sizeHint().height()); - if (index->sizeHint().height()!=-1) - index->setMaximumHeight(index->sizeHint().height()); - if (buttonOk->sizeHint().width()!=-1) - buttonOk->setMinimumWidth(buttonOk->sizeHint().width()); - if (buttonOk->sizeHint().height()!=-1) - buttonOk->setMinimumHeight(buttonOk->sizeHint().height()); - if (buttonOk->sizeHint().width()!=-1) - buttonOk->setMaximumWidth(buttonOk->sizeHint().width()); - if (buttonOk->sizeHint().height()!=-1) - buttonOk->setMaximumHeight(buttonOk->sizeHint().height()); - if (buttonCancel->sizeHint().width()!=-1) - buttonCancel->setMinimumWidth(buttonCancel->sizeHint().width()); - if (buttonCancel->sizeHint().height()!=-1) - buttonCancel->setMinimumHeight(buttonCancel->sizeHint().height()); - if (buttonCancel->sizeHint().width()!=-1) - buttonCancel->setMaximumWidth(buttonCancel->sizeHint().width()); - if (buttonCancel->sizeHint().height()!=-1) - buttonCancel->setMaximumHeight(buttonCancel->sizeHint().height()); + if (label_index->sizeHint().width()!=-1) + label_index->setMinimumWidth(label_index->sizeHint().width()); + if (label_index->sizeHint().height()!=-1) + label_index->setMinimumHeight(label_index->sizeHint().height()); + if (label_index->sizeHint().width()!=-1) + label_index->setMaximumWidth(label_index->sizeHint().width()); + if (label_index->sizeHint().height()!=-1) + label_index->setMaximumHeight(label_index->sizeHint().height()); + if (line_index->sizeHint().width()!=-1) + line_index->setMinimumWidth(line_index->sizeHint().width()); + if (line_index->sizeHint().height()!=-1) + line_index->setMinimumHeight(line_index->sizeHint().height()); + if (line_index->sizeHint().height()!=-1) + line_index->setMaximumHeight(line_index->sizeHint().height()); + if (button_ok->sizeHint().width()!=-1) + button_ok->setMinimumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMinimumHeight(button_ok->sizeHint().height()); + if (button_ok->sizeHint().width()!=-1) + button_ok->setMaximumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMaximumHeight(button_ok->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMinimumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMinimumHeight(button_cancel->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMaximumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMaximumHeight(button_cancel->sizeHint().height()); QGridLayout* qtarch_layout_1 = new QGridLayout( this, 2, 1, 5, 5, NULL ); qtarch_layout_1->addColSpacing( 0, 5 ); qtarch_layout_1->setColStretch( 0, 1 ); @@ -128,17 +128,17 @@ IndexDialogData::IndexDialogData QBoxLayout* qtarch_layout_1_1_1 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_1_1, 0, 0 ); qtarch_layout_1_1_1->addStrut( 0 ); - qtarch_layout_1_1_1->addWidget( labelindex, 0, 36 ); - qtarch_layout_1_1_1->addWidget( index, 1, 36 ); + qtarch_layout_1_1_1->addWidget( label_index, 0, 36 ); + qtarch_layout_1_1_1->addWidget( line_index, 1, 36 ); qtarch_layout_1->addRowSpacing( 1, 0 ); qtarch_layout_1->setRowStretch( 1, 0 ); QBoxLayout* qtarch_layout_1_2_1 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2_1, 1, 0 ); qtarch_layout_1_2_1->addStrut( 0 ); qtarch_layout_1_2_1->addStretch( 1 ); - qtarch_layout_1_2_1->addWidget( buttonOk, 1, 36 ); + qtarch_layout_1_2_1->addWidget( button_ok, 1, 36 ); qtarch_layout_1_2_1->addStretch( 2 ); - qtarch_layout_1_2_1->addWidget( buttonCancel, 1, 36 ); + qtarch_layout_1_2_1->addWidget( button_cancel, 1, 36 ); qtarch_layout_1_2_1->addStretch( 1 ); resize( 250,105 ); setMinimumSize( 200, 65 ); diff --git a/src/frontends/kde/dlg/indexdlgdata.h b/src/frontends/kde/dlg/indexdlgdata.h index 7acd1ac60c..eaa1ccd806 100644 --- a/src/frontends/kde/dlg/indexdlgdata.h +++ b/src/frontends/kde/dlg/indexdlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: indexdlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:44 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -40,11 +40,11 @@ protected slots: virtual void clickedCancel(); virtual void clickedOK(); -protected: - QLabel* labelindex; - QLineEdit* index; - QPushButton* buttonOk; - QPushButton* buttonCancel; +public: + QLabel* label_index; + QLineEdit* line_index; + QPushButton* button_ok; + QPushButton* button_cancel; }; diff --git a/src/frontends/kde/dlg/lengthentry.h b/src/frontends/kde/dlg/lengthentry.h index 54fde3614e..3fd06743d4 100644 --- a/src/frontends/kde/dlg/lengthentry.h +++ b/src/frontends/kde/dlg/lengthentry.h @@ -30,7 +30,7 @@ class QComboBox; * This widget provides a value edit and a combo box * for LyXLengths. */ -class LengthEntry : public QWidget, public noncopyable { +class LengthEntry : public QWidget, public boost::noncopyable { Q_OBJECT public: LengthEntry(QWidget * parent = 0, const char * name = 0); diff --git a/src/frontends/kde/dlg/logdlgdata.C b/src/frontends/kde/dlg/logdlgdata.C index 6e684fe9d7..72b17f25f3 100644 --- a/src/frontends/kde/dlg/logdlgdata.C +++ b/src/frontends/kde/dlg/logdlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: logdlgdata.C - Last generated: Mon Feb 12 01:41:52 2001 + Last generated: Sat Mar 31 16:48:46 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -27,90 +27,90 @@ LogDialogData::LogDialogData : Inherited( parent, name, FALSE, 0 ) { - close = new QPushButton( this, "close" ); - close->setGeometry( 241, 269, 77, 26 ); - close->setMinimumSize( 0, 0 ); - close->setMaximumSize( 32767, 32767 ); - connect( close, SIGNAL(clicked()), SLOT(closePressed()) ); - close->setFocusPolicy( QWidget::TabFocus ); - close->setBackgroundMode( QWidget::PaletteBackground ); - close->setFontPropagation( QWidget::NoChildren ); - close->setPalettePropagation( QWidget::NoChildren ); - close->setText( _("&Close") ); - close->setAutoRepeat( false ); - close->setAutoResize( false ); - close->setToggleButton( false ); - close->setDefault( true ); - close->setAutoDefault( false ); - close->setIsMenuButton( false ); + button_cancel = new QPushButton( this, "button_cancel" ); + button_cancel->setGeometry( 241, 269, 77, 26 ); + button_cancel->setMinimumSize( 0, 0 ); + button_cancel->setMaximumSize( 32767, 32767 ); + connect( button_cancel, SIGNAL(clicked()), SLOT(closePressed()) ); + button_cancel->setFocusPolicy( QWidget::TabFocus ); + button_cancel->setBackgroundMode( QWidget::PaletteBackground ); + button_cancel->setFontPropagation( QWidget::NoChildren ); + button_cancel->setPalettePropagation( QWidget::NoChildren ); + button_cancel->setText( _("&Close") ); + button_cancel->setAutoRepeat( false ); + button_cancel->setAutoResize( false ); + button_cancel->setToggleButton( false ); + button_cancel->setDefault( true ); + button_cancel->setAutoDefault( false ); + button_cancel->setIsMenuButton( false ); - updateb = new QPushButton( this, "updateb" ); - updateb->setGeometry( 82, 269, 77, 26 ); - updateb->setMinimumSize( 0, 0 ); - updateb->setMaximumSize( 32767, 32767 ); - connect( updateb, SIGNAL(clicked()), SLOT(updatePressed()) ); - updateb->setFocusPolicy( QWidget::TabFocus ); - updateb->setBackgroundMode( QWidget::PaletteBackground ); - updateb->setFontPropagation( QWidget::NoChildren ); - updateb->setPalettePropagation( QWidget::NoChildren ); - updateb->setText( _("&Update") ); - updateb->setAutoRepeat( false ); - updateb->setAutoResize( false ); - updateb->setToggleButton( false ); - updateb->setDefault( false ); - updateb->setAutoDefault( false ); - updateb->setIsMenuButton( false ); + button_update = new QPushButton( this, "button_update" ); + button_update->setGeometry( 82, 269, 77, 26 ); + button_update->setMinimumSize( 0, 0 ); + button_update->setMaximumSize( 32767, 32767 ); + connect( button_update, SIGNAL(clicked()), SLOT(updatePressed()) ); + button_update->setFocusPolicy( QWidget::TabFocus ); + button_update->setBackgroundMode( QWidget::PaletteBackground ); + button_update->setFontPropagation( QWidget::NoChildren ); + button_update->setPalettePropagation( QWidget::NoChildren ); + button_update->setText( _("&Update") ); + button_update->setAutoRepeat( false ); + button_update->setAutoResize( false ); + button_update->setToggleButton( false ); + button_update->setDefault( false ); + button_update->setAutoDefault( false ); + button_update->setIsMenuButton( false ); - viewer = new QMultiLineEdit( this, "viewer" ); - viewer->setGeometry( 5, 5, 390, 259 ); - viewer->setMinimumSize( 0, 0 ); - viewer->setMaximumSize( 32767, 32767 ); - viewer->setFocusPolicy( QWidget::StrongFocus ); - viewer->setBackgroundMode( QWidget::PaletteBase ); - viewer->setFontPropagation( QWidget::SameFont ); - viewer->setPalettePropagation( QWidget::SameFont ); - viewer->setFrameStyle( 51 ); - viewer->setLineWidth( 2 ); - viewer->setMidLineWidth( 0 ); - viewer->QFrame::setMargin( 0 ); - viewer->insertLine( "" ); - viewer->setReadOnly( true ); - viewer->setOverwriteMode( false ); - viewer->setAutoUpdate( true ); + line_viewer = new QMultiLineEdit( this, "line_viewer" ); + line_viewer->setGeometry( 5, 5, 390, 259 ); + line_viewer->setMinimumSize( 0, 0 ); + line_viewer->setMaximumSize( 32767, 32767 ); + line_viewer->setFocusPolicy( QWidget::StrongFocus ); + line_viewer->setBackgroundMode( QWidget::PaletteBase ); + line_viewer->setFontPropagation( QWidget::SameFont ); + line_viewer->setPalettePropagation( QWidget::SameFont ); + line_viewer->setFrameStyle( 51 ); + line_viewer->setLineWidth( 2 ); + line_viewer->setMidLineWidth( 0 ); + line_viewer->QFrame::setMargin( 0 ); + line_viewer->insertLine( "" ); + line_viewer->setReadOnly( true ); + line_viewer->setOverwriteMode( false ); + line_viewer->setAutoUpdate( true ); - if (close->sizeHint().width()!=-1) - close->setMinimumWidth(close->sizeHint().width()); - if (close->sizeHint().height()!=-1) - close->setMinimumHeight(close->sizeHint().height()); - if (close->sizeHint().width()!=-1) - close->setMaximumWidth(close->sizeHint().width()); - if (close->sizeHint().height()!=-1) - close->setMaximumHeight(close->sizeHint().height()); - if (updateb->sizeHint().width()!=-1) - updateb->setMinimumWidth(updateb->sizeHint().width()); - if (updateb->sizeHint().height()!=-1) - updateb->setMinimumHeight(updateb->sizeHint().height()); - if (updateb->sizeHint().width()!=-1) - updateb->setMaximumWidth(updateb->sizeHint().width()); - if (updateb->sizeHint().height()!=-1) - updateb->setMaximumHeight(updateb->sizeHint().height()); - if (viewer->sizeHint().width()!=-1) - viewer->setMinimumWidth(viewer->sizeHint().width()); - if (viewer->sizeHint().height()!=-1) - viewer->setMinimumHeight(viewer->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMinimumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMinimumHeight(button_cancel->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMaximumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMaximumHeight(button_cancel->sizeHint().height()); + if (button_update->sizeHint().width()!=-1) + button_update->setMinimumWidth(button_update->sizeHint().width()); + if (button_update->sizeHint().height()!=-1) + button_update->setMinimumHeight(button_update->sizeHint().height()); + if (button_update->sizeHint().width()!=-1) + button_update->setMaximumWidth(button_update->sizeHint().width()); + if (button_update->sizeHint().height()!=-1) + button_update->setMaximumHeight(button_update->sizeHint().height()); + if (line_viewer->sizeHint().width()!=-1) + line_viewer->setMinimumWidth(line_viewer->sizeHint().width()); + if (line_viewer->sizeHint().height()!=-1) + line_viewer->setMinimumHeight(line_viewer->sizeHint().height()); QBoxLayout* qtarch_layout_1 = new QBoxLayout( this, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1->addStrut( 0 ); QBoxLayout* qtarch_layout_1_1 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_1, 10 ); qtarch_layout_1_1->addStrut( 0 ); - qtarch_layout_1_1->addWidget( viewer, 1, 36 ); + qtarch_layout_1_1->addWidget( line_viewer, 1, 36 ); QBoxLayout* qtarch_layout_1_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2, 1 ); qtarch_layout_1_2->addStrut( 0 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( updateb, 1, 36 ); + qtarch_layout_1_2->addWidget( button_update, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( close, 1, 36 ); + qtarch_layout_1_2->addWidget( button_cancel, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); resize( 400,300 ); setMinimumSize( 0, 0 ); diff --git a/src/frontends/kde/dlg/logdlgdata.h b/src/frontends/kde/dlg/logdlgdata.h index f582b6d62b..a51fd4688f 100644 --- a/src/frontends/kde/dlg/logdlgdata.h +++ b/src/frontends/kde/dlg/logdlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: logdlgdata.h - Last generated: Mon Feb 12 01:41:52 2001 + Last generated: Sat Mar 31 16:48:46 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -39,10 +39,10 @@ protected slots: virtual void updatePressed(); virtual void closePressed(); -protected: - QPushButton* close; - QPushButton* updateb; - QMultiLineEdit* viewer; +public: + QPushButton* button_cancel; + QPushButton* button_update; + QMultiLineEdit* line_viewer; }; diff --git a/src/frontends/kde/dlg/paraabovedlgdata.C b/src/frontends/kde/dlg/paraabovedlgdata.C index 09a89d02d0..584dedf1cf 100644 --- a/src/frontends/kde/dlg/paraabovedlgdata.C +++ b/src/frontends/kde/dlg/paraabovedlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: paraabovedlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:55 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -28,31 +28,31 @@ ParaAboveDialogData::ParaAboveDialogData : Inherited( parent, name, 0 ) { - pagebreakabove = new QCheckBox( this, "pagebreakabove" ); - pagebreakabove->setGeometry( 5, 5, 228, 67 ); - pagebreakabove->setMinimumSize( 0, 0 ); - pagebreakabove->setMaximumSize( 32767, 32767 ); - pagebreakabove->setFocusPolicy( QWidget::TabFocus ); - pagebreakabove->setBackgroundMode( QWidget::PaletteBackground ); - pagebreakabove->setFontPropagation( QWidget::NoChildren ); - pagebreakabove->setPalettePropagation( QWidget::NoChildren ); - pagebreakabove->setText( _("Page break") ); - pagebreakabove->setAutoRepeat( false ); - pagebreakabove->setAutoResize( false ); - pagebreakabove->setChecked( false ); + check_pagebreakabove = new QCheckBox( this, "check_pagebreakabove" ); + check_pagebreakabove->setGeometry( 5, 5, 228, 67 ); + check_pagebreakabove->setMinimumSize( 0, 0 ); + check_pagebreakabove->setMaximumSize( 32767, 32767 ); + check_pagebreakabove->setFocusPolicy( QWidget::TabFocus ); + check_pagebreakabove->setBackgroundMode( QWidget::PaletteBackground ); + check_pagebreakabove->setFontPropagation( QWidget::NoChildren ); + check_pagebreakabove->setPalettePropagation( QWidget::NoChildren ); + check_pagebreakabove->setText( _("Page break") ); + check_pagebreakabove->setAutoRepeat( false ); + check_pagebreakabove->setAutoResize( false ); + check_pagebreakabove->setChecked( false ); - keepabove = new QCheckBox( this, "keepabove" ); - keepabove->setGeometry( 5, 77, 228, 66 ); - keepabove->setMinimumSize( 0, 0 ); - keepabove->setMaximumSize( 32767, 32767 ); - keepabove->setFocusPolicy( QWidget::TabFocus ); - keepabove->setBackgroundMode( QWidget::PaletteBackground ); - keepabove->setFontPropagation( QWidget::NoChildren ); - keepabove->setPalettePropagation( QWidget::NoChildren ); - keepabove->setText( _("Keep space when at top of page") ); - keepabove->setAutoRepeat( false ); - keepabove->setAutoResize( false ); - keepabove->setChecked( false ); + check_keepabove = new QCheckBox( this, "check_keepabove" ); + check_keepabove->setGeometry( 5, 77, 228, 66 ); + check_keepabove->setMinimumSize( 0, 0 ); + check_keepabove->setMaximumSize( 32767, 32767 ); + check_keepabove->setFocusPolicy( QWidget::TabFocus ); + check_keepabove->setBackgroundMode( QWidget::PaletteBackground ); + check_keepabove->setFontPropagation( QWidget::NoChildren ); + check_keepabove->setPalettePropagation( QWidget::NoChildren ); + check_keepabove->setText( _("Keep space when at top of page") ); + check_keepabove->setAutoRepeat( false ); + check_keepabove->setAutoResize( false ); + check_keepabove->setChecked( false ); QLabel* qtarch_abovelabel; qtarch_abovelabel = new QLabel( this, "abovelabel" ); @@ -71,19 +71,19 @@ ParaAboveDialogData::ParaAboveDialogData qtarch_abovelabel->setAlignment( 289 ); qtarch_abovelabel->setMargin( -1 ); - spaceabove = new QComboBox( FALSE, this, "spaceabove" ); - spaceabove->setGeometry( 235, 148, 113, 67 ); - spaceabove->setMinimumSize( 0, 0 ); - spaceabove->setMaximumSize( 32767, 32767 ); - connect( spaceabove, SIGNAL(highlighted(int)), SLOT(spaceaboveHighlighted(int)) ); - spaceabove->setFocusPolicy( QWidget::StrongFocus ); - spaceabove->setBackgroundMode( QWidget::PaletteBackground ); - spaceabove->setFontPropagation( QWidget::AllChildren ); - spaceabove->setPalettePropagation( QWidget::AllChildren ); - spaceabove->setSizeLimit( 10 ); - spaceabove->setAutoResize( false ); - spaceabove->setMaxCount( 2147483647 ); - spaceabove->setAutoCompletion( false ); + combo_spaceabove = new QComboBox( FALSE, this, "combo_spaceabove" ); + combo_spaceabove->setGeometry( 235, 148, 113, 67 ); + combo_spaceabove->setMinimumSize( 0, 0 ); + combo_spaceabove->setMaximumSize( 32767, 32767 ); + connect( combo_spaceabove, SIGNAL(highlighted(int)), SLOT(spaceaboveHighlighted(int)) ); + combo_spaceabove->setFocusPolicy( QWidget::StrongFocus ); + combo_spaceabove->setBackgroundMode( QWidget::PaletteBackground ); + combo_spaceabove->setFontPropagation( QWidget::AllChildren ); + combo_spaceabove->setPalettePropagation( QWidget::AllChildren ); + combo_spaceabove->setSizeLimit( 10 ); + combo_spaceabove->setAutoResize( false ); + combo_spaceabove->setMaxCount( 2147483647 ); + combo_spaceabove->setAutoCompletion( false ); QLabel* qtarch_ValueLabel; qtarch_ValueLabel = new QLabel( this, "ValueLabel" ); @@ -136,49 +136,49 @@ ParaAboveDialogData::ParaAboveDialogData qtarch_aboveminuslabel->setAlignment( 289 ); qtarch_aboveminuslabel->setMargin( -1 ); - spaceabovevalue = new LengthEntry( this, "spaceabovevalue" ); - spaceabovevalue->setGeometry( 217, 220, 187, 67 ); - spaceabovevalue->setMinimumSize( 0, 0 ); - spaceabovevalue->setMaximumSize( 32767, 32767 ); - spaceabovevalue->setFocusPolicy( QWidget::NoFocus ); - spaceabovevalue->setBackgroundMode( QWidget::PaletteBackground ); - spaceabovevalue->setFontPropagation( QWidget::NoChildren ); - spaceabovevalue->setPalettePropagation( QWidget::NoChildren ); + length_spaceabove = new LengthEntry( this, "length_spaceabove" ); + length_spaceabove->setGeometry( 217, 220, 187, 67 ); + length_spaceabove->setMinimumSize( 0, 0 ); + length_spaceabove->setMaximumSize( 32767, 32767 ); + length_spaceabove->setFocusPolicy( QWidget::NoFocus ); + length_spaceabove->setBackgroundMode( QWidget::PaletteBackground ); + length_spaceabove->setFontPropagation( QWidget::NoChildren ); + length_spaceabove->setPalettePropagation( QWidget::NoChildren ); - spaceaboveplus = new LengthEntry( this, "spaceaboveplus" ); - spaceaboveplus->setGeometry( 217, 292, 187, 66 ); - spaceaboveplus->setMinimumSize( 0, 0 ); - spaceaboveplus->setMaximumSize( 32767, 32767 ); - spaceaboveplus->setFocusPolicy( QWidget::NoFocus ); - spaceaboveplus->setBackgroundMode( QWidget::PaletteBackground ); - spaceaboveplus->setFontPropagation( QWidget::NoChildren ); - spaceaboveplus->setPalettePropagation( QWidget::NoChildren ); + length_spaceaboveplus = new LengthEntry( this, "length_spaceaboveplus" ); + length_spaceaboveplus->setGeometry( 217, 292, 187, 66 ); + length_spaceaboveplus->setMinimumSize( 0, 0 ); + length_spaceaboveplus->setMaximumSize( 32767, 32767 ); + length_spaceaboveplus->setFocusPolicy( QWidget::NoFocus ); + length_spaceaboveplus->setBackgroundMode( QWidget::PaletteBackground ); + length_spaceaboveplus->setFontPropagation( QWidget::NoChildren ); + length_spaceaboveplus->setPalettePropagation( QWidget::NoChildren ); - spaceaboveminus = new LengthEntry( this, "spaceaboveminus" ); - spaceaboveminus->setGeometry( 217, 363, 187, 67 ); - spaceaboveminus->setMinimumSize( 0, 0 ); - spaceaboveminus->setMaximumSize( 32767, 32767 ); - spaceaboveminus->setFocusPolicy( QWidget::NoFocus ); - spaceaboveminus->setBackgroundMode( QWidget::PaletteBackground ); - spaceaboveminus->setFontPropagation( QWidget::NoChildren ); - spaceaboveminus->setPalettePropagation( QWidget::NoChildren ); + length_spaceaboveminus = new LengthEntry( this, "length_spaceaboveminus" ); + length_spaceaboveminus->setGeometry( 217, 363, 187, 67 ); + length_spaceaboveminus->setMinimumSize( 0, 0 ); + length_spaceaboveminus->setMaximumSize( 32767, 32767 ); + length_spaceaboveminus->setFocusPolicy( QWidget::NoFocus ); + length_spaceaboveminus->setBackgroundMode( QWidget::PaletteBackground ); + length_spaceaboveminus->setFontPropagation( QWidget::NoChildren ); + length_spaceaboveminus->setPalettePropagation( QWidget::NoChildren ); - if (pagebreakabove->sizeHint().width()!=-1) - pagebreakabove->setMinimumWidth(pagebreakabove->sizeHint().width()); - if (pagebreakabove->sizeHint().height()!=-1) - pagebreakabove->setMinimumHeight(pagebreakabove->sizeHint().height()); - if (pagebreakabove->sizeHint().width()!=-1) - pagebreakabove->setMaximumWidth(pagebreakabove->sizeHint().width()); - if (pagebreakabove->sizeHint().height()!=-1) - pagebreakabove->setMaximumHeight(pagebreakabove->sizeHint().height()); - if (keepabove->sizeHint().width()!=-1) - keepabove->setMinimumWidth(keepabove->sizeHint().width()); - if (keepabove->sizeHint().height()!=-1) - keepabove->setMinimumHeight(keepabove->sizeHint().height()); - if (keepabove->sizeHint().width()!=-1) - keepabove->setMaximumWidth(keepabove->sizeHint().width()); - if (keepabove->sizeHint().height()!=-1) - keepabove->setMaximumHeight(keepabove->sizeHint().height()); + if (check_pagebreakabove->sizeHint().width()!=-1) + check_pagebreakabove->setMinimumWidth(check_pagebreakabove->sizeHint().width()); + if (check_pagebreakabove->sizeHint().height()!=-1) + check_pagebreakabove->setMinimumHeight(check_pagebreakabove->sizeHint().height()); + if (check_pagebreakabove->sizeHint().width()!=-1) + check_pagebreakabove->setMaximumWidth(check_pagebreakabove->sizeHint().width()); + if (check_pagebreakabove->sizeHint().height()!=-1) + check_pagebreakabove->setMaximumHeight(check_pagebreakabove->sizeHint().height()); + if (check_keepabove->sizeHint().width()!=-1) + check_keepabove->setMinimumWidth(check_keepabove->sizeHint().width()); + if (check_keepabove->sizeHint().height()!=-1) + check_keepabove->setMinimumHeight(check_keepabove->sizeHint().height()); + if (check_keepabove->sizeHint().width()!=-1) + check_keepabove->setMaximumWidth(check_keepabove->sizeHint().width()); + if (check_keepabove->sizeHint().height()!=-1) + check_keepabove->setMaximumHeight(check_keepabove->sizeHint().height()); if (qtarch_abovelabel->sizeHint().width()!=-1) qtarch_abovelabel->setMinimumWidth(qtarch_abovelabel->sizeHint().width()); if (qtarch_abovelabel->sizeHint().height()!=-1) @@ -187,12 +187,12 @@ ParaAboveDialogData::ParaAboveDialogData qtarch_abovelabel->setMaximumWidth(qtarch_abovelabel->sizeHint().width()); if (qtarch_abovelabel->sizeHint().height()!=-1) qtarch_abovelabel->setMaximumHeight(qtarch_abovelabel->sizeHint().height()); - if (spaceabove->sizeHint().width()!=-1) - spaceabove->setMinimumWidth(spaceabove->sizeHint().width()); - if (spaceabove->sizeHint().height()!=-1) - spaceabove->setMinimumHeight(spaceabove->sizeHint().height()); - if (spaceabove->sizeHint().height()!=-1) - spaceabove->setMaximumHeight(spaceabove->sizeHint().height()); + if (combo_spaceabove->sizeHint().width()!=-1) + combo_spaceabove->setMinimumWidth(combo_spaceabove->sizeHint().width()); + if (combo_spaceabove->sizeHint().height()!=-1) + combo_spaceabove->setMinimumHeight(combo_spaceabove->sizeHint().height()); + if (combo_spaceabove->sizeHint().height()!=-1) + combo_spaceabove->setMaximumHeight(combo_spaceabove->sizeHint().height()); if (qtarch_ValueLabel->sizeHint().width()!=-1) qtarch_ValueLabel->setMinimumWidth(qtarch_ValueLabel->sizeHint().width()); if (qtarch_ValueLabel->sizeHint().height()!=-1) @@ -205,36 +205,36 @@ ParaAboveDialogData::ParaAboveDialogData qtarch_aboveminuslabel->setMinimumWidth(qtarch_aboveminuslabel->sizeHint().width()); if (qtarch_aboveminuslabel->sizeHint().height()!=-1) qtarch_aboveminuslabel->setMinimumHeight(qtarch_aboveminuslabel->sizeHint().height()); - if (spaceabovevalue->sizeHint().width()!=-1) - spaceabovevalue->setMinimumWidth(spaceabovevalue->sizeHint().width()); - if (spaceabovevalue->sizeHint().height()!=-1) - spaceabovevalue->setMinimumHeight(spaceabovevalue->sizeHint().height()); - if (spaceaboveplus->sizeHint().width()!=-1) - spaceaboveplus->setMinimumWidth(spaceaboveplus->sizeHint().width()); - if (spaceaboveplus->sizeHint().height()!=-1) - spaceaboveplus->setMinimumHeight(spaceaboveplus->sizeHint().height()); - if (spaceaboveminus->sizeHint().width()!=-1) - spaceaboveminus->setMinimumWidth(spaceaboveminus->sizeHint().width()); - if (spaceaboveminus->sizeHint().height()!=-1) - spaceaboveminus->setMinimumHeight(spaceaboveminus->sizeHint().height()); + if (length_spaceabove->sizeHint().width()!=-1) + length_spaceabove->setMinimumWidth(length_spaceabove->sizeHint().width()); + if (length_spaceabove->sizeHint().height()!=-1) + length_spaceabove->setMinimumHeight(length_spaceabove->sizeHint().height()); + if (length_spaceaboveplus->sizeHint().width()!=-1) + length_spaceaboveplus->setMinimumWidth(length_spaceaboveplus->sizeHint().width()); + if (length_spaceaboveplus->sizeHint().height()!=-1) + length_spaceaboveplus->setMinimumHeight(length_spaceaboveplus->sizeHint().height()); + if (length_spaceaboveminus->sizeHint().width()!=-1) + length_spaceaboveminus->setMinimumWidth(length_spaceaboveminus->sizeHint().width()); + if (length_spaceaboveminus->sizeHint().height()!=-1) + length_spaceaboveminus->setMinimumHeight(length_spaceaboveminus->sizeHint().height()); QBoxLayout* qtarch_layout_1 = new QBoxLayout( this, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1->addStrut( 0 ); QBoxLayout* qtarch_layout_1_1 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_1, 1 ); qtarch_layout_1_1->addStrut( 0 ); - qtarch_layout_1_1->addWidget( pagebreakabove, 1, 33 ); + qtarch_layout_1_1->addWidget( check_pagebreakabove, 1, 33 ); qtarch_layout_1_1->addStretch( 1 ); QBoxLayout* qtarch_layout_1_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2, 1 ); qtarch_layout_1_2->addStrut( 0 ); - qtarch_layout_1_2->addWidget( keepabove, 1, 33 ); + qtarch_layout_1_2->addWidget( check_keepabove, 1, 33 ); qtarch_layout_1_2->addStretch( 1 ); QBoxLayout* qtarch_layout_1_3 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_3, 1 ); qtarch_layout_1_3->addStrut( 0 ); qtarch_layout_1_3->addWidget( qtarch_abovelabel, 1, 33 ); qtarch_layout_1_3->addStretch( 1 ); - qtarch_layout_1_3->addWidget( spaceabove, 1, 33 ); + qtarch_layout_1_3->addWidget( combo_spaceabove, 1, 33 ); qtarch_layout_1_3->addStretch( 1 ); QGridLayout* qtarch_layout_1_4 = new QGridLayout( 3, 5, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_4, 3 ); @@ -251,15 +251,15 @@ ParaAboveDialogData::ParaAboveDialogData qtarch_layout_1_4->addRowSpacing( 0, 0 ); qtarch_layout_1_4->setRowStretch( 0, 1 ); qtarch_layout_1_4->addWidget( qtarch_ValueLabel, 0, 1, 33 ); - qtarch_layout_1_4->addWidget( spaceabovevalue, 0, 3, 33 ); + qtarch_layout_1_4->addWidget( length_spaceabove, 0, 3, 33 ); qtarch_layout_1_4->addRowSpacing( 1, 0 ); qtarch_layout_1_4->setRowStretch( 1, 1 ); qtarch_layout_1_4->addWidget( qtarch_Label_14, 1, 1, 33 ); - qtarch_layout_1_4->addWidget( spaceaboveplus, 1, 3, 33 ); + qtarch_layout_1_4->addWidget( length_spaceaboveplus, 1, 3, 33 ); qtarch_layout_1_4->addRowSpacing( 2, 0 ); qtarch_layout_1_4->setRowStretch( 2, 1 ); qtarch_layout_1_4->addWidget( qtarch_aboveminuslabel, 2, 1, 33 ); - qtarch_layout_1_4->addWidget( spaceaboveminus, 2, 3, 33 ); + qtarch_layout_1_4->addWidget( length_spaceaboveminus, 2, 3, 33 ); resize( 465,435 ); setMinimumSize( 0, 0 ); setMaximumSize( 32767, 32767 ); diff --git a/src/frontends/kde/dlg/paraabovedlgdata.h b/src/frontends/kde/dlg/paraabovedlgdata.h index bb79b8228d..d35c26d12c 100644 --- a/src/frontends/kde/dlg/paraabovedlgdata.h +++ b/src/frontends/kde/dlg/paraabovedlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: paraabovedlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:55 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -40,12 +40,12 @@ protected slots: virtual void spaceaboveHighlighted(int); public: - QCheckBox* pagebreakabove; - QCheckBox* keepabove; - QComboBox* spaceabove; - LengthEntry* spaceabovevalue; - LengthEntry* spaceaboveplus; - LengthEntry* spaceaboveminus; + QCheckBox* check_pagebreakabove; + QCheckBox* check_keepabove; + QComboBox* combo_spaceabove; + LengthEntry* length_spaceabove; + LengthEntry* length_spaceaboveplus; + LengthEntry* length_spaceaboveminus; }; diff --git a/src/frontends/kde/dlg/parabelowdlgdata.C b/src/frontends/kde/dlg/parabelowdlgdata.C index 68bd6968d2..4e71519885 100644 --- a/src/frontends/kde/dlg/parabelowdlgdata.C +++ b/src/frontends/kde/dlg/parabelowdlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: parabelowdlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:58 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -28,31 +28,31 @@ ParaBelowDialogData::ParaBelowDialogData : Inherited( parent, name, 0 ) { - pagebreakbelow = new QCheckBox( this, "pagebreakbelow" ); - pagebreakbelow->setGeometry( 5, 5, 228, 67 ); - pagebreakbelow->setMinimumSize( 0, 0 ); - pagebreakbelow->setMaximumSize( 32767, 32767 ); - pagebreakbelow->setFocusPolicy( QWidget::TabFocus ); - pagebreakbelow->setBackgroundMode( QWidget::PaletteBackground ); - pagebreakbelow->setFontPropagation( QWidget::NoChildren ); - pagebreakbelow->setPalettePropagation( QWidget::NoChildren ); - pagebreakbelow->setText( _("Page break") ); - pagebreakbelow->setAutoRepeat( false ); - pagebreakbelow->setAutoResize( false ); - pagebreakbelow->setChecked( false ); + check_pagebreakbelow = new QCheckBox( this, "check_pagebreakbelow" ); + check_pagebreakbelow->setGeometry( 5, 5, 228, 67 ); + check_pagebreakbelow->setMinimumSize( 0, 0 ); + check_pagebreakbelow->setMaximumSize( 32767, 32767 ); + check_pagebreakbelow->setFocusPolicy( QWidget::TabFocus ); + check_pagebreakbelow->setBackgroundMode( QWidget::PaletteBackground ); + check_pagebreakbelow->setFontPropagation( QWidget::NoChildren ); + check_pagebreakbelow->setPalettePropagation( QWidget::NoChildren ); + check_pagebreakbelow->setText( _("Page break") ); + check_pagebreakbelow->setAutoRepeat( false ); + check_pagebreakbelow->setAutoResize( false ); + check_pagebreakbelow->setChecked( false ); - keepbelow = new QCheckBox( this, "keepbelow" ); - keepbelow->setGeometry( 5, 77, 228, 66 ); - keepbelow->setMinimumSize( 0, 0 ); - keepbelow->setMaximumSize( 32767, 32767 ); - keepbelow->setFocusPolicy( QWidget::TabFocus ); - keepbelow->setBackgroundMode( QWidget::PaletteBackground ); - keepbelow->setFontPropagation( QWidget::NoChildren ); - keepbelow->setPalettePropagation( QWidget::NoChildren ); - keepbelow->setText( _("Keep space when at bottom of page") ); - keepbelow->setAutoRepeat( false ); - keepbelow->setAutoResize( false ); - keepbelow->setChecked( false ); + check_keepbelow = new QCheckBox( this, "check_keepbelow" ); + check_keepbelow->setGeometry( 5, 77, 228, 66 ); + check_keepbelow->setMinimumSize( 0, 0 ); + check_keepbelow->setMaximumSize( 32767, 32767 ); + check_keepbelow->setFocusPolicy( QWidget::TabFocus ); + check_keepbelow->setBackgroundMode( QWidget::PaletteBackground ); + check_keepbelow->setFontPropagation( QWidget::NoChildren ); + check_keepbelow->setPalettePropagation( QWidget::NoChildren ); + check_keepbelow->setText( _("Keep space when at top of page") ); + check_keepbelow->setAutoRepeat( false ); + check_keepbelow->setAutoResize( false ); + check_keepbelow->setChecked( false ); QLabel* qtarch_belowlabel; qtarch_belowlabel = new QLabel( this, "belowlabel" ); @@ -71,19 +71,19 @@ ParaBelowDialogData::ParaBelowDialogData qtarch_belowlabel->setAlignment( 289 ); qtarch_belowlabel->setMargin( -1 ); - spacebelow = new QComboBox( FALSE, this, "spacebelow" ); - spacebelow->setGeometry( 235, 148, 113, 67 ); - spacebelow->setMinimumSize( 0, 0 ); - spacebelow->setMaximumSize( 32767, 32767 ); - connect( spacebelow, SIGNAL(highlighted(int)), SLOT(spacebelowHighlighted(int)) ); - spacebelow->setFocusPolicy( QWidget::StrongFocus ); - spacebelow->setBackgroundMode( QWidget::PaletteBackground ); - spacebelow->setFontPropagation( QWidget::AllChildren ); - spacebelow->setPalettePropagation( QWidget::AllChildren ); - spacebelow->setSizeLimit( 10 ); - spacebelow->setAutoResize( false ); - spacebelow->setMaxCount( 2147483647 ); - spacebelow->setAutoCompletion( false ); + combo_spacebelow = new QComboBox( FALSE, this, "combo_spacebelow" ); + combo_spacebelow->setGeometry( 235, 148, 113, 67 ); + combo_spacebelow->setMinimumSize( 0, 0 ); + combo_spacebelow->setMaximumSize( 32767, 32767 ); + connect( combo_spacebelow, SIGNAL(highlighted(int)), SLOT(spacebelowHighlighted(int)) ); + combo_spacebelow->setFocusPolicy( QWidget::StrongFocus ); + combo_spacebelow->setBackgroundMode( QWidget::PaletteBackground ); + combo_spacebelow->setFontPropagation( QWidget::AllChildren ); + combo_spacebelow->setPalettePropagation( QWidget::AllChildren ); + combo_spacebelow->setSizeLimit( 10 ); + combo_spacebelow->setAutoResize( false ); + combo_spacebelow->setMaxCount( 2147483647 ); + combo_spacebelow->setAutoCompletion( false ); QLabel* qtarch_ValueLabel; qtarch_ValueLabel = new QLabel( this, "ValueLabel" ); @@ -136,49 +136,49 @@ ParaBelowDialogData::ParaBelowDialogData qtarch_belowminuslabel->setAlignment( 289 ); qtarch_belowminuslabel->setMargin( -1 ); - spacebelowvalue = new LengthEntry( this, "spacebelowvalue" ); - spacebelowvalue->setGeometry( 217, 220, 187, 67 ); - spacebelowvalue->setMinimumSize( 0, 0 ); - spacebelowvalue->setMaximumSize( 32767, 32767 ); - spacebelowvalue->setFocusPolicy( QWidget::NoFocus ); - spacebelowvalue->setBackgroundMode( QWidget::PaletteBackground ); - spacebelowvalue->setFontPropagation( QWidget::NoChildren ); - spacebelowvalue->setPalettePropagation( QWidget::NoChildren ); + length_spacebelow = new LengthEntry( this, "length_spacebelow" ); + length_spacebelow->setGeometry( 217, 220, 187, 67 ); + length_spacebelow->setMinimumSize( 0, 0 ); + length_spacebelow->setMaximumSize( 32767, 32767 ); + length_spacebelow->setFocusPolicy( QWidget::NoFocus ); + length_spacebelow->setBackgroundMode( QWidget::PaletteBackground ); + length_spacebelow->setFontPropagation( QWidget::NoChildren ); + length_spacebelow->setPalettePropagation( QWidget::NoChildren ); - spacebelowplus = new LengthEntry( this, "spacebelowplus" ); - spacebelowplus->setGeometry( 217, 292, 187, 66 ); - spacebelowplus->setMinimumSize( 0, 0 ); - spacebelowplus->setMaximumSize( 32767, 32767 ); - spacebelowplus->setFocusPolicy( QWidget::NoFocus ); - spacebelowplus->setBackgroundMode( QWidget::PaletteBackground ); - spacebelowplus->setFontPropagation( QWidget::NoChildren ); - spacebelowplus->setPalettePropagation( QWidget::NoChildren ); + length_spacebelowplus = new LengthEntry( this, "length_spacebelowplus" ); + length_spacebelowplus->setGeometry( 217, 292, 187, 66 ); + length_spacebelowplus->setMinimumSize( 0, 0 ); + length_spacebelowplus->setMaximumSize( 32767, 32767 ); + length_spacebelowplus->setFocusPolicy( QWidget::NoFocus ); + length_spacebelowplus->setBackgroundMode( QWidget::PaletteBackground ); + length_spacebelowplus->setFontPropagation( QWidget::NoChildren ); + length_spacebelowplus->setPalettePropagation( QWidget::NoChildren ); - spacebelowminus = new LengthEntry( this, "spacebelowminus" ); - spacebelowminus->setGeometry( 217, 363, 187, 67 ); - spacebelowminus->setMinimumSize( 0, 0 ); - spacebelowminus->setMaximumSize( 32767, 32767 ); - spacebelowminus->setFocusPolicy( QWidget::NoFocus ); - spacebelowminus->setBackgroundMode( QWidget::PaletteBackground ); - spacebelowminus->setFontPropagation( QWidget::NoChildren ); - spacebelowminus->setPalettePropagation( QWidget::NoChildren ); + length_spacebelowminus = new LengthEntry( this, "length_spacebelowminus" ); + length_spacebelowminus->setGeometry( 217, 363, 187, 67 ); + length_spacebelowminus->setMinimumSize( 0, 0 ); + length_spacebelowminus->setMaximumSize( 32767, 32767 ); + length_spacebelowminus->setFocusPolicy( QWidget::NoFocus ); + length_spacebelowminus->setBackgroundMode( QWidget::PaletteBackground ); + length_spacebelowminus->setFontPropagation( QWidget::NoChildren ); + length_spacebelowminus->setPalettePropagation( QWidget::NoChildren ); - if (pagebreakbelow->sizeHint().width()!=-1) - pagebreakbelow->setMinimumWidth(pagebreakbelow->sizeHint().width()); - if (pagebreakbelow->sizeHint().height()!=-1) - pagebreakbelow->setMinimumHeight(pagebreakbelow->sizeHint().height()); - if (pagebreakbelow->sizeHint().width()!=-1) - pagebreakbelow->setMaximumWidth(pagebreakbelow->sizeHint().width()); - if (pagebreakbelow->sizeHint().height()!=-1) - pagebreakbelow->setMaximumHeight(pagebreakbelow->sizeHint().height()); - if (keepbelow->sizeHint().width()!=-1) - keepbelow->setMinimumWidth(keepbelow->sizeHint().width()); - if (keepbelow->sizeHint().height()!=-1) - keepbelow->setMinimumHeight(keepbelow->sizeHint().height()); - if (keepbelow->sizeHint().width()!=-1) - keepbelow->setMaximumWidth(keepbelow->sizeHint().width()); - if (keepbelow->sizeHint().height()!=-1) - keepbelow->setMaximumHeight(keepbelow->sizeHint().height()); + if (check_pagebreakbelow->sizeHint().width()!=-1) + check_pagebreakbelow->setMinimumWidth(check_pagebreakbelow->sizeHint().width()); + if (check_pagebreakbelow->sizeHint().height()!=-1) + check_pagebreakbelow->setMinimumHeight(check_pagebreakbelow->sizeHint().height()); + if (check_pagebreakbelow->sizeHint().width()!=-1) + check_pagebreakbelow->setMaximumWidth(check_pagebreakbelow->sizeHint().width()); + if (check_pagebreakbelow->sizeHint().height()!=-1) + check_pagebreakbelow->setMaximumHeight(check_pagebreakbelow->sizeHint().height()); + if (check_keepbelow->sizeHint().width()!=-1) + check_keepbelow->setMinimumWidth(check_keepbelow->sizeHint().width()); + if (check_keepbelow->sizeHint().height()!=-1) + check_keepbelow->setMinimumHeight(check_keepbelow->sizeHint().height()); + if (check_keepbelow->sizeHint().width()!=-1) + check_keepbelow->setMaximumWidth(check_keepbelow->sizeHint().width()); + if (check_keepbelow->sizeHint().height()!=-1) + check_keepbelow->setMaximumHeight(check_keepbelow->sizeHint().height()); if (qtarch_belowlabel->sizeHint().width()!=-1) qtarch_belowlabel->setMinimumWidth(qtarch_belowlabel->sizeHint().width()); if (qtarch_belowlabel->sizeHint().height()!=-1) @@ -187,12 +187,12 @@ ParaBelowDialogData::ParaBelowDialogData qtarch_belowlabel->setMaximumWidth(qtarch_belowlabel->sizeHint().width()); if (qtarch_belowlabel->sizeHint().height()!=-1) qtarch_belowlabel->setMaximumHeight(qtarch_belowlabel->sizeHint().height()); - if (spacebelow->sizeHint().width()!=-1) - spacebelow->setMinimumWidth(spacebelow->sizeHint().width()); - if (spacebelow->sizeHint().height()!=-1) - spacebelow->setMinimumHeight(spacebelow->sizeHint().height()); - if (spacebelow->sizeHint().height()!=-1) - spacebelow->setMaximumHeight(spacebelow->sizeHint().height()); + if (combo_spacebelow->sizeHint().width()!=-1) + combo_spacebelow->setMinimumWidth(combo_spacebelow->sizeHint().width()); + if (combo_spacebelow->sizeHint().height()!=-1) + combo_spacebelow->setMinimumHeight(combo_spacebelow->sizeHint().height()); + if (combo_spacebelow->sizeHint().height()!=-1) + combo_spacebelow->setMaximumHeight(combo_spacebelow->sizeHint().height()); if (qtarch_ValueLabel->sizeHint().width()!=-1) qtarch_ValueLabel->setMinimumWidth(qtarch_ValueLabel->sizeHint().width()); if (qtarch_ValueLabel->sizeHint().height()!=-1) @@ -205,36 +205,36 @@ ParaBelowDialogData::ParaBelowDialogData qtarch_belowminuslabel->setMinimumWidth(qtarch_belowminuslabel->sizeHint().width()); if (qtarch_belowminuslabel->sizeHint().height()!=-1) qtarch_belowminuslabel->setMinimumHeight(qtarch_belowminuslabel->sizeHint().height()); - if (spacebelowvalue->sizeHint().width()!=-1) - spacebelowvalue->setMinimumWidth(spacebelowvalue->sizeHint().width()); - if (spacebelowvalue->sizeHint().height()!=-1) - spacebelowvalue->setMinimumHeight(spacebelowvalue->sizeHint().height()); - if (spacebelowplus->sizeHint().width()!=-1) - spacebelowplus->setMinimumWidth(spacebelowplus->sizeHint().width()); - if (spacebelowplus->sizeHint().height()!=-1) - spacebelowplus->setMinimumHeight(spacebelowplus->sizeHint().height()); - if (spacebelowminus->sizeHint().width()!=-1) - spacebelowminus->setMinimumWidth(spacebelowminus->sizeHint().width()); - if (spacebelowminus->sizeHint().height()!=-1) - spacebelowminus->setMinimumHeight(spacebelowminus->sizeHint().height()); + if (length_spacebelow->sizeHint().width()!=-1) + length_spacebelow->setMinimumWidth(length_spacebelow->sizeHint().width()); + if (length_spacebelow->sizeHint().height()!=-1) + length_spacebelow->setMinimumHeight(length_spacebelow->sizeHint().height()); + if (length_spacebelowplus->sizeHint().width()!=-1) + length_spacebelowplus->setMinimumWidth(length_spacebelowplus->sizeHint().width()); + if (length_spacebelowplus->sizeHint().height()!=-1) + length_spacebelowplus->setMinimumHeight(length_spacebelowplus->sizeHint().height()); + if (length_spacebelowminus->sizeHint().width()!=-1) + length_spacebelowminus->setMinimumWidth(length_spacebelowminus->sizeHint().width()); + if (length_spacebelowminus->sizeHint().height()!=-1) + length_spacebelowminus->setMinimumHeight(length_spacebelowminus->sizeHint().height()); QBoxLayout* qtarch_layout_1 = new QBoxLayout( this, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1->addStrut( 0 ); QBoxLayout* qtarch_layout_1_1 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_1, 1 ); qtarch_layout_1_1->addStrut( 0 ); - qtarch_layout_1_1->addWidget( pagebreakbelow, 1, 33 ); + qtarch_layout_1_1->addWidget( check_pagebreakbelow, 1, 33 ); qtarch_layout_1_1->addStretch( 1 ); QBoxLayout* qtarch_layout_1_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2, 1 ); qtarch_layout_1_2->addStrut( 0 ); - qtarch_layout_1_2->addWidget( keepbelow, 1, 33 ); + qtarch_layout_1_2->addWidget( check_keepbelow, 1, 33 ); qtarch_layout_1_2->addStretch( 1 ); QBoxLayout* qtarch_layout_1_3 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_3, 1 ); qtarch_layout_1_3->addStrut( 0 ); qtarch_layout_1_3->addWidget( qtarch_belowlabel, 1, 33 ); qtarch_layout_1_3->addStretch( 1 ); - qtarch_layout_1_3->addWidget( spacebelow, 1, 33 ); + qtarch_layout_1_3->addWidget( combo_spacebelow, 1, 33 ); qtarch_layout_1_3->addStretch( 1 ); QGridLayout* qtarch_layout_1_4 = new QGridLayout( 3, 5, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_4, 3 ); @@ -251,15 +251,15 @@ ParaBelowDialogData::ParaBelowDialogData qtarch_layout_1_4->addRowSpacing( 0, 0 ); qtarch_layout_1_4->setRowStretch( 0, 1 ); qtarch_layout_1_4->addWidget( qtarch_ValueLabel, 0, 1, 33 ); - qtarch_layout_1_4->addWidget( spacebelowvalue, 0, 3, 33 ); + qtarch_layout_1_4->addWidget( length_spacebelow, 0, 3, 33 ); qtarch_layout_1_4->addRowSpacing( 1, 0 ); qtarch_layout_1_4->setRowStretch( 1, 1 ); qtarch_layout_1_4->addWidget( qtarch_Label_14, 1, 1, 33 ); - qtarch_layout_1_4->addWidget( spacebelowplus, 1, 3, 33 ); + qtarch_layout_1_4->addWidget( length_spacebelowplus, 1, 3, 33 ); qtarch_layout_1_4->addRowSpacing( 2, 0 ); qtarch_layout_1_4->setRowStretch( 2, 1 ); qtarch_layout_1_4->addWidget( qtarch_belowminuslabel, 2, 1, 33 ); - qtarch_layout_1_4->addWidget( spacebelowminus, 2, 3, 33 ); + qtarch_layout_1_4->addWidget( length_spacebelowminus, 2, 3, 33 ); resize( 465,435 ); setMinimumSize( 0, 0 ); setMaximumSize( 32767, 32767 ); diff --git a/src/frontends/kde/dlg/parabelowdlgdata.h b/src/frontends/kde/dlg/parabelowdlgdata.h index 056e12232c..45e7aec405 100644 --- a/src/frontends/kde/dlg/parabelowdlgdata.h +++ b/src/frontends/kde/dlg/parabelowdlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: parabelowdlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:58 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -40,12 +40,12 @@ protected slots: virtual void spacebelowHighlighted(int); public: - QCheckBox* pagebreakbelow; - QCheckBox* keepbelow; - QComboBox* spacebelow; - LengthEntry* spacebelowvalue; - LengthEntry* spacebelowplus; - LengthEntry* spacebelowminus; + QCheckBox* check_pagebreakbelow; + QCheckBox* check_keepbelow; + QComboBox* combo_spacebelow; + LengthEntry* length_spacebelow; + LengthEntry* length_spacebelowplus; + LengthEntry* length_spacebelowminus; }; diff --git a/src/frontends/kde/dlg/paradlgdata.C b/src/frontends/kde/dlg/paradlgdata.C index 28d030dbb5..6d8c1dabed 100644 --- a/src/frontends/kde/dlg/paradlgdata.C +++ b/src/frontends/kde/dlg/paradlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: paradlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:52 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -27,75 +27,75 @@ ParaDialogData::ParaDialogData : Inherited( parent, name, TRUE, 0 ) { - ok = new QPushButton( this, "OK" ); - ok->setGeometry( 73, 555, 69, 55 ); - ok->setMinimumSize( 0, 0 ); - ok->setMaximumSize( 32767, 32767 ); - connect( ok, SIGNAL(clicked()), SLOT(ok_adaptor()) ); - ok->setFocusPolicy( QWidget::TabFocus ); - ok->setBackgroundMode( QWidget::PaletteBackground ); - ok->setFontPropagation( QWidget::NoChildren ); - ok->setPalettePropagation( QWidget::NoChildren ); - ok->setText( _("&OK") ); - ok->setAutoRepeat( false ); - ok->setAutoResize( false ); - ok->setToggleButton( false ); - ok->setDefault( true ); - ok->setAutoDefault( false ); - ok->setIsMenuButton( false ); - - apply = new QPushButton( this, "apply" ); - apply->setGeometry( 215, 555, 68, 55 ); - apply->setMinimumSize( 0, 0 ); - apply->setMaximumSize( 32767, 32767 ); - connect( apply, SIGNAL(clicked()), SLOT(apply_adaptor()) ); - apply->setFocusPolicy( QWidget::TabFocus ); - apply->setBackgroundMode( QWidget::PaletteBackground ); - apply->setFontPropagation( QWidget::NoChildren ); - apply->setPalettePropagation( QWidget::NoChildren ); - apply->setText( _("&Apply") ); - apply->setAutoRepeat( false ); - apply->setAutoResize( false ); - apply->setToggleButton( false ); - apply->setDefault( false ); - apply->setAutoDefault( false ); - apply->setIsMenuButton( false ); - - restore = new QPushButton( this, "restore" ); - restore->setGeometry( 357, 555, 68, 55 ); - restore->setMinimumSize( 0, 0 ); - restore->setMaximumSize( 32767, 32767 ); - connect( restore, SIGNAL(clicked()), SLOT(restore_adaptor()) ); - restore->setFocusPolicy( QWidget::TabFocus ); - restore->setBackgroundMode( QWidget::PaletteBackground ); - restore->setFontPropagation( QWidget::NoChildren ); - restore->setPalettePropagation( QWidget::NoChildren ); - restore->setText( _("&Restore") ); - restore->setAutoRepeat( false ); - restore->setAutoResize( false ); - restore->setToggleButton( false ); - restore->setDefault( false ); - restore->setAutoDefault( false ); - restore->setIsMenuButton( false ); - - cancel = new QPushButton( this, "Cancel" ); - cancel->setGeometry( 498, 555, 69, 55 ); - cancel->setMinimumSize( 0, 0 ); - cancel->setMaximumSize( 32767, 32767 ); - connect( cancel, SIGNAL(clicked()), SLOT(cancel_adaptor()) ); - cancel->setFocusPolicy( QWidget::TabFocus ); - cancel->setBackgroundMode( QWidget::PaletteBackground ); - cancel->setFontPropagation( QWidget::NoChildren ); - cancel->setPalettePropagation( QWidget::NoChildren ); - cancel->setText( _("&Cancel") ); - cancel->setAutoRepeat( false ); - cancel->setAutoResize( false ); - cancel->setToggleButton( false ); - cancel->setDefault( false ); - cancel->setAutoDefault( false ); - cancel->setIsMenuButton( false ); - - tabstack = new TabStack( this, "User_1" ); + button_ok = new QPushButton( this, "button_ok" ); + button_ok->setGeometry( 73, 555, 69, 55 ); + button_ok->setMinimumSize( 0, 0 ); + button_ok->setMaximumSize( 32767, 32767 ); + connect( button_ok, SIGNAL(clicked()), SLOT(ok_adaptor()) ); + button_ok->setFocusPolicy( QWidget::TabFocus ); + button_ok->setBackgroundMode( QWidget::PaletteBackground ); + button_ok->setFontPropagation( QWidget::NoChildren ); + button_ok->setPalettePropagation( QWidget::NoChildren ); + button_ok->setText( _("&OK") ); + button_ok->setAutoRepeat( false ); + button_ok->setAutoResize( false ); + button_ok->setToggleButton( false ); + button_ok->setDefault( true ); + button_ok->setAutoDefault( false ); + button_ok->setIsMenuButton( false ); + + button_apply = new QPushButton( this, "button_apply" ); + button_apply->setGeometry( 215, 555, 68, 55 ); + button_apply->setMinimumSize( 0, 0 ); + button_apply->setMaximumSize( 32767, 32767 ); + connect( button_apply, SIGNAL(clicked()), SLOT(apply_adaptor()) ); + button_apply->setFocusPolicy( QWidget::TabFocus ); + button_apply->setBackgroundMode( QWidget::PaletteBackground ); + button_apply->setFontPropagation( QWidget::NoChildren ); + button_apply->setPalettePropagation( QWidget::NoChildren ); + button_apply->setText( _("&Apply") ); + button_apply->setAutoRepeat( false ); + button_apply->setAutoResize( false ); + button_apply->setToggleButton( false ); + button_apply->setDefault( false ); + button_apply->setAutoDefault( false ); + button_apply->setIsMenuButton( false ); + + button_restore = new QPushButton( this, "button_restore" ); + button_restore->setGeometry( 357, 555, 68, 55 ); + button_restore->setMinimumSize( 0, 0 ); + button_restore->setMaximumSize( 32767, 32767 ); + connect( button_restore, SIGNAL(clicked()), SLOT(restore_adaptor()) ); + button_restore->setFocusPolicy( QWidget::TabFocus ); + button_restore->setBackgroundMode( QWidget::PaletteBackground ); + button_restore->setFontPropagation( QWidget::NoChildren ); + button_restore->setPalettePropagation( QWidget::NoChildren ); + button_restore->setText( _("&Restore") ); + button_restore->setAutoRepeat( false ); + button_restore->setAutoResize( false ); + button_restore->setToggleButton( false ); + button_restore->setDefault( false ); + button_restore->setAutoDefault( false ); + button_restore->setIsMenuButton( false ); + + button_cancel = new QPushButton( this, "button_cancel" ); + button_cancel->setGeometry( 498, 555, 69, 55 ); + button_cancel->setMinimumSize( 0, 0 ); + button_cancel->setMaximumSize( 32767, 32767 ); + connect( button_cancel, SIGNAL(clicked()), SLOT(cancel_adaptor()) ); + button_cancel->setFocusPolicy( QWidget::TabFocus ); + button_cancel->setBackgroundMode( QWidget::PaletteBackground ); + button_cancel->setFontPropagation( QWidget::NoChildren ); + button_cancel->setPalettePropagation( QWidget::NoChildren ); + button_cancel->setText( _("&Cancel") ); + button_cancel->setAutoRepeat( false ); + button_cancel->setAutoResize( false ); + button_cancel->setToggleButton( false ); + button_cancel->setDefault( false ); + button_cancel->setAutoDefault( false ); + button_cancel->setIsMenuButton( false ); + + tabstack = new TabStack( this, "tabstack" ); tabstack->setGeometry( 5, 5, 630, 545 ); tabstack->setMinimumSize( 0, 0 ); tabstack->setMaximumSize( 32767, 32767 ); @@ -104,38 +104,38 @@ ParaDialogData::ParaDialogData tabstack->setFontPropagation( QWidget::NoChildren ); tabstack->setPalettePropagation( QWidget::NoChildren ); - if (ok->sizeHint().width()!=-1) - ok->setMinimumWidth(ok->sizeHint().width()); - if (ok->sizeHint().height()!=-1) - ok->setMinimumHeight(ok->sizeHint().height()); - if (ok->sizeHint().width()!=-1) - ok->setMaximumWidth(ok->sizeHint().width()); - if (ok->sizeHint().height()!=-1) - ok->setMaximumHeight(ok->sizeHint().height()); - if (apply->sizeHint().width()!=-1) - apply->setMinimumWidth(apply->sizeHint().width()); - if (apply->sizeHint().height()!=-1) - apply->setMinimumHeight(apply->sizeHint().height()); - if (apply->sizeHint().width()!=-1) - apply->setMaximumWidth(apply->sizeHint().width()); - if (apply->sizeHint().height()!=-1) - apply->setMaximumHeight(apply->sizeHint().height()); - if (restore->sizeHint().width()!=-1) - restore->setMinimumWidth(restore->sizeHint().width()); - if (restore->sizeHint().height()!=-1) - restore->setMinimumHeight(restore->sizeHint().height()); - if (restore->sizeHint().width()!=-1) - restore->setMaximumWidth(restore->sizeHint().width()); - if (restore->sizeHint().height()!=-1) - restore->setMaximumHeight(restore->sizeHint().height()); - if (cancel->sizeHint().width()!=-1) - cancel->setMinimumWidth(cancel->sizeHint().width()); - if (cancel->sizeHint().height()!=-1) - cancel->setMinimumHeight(cancel->sizeHint().height()); - if (cancel->sizeHint().width()!=-1) - cancel->setMaximumWidth(cancel->sizeHint().width()); - if (cancel->sizeHint().height()!=-1) - cancel->setMaximumHeight(cancel->sizeHint().height()); + if (button_ok->sizeHint().width()!=-1) + button_ok->setMinimumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMinimumHeight(button_ok->sizeHint().height()); + if (button_ok->sizeHint().width()!=-1) + button_ok->setMaximumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMaximumHeight(button_ok->sizeHint().height()); + if (button_apply->sizeHint().width()!=-1) + button_apply->setMinimumWidth(button_apply->sizeHint().width()); + if (button_apply->sizeHint().height()!=-1) + button_apply->setMinimumHeight(button_apply->sizeHint().height()); + if (button_apply->sizeHint().width()!=-1) + button_apply->setMaximumWidth(button_apply->sizeHint().width()); + if (button_apply->sizeHint().height()!=-1) + button_apply->setMaximumHeight(button_apply->sizeHint().height()); + if (button_restore->sizeHint().width()!=-1) + button_restore->setMinimumWidth(button_restore->sizeHint().width()); + if (button_restore->sizeHint().height()!=-1) + button_restore->setMinimumHeight(button_restore->sizeHint().height()); + if (button_restore->sizeHint().width()!=-1) + button_restore->setMaximumWidth(button_restore->sizeHint().width()); + if (button_restore->sizeHint().height()!=-1) + button_restore->setMaximumHeight(button_restore->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMinimumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMinimumHeight(button_cancel->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMaximumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMaximumHeight(button_cancel->sizeHint().height()); if (tabstack->sizeHint().width()!=-1) tabstack->setMinimumWidth(tabstack->sizeHint().width()); if (tabstack->sizeHint().height()!=-1) @@ -150,13 +150,13 @@ ParaDialogData::ParaDialogData qtarch_layout_1->addLayout( qtarch_layout_1_2, 1 ); qtarch_layout_1_2->addStrut( 0 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( ok, 1, 36 ); + qtarch_layout_1_2->addWidget( button_ok, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( apply, 1, 36 ); + qtarch_layout_1_2->addWidget( button_apply, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( restore, 1, 36 ); + qtarch_layout_1_2->addWidget( button_restore, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); - qtarch_layout_1_2->addWidget( cancel, 1, 36 ); + qtarch_layout_1_2->addWidget( button_cancel, 1, 36 ); qtarch_layout_1_2->addStretch( 1 ); resize( 640,615 ); setMinimumSize( 0, 0 ); diff --git a/src/frontends/kde/dlg/paradlgdata.h b/src/frontends/kde/dlg/paradlgdata.h index 6d75b6fca7..cfcbcebd84 100644 --- a/src/frontends/kde/dlg/paradlgdata.h +++ b/src/frontends/kde/dlg/paradlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: paradlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:48:52 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -41,11 +41,11 @@ protected slots: virtual void apply_adaptor(); virtual void cancel_adaptor(); -protected: - QPushButton* ok; - QPushButton* apply; - QPushButton* restore; - QPushButton* cancel; +public: + QPushButton* button_ok; + QPushButton* button_apply; + QPushButton* button_restore; + QPushButton* button_cancel; TabStack* tabstack; }; diff --git a/src/frontends/kde/dlg/paraextradlgdata.C b/src/frontends/kde/dlg/paraextradlgdata.C index 023278608c..2aa32c0f13 100644 --- a/src/frontends/kde/dlg/paraextradlgdata.C +++ b/src/frontends/kde/dlg/paraextradlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: paraextradlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:49:02 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -28,19 +28,19 @@ ParaExtraDialogData::ParaExtraDialogData : Inherited( parent, name, 0 ) { - type = new QComboBox( FALSE, this, "type" ); - type->setGeometry( 5, 65, 265, 54 ); - type->setMinimumSize( 0, 0 ); - type->setMaximumSize( 32767, 32767 ); - connect( type, SIGNAL(highlighted(int)), SLOT(typeHighlighted(int)) ); - type->setFocusPolicy( QWidget::StrongFocus ); - type->setBackgroundMode( QWidget::PaletteBackground ); - type->setFontPropagation( QWidget::AllChildren ); - type->setPalettePropagation( QWidget::AllChildren ); - type->setSizeLimit( 10 ); - type->setAutoResize( false ); - type->setMaxCount( 2147483647 ); - type->setAutoCompletion( false ); + combo_type = new QComboBox( FALSE, this, "combo_type" ); + combo_type->setGeometry( 5, 65, 265, 54 ); + combo_type->setMinimumSize( 0, 0 ); + combo_type->setMaximumSize( 32767, 32767 ); + connect( combo_type, SIGNAL(highlighted(int)), SLOT(typeHighlighted(int)) ); + combo_type->setFocusPolicy( QWidget::StrongFocus ); + combo_type->setBackgroundMode( QWidget::PaletteBackground ); + combo_type->setFontPropagation( QWidget::AllChildren ); + combo_type->setPalettePropagation( QWidget::AllChildren ); + combo_type->setSizeLimit( 10 ); + combo_type->setAutoResize( false ); + combo_type->setMaxCount( 2147483647 ); + combo_type->setAutoCompletion( false ); QLabel* qtarch_speciallabel; qtarch_speciallabel = new QLabel( this, "speciallabel" ); @@ -76,32 +76,32 @@ ParaExtraDialogData::ParaExtraDialogData qtarch_specialwidthlabel->setAlignment( 289 ); qtarch_specialwidthlabel->setMargin( -1 ); - widthvalue = new KRestrictedLine( this, "widthvalue" ); - widthvalue->setGeometry( 275, 65, 87, 54 ); - widthvalue->setMinimumSize( 0, 0 ); - widthvalue->setMaximumSize( 32767, 32767 ); - widthvalue->setFocusPolicy( QWidget::StrongFocus ); - widthvalue->setBackgroundMode( QWidget::PaletteBase ); - widthvalue->setFontPropagation( QWidget::NoChildren ); - widthvalue->setPalettePropagation( QWidget::NoChildren ); - widthvalue->setText( "" ); - widthvalue->setMaxLength( 32767 ); - widthvalue->setFrame( QLineEdit::Normal ); - widthvalue->setFrame( true ); - widthvalue->setValidChars( "0123456789.-," ); + line_widthvalue = new KRestrictedLine( this, "line_widthvalue" ); + line_widthvalue->setGeometry( 275, 65, 87, 54 ); + line_widthvalue->setMinimumSize( 0, 0 ); + line_widthvalue->setMaximumSize( 32767, 32767 ); + line_widthvalue->setFocusPolicy( QWidget::StrongFocus ); + line_widthvalue->setBackgroundMode( QWidget::PaletteBase ); + line_widthvalue->setFontPropagation( QWidget::NoChildren ); + line_widthvalue->setPalettePropagation( QWidget::NoChildren ); + line_widthvalue->setText( "" ); + line_widthvalue->setMaxLength( 32767 ); + line_widthvalue->setFrame( QLineEdit::Normal ); + line_widthvalue->setFrame( true ); + line_widthvalue->setValidChars( "0123456789.-," ); - widthvalueunits = new QComboBox( FALSE, this, "widthvalueunits" ); - widthvalueunits->setGeometry( 367, 65, 173, 54 ); - widthvalueunits->setMinimumSize( 0, 0 ); - widthvalueunits->setMaximumSize( 32767, 32767 ); - widthvalueunits->setFocusPolicy( QWidget::StrongFocus ); - widthvalueunits->setBackgroundMode( QWidget::PaletteBackground ); - widthvalueunits->setFontPropagation( QWidget::AllChildren ); - widthvalueunits->setPalettePropagation( QWidget::AllChildren ); - widthvalueunits->setSizeLimit( 10 ); - widthvalueunits->setAutoResize( false ); - widthvalueunits->setMaxCount( 2147483647 ); - widthvalueunits->setAutoCompletion( false ); + combo_widthvalueunits = new QComboBox( FALSE, this, "combo_widthvalueunits" ); + combo_widthvalueunits->setGeometry( 367, 65, 173, 54 ); + combo_widthvalueunits->setMinimumSize( 0, 0 ); + combo_widthvalueunits->setMaximumSize( 32767, 32767 ); + combo_widthvalueunits->setFocusPolicy( QWidget::StrongFocus ); + combo_widthvalueunits->setBackgroundMode( QWidget::PaletteBackground ); + combo_widthvalueunits->setFontPropagation( QWidget::AllChildren ); + combo_widthvalueunits->setPalettePropagation( QWidget::AllChildren ); + combo_widthvalueunits->setSizeLimit( 10 ); + combo_widthvalueunits->setAutoResize( false ); + combo_widthvalueunits->setMaxCount( 2147483647 ); + combo_widthvalueunits->setAutoCompletion( false ); specialalignment = new QButtonGroup( this, "specialalignment" ); specialalignment->setGeometry( 5, 124, 265, 331 ); @@ -119,77 +119,77 @@ ParaExtraDialogData::ParaExtraDialogData specialalignment->setAlignment( 1 ); specialalignment->setExclusive( true ); - top = new QRadioButton( specialalignment, "top" ); - top->setGeometry( 5, 49, 255, 45 ); - top->setMinimumSize( 0, 0 ); - top->setMaximumSize( 32767, 32767 ); - top->setFocusPolicy( QWidget::TabFocus ); - top->setBackgroundMode( QWidget::PaletteBackground ); - top->setFontPropagation( QWidget::NoChildren ); - top->setPalettePropagation( QWidget::NoChildren ); - top->setText( _("&Top") ); - top->setAutoRepeat( false ); - top->setAutoResize( false ); - top->setChecked( false ); + radio_top = new QRadioButton( specialalignment, "radio_top" ); + radio_top->setGeometry( 5, 49, 255, 45 ); + radio_top->setMinimumSize( 0, 0 ); + radio_top->setMaximumSize( 32767, 32767 ); + radio_top->setFocusPolicy( QWidget::TabFocus ); + radio_top->setBackgroundMode( QWidget::PaletteBackground ); + radio_top->setFontPropagation( QWidget::NoChildren ); + radio_top->setPalettePropagation( QWidget::NoChildren ); + radio_top->setText( _("&Top") ); + radio_top->setAutoRepeat( false ); + radio_top->setAutoResize( false ); + radio_top->setChecked( false ); - middle = new QRadioButton( specialalignment, "middle" ); - middle->setGeometry( 5, 143, 255, 45 ); - middle->setMinimumSize( 0, 0 ); - middle->setMaximumSize( 32767, 32767 ); - middle->setFocusPolicy( QWidget::TabFocus ); - middle->setBackgroundMode( QWidget::PaletteBackground ); - middle->setFontPropagation( QWidget::NoChildren ); - middle->setPalettePropagation( QWidget::NoChildren ); - middle->setText( _("&Middle") ); - middle->setAutoRepeat( false ); - middle->setAutoResize( false ); - middle->setChecked( false ); + radio_middle = new QRadioButton( specialalignment, "radio_middle" ); + radio_middle->setGeometry( 5, 143, 255, 45 ); + radio_middle->setMinimumSize( 0, 0 ); + radio_middle->setMaximumSize( 32767, 32767 ); + radio_middle->setFocusPolicy( QWidget::TabFocus ); + radio_middle->setBackgroundMode( QWidget::PaletteBackground ); + radio_middle->setFontPropagation( QWidget::NoChildren ); + radio_middle->setPalettePropagation( QWidget::NoChildren ); + radio_middle->setText( _("&Middle") ); + radio_middle->setAutoRepeat( false ); + radio_middle->setAutoResize( false ); + radio_middle->setChecked( false ); - bottom = new QRadioButton( specialalignment, "bottom" ); - bottom->setGeometry( 5, 237, 255, 45 ); - bottom->setMinimumSize( 0, 0 ); - bottom->setMaximumSize( 32767, 32767 ); - bottom->setFocusPolicy( QWidget::TabFocus ); - bottom->setBackgroundMode( QWidget::PaletteBackground ); - bottom->setFontPropagation( QWidget::NoChildren ); - bottom->setPalettePropagation( QWidget::NoChildren ); - bottom->setText( _("&Bottom") ); - bottom->setAutoRepeat( false ); - bottom->setAutoResize( false ); - bottom->setChecked( false ); + radio_bottom = new QRadioButton( specialalignment, "radio_bottom" ); + radio_bottom->setGeometry( 5, 237, 255, 45 ); + radio_bottom->setMinimumSize( 0, 0 ); + radio_bottom->setMaximumSize( 32767, 32767 ); + radio_bottom->setFocusPolicy( QWidget::TabFocus ); + radio_bottom->setBackgroundMode( QWidget::PaletteBackground ); + radio_bottom->setFontPropagation( QWidget::NoChildren ); + radio_bottom->setPalettePropagation( QWidget::NoChildren ); + radio_bottom->setText( _("&Bottom") ); + radio_bottom->setAutoRepeat( false ); + radio_bottom->setAutoResize( false ); + radio_bottom->setChecked( false ); - hfillbetween = new QCheckBox( this, "hfillbetween" ); - hfillbetween->setGeometry( 275, 189, 265, 65 ); - hfillbetween->setMinimumSize( 0, 0 ); - hfillbetween->setMaximumSize( 32767, 32767 ); - hfillbetween->setFocusPolicy( QWidget::TabFocus ); - hfillbetween->setBackgroundMode( QWidget::PaletteBackground ); - hfillbetween->setFontPropagation( QWidget::NoChildren ); - hfillbetween->setPalettePropagation( QWidget::NoChildren ); - hfillbetween->setText( _("&HFill between minipage paragraphs") ); - hfillbetween->setAutoRepeat( false ); - hfillbetween->setAutoResize( false ); - hfillbetween->setChecked( false ); + check_hfillbetween = new QCheckBox( this, "check_hfillbetween" ); + check_hfillbetween->setGeometry( 275, 189, 265, 65 ); + check_hfillbetween->setMinimumSize( 0, 0 ); + check_hfillbetween->setMaximumSize( 32767, 32767 ); + check_hfillbetween->setFocusPolicy( QWidget::TabFocus ); + check_hfillbetween->setBackgroundMode( QWidget::PaletteBackground ); + check_hfillbetween->setFontPropagation( QWidget::NoChildren ); + check_hfillbetween->setPalettePropagation( QWidget::NoChildren ); + check_hfillbetween->setText( _("&HFill between minipage paragraphs") ); + check_hfillbetween->setAutoRepeat( false ); + check_hfillbetween->setAutoResize( false ); + check_hfillbetween->setChecked( false ); - startnewminipage = new QCheckBox( this, "startnewminipage" ); - startnewminipage->setGeometry( 275, 325, 265, 65 ); - startnewminipage->setMinimumSize( 0, 0 ); - startnewminipage->setMaximumSize( 32767, 32767 ); - startnewminipage->setFocusPolicy( QWidget::TabFocus ); - startnewminipage->setBackgroundMode( QWidget::PaletteBackground ); - startnewminipage->setFontPropagation( QWidget::NoChildren ); - startnewminipage->setPalettePropagation( QWidget::NoChildren ); - startnewminipage->setText( _("&Start new minipage") ); - startnewminipage->setAutoRepeat( false ); - startnewminipage->setAutoResize( false ); - startnewminipage->setChecked( false ); + check_startnewminipage = new QCheckBox( this, "check_startnewminipage" ); + check_startnewminipage->setGeometry( 275, 325, 265, 65 ); + check_startnewminipage->setMinimumSize( 0, 0 ); + check_startnewminipage->setMaximumSize( 32767, 32767 ); + check_startnewminipage->setFocusPolicy( QWidget::TabFocus ); + check_startnewminipage->setBackgroundMode( QWidget::PaletteBackground ); + check_startnewminipage->setFontPropagation( QWidget::NoChildren ); + check_startnewminipage->setPalettePropagation( QWidget::NoChildren ); + check_startnewminipage->setText( _("&Start new minipage") ); + check_startnewminipage->setAutoRepeat( false ); + check_startnewminipage->setAutoResize( false ); + check_startnewminipage->setChecked( false ); - if (type->sizeHint().width()!=-1) - type->setMinimumWidth(type->sizeHint().width()); - if (type->sizeHint().height()!=-1) - type->setMinimumHeight(type->sizeHint().height()); - if (type->sizeHint().height()!=-1) - type->setMaximumHeight(type->sizeHint().height()); + if (combo_type->sizeHint().width()!=-1) + combo_type->setMinimumWidth(combo_type->sizeHint().width()); + if (combo_type->sizeHint().height()!=-1) + combo_type->setMinimumHeight(combo_type->sizeHint().height()); + if (combo_type->sizeHint().height()!=-1) + combo_type->setMaximumHeight(combo_type->sizeHint().height()); if (qtarch_speciallabel->sizeHint().width()!=-1) qtarch_speciallabel->setMinimumWidth(qtarch_speciallabel->sizeHint().width()); if (qtarch_speciallabel->sizeHint().height()!=-1) @@ -206,62 +206,62 @@ ParaExtraDialogData::ParaExtraDialogData qtarch_specialwidthlabel->setMaximumWidth(qtarch_specialwidthlabel->sizeHint().width()); if (qtarch_specialwidthlabel->sizeHint().height()!=-1) qtarch_specialwidthlabel->setMaximumHeight(qtarch_specialwidthlabel->sizeHint().height()); - if (widthvalue->sizeHint().width()!=-1) - widthvalue->setMinimumWidth(widthvalue->sizeHint().width()); - if (widthvalue->sizeHint().height()!=-1) - widthvalue->setMinimumHeight(widthvalue->sizeHint().height()); - if (widthvalue->sizeHint().height()!=-1) - widthvalue->setMaximumHeight(widthvalue->sizeHint().height()); - if (widthvalueunits->sizeHint().width()!=-1) - widthvalueunits->setMinimumWidth(widthvalueunits->sizeHint().width()); - if (widthvalueunits->sizeHint().height()!=-1) - widthvalueunits->setMinimumHeight(widthvalueunits->sizeHint().height()); - if (widthvalueunits->sizeHint().height()!=-1) - widthvalueunits->setMaximumHeight(widthvalueunits->sizeHint().height()); - specialalignment->insert( top ); - specialalignment->insert( middle ); - specialalignment->insert( bottom ); + if (line_widthvalue->sizeHint().width()!=-1) + line_widthvalue->setMinimumWidth(line_widthvalue->sizeHint().width()); + if (line_widthvalue->sizeHint().height()!=-1) + line_widthvalue->setMinimumHeight(line_widthvalue->sizeHint().height()); + if (line_widthvalue->sizeHint().height()!=-1) + line_widthvalue->setMaximumHeight(line_widthvalue->sizeHint().height()); + if (combo_widthvalueunits->sizeHint().width()!=-1) + combo_widthvalueunits->setMinimumWidth(combo_widthvalueunits->sizeHint().width()); + if (combo_widthvalueunits->sizeHint().height()!=-1) + combo_widthvalueunits->setMinimumHeight(combo_widthvalueunits->sizeHint().height()); + if (combo_widthvalueunits->sizeHint().height()!=-1) + combo_widthvalueunits->setMaximumHeight(combo_widthvalueunits->sizeHint().height()); + specialalignment->insert( radio_top ); + specialalignment->insert( radio_middle ); + specialalignment->insert( radio_bottom ); - if (top->sizeHint().width()!=-1) - top->setMinimumWidth(top->sizeHint().width()); - if (top->sizeHint().height()!=-1) - top->setMinimumHeight(top->sizeHint().height()); - if (top->sizeHint().width()!=-1) - top->setMaximumWidth(top->sizeHint().width()); - if (top->sizeHint().height()!=-1) - top->setMaximumHeight(top->sizeHint().height()); - if (middle->sizeHint().width()!=-1) - middle->setMinimumWidth(middle->sizeHint().width()); - if (middle->sizeHint().height()!=-1) - middle->setMinimumHeight(middle->sizeHint().height()); - if (middle->sizeHint().width()!=-1) - middle->setMaximumWidth(middle->sizeHint().width()); - if (middle->sizeHint().height()!=-1) - middle->setMaximumHeight(middle->sizeHint().height()); - if (bottom->sizeHint().width()!=-1) - bottom->setMinimumWidth(bottom->sizeHint().width()); - if (bottom->sizeHint().height()!=-1) - bottom->setMinimumHeight(bottom->sizeHint().height()); - if (bottom->sizeHint().width()!=-1) - bottom->setMaximumWidth(bottom->sizeHint().width()); - if (bottom->sizeHint().height()!=-1) - bottom->setMaximumHeight(bottom->sizeHint().height()); - if (hfillbetween->sizeHint().width()!=-1) - hfillbetween->setMinimumWidth(hfillbetween->sizeHint().width()); - if (hfillbetween->sizeHint().height()!=-1) - hfillbetween->setMinimumHeight(hfillbetween->sizeHint().height()); - if (hfillbetween->sizeHint().width()!=-1) - hfillbetween->setMaximumWidth(hfillbetween->sizeHint().width()); - if (hfillbetween->sizeHint().height()!=-1) - hfillbetween->setMaximumHeight(hfillbetween->sizeHint().height()); - if (startnewminipage->sizeHint().width()!=-1) - startnewminipage->setMinimumWidth(startnewminipage->sizeHint().width()); - if (startnewminipage->sizeHint().height()!=-1) - startnewminipage->setMinimumHeight(startnewminipage->sizeHint().height()); - if (startnewminipage->sizeHint().width()!=-1) - startnewminipage->setMaximumWidth(startnewminipage->sizeHint().width()); - if (startnewminipage->sizeHint().height()!=-1) - startnewminipage->setMaximumHeight(startnewminipage->sizeHint().height()); + if (radio_top->sizeHint().width()!=-1) + radio_top->setMinimumWidth(radio_top->sizeHint().width()); + if (radio_top->sizeHint().height()!=-1) + radio_top->setMinimumHeight(radio_top->sizeHint().height()); + if (radio_top->sizeHint().width()!=-1) + radio_top->setMaximumWidth(radio_top->sizeHint().width()); + if (radio_top->sizeHint().height()!=-1) + radio_top->setMaximumHeight(radio_top->sizeHint().height()); + if (radio_middle->sizeHint().width()!=-1) + radio_middle->setMinimumWidth(radio_middle->sizeHint().width()); + if (radio_middle->sizeHint().height()!=-1) + radio_middle->setMinimumHeight(radio_middle->sizeHint().height()); + if (radio_middle->sizeHint().width()!=-1) + radio_middle->setMaximumWidth(radio_middle->sizeHint().width()); + if (radio_middle->sizeHint().height()!=-1) + radio_middle->setMaximumHeight(radio_middle->sizeHint().height()); + if (radio_bottom->sizeHint().width()!=-1) + radio_bottom->setMinimumWidth(radio_bottom->sizeHint().width()); + if (radio_bottom->sizeHint().height()!=-1) + radio_bottom->setMinimumHeight(radio_bottom->sizeHint().height()); + if (radio_bottom->sizeHint().width()!=-1) + radio_bottom->setMaximumWidth(radio_bottom->sizeHint().width()); + if (radio_bottom->sizeHint().height()!=-1) + radio_bottom->setMaximumHeight(radio_bottom->sizeHint().height()); + if (check_hfillbetween->sizeHint().width()!=-1) + check_hfillbetween->setMinimumWidth(check_hfillbetween->sizeHint().width()); + if (check_hfillbetween->sizeHint().height()!=-1) + check_hfillbetween->setMinimumHeight(check_hfillbetween->sizeHint().height()); + if (check_hfillbetween->sizeHint().width()!=-1) + check_hfillbetween->setMaximumWidth(check_hfillbetween->sizeHint().width()); + if (check_hfillbetween->sizeHint().height()!=-1) + check_hfillbetween->setMaximumHeight(check_hfillbetween->sizeHint().height()); + if (check_startnewminipage->sizeHint().width()!=-1) + check_startnewminipage->setMinimumWidth(check_startnewminipage->sizeHint().width()); + if (check_startnewminipage->sizeHint().height()!=-1) + check_startnewminipage->setMinimumHeight(check_startnewminipage->sizeHint().height()); + if (check_startnewminipage->sizeHint().width()!=-1) + check_startnewminipage->setMaximumWidth(check_startnewminipage->sizeHint().width()); + if (check_startnewminipage->sizeHint().height()!=-1) + check_startnewminipage->setMaximumHeight(check_startnewminipage->sizeHint().height()); QGridLayout* qtarch_layout_1 = new QGridLayout( this, 2, 2, 5, 5, NULL ); qtarch_layout_1->addColSpacing( 0, 5 ); qtarch_layout_1->setColStretch( 0, 1 ); @@ -273,7 +273,7 @@ ParaExtraDialogData::ParaExtraDialogData qtarch_layout_1->addLayout( qtarch_layout_1_1_1, 0, 0 ); qtarch_layout_1_1_1->addStrut( 5 ); qtarch_layout_1_1_1->addWidget( qtarch_speciallabel, 1, 1 ); - qtarch_layout_1_1_1->addWidget( type, 1, 36 ); + qtarch_layout_1_1_1->addWidget( combo_type, 1, 36 ); QBoxLayout* qtarch_layout_1_1_2 = new QBoxLayout( QBoxLayout::TopToBottom, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_1_2, 0, 1 ); qtarch_layout_1_1_2->addStrut( 5 ); @@ -281,27 +281,27 @@ ParaExtraDialogData::ParaExtraDialogData QBoxLayout* qtarch_layout_1_1_2_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_1_2->addLayout( qtarch_layout_1_1_2_2, 1 ); qtarch_layout_1_1_2_2->addStrut( 0 ); - qtarch_layout_1_1_2_2->addWidget( widthvalue, 1, 36 ); - qtarch_layout_1_1_2_2->addWidget( widthvalueunits, 2, 36 ); + qtarch_layout_1_1_2_2->addWidget( line_widthvalue, 1, 36 ); + qtarch_layout_1_1_2_2->addWidget( combo_widthvalueunits, 2, 36 ); qtarch_layout_1->addRowSpacing( 1, 5 ); qtarch_layout_1->setRowStretch( 1, 3 ); qtarch_layout_1->addWidget( specialalignment, 1, 0, 33 ); QBoxLayout* qtarch_layout_1_2_1 = new QBoxLayout( specialalignment, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1_2_1->addStrut( 0 ); qtarch_layout_1_2_1->addStretch( 1 ); - qtarch_layout_1_2_1->addWidget( top, 1, 1 ); + qtarch_layout_1_2_1->addWidget( radio_top, 1, 1 ); qtarch_layout_1_2_1->addStretch( 1 ); - qtarch_layout_1_2_1->addWidget( middle, 1, 1 ); + qtarch_layout_1_2_1->addWidget( radio_middle, 1, 1 ); qtarch_layout_1_2_1->addStretch( 1 ); - qtarch_layout_1_2_1->addWidget( bottom, 1, 1 ); + qtarch_layout_1_2_1->addWidget( radio_bottom, 1, 1 ); qtarch_layout_1_2_1->addStretch( 1 ); QBoxLayout* qtarch_layout_1_2_2 = new QBoxLayout( QBoxLayout::TopToBottom, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2_2, 1, 1 ); qtarch_layout_1_2_2->addStrut( 0 ); qtarch_layout_1_2_2->addStretch( 1 ); - qtarch_layout_1_2_2->addWidget( hfillbetween, 1, 1 ); + qtarch_layout_1_2_2->addWidget( check_hfillbetween, 1, 1 ); qtarch_layout_1_2_2->addStretch( 1 ); - qtarch_layout_1_2_2->addWidget( startnewminipage, 1, 1 ); + qtarch_layout_1_2_2->addWidget( check_startnewminipage, 1, 1 ); qtarch_layout_1_2_2->addStretch( 1 ); resize( 545,460 ); setMinimumSize( 0, 0 ); diff --git a/src/frontends/kde/dlg/paraextradlgdata.h b/src/frontends/kde/dlg/paraextradlgdata.h index 9badc04e33..8733e85501 100644 --- a/src/frontends/kde/dlg/paraextradlgdata.h +++ b/src/frontends/kde/dlg/paraextradlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: paraextradlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:49:02 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -42,15 +42,15 @@ protected slots: virtual void typeHighlighted(int); protected: - QComboBox* type; - KRestrictedLine* widthvalue; - QComboBox* widthvalueunits; + QComboBox* combo_type; + KRestrictedLine* line_widthvalue; + QComboBox* combo_widthvalueunits; QButtonGroup* specialalignment; - QRadioButton* top; - QRadioButton* middle; - QRadioButton* bottom; - QCheckBox* hfillbetween; - QCheckBox* startnewminipage; + QRadioButton* radio_top; + QRadioButton* radio_middle; + QRadioButton* radio_bottom; + QCheckBox* check_hfillbetween; + QCheckBox* check_startnewminipage; }; diff --git a/src/frontends/kde/dlg/parageneraldlgdata.C b/src/frontends/kde/dlg/parageneraldlgdata.C index acc465d211..1e43001cf1 100644 --- a/src/frontends/kde/dlg/parageneraldlgdata.C +++ b/src/frontends/kde/dlg/parageneraldlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: parageneraldlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:49:06 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -28,66 +28,66 @@ ParaGeneralDialogData::ParaGeneralDialogData : Inherited( parent, name, 0 ) { - justification = new QComboBox( FALSE, this, "justification" ); - justification->setGeometry( 130, 5, 120, 59 ); - justification->setMinimumSize( 0, 0 ); - justification->setMaximumSize( 32767, 32767 ); - justification->setFocusPolicy( QWidget::StrongFocus ); - justification->setBackgroundMode( QWidget::PaletteBackground ); - justification->setFontPropagation( QWidget::AllChildren ); - justification->setPalettePropagation( QWidget::AllChildren ); - justification->setSizeLimit( 4 ); - justification->setAutoResize( false ); - justification->setMaxCount( 4 ); - justification->setAutoCompletion( false ); - - spacetab = new TabStack( this, "spacetab" ); - spacetab->setGeometry( 5, 69, 605, 294 ); - spacetab->setMinimumSize( 0, 0 ); - spacetab->setMaximumSize( 32767, 32767 ); - spacetab->setFocusPolicy( QWidget::NoFocus ); - spacetab->setBackgroundMode( QWidget::PaletteBackground ); - spacetab->setFontPropagation( QWidget::NoChildren ); - spacetab->setPalettePropagation( QWidget::NoChildren ); - - lineabove = new QCheckBox( this, "lineabove" ); - lineabove->setGeometry( 5, 368, 298, 39 ); - lineabove->setMinimumSize( 0, 0 ); - lineabove->setMaximumSize( 32767, 32767 ); - lineabove->setFocusPolicy( QWidget::TabFocus ); - lineabove->setBackgroundMode( QWidget::PaletteBackground ); - lineabove->setFontPropagation( QWidget::NoChildren ); - lineabove->setPalettePropagation( QWidget::NoChildren ); - lineabove->setText( _("Draw line above paragraph") ); - lineabove->setAutoRepeat( false ); - lineabove->setAutoResize( false ); - lineabove->setChecked( false ); - - linebelow = new QCheckBox( this, "linebelow" ); - linebelow->setGeometry( 5, 412, 298, 39 ); - linebelow->setMinimumSize( 0, 0 ); - linebelow->setMaximumSize( 32767, 32767 ); - linebelow->setFocusPolicy( QWidget::TabFocus ); - linebelow->setBackgroundMode( QWidget::PaletteBackground ); - linebelow->setFontPropagation( QWidget::NoChildren ); - linebelow->setPalettePropagation( QWidget::NoChildren ); - linebelow->setText( _("Draw line below paragraph") ); - linebelow->setAutoRepeat( false ); - linebelow->setAutoResize( false ); - linebelow->setChecked( false ); - - noindent = new QCheckBox( this, "noindent" ); - noindent->setGeometry( 5, 456, 298, 39 ); - noindent->setMinimumSize( 0, 0 ); - noindent->setMaximumSize( 32767, 32767 ); - noindent->setFocusPolicy( QWidget::TabFocus ); - noindent->setBackgroundMode( QWidget::PaletteBackground ); - noindent->setFontPropagation( QWidget::NoChildren ); - noindent->setPalettePropagation( QWidget::NoChildren ); - noindent->setText( _("Don't indent paragraph") ); - noindent->setAutoRepeat( false ); - noindent->setAutoResize( false ); - noindent->setChecked( false ); + combo_justification = new QComboBox( FALSE, this, "combo_justification" ); + combo_justification->setGeometry( 130, 5, 120, 59 ); + combo_justification->setMinimumSize( 0, 0 ); + combo_justification->setMaximumSize( 32767, 32767 ); + combo_justification->setFocusPolicy( QWidget::StrongFocus ); + combo_justification->setBackgroundMode( QWidget::PaletteBackground ); + combo_justification->setFontPropagation( QWidget::AllChildren ); + combo_justification->setPalettePropagation( QWidget::AllChildren ); + combo_justification->setSizeLimit( 4 ); + combo_justification->setAutoResize( false ); + combo_justification->setMaxCount( 4 ); + combo_justification->setAutoCompletion( false ); + + tabstack = new TabStack( this, "tabstack" ); + tabstack->setGeometry( 5, 69, 605, 294 ); + tabstack->setMinimumSize( 0, 0 ); + tabstack->setMaximumSize( 32767, 32767 ); + tabstack->setFocusPolicy( QWidget::NoFocus ); + tabstack->setBackgroundMode( QWidget::PaletteBackground ); + tabstack->setFontPropagation( QWidget::NoChildren ); + tabstack->setPalettePropagation( QWidget::NoChildren ); + + check_lineabove = new QCheckBox( this, "check_lineabove" ); + check_lineabove->setGeometry( 5, 368, 298, 39 ); + check_lineabove->setMinimumSize( 0, 0 ); + check_lineabove->setMaximumSize( 32767, 32767 ); + check_lineabove->setFocusPolicy( QWidget::TabFocus ); + check_lineabove->setBackgroundMode( QWidget::PaletteBackground ); + check_lineabove->setFontPropagation( QWidget::NoChildren ); + check_lineabove->setPalettePropagation( QWidget::NoChildren ); + check_lineabove->setText( _("Draw line above paragraph") ); + check_lineabove->setAutoRepeat( false ); + check_lineabove->setAutoResize( false ); + check_lineabove->setChecked( false ); + + check_linebelow = new QCheckBox( this, "check_linebelow" ); + check_linebelow->setGeometry( 5, 412, 298, 39 ); + check_linebelow->setMinimumSize( 0, 0 ); + check_linebelow->setMaximumSize( 32767, 32767 ); + check_linebelow->setFocusPolicy( QWidget::TabFocus ); + check_linebelow->setBackgroundMode( QWidget::PaletteBackground ); + check_linebelow->setFontPropagation( QWidget::NoChildren ); + check_linebelow->setPalettePropagation( QWidget::NoChildren ); + check_linebelow->setText( _("Draw line below paragraph") ); + check_linebelow->setAutoRepeat( false ); + check_linebelow->setAutoResize( false ); + check_linebelow->setChecked( false ); + + check_noindent = new QCheckBox( this, "check_noindent" ); + check_noindent->setGeometry( 5, 456, 298, 39 ); + check_noindent->setMinimumSize( 0, 0 ); + check_noindent->setMaximumSize( 32767, 32767 ); + check_noindent->setFocusPolicy( QWidget::TabFocus ); + check_noindent->setBackgroundMode( QWidget::PaletteBackground ); + check_noindent->setFontPropagation( QWidget::NoChildren ); + check_noindent->setPalettePropagation( QWidget::NoChildren ); + check_noindent->setText( _("Don't indent paragraph") ); + check_noindent->setAutoRepeat( false ); + check_noindent->setAutoResize( false ); + check_noindent->setChecked( false ); QLabel* qtarch_labelwidthlabel; qtarch_labelwidthlabel = new QLabel( this, "labelwidthlabel" ); @@ -106,18 +106,18 @@ ParaGeneralDialogData::ParaGeneralDialogData qtarch_labelwidthlabel->setAlignment( 289 ); qtarch_labelwidthlabel->setMargin( -1 ); - labelwidth = new QLineEdit( this, "labelwidth" ); - labelwidth->setGeometry( 462, 368, 148, 127 ); - labelwidth->setMinimumSize( 0, 0 ); - labelwidth->setMaximumSize( 32767, 32767 ); - labelwidth->setFocusPolicy( QWidget::StrongFocus ); - labelwidth->setBackgroundMode( QWidget::PaletteBase ); - labelwidth->setFontPropagation( QWidget::NoChildren ); - labelwidth->setPalettePropagation( QWidget::NoChildren ); - labelwidth->setText( "" ); - labelwidth->setMaxLength( 32767 ); - labelwidth->setFrame( QLineEdit::Normal ); - labelwidth->setFrame( true ); + line_labelwidth = new QLineEdit( this, "line_labelwidth" ); + line_labelwidth->setGeometry( 462, 368, 148, 127 ); + line_labelwidth->setMinimumSize( 0, 0 ); + line_labelwidth->setMaximumSize( 32767, 32767 ); + line_labelwidth->setFocusPolicy( QWidget::StrongFocus ); + line_labelwidth->setBackgroundMode( QWidget::PaletteBase ); + line_labelwidth->setFontPropagation( QWidget::NoChildren ); + line_labelwidth->setPalettePropagation( QWidget::NoChildren ); + line_labelwidth->setText( "" ); + line_labelwidth->setMaxLength( 32767 ); + line_labelwidth->setFrame( QLineEdit::Normal ); + line_labelwidth->setFrame( true ); QLabel* qtarch_labelJustification; qtarch_labelJustification = new QLabel( this, "labelJustification" ); @@ -136,40 +136,40 @@ ParaGeneralDialogData::ParaGeneralDialogData qtarch_labelJustification->setAlignment( 289 ); qtarch_labelJustification->setMargin( -1 ); - if (justification->sizeHint().width()!=-1) - justification->setMinimumWidth(justification->sizeHint().width()); - if (justification->sizeHint().height()!=-1) - justification->setMinimumHeight(justification->sizeHint().height()); - if (justification->sizeHint().height()!=-1) - justification->setMaximumHeight(justification->sizeHint().height()); - if (spacetab->sizeHint().width()!=-1) - spacetab->setMinimumWidth(spacetab->sizeHint().width()); - if (spacetab->sizeHint().height()!=-1) - spacetab->setMinimumHeight(spacetab->sizeHint().height()); - if (lineabove->sizeHint().width()!=-1) - lineabove->setMinimumWidth(lineabove->sizeHint().width()); - if (lineabove->sizeHint().height()!=-1) - lineabove->setMinimumHeight(lineabove->sizeHint().height()); - if (lineabove->sizeHint().width()!=-1) - lineabove->setMaximumWidth(lineabove->sizeHint().width()); - if (lineabove->sizeHint().height()!=-1) - lineabove->setMaximumHeight(lineabove->sizeHint().height()); - if (linebelow->sizeHint().width()!=-1) - linebelow->setMinimumWidth(linebelow->sizeHint().width()); - if (linebelow->sizeHint().height()!=-1) - linebelow->setMinimumHeight(linebelow->sizeHint().height()); - if (linebelow->sizeHint().width()!=-1) - linebelow->setMaximumWidth(linebelow->sizeHint().width()); - if (linebelow->sizeHint().height()!=-1) - linebelow->setMaximumHeight(linebelow->sizeHint().height()); - if (noindent->sizeHint().width()!=-1) - noindent->setMinimumWidth(noindent->sizeHint().width()); - if (noindent->sizeHint().height()!=-1) - noindent->setMinimumHeight(noindent->sizeHint().height()); - if (noindent->sizeHint().width()!=-1) - noindent->setMaximumWidth(noindent->sizeHint().width()); - if (noindent->sizeHint().height()!=-1) - noindent->setMaximumHeight(noindent->sizeHint().height()); + if (combo_justification->sizeHint().width()!=-1) + combo_justification->setMinimumWidth(combo_justification->sizeHint().width()); + if (combo_justification->sizeHint().height()!=-1) + combo_justification->setMinimumHeight(combo_justification->sizeHint().height()); + if (combo_justification->sizeHint().height()!=-1) + combo_justification->setMaximumHeight(combo_justification->sizeHint().height()); + if (tabstack->sizeHint().width()!=-1) + tabstack->setMinimumWidth(tabstack->sizeHint().width()); + if (tabstack->sizeHint().height()!=-1) + tabstack->setMinimumHeight(tabstack->sizeHint().height()); + if (check_lineabove->sizeHint().width()!=-1) + check_lineabove->setMinimumWidth(check_lineabove->sizeHint().width()); + if (check_lineabove->sizeHint().height()!=-1) + check_lineabove->setMinimumHeight(check_lineabove->sizeHint().height()); + if (check_lineabove->sizeHint().width()!=-1) + check_lineabove->setMaximumWidth(check_lineabove->sizeHint().width()); + if (check_lineabove->sizeHint().height()!=-1) + check_lineabove->setMaximumHeight(check_lineabove->sizeHint().height()); + if (check_linebelow->sizeHint().width()!=-1) + check_linebelow->setMinimumWidth(check_linebelow->sizeHint().width()); + if (check_linebelow->sizeHint().height()!=-1) + check_linebelow->setMinimumHeight(check_linebelow->sizeHint().height()); + if (check_linebelow->sizeHint().width()!=-1) + check_linebelow->setMaximumWidth(check_linebelow->sizeHint().width()); + if (check_linebelow->sizeHint().height()!=-1) + check_linebelow->setMaximumHeight(check_linebelow->sizeHint().height()); + if (check_noindent->sizeHint().width()!=-1) + check_noindent->setMinimumWidth(check_noindent->sizeHint().width()); + if (check_noindent->sizeHint().height()!=-1) + check_noindent->setMinimumHeight(check_noindent->sizeHint().height()); + if (check_noindent->sizeHint().width()!=-1) + check_noindent->setMaximumWidth(check_noindent->sizeHint().width()); + if (check_noindent->sizeHint().height()!=-1) + check_noindent->setMaximumHeight(check_noindent->sizeHint().height()); if (qtarch_labelwidthlabel->sizeHint().width()!=-1) qtarch_labelwidthlabel->setMinimumWidth(qtarch_labelwidthlabel->sizeHint().width()); if (qtarch_labelwidthlabel->sizeHint().height()!=-1) @@ -178,12 +178,12 @@ ParaGeneralDialogData::ParaGeneralDialogData qtarch_labelwidthlabel->setMaximumWidth(qtarch_labelwidthlabel->sizeHint().width()); if (qtarch_labelwidthlabel->sizeHint().height()!=-1) qtarch_labelwidthlabel->setMaximumHeight(qtarch_labelwidthlabel->sizeHint().height()); - if (labelwidth->sizeHint().width()!=-1) - labelwidth->setMinimumWidth(labelwidth->sizeHint().width()); - if (labelwidth->sizeHint().height()!=-1) - labelwidth->setMinimumHeight(labelwidth->sizeHint().height()); - if (labelwidth->sizeHint().height()!=-1) - labelwidth->setMaximumHeight(labelwidth->sizeHint().height()); + if (line_labelwidth->sizeHint().width()!=-1) + line_labelwidth->setMinimumWidth(line_labelwidth->sizeHint().width()); + if (line_labelwidth->sizeHint().height()!=-1) + line_labelwidth->setMinimumHeight(line_labelwidth->sizeHint().height()); + if (line_labelwidth->sizeHint().height()!=-1) + line_labelwidth->setMaximumHeight(line_labelwidth->sizeHint().height()); if (qtarch_labelJustification->sizeHint().width()!=-1) qtarch_labelJustification->setMinimumWidth(qtarch_labelJustification->sizeHint().width()); if (qtarch_labelJustification->sizeHint().height()!=-1) @@ -198,26 +198,26 @@ ParaGeneralDialogData::ParaGeneralDialogData qtarch_layout_1->addLayout( qtarch_layout_1_1, 1 ); qtarch_layout_1_1->addStrut( 0 ); qtarch_layout_1_1->addWidget( qtarch_labelJustification, 1, 36 ); - qtarch_layout_1_1->addWidget( justification, 1, 36 ); + qtarch_layout_1_1->addWidget( combo_justification, 1, 36 ); qtarch_layout_1_1->addStretch( 3 ); QBoxLayout* qtarch_layout_1_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_2, 5 ); qtarch_layout_1_2->addStrut( 0 ); - qtarch_layout_1_2->addWidget( spacetab, 5, 36 ); + qtarch_layout_1_2->addWidget( tabstack, 5, 36 ); QBoxLayout* qtarch_layout_1_3 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_3, 2 ); qtarch_layout_1_3->addStrut( 0 ); QBoxLayout* qtarch_layout_1_3_1 = new QBoxLayout( QBoxLayout::TopToBottom, 5, NULL ); qtarch_layout_1_3->addLayout( qtarch_layout_1_3_1, 1 ); qtarch_layout_1_3_1->addStrut( 0 ); - qtarch_layout_1_3_1->addWidget( lineabove, 1, 1 ); - qtarch_layout_1_3_1->addWidget( linebelow, 1, 1 ); - qtarch_layout_1_3_1->addWidget( noindent, 1, 1 ); + qtarch_layout_1_3_1->addWidget( check_lineabove, 1, 1 ); + qtarch_layout_1_3_1->addWidget( check_linebelow, 1, 1 ); + qtarch_layout_1_3_1->addWidget( check_noindent, 1, 1 ); QBoxLayout* qtarch_layout_1_3_2 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_3->addLayout( qtarch_layout_1_3_2, 1 ); qtarch_layout_1_3_2->addStrut( 0 ); qtarch_layout_1_3_2->addWidget( qtarch_labelwidthlabel, 1, 36 ); - qtarch_layout_1_3_2->addWidget( labelwidth, 1, 36 ); + qtarch_layout_1_3_2->addWidget( line_labelwidth, 1, 36 ); resize( 615,500 ); setMinimumSize( 0, 0 ); setMaximumSize( 32767, 32767 ); diff --git a/src/frontends/kde/dlg/parageneraldlgdata.h b/src/frontends/kde/dlg/parageneraldlgdata.h index 0db7584658..5346eb70bb 100644 --- a/src/frontends/kde/dlg/parageneraldlgdata.h +++ b/src/frontends/kde/dlg/parageneraldlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: parageneraldlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:49:06 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -40,12 +40,12 @@ protected slots: protected: - QComboBox* justification; - TabStack* spacetab; - QCheckBox* lineabove; - QCheckBox* linebelow; - QCheckBox* noindent; - QLineEdit* labelwidth; + QComboBox* combo_justification; + TabStack* tabstack; + QCheckBox* check_lineabove; + QCheckBox* check_linebelow; + QCheckBox* check_noindent; + QLineEdit* line_labelwidth; }; diff --git a/src/frontends/kde/dlg/printdlgdata.C b/src/frontends/kde/dlg/printdlgdata.C index ba2fc800af..6ad7a3ff20 100644 --- a/src/frontends/kde/dlg/printdlgdata.C +++ b/src/frontends/kde/dlg/printdlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: printdlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:49:09 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -104,144 +104,144 @@ PrintDialogData::PrintDialogData printToRadioGroup->setAlignment( 1 ); printToRadioGroup->setExclusive( true ); - print = new QPushButton( this, "print" ); - print->setGeometry( 86, 280, 81, 45 ); - print->setMinimumSize( 0, 0 ); - print->setMaximumSize( 32767, 32767 ); - connect( print, SIGNAL(clicked()), SLOT(clickedPrint()) ); - print->setFocusPolicy( QWidget::TabFocus ); - print->setBackgroundMode( QWidget::PaletteBackground ); - print->setFontPropagation( QWidget::NoChildren ); - print->setPalettePropagation( QWidget::NoChildren ); - print->setText( _("&Print") ); - print->setAutoRepeat( false ); - print->setAutoResize( false ); - print->setToggleButton( false ); - print->setDefault( false ); - print->setAutoDefault( false ); - print->setIsMenuButton( false ); - - cancel = new QPushButton( this, "cancel" ); - cancel->setGeometry( 333, 280, 81, 45 ); - cancel->setMinimumSize( 0, 0 ); - cancel->setMaximumSize( 32767, 32767 ); - connect( cancel, SIGNAL(clicked()), SLOT(clickedCancel()) ); - cancel->setFocusPolicy( QWidget::TabFocus ); - cancel->setBackgroundMode( QWidget::PaletteBackground ); - cancel->setFontPropagation( QWidget::NoChildren ); - cancel->setPalettePropagation( QWidget::NoChildren ); - cancel->setText( _("&Cancel") ); - cancel->setAutoRepeat( false ); - cancel->setAutoResize( false ); - cancel->setToggleButton( false ); - cancel->setDefault( true ); - cancel->setAutoDefault( false ); - cancel->setIsMenuButton( false ); - - allpages = new QRadioButton( pagesRadioGroup, "allpages" ); - allpages->setGeometry( 5, 20, 142, 34 ); - allpages->setMinimumSize( 80, 20 ); - allpages->setMaximumSize( 32767, 32767 ); - allpages->setFocusPolicy( QWidget::TabFocus ); - allpages->setBackgroundMode( QWidget::PaletteBackground ); - allpages->setFontPropagation( QWidget::NoChildren ); - allpages->setPalettePropagation( QWidget::NoChildren ); - allpages->setText( _("&All pages") ); - allpages->setAutoRepeat( false ); - allpages->setAutoResize( false ); - allpages->setChecked( false ); - - oddpages = new QRadioButton( pagesRadioGroup, "oddpages" ); - oddpages->setGeometry( 5, 74, 142, 14 ); - oddpages->setMinimumSize( 0, 0 ); - oddpages->setMaximumSize( 32767, 32767 ); - oddpages->setFocusPolicy( QWidget::TabFocus ); - oddpages->setBackgroundMode( QWidget::PaletteBackground ); - oddpages->setFontPropagation( QWidget::NoChildren ); - oddpages->setPalettePropagation( QWidget::NoChildren ); - oddpages->setText( _("&Odd pages") ); - oddpages->setAutoRepeat( false ); - oddpages->setAutoResize( false ); - oddpages->setChecked( false ); - - evenpages = new QRadioButton( pagesRadioGroup, "evenpages" ); - evenpages->setGeometry( 5, 108, 142, 14 ); - evenpages->setMinimumSize( 0, 0 ); - evenpages->setMaximumSize( 32767, 32767 ); - evenpages->setFocusPolicy( QWidget::TabFocus ); - evenpages->setBackgroundMode( QWidget::PaletteBackground ); - evenpages->setFontPropagation( QWidget::NoChildren ); - evenpages->setPalettePropagation( QWidget::NoChildren ); - evenpages->setText( _("&Even pages") ); - evenpages->setAutoRepeat( false ); - evenpages->setAutoResize( false ); - evenpages->setChecked( false ); - - from = new KIntLineEdit( pagesGroupBox, "from" ); - from->setGeometry( 108, 164, 49, 30 ); - from->setMinimumSize( 0, 0 ); - from->setMaximumSize( 32767, 32767 ); - from->setFocusPolicy( QWidget::StrongFocus ); - from->setBackgroundMode( QWidget::PaletteBase ); - from->setFontPropagation( QWidget::NoChildren ); - from->setPalettePropagation( QWidget::NoChildren ); - from->setText( "" ); - from->setMaxLength( 32767 ); - from->setFrame( QLineEdit::Normal ); - from->setFrame( true ); - - to = new KIntLineEdit( pagesGroupBox, "to" ); - to->setGeometry( 108, 199, 49, 31 ); - to->setMinimumSize( 0, 0 ); - to->setMaximumSize( 32767, 32767 ); - to->setFocusPolicy( QWidget::StrongFocus ); - to->setBackgroundMode( QWidget::PaletteBase ); - to->setFontPropagation( QWidget::NoChildren ); - to->setPalettePropagation( QWidget::NoChildren ); - to->setText( "" ); - to->setMaxLength( 32767 ); - to->setFrame( QLineEdit::Normal ); - to->setFrame( true ); - - reverse = new QCheckBox( pagesGroupBox, "reverse" ); - reverse->setGeometry( 5, 235, 152, 30 ); - reverse->setMinimumSize( 0, 0 ); - reverse->setMaximumSize( 32767, 32767 ); - reverse->setFocusPolicy( QWidget::TabFocus ); - reverse->setBackgroundMode( QWidget::PaletteBackground ); - reverse->setFontPropagation( QWidget::NoChildren ); - reverse->setPalettePropagation( QWidget::NoChildren ); - reverse->setText( _("&Reverse order") ); - reverse->setAutoRepeat( false ); - reverse->setAutoResize( true ); - reverse->setChecked( false ); - - count = new KIntLineEdit( copies, "count" ); - count->setGeometry( 162, 12, 50, 46 ); - count->setMinimumSize( 0, 0 ); - count->setMaximumSize( 32767, 32767 ); - connect( count, SIGNAL(textChanged(const char*)), SLOT(changedCount(const char*)) ); - count->setFocusPolicy( QWidget::StrongFocus ); - count->setBackgroundMode( QWidget::PaletteBase ); - count->setFontPropagation( QWidget::NoChildren ); - count->setPalettePropagation( QWidget::NoChildren ); - count->setText( "" ); - count->setMaxLength( 32767 ); - count->setFrame( QLineEdit::Normal ); - count->setFrame( true ); - - sort = new QCheckBox( copies, "sort" ); - sort->setGeometry( 268, 12, 50, 46 ); - sort->setMinimumSize( 0, 0 ); - sort->setMaximumSize( 32767, 32767 ); - sort->setFocusPolicy( QWidget::TabFocus ); - sort->setBackgroundMode( QWidget::PaletteBackground ); - sort->setFontPropagation( QWidget::NoChildren ); - sort->setPalettePropagation( QWidget::NoChildren ); - sort->setText( _("Co&llate") ); - sort->setAutoRepeat( false ); - sort->setAutoResize( true ); - sort->setChecked( false ); + button_ok = new QPushButton( this, "button_ok" ); + button_ok->setGeometry( 86, 280, 81, 45 ); + button_ok->setMinimumSize( 0, 0 ); + button_ok->setMaximumSize( 32767, 32767 ); + connect( button_ok, SIGNAL(clicked()), SLOT(clickedPrint()) ); + button_ok->setFocusPolicy( QWidget::TabFocus ); + button_ok->setBackgroundMode( QWidget::PaletteBackground ); + button_ok->setFontPropagation( QWidget::NoChildren ); + button_ok->setPalettePropagation( QWidget::NoChildren ); + button_ok->setText( _("&Print") ); + button_ok->setAutoRepeat( false ); + button_ok->setAutoResize( false ); + button_ok->setToggleButton( false ); + button_ok->setDefault( false ); + button_ok->setAutoDefault( false ); + button_ok->setIsMenuButton( false ); + + button_cancel = new QPushButton( this, "button_cancel" ); + button_cancel->setGeometry( 333, 280, 81, 45 ); + button_cancel->setMinimumSize( 0, 0 ); + button_cancel->setMaximumSize( 32767, 32767 ); + connect( button_cancel, SIGNAL(clicked()), SLOT(clickedCancel()) ); + button_cancel->setFocusPolicy( QWidget::TabFocus ); + button_cancel->setBackgroundMode( QWidget::PaletteBackground ); + button_cancel->setFontPropagation( QWidget::NoChildren ); + button_cancel->setPalettePropagation( QWidget::NoChildren ); + button_cancel->setText( _("&Cancel") ); + button_cancel->setAutoRepeat( false ); + button_cancel->setAutoResize( false ); + button_cancel->setToggleButton( false ); + button_cancel->setDefault( true ); + button_cancel->setAutoDefault( false ); + button_cancel->setIsMenuButton( false ); + + radio_allpages = new QRadioButton( pagesRadioGroup, "radio_allpages" ); + radio_allpages->setGeometry( 5, 20, 142, 34 ); + radio_allpages->setMinimumSize( 80, 20 ); + radio_allpages->setMaximumSize( 32767, 32767 ); + radio_allpages->setFocusPolicy( QWidget::TabFocus ); + radio_allpages->setBackgroundMode( QWidget::PaletteBackground ); + radio_allpages->setFontPropagation( QWidget::NoChildren ); + radio_allpages->setPalettePropagation( QWidget::NoChildren ); + radio_allpages->setText( _("&All pages") ); + radio_allpages->setAutoRepeat( false ); + radio_allpages->setAutoResize( false ); + radio_allpages->setChecked( false ); + + radio_oddpages = new QRadioButton( pagesRadioGroup, "radio_oddpages" ); + radio_oddpages->setGeometry( 5, 74, 142, 14 ); + radio_oddpages->setMinimumSize( 0, 0 ); + radio_oddpages->setMaximumSize( 32767, 32767 ); + radio_oddpages->setFocusPolicy( QWidget::TabFocus ); + radio_oddpages->setBackgroundMode( QWidget::PaletteBackground ); + radio_oddpages->setFontPropagation( QWidget::NoChildren ); + radio_oddpages->setPalettePropagation( QWidget::NoChildren ); + radio_oddpages->setText( _("&Odd pages") ); + radio_oddpages->setAutoRepeat( false ); + radio_oddpages->setAutoResize( false ); + radio_oddpages->setChecked( false ); + + radio_evenpages = new QRadioButton( pagesRadioGroup, "radio_evenpages" ); + radio_evenpages->setGeometry( 5, 108, 142, 14 ); + radio_evenpages->setMinimumSize( 0, 0 ); + radio_evenpages->setMaximumSize( 32767, 32767 ); + radio_evenpages->setFocusPolicy( QWidget::TabFocus ); + radio_evenpages->setBackgroundMode( QWidget::PaletteBackground ); + radio_evenpages->setFontPropagation( QWidget::NoChildren ); + radio_evenpages->setPalettePropagation( QWidget::NoChildren ); + radio_evenpages->setText( _("&Even pages") ); + radio_evenpages->setAutoRepeat( false ); + radio_evenpages->setAutoResize( false ); + radio_evenpages->setChecked( false ); + + line_from = new KIntLineEdit( pagesGroupBox, "line_from" ); + line_from->setGeometry( 108, 164, 49, 30 ); + line_from->setMinimumSize( 0, 0 ); + line_from->setMaximumSize( 32767, 32767 ); + line_from->setFocusPolicy( QWidget::StrongFocus ); + line_from->setBackgroundMode( QWidget::PaletteBase ); + line_from->setFontPropagation( QWidget::NoChildren ); + line_from->setPalettePropagation( QWidget::NoChildren ); + line_from->setText( "" ); + line_from->setMaxLength( 32767 ); + line_from->setFrame( QLineEdit::Normal ); + line_from->setFrame( true ); + + line_to = new KIntLineEdit( pagesGroupBox, "line_to" ); + line_to->setGeometry( 108, 199, 49, 31 ); + line_to->setMinimumSize( 0, 0 ); + line_to->setMaximumSize( 32767, 32767 ); + line_to->setFocusPolicy( QWidget::StrongFocus ); + line_to->setBackgroundMode( QWidget::PaletteBase ); + line_to->setFontPropagation( QWidget::NoChildren ); + line_to->setPalettePropagation( QWidget::NoChildren ); + line_to->setText( "" ); + line_to->setMaxLength( 32767 ); + line_to->setFrame( QLineEdit::Normal ); + line_to->setFrame( true ); + + check_reverse = new QCheckBox( pagesGroupBox, "check_reverse" ); + check_reverse->setGeometry( 5, 235, 152, 30 ); + check_reverse->setMinimumSize( 0, 0 ); + check_reverse->setMaximumSize( 32767, 32767 ); + check_reverse->setFocusPolicy( QWidget::TabFocus ); + check_reverse->setBackgroundMode( QWidget::PaletteBackground ); + check_reverse->setFontPropagation( QWidget::NoChildren ); + check_reverse->setPalettePropagation( QWidget::NoChildren ); + check_reverse->setText( _("&Reverse order") ); + check_reverse->setAutoRepeat( false ); + check_reverse->setAutoResize( true ); + check_reverse->setChecked( false ); + + line_count = new KIntLineEdit( copies, "line_count" ); + line_count->setGeometry( 162, 12, 50, 46 ); + line_count->setMinimumSize( 0, 0 ); + line_count->setMaximumSize( 32767, 32767 ); + connect( line_count, SIGNAL(textChanged(const char*)), SLOT(changedCount(const char*)) ); + line_count->setFocusPolicy( QWidget::StrongFocus ); + line_count->setBackgroundMode( QWidget::PaletteBase ); + line_count->setFontPropagation( QWidget::NoChildren ); + line_count->setPalettePropagation( QWidget::NoChildren ); + line_count->setText( "" ); + line_count->setMaxLength( 32767 ); + line_count->setFrame( QLineEdit::Normal ); + line_count->setFrame( true ); + + check_sort = new QCheckBox( copies, "check_sort" ); + check_sort->setGeometry( 268, 12, 50, 46 ); + check_sort->setMinimumSize( 0, 0 ); + check_sort->setMaximumSize( 32767, 32767 ); + check_sort->setFocusPolicy( QWidget::TabFocus ); + check_sort->setBackgroundMode( QWidget::PaletteBackground ); + check_sort->setFontPropagation( QWidget::NoChildren ); + check_sort->setPalettePropagation( QWidget::NoChildren ); + check_sort->setText( _("Co&llate") ); + check_sort->setAutoRepeat( false ); + check_sort->setAutoResize( true ); + check_sort->setChecked( false ); fromLabel = new QLabel( pagesGroupBox, "fromLabel" ); fromLabel->setGeometry( 5, 164, 98, 30 ); @@ -275,74 +275,74 @@ PrintDialogData::PrintDialogData toLabel->setAlignment( 289 ); toLabel->setMargin( -1 ); - toprinter = new QRadioButton( printToRadioGroup, "toprinter" ); - toprinter->setGeometry( 5, 5, 142, 23 ); - toprinter->setMinimumSize( 0, 0 ); - toprinter->setMaximumSize( 32767, 32767 ); - toprinter->setFocusPolicy( QWidget::TabFocus ); - toprinter->setBackgroundMode( QWidget::PaletteBackground ); - toprinter->setFontPropagation( QWidget::NoChildren ); - toprinter->setPalettePropagation( QWidget::NoChildren ); - toprinter->setText( _("&Printer") ); - toprinter->setAutoRepeat( false ); - toprinter->setAutoResize( false ); - toprinter->setChecked( false ); - - tofile = new QRadioButton( printToRadioGroup, "tofile" ); - tofile->setGeometry( 5, 55, 142, 23 ); - tofile->setMinimumSize( 0, 0 ); - tofile->setMaximumSize( 32767, 32767 ); - tofile->setFocusPolicy( QWidget::TabFocus ); - tofile->setBackgroundMode( QWidget::PaletteBackground ); - tofile->setFontPropagation( QWidget::NoChildren ); - tofile->setPalettePropagation( QWidget::NoChildren ); - tofile->setText( _("&File") ); - tofile->setAutoRepeat( false ); - tofile->setAutoResize( false ); - tofile->setChecked( false ); - - printername = new QLineEdit( printToGroupBox, "printername" ); - printername->setGeometry( 169, 39, 142, 26 ); - printername->setMinimumSize( 0, 0 ); - printername->setMaximumSize( 32767, 32767 ); - printername->setFocusPolicy( QWidget::StrongFocus ); - printername->setBackgroundMode( QWidget::PaletteBase ); - printername->setFontPropagation( QWidget::NoChildren ); - printername->setPalettePropagation( QWidget::NoChildren ); - printername->setText( "" ); - printername->setMaxLength( 32767 ); - printername->setFrame( QLineEdit::Normal ); - printername->setFrame( true ); - - filename = new QLineEdit( printToGroupBox, "filename" ); - filename->setGeometry( 169, 96, 142, 26 ); - filename->setMinimumSize( 0, 0 ); - filename->setMaximumSize( 32767, 32767 ); - filename->setFocusPolicy( QWidget::StrongFocus ); - filename->setBackgroundMode( QWidget::PaletteBase ); - filename->setFontPropagation( QWidget::NoChildren ); - filename->setPalettePropagation( QWidget::NoChildren ); - filename->setText( "" ); - filename->setMaxLength( 32767 ); - filename->setFrame( QLineEdit::Normal ); - filename->setFrame( true ); - - browse = new QPushButton( printToGroupBox, "browse" ); - browse->setGeometry( 158, 149, 153, 23 ); - browse->setMinimumSize( 0, 0 ); - browse->setMaximumSize( 32767, 32767 ); - connect( browse, SIGNAL(clicked()), SLOT(clickedBrowse()) ); - browse->setFocusPolicy( QWidget::TabFocus ); - browse->setBackgroundMode( QWidget::PaletteBackground ); - browse->setFontPropagation( QWidget::NoChildren ); - browse->setPalettePropagation( QWidget::NoChildren ); - browse->setText( _("&Browse") ); - browse->setAutoRepeat( false ); - browse->setAutoResize( false ); - browse->setToggleButton( false ); - browse->setDefault( false ); - browse->setAutoDefault( false ); - browse->setIsMenuButton( false ); + radio_toprinter = new QRadioButton( printToRadioGroup, "radio_toprinter" ); + radio_toprinter->setGeometry( 5, 5, 142, 23 ); + radio_toprinter->setMinimumSize( 0, 0 ); + radio_toprinter->setMaximumSize( 32767, 32767 ); + radio_toprinter->setFocusPolicy( QWidget::TabFocus ); + radio_toprinter->setBackgroundMode( QWidget::PaletteBackground ); + radio_toprinter->setFontPropagation( QWidget::NoChildren ); + radio_toprinter->setPalettePropagation( QWidget::NoChildren ); + radio_toprinter->setText( _("&Printer") ); + radio_toprinter->setAutoRepeat( false ); + radio_toprinter->setAutoResize( false ); + radio_toprinter->setChecked( false ); + + radio_tofile = new QRadioButton( printToRadioGroup, "radio_tofile" ); + radio_tofile->setGeometry( 5, 55, 142, 23 ); + radio_tofile->setMinimumSize( 0, 0 ); + radio_tofile->setMaximumSize( 32767, 32767 ); + radio_tofile->setFocusPolicy( QWidget::TabFocus ); + radio_tofile->setBackgroundMode( QWidget::PaletteBackground ); + radio_tofile->setFontPropagation( QWidget::NoChildren ); + radio_tofile->setPalettePropagation( QWidget::NoChildren ); + radio_tofile->setText( _("&File") ); + radio_tofile->setAutoRepeat( false ); + radio_tofile->setAutoResize( false ); + radio_tofile->setChecked( false ); + + line_printername = new QLineEdit( printToGroupBox, "line_printername" ); + line_printername->setGeometry( 169, 39, 142, 26 ); + line_printername->setMinimumSize( 0, 0 ); + line_printername->setMaximumSize( 32767, 32767 ); + line_printername->setFocusPolicy( QWidget::StrongFocus ); + line_printername->setBackgroundMode( QWidget::PaletteBase ); + line_printername->setFontPropagation( QWidget::NoChildren ); + line_printername->setPalettePropagation( QWidget::NoChildren ); + line_printername->setText( "" ); + line_printername->setMaxLength( 32767 ); + line_printername->setFrame( QLineEdit::Normal ); + line_printername->setFrame( true ); + + line_filename = new QLineEdit( printToGroupBox, "line_filename" ); + line_filename->setGeometry( 169, 96, 142, 26 ); + line_filename->setMinimumSize( 0, 0 ); + line_filename->setMaximumSize( 32767, 32767 ); + line_filename->setFocusPolicy( QWidget::StrongFocus ); + line_filename->setBackgroundMode( QWidget::PaletteBase ); + line_filename->setFontPropagation( QWidget::NoChildren ); + line_filename->setPalettePropagation( QWidget::NoChildren ); + line_filename->setText( "" ); + line_filename->setMaxLength( 32767 ); + line_filename->setFrame( QLineEdit::Normal ); + line_filename->setFrame( true ); + + button_browse = new QPushButton( printToGroupBox, "button_browse" ); + button_browse->setGeometry( 158, 149, 153, 23 ); + button_browse->setMinimumSize( 0, 0 ); + button_browse->setMaximumSize( 32767, 32767 ); + connect( button_browse, SIGNAL(clicked()), SLOT(clickedBrowse()) ); + button_browse->setFocusPolicy( QWidget::TabFocus ); + button_browse->setBackgroundMode( QWidget::PaletteBackground ); + button_browse->setFontPropagation( QWidget::NoChildren ); + button_browse->setPalettePropagation( QWidget::NoChildren ); + button_browse->setText( _("&Browse") ); + button_browse->setAutoRepeat( false ); + button_browse->setAutoResize( false ); + button_browse->setToggleButton( false ); + button_browse->setDefault( false ); + button_browse->setAutoDefault( false ); + button_browse->setIsMenuButton( false ); countLabel = new QLabel( copies, "countLabel" ); countLabel->setGeometry( 56, 12, 50, 46 ); @@ -360,87 +360,87 @@ PrintDialogData::PrintDialogData countLabel->setAlignment( 289 ); countLabel->setMargin( -1 ); - pagesRadioGroup->insert( allpages ); - pagesRadioGroup->insert( oddpages ); - pagesRadioGroup->insert( evenpages ); - - printToRadioGroup->insert( toprinter ); - printToRadioGroup->insert( tofile ); - - if (print->sizeHint().width()!=-1) - print->setMinimumWidth(print->sizeHint().width()); - if (print->sizeHint().height()!=-1) - print->setMinimumHeight(print->sizeHint().height()); - if (print->sizeHint().width()!=-1) - print->setMaximumWidth(print->sizeHint().width()); - if (print->sizeHint().height()!=-1) - print->setMaximumHeight(print->sizeHint().height()); - if (cancel->sizeHint().width()!=-1) - cancel->setMinimumWidth(cancel->sizeHint().width()); - if (cancel->sizeHint().height()!=-1) - cancel->setMinimumHeight(cancel->sizeHint().height()); - if (cancel->sizeHint().width()!=-1) - cancel->setMaximumWidth(cancel->sizeHint().width()); - if (cancel->sizeHint().height()!=-1) - cancel->setMaximumHeight(cancel->sizeHint().height()); - if (allpages->sizeHint().width()!=-1) - allpages->setMinimumWidth(allpages->sizeHint().width()); - if (allpages->sizeHint().height()!=-1) - allpages->setMinimumHeight(allpages->sizeHint().height()); - if (allpages->sizeHint().width()!=-1) - allpages->setMaximumWidth(allpages->sizeHint().width()); - if (allpages->sizeHint().height()!=-1) - allpages->setMaximumHeight(allpages->sizeHint().height()); - if (oddpages->sizeHint().width()!=-1) - oddpages->setMinimumWidth(oddpages->sizeHint().width()); - if (oddpages->sizeHint().height()!=-1) - oddpages->setMinimumHeight(oddpages->sizeHint().height()); - if (oddpages->sizeHint().width()!=-1) - oddpages->setMaximumWidth(oddpages->sizeHint().width()); - if (oddpages->sizeHint().height()!=-1) - oddpages->setMaximumHeight(oddpages->sizeHint().height()); - if (evenpages->sizeHint().width()!=-1) - evenpages->setMinimumWidth(evenpages->sizeHint().width()); - if (evenpages->sizeHint().height()!=-1) - evenpages->setMinimumHeight(evenpages->sizeHint().height()); - if (evenpages->sizeHint().width()!=-1) - evenpages->setMaximumWidth(evenpages->sizeHint().width()); - if (evenpages->sizeHint().height()!=-1) - evenpages->setMaximumHeight(evenpages->sizeHint().height()); - if (from->sizeHint().width()!=-1) - from->setMinimumWidth(from->sizeHint().width()); - if (from->sizeHint().height()!=-1) - from->setMinimumHeight(from->sizeHint().height()); - if (from->sizeHint().height()!=-1) - from->setMaximumHeight(from->sizeHint().height()); - if (to->sizeHint().width()!=-1) - to->setMinimumWidth(to->sizeHint().width()); - if (to->sizeHint().height()!=-1) - to->setMinimumHeight(to->sizeHint().height()); - if (to->sizeHint().height()!=-1) - to->setMaximumHeight(to->sizeHint().height()); - if (reverse->sizeHint().width()!=-1) - reverse->setMinimumWidth(reverse->sizeHint().width()); - if (reverse->sizeHint().height()!=-1) - reverse->setMinimumHeight(reverse->sizeHint().height()); - if (reverse->sizeHint().width()!=-1) - reverse->setMaximumWidth(reverse->sizeHint().width()); - if (reverse->sizeHint().height()!=-1) - reverse->setMaximumHeight(reverse->sizeHint().height()); - if (count->sizeHint().width()!=-1) - count->setMinimumWidth(count->sizeHint().width()); - if (count->sizeHint().height()!=-1) - count->setMinimumHeight(count->sizeHint().height()); - if (count->sizeHint().height()!=-1) - count->setMaximumHeight(count->sizeHint().height()); - if (sort->sizeHint().width()!=-1) - sort->setMinimumWidth(sort->sizeHint().width()); - if (sort->sizeHint().height()!=-1) - sort->setMinimumHeight(sort->sizeHint().height()); - if (sort->sizeHint().width()!=-1) - sort->setMaximumWidth(sort->sizeHint().width()); - if (sort->sizeHint().height()!=-1) - sort->setMaximumHeight(sort->sizeHint().height()); + pagesRadioGroup->insert( radio_allpages ); + pagesRadioGroup->insert( radio_oddpages ); + pagesRadioGroup->insert( radio_evenpages ); + + printToRadioGroup->insert( radio_toprinter ); + printToRadioGroup->insert( radio_tofile ); + + if (button_ok->sizeHint().width()!=-1) + button_ok->setMinimumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMinimumHeight(button_ok->sizeHint().height()); + if (button_ok->sizeHint().width()!=-1) + button_ok->setMaximumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMaximumHeight(button_ok->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMinimumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMinimumHeight(button_cancel->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMaximumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMaximumHeight(button_cancel->sizeHint().height()); + if (radio_allpages->sizeHint().width()!=-1) + radio_allpages->setMinimumWidth(radio_allpages->sizeHint().width()); + if (radio_allpages->sizeHint().height()!=-1) + radio_allpages->setMinimumHeight(radio_allpages->sizeHint().height()); + if (radio_allpages->sizeHint().width()!=-1) + radio_allpages->setMaximumWidth(radio_allpages->sizeHint().width()); + if (radio_allpages->sizeHint().height()!=-1) + radio_allpages->setMaximumHeight(radio_allpages->sizeHint().height()); + if (radio_oddpages->sizeHint().width()!=-1) + radio_oddpages->setMinimumWidth(radio_oddpages->sizeHint().width()); + if (radio_oddpages->sizeHint().height()!=-1) + radio_oddpages->setMinimumHeight(radio_oddpages->sizeHint().height()); + if (radio_oddpages->sizeHint().width()!=-1) + radio_oddpages->setMaximumWidth(radio_oddpages->sizeHint().width()); + if (radio_oddpages->sizeHint().height()!=-1) + radio_oddpages->setMaximumHeight(radio_oddpages->sizeHint().height()); + if (radio_evenpages->sizeHint().width()!=-1) + radio_evenpages->setMinimumWidth(radio_evenpages->sizeHint().width()); + if (radio_evenpages->sizeHint().height()!=-1) + radio_evenpages->setMinimumHeight(radio_evenpages->sizeHint().height()); + if (radio_evenpages->sizeHint().width()!=-1) + radio_evenpages->setMaximumWidth(radio_evenpages->sizeHint().width()); + if (radio_evenpages->sizeHint().height()!=-1) + radio_evenpages->setMaximumHeight(radio_evenpages->sizeHint().height()); + if (line_from->sizeHint().width()!=-1) + line_from->setMinimumWidth(line_from->sizeHint().width()); + if (line_from->sizeHint().height()!=-1) + line_from->setMinimumHeight(line_from->sizeHint().height()); + if (line_from->sizeHint().height()!=-1) + line_from->setMaximumHeight(line_from->sizeHint().height()); + if (line_to->sizeHint().width()!=-1) + line_to->setMinimumWidth(line_to->sizeHint().width()); + if (line_to->sizeHint().height()!=-1) + line_to->setMinimumHeight(line_to->sizeHint().height()); + if (line_to->sizeHint().height()!=-1) + line_to->setMaximumHeight(line_to->sizeHint().height()); + if (check_reverse->sizeHint().width()!=-1) + check_reverse->setMinimumWidth(check_reverse->sizeHint().width()); + if (check_reverse->sizeHint().height()!=-1) + check_reverse->setMinimumHeight(check_reverse->sizeHint().height()); + if (check_reverse->sizeHint().width()!=-1) + check_reverse->setMaximumWidth(check_reverse->sizeHint().width()); + if (check_reverse->sizeHint().height()!=-1) + check_reverse->setMaximumHeight(check_reverse->sizeHint().height()); + if (line_count->sizeHint().width()!=-1) + line_count->setMinimumWidth(line_count->sizeHint().width()); + if (line_count->sizeHint().height()!=-1) + line_count->setMinimumHeight(line_count->sizeHint().height()); + if (line_count->sizeHint().height()!=-1) + line_count->setMaximumHeight(line_count->sizeHint().height()); + if (check_sort->sizeHint().width()!=-1) + check_sort->setMinimumWidth(check_sort->sizeHint().width()); + if (check_sort->sizeHint().height()!=-1) + check_sort->setMinimumHeight(check_sort->sizeHint().height()); + if (check_sort->sizeHint().width()!=-1) + check_sort->setMaximumWidth(check_sort->sizeHint().width()); + if (check_sort->sizeHint().height()!=-1) + check_sort->setMaximumHeight(check_sort->sizeHint().height()); if (fromLabel->sizeHint().width()!=-1) fromLabel->setMinimumWidth(fromLabel->sizeHint().width()); if (fromLabel->sizeHint().height()!=-1) @@ -457,42 +457,42 @@ PrintDialogData::PrintDialogData toLabel->setMaximumWidth(toLabel->sizeHint().width()); if (toLabel->sizeHint().height()!=-1) toLabel->setMaximumHeight(toLabel->sizeHint().height()); - if (toprinter->sizeHint().width()!=-1) - toprinter->setMinimumWidth(toprinter->sizeHint().width()); - if (toprinter->sizeHint().height()!=-1) - toprinter->setMinimumHeight(toprinter->sizeHint().height()); - if (toprinter->sizeHint().width()!=-1) - toprinter->setMaximumWidth(toprinter->sizeHint().width()); - if (toprinter->sizeHint().height()!=-1) - toprinter->setMaximumHeight(toprinter->sizeHint().height()); - if (tofile->sizeHint().width()!=-1) - tofile->setMinimumWidth(tofile->sizeHint().width()); - if (tofile->sizeHint().height()!=-1) - tofile->setMinimumHeight(tofile->sizeHint().height()); - if (tofile->sizeHint().width()!=-1) - tofile->setMaximumWidth(tofile->sizeHint().width()); - if (tofile->sizeHint().height()!=-1) - tofile->setMaximumHeight(tofile->sizeHint().height()); - if (printername->sizeHint().width()!=-1) - printername->setMinimumWidth(printername->sizeHint().width()); - if (printername->sizeHint().height()!=-1) - printername->setMinimumHeight(printername->sizeHint().height()); - if (printername->sizeHint().height()!=-1) - printername->setMaximumHeight(printername->sizeHint().height()); - if (filename->sizeHint().width()!=-1) - filename->setMinimumWidth(filename->sizeHint().width()); - if (filename->sizeHint().height()!=-1) - filename->setMinimumHeight(filename->sizeHint().height()); - if (filename->sizeHint().height()!=-1) - filename->setMaximumHeight(filename->sizeHint().height()); - if (browse->sizeHint().width()!=-1) - browse->setMinimumWidth(browse->sizeHint().width()); - if (browse->sizeHint().height()!=-1) - browse->setMinimumHeight(browse->sizeHint().height()); - if (browse->sizeHint().width()!=-1) - browse->setMaximumWidth(browse->sizeHint().width()); - if (browse->sizeHint().height()!=-1) - browse->setMaximumHeight(browse->sizeHint().height()); + if (radio_toprinter->sizeHint().width()!=-1) + radio_toprinter->setMinimumWidth(radio_toprinter->sizeHint().width()); + if (radio_toprinter->sizeHint().height()!=-1) + radio_toprinter->setMinimumHeight(radio_toprinter->sizeHint().height()); + if (radio_toprinter->sizeHint().width()!=-1) + radio_toprinter->setMaximumWidth(radio_toprinter->sizeHint().width()); + if (radio_toprinter->sizeHint().height()!=-1) + radio_toprinter->setMaximumHeight(radio_toprinter->sizeHint().height()); + if (radio_tofile->sizeHint().width()!=-1) + radio_tofile->setMinimumWidth(radio_tofile->sizeHint().width()); + if (radio_tofile->sizeHint().height()!=-1) + radio_tofile->setMinimumHeight(radio_tofile->sizeHint().height()); + if (radio_tofile->sizeHint().width()!=-1) + radio_tofile->setMaximumWidth(radio_tofile->sizeHint().width()); + if (radio_tofile->sizeHint().height()!=-1) + radio_tofile->setMaximumHeight(radio_tofile->sizeHint().height()); + if (line_printername->sizeHint().width()!=-1) + line_printername->setMinimumWidth(line_printername->sizeHint().width()); + if (line_printername->sizeHint().height()!=-1) + line_printername->setMinimumHeight(line_printername->sizeHint().height()); + if (line_printername->sizeHint().height()!=-1) + line_printername->setMaximumHeight(line_printername->sizeHint().height()); + if (line_filename->sizeHint().width()!=-1) + line_filename->setMinimumWidth(line_filename->sizeHint().width()); + if (line_filename->sizeHint().height()!=-1) + line_filename->setMinimumHeight(line_filename->sizeHint().height()); + if (line_filename->sizeHint().height()!=-1) + line_filename->setMaximumHeight(line_filename->sizeHint().height()); + if (button_browse->sizeHint().width()!=-1) + button_browse->setMinimumWidth(button_browse->sizeHint().width()); + if (button_browse->sizeHint().height()!=-1) + button_browse->setMinimumHeight(button_browse->sizeHint().height()); + if (button_browse->sizeHint().width()!=-1) + button_browse->setMaximumWidth(button_browse->sizeHint().width()); + if (button_browse->sizeHint().height()!=-1) + button_browse->setMaximumHeight(button_browse->sizeHint().height()); if (countLabel->sizeHint().width()!=-1) countLabel->setMinimumWidth(countLabel->sizeHint().width()); if (countLabel->sizeHint().height()!=-1) @@ -517,23 +517,23 @@ PrintDialogData::PrintDialogData QBoxLayout* qtarch_layout_1_1_1_1_2 = new QBoxLayout( pagesRadioGroup, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1_1_1_1_2->addStrut( 0 ); qtarch_layout_1_1_1_1_2->addStretch( 1 ); - qtarch_layout_1_1_1_1_2->addWidget( allpages, 1, 1 ); + qtarch_layout_1_1_1_1_2->addWidget( radio_allpages, 1, 1 ); qtarch_layout_1_1_1_1_2->addStretch( 1 ); - qtarch_layout_1_1_1_1_2->addWidget( oddpages, 1, 1 ); + qtarch_layout_1_1_1_1_2->addWidget( radio_oddpages, 1, 1 ); qtarch_layout_1_1_1_1_2->addStretch( 1 ); - qtarch_layout_1_1_1_1_2->addWidget( evenpages, 1, 1 ); + qtarch_layout_1_1_1_1_2->addWidget( radio_evenpages, 1, 1 ); qtarch_layout_1_1_1_1_2->addStretch( 1 ); QBoxLayout* qtarch_layout_1_1_1_1_3 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_1_1_1->addLayout( qtarch_layout_1_1_1_1_3, 1 ); qtarch_layout_1_1_1_1_3->addStrut( 0 ); qtarch_layout_1_1_1_1_3->addWidget( fromLabel, 2, 36 ); - qtarch_layout_1_1_1_1_3->addWidget( from, 1, 36 ); + qtarch_layout_1_1_1_1_3->addWidget( line_from, 1, 36 ); QBoxLayout* qtarch_layout_1_1_1_1_4 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_1_1_1->addLayout( qtarch_layout_1_1_1_1_4, 1 ); qtarch_layout_1_1_1_1_4->addStrut( 0 ); qtarch_layout_1_1_1_1_4->addWidget( toLabel, 2, 36 ); - qtarch_layout_1_1_1_1_4->addWidget( to, 1, 36 ); - qtarch_layout_1_1_1_1->addWidget( reverse, 1, 36 ); + qtarch_layout_1_1_1_1_4->addWidget( line_to, 1, 36 ); + qtarch_layout_1_1_1_1->addWidget( check_reverse, 1, 36 ); QBoxLayout* qtarch_layout_1_1_1_2 = new QBoxLayout( QBoxLayout::TopToBottom, 5, NULL ); qtarch_layout_1_1_1->addLayout( qtarch_layout_1_1_1_2, 2 ); qtarch_layout_1_1_1_2->addStrut( 0 ); @@ -547,9 +547,9 @@ PrintDialogData::PrintDialogData qtarch_layout_1_1_1_2_1_2->addStretch( 1 ); qtarch_layout_1_1_1_2_1_2->addWidget( countLabel, 1, 36 ); qtarch_layout_1_1_1_2_1_2->addStretch( 1 ); - qtarch_layout_1_1_1_2_1_2->addWidget( count, 1, 36 ); + qtarch_layout_1_1_1_2_1_2->addWidget( line_count, 1, 36 ); qtarch_layout_1_1_1_2_1_2->addStretch( 1 ); - qtarch_layout_1_1_1_2_1_2->addWidget( sort, 1, 36 ); + qtarch_layout_1_1_1_2_1_2->addWidget( check_sort, 1, 36 ); qtarch_layout_1_1_1_2_1->addSpacing( 3 ); qtarch_layout_1_1_1_2->addWidget( printToGroupBox, 3, 36 ); QBoxLayout* qtarch_layout_1_1_1_2_2 = new QBoxLayout( printToGroupBox, QBoxLayout::TopToBottom, 5, 5, NULL ); @@ -563,22 +563,22 @@ PrintDialogData::PrintDialogData qtarch_layout_1_1_1_2_2_3->addWidget( printToRadioGroup, 1, 33 ); QBoxLayout* qtarch_layout_1_1_1_2_2_3_2 = new QBoxLayout( printToRadioGroup, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1_1_1_2_2_3_2->addStrut( 0 ); - qtarch_layout_1_1_1_2_2_3_2->addWidget( toprinter, 1, 1 ); + qtarch_layout_1_1_1_2_2_3_2->addWidget( radio_toprinter, 1, 1 ); qtarch_layout_1_1_1_2_2_3_2->addStretch( 1 ); - qtarch_layout_1_1_1_2_2_3_2->addWidget( tofile, 1, 1 ); + qtarch_layout_1_1_1_2_2_3_2->addWidget( radio_tofile, 1, 1 ); QBoxLayout* qtarch_layout_1_1_1_2_2_3_3 = new QBoxLayout( QBoxLayout::TopToBottom, 5, NULL ); qtarch_layout_1_1_1_2_2_3->addLayout( qtarch_layout_1_1_1_2_2_3_3, 1 ); qtarch_layout_1_1_1_2_2_3_3->addStrut( 0 ); - qtarch_layout_1_1_1_2_2_3_3->addWidget( printername, 1, 36 ); + qtarch_layout_1_1_1_2_2_3_3->addWidget( line_printername, 1, 36 ); qtarch_layout_1_1_1_2_2_3_3->addStretch( 1 ); - qtarch_layout_1_1_1_2_2_3_3->addWidget( filename, 1, 36 ); + qtarch_layout_1_1_1_2_2_3_3->addWidget( line_filename, 1, 36 ); qtarch_layout_1_1_1_2_2_3->addSpacing( 7 ); qtarch_layout_1_1_1_2_2->addStretch( 1 ); QBoxLayout* qtarch_layout_1_1_1_2_2_5 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1_1_1_2_2->addLayout( qtarch_layout_1_1_1_2_2_5, 1 ); qtarch_layout_1_1_1_2_2_5->addStrut( 0 ); qtarch_layout_1_1_1_2_2_5->addStretch( 1 ); - qtarch_layout_1_1_1_2_2_5->addWidget( browse, 1, 36 ); + qtarch_layout_1_1_1_2_2_5->addWidget( button_browse, 1, 36 ); qtarch_layout_1_1_1_2_2_5->addSpacing( 7 ); qtarch_layout_1_1_1_2_2->addStretch( 1 ); qtarch_layout_1->addRowSpacing( 1, 0 ); @@ -587,9 +587,9 @@ PrintDialogData::PrintDialogData qtarch_layout_1->addLayout( qtarch_layout_1_2_1, 1, 0 ); qtarch_layout_1_2_1->addStrut( 0 ); qtarch_layout_1_2_1->addStretch( 1 ); - qtarch_layout_1_2_1->addWidget( print, 1, 36 ); + qtarch_layout_1_2_1->addWidget( button_ok, 1, 36 ); qtarch_layout_1_2_1->addStretch( 2 ); - qtarch_layout_1_2_1->addWidget( cancel, 1, 36 ); + qtarch_layout_1_2_1->addWidget( button_cancel, 1, 36 ); qtarch_layout_1_2_1->addStretch( 1 ); resize( 500,330 ); setMinimumSize( 0, 0 ); diff --git a/src/frontends/kde/dlg/printdlgdata.h b/src/frontends/kde/dlg/printdlgdata.h index e0b3d28dc9..857eaceec2 100644 --- a/src/frontends/kde/dlg/printdlgdata.h +++ b/src/frontends/kde/dlg/printdlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: printdlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 16:49:09 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -47,29 +47,29 @@ protected slots: virtual void changedCount(const char*); virtual void clickedPrint(); -protected: +public: QGroupBox* pagesGroupBox; QButtonGroup* pagesRadioGroup; QGroupBox* copies; QGroupBox* printToGroupBox; QButtonGroup* printToRadioGroup; - QPushButton* print; - QPushButton* cancel; - QRadioButton* allpages; - QRadioButton* oddpages; - QRadioButton* evenpages; - KIntLineEdit* from; - KIntLineEdit* to; - QCheckBox* reverse; - KIntLineEdit* count; - QCheckBox* sort; + QPushButton* button_ok; + QPushButton* button_cancel; + QRadioButton* radio_allpages; + QRadioButton* radio_oddpages; + QRadioButton* radio_evenpages; + KIntLineEdit* line_from; + KIntLineEdit* line_to; + QCheckBox* check_reverse; + KIntLineEdit* line_count; + QCheckBox* check_sort; QLabel* fromLabel; QLabel* toLabel; - QRadioButton* toprinter; - QRadioButton* tofile; - QLineEdit* printername; - QLineEdit* filename; - QPushButton* browse; + QRadioButton* radio_toprinter; + QRadioButton* radio_tofile; + QLineEdit* line_printername; + QLineEdit* line_filename; + QPushButton* button_browse; QLabel* countLabel; }; diff --git a/src/frontends/kde/dlg/tabcreatedlgdata.C b/src/frontends/kde/dlg/tabcreatedlgdata.C index 509b28643a..ac3289910f 100644 --- a/src/frontends/kde/dlg/tabcreatedlgdata.C +++ b/src/frontends/kde/dlg/tabcreatedlgdata.C @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: tabcreatedlgdata.C - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 17:24:11 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -19,7 +19,6 @@ #define Inherited QDialog #include -#include TabularCreateDialogData::TabularCreateDialogData ( @@ -29,41 +28,39 @@ TabularCreateDialogData::TabularCreateDialogData : Inherited( parent, name, TRUE, 0 ) { - QPushButton* qtarch_Insert; - qtarch_Insert = new QPushButton( this, "Insert" ); - qtarch_Insert->setGeometry( 64, 249, 59, 21 ); - qtarch_Insert->setMinimumSize( 0, 0 ); - qtarch_Insert->setMaximumSize( 32767, 32767 ); - connect( qtarch_Insert, SIGNAL(clicked()), SLOT(clickedInsert()) ); - qtarch_Insert->setFocusPolicy( QWidget::TabFocus ); - qtarch_Insert->setBackgroundMode( QWidget::PaletteBackground ); - qtarch_Insert->setFontPropagation( QWidget::NoChildren ); - qtarch_Insert->setPalettePropagation( QWidget::NoChildren ); - qtarch_Insert->setText( _("&Insert") ); - qtarch_Insert->setAutoRepeat( false ); - qtarch_Insert->setAutoResize( false ); - qtarch_Insert->setToggleButton( false ); - qtarch_Insert->setDefault( true ); - qtarch_Insert->setAutoDefault( false ); - qtarch_Insert->setIsMenuButton( false ); - - QPushButton* qtarch_Cancel; - qtarch_Cancel = new QPushButton( this, "Cancel" ); - qtarch_Cancel->setGeometry( 187, 249, 59, 21 ); - qtarch_Cancel->setMinimumSize( 0, 0 ); - qtarch_Cancel->setMaximumSize( 32767, 32767 ); - connect( qtarch_Cancel, SIGNAL(clicked()), SLOT(clickedCancel()) ); - qtarch_Cancel->setFocusPolicy( QWidget::TabFocus ); - qtarch_Cancel->setBackgroundMode( QWidget::PaletteBackground ); - qtarch_Cancel->setFontPropagation( QWidget::NoChildren ); - qtarch_Cancel->setPalettePropagation( QWidget::NoChildren ); - qtarch_Cancel->setText( _("&Cancel") ); - qtarch_Cancel->setAutoRepeat( false ); - qtarch_Cancel->setAutoResize( false ); - qtarch_Cancel->setToggleButton( false ); - qtarch_Cancel->setDefault( false ); - qtarch_Cancel->setAutoDefault( false ); - qtarch_Cancel->setIsMenuButton( false ); + button_ok = new QPushButton( this, "button_ok" ); + button_ok->setGeometry( 64, 249, 59, 21 ); + button_ok->setMinimumSize( 0, 0 ); + button_ok->setMaximumSize( 32767, 32767 ); + connect( button_ok, SIGNAL(clicked()), SLOT(clickedInsert()) ); + button_ok->setFocusPolicy( QWidget::TabFocus ); + button_ok->setBackgroundMode( QWidget::PaletteBackground ); + button_ok->setFontPropagation( QWidget::NoChildren ); + button_ok->setPalettePropagation( QWidget::NoChildren ); + button_ok->setText( _("&Insert") ); + button_ok->setAutoRepeat( false ); + button_ok->setAutoResize( false ); + button_ok->setToggleButton( false ); + button_ok->setDefault( true ); + button_ok->setAutoDefault( false ); + button_ok->setIsMenuButton( false ); + + button_cancel = new QPushButton( this, "button_cancel" ); + button_cancel->setGeometry( 187, 249, 59, 21 ); + button_cancel->setMinimumSize( 0, 0 ); + button_cancel->setMaximumSize( 32767, 32767 ); + connect( button_cancel, SIGNAL(clicked()), SLOT(clickedCancel()) ); + button_cancel->setFocusPolicy( QWidget::TabFocus ); + button_cancel->setBackgroundMode( QWidget::PaletteBackground ); + button_cancel->setFontPropagation( QWidget::NoChildren ); + button_cancel->setPalettePropagation( QWidget::NoChildren ); + button_cancel->setText( _("&Cancel") ); + button_cancel->setAutoRepeat( false ); + button_cancel->setAutoResize( false ); + button_cancel->setToggleButton( false ); + button_cancel->setDefault( false ); + button_cancel->setAutoDefault( false ); + button_cancel->setIsMenuButton( false ); table = new EmptyTable( this, "table" ); table->setGeometry( 5, 31, 300, 213 ); @@ -108,60 +105,60 @@ TabularCreateDialogData::TabularCreateDialogData qtarch_columnslabel->setAlignment( 290 ); qtarch_columnslabel->setMargin( -1 ); - rows = new QSpinBox( this, "rows" ); - rows->setGeometry( 91, 5, 41, 21 ); - rows->setMinimumSize( 0, 0 ); - rows->setMaximumSize( 32767, 32767 ); - rows->setFocusPolicy( QWidget::StrongFocus ); - rows->setBackgroundMode( QWidget::PaletteBackground ); - rows->setFontPropagation( QWidget::NoChildren ); - rows->setPalettePropagation( QWidget::NoChildren ); - rows->setFrameStyle( 51 ); - rows->setLineWidth( 2 ); - rows->setMidLineWidth( 0 ); - rows->QFrame::setMargin( 0 ); - rows->setRange( 1, 300 ); - rows->setSteps( 1, 0 ); - rows->setPrefix( "" ); - rows->setSuffix( "" ); - rows->setSpecialValueText( "" ); - rows->setWrapping( false ); - - cols = new QSpinBox( this, "cols" ); - cols->setGeometry( 224, 5, 40, 21 ); - cols->setMinimumSize( 0, 0 ); - cols->setMaximumSize( 32767, 32767 ); - cols->setFocusPolicy( QWidget::StrongFocus ); - cols->setBackgroundMode( QWidget::PaletteBackground ); - cols->setFontPropagation( QWidget::NoChildren ); - cols->setPalettePropagation( QWidget::NoChildren ); - cols->setFrameStyle( 51 ); - cols->setLineWidth( 2 ); - cols->setMidLineWidth( 0 ); - cols->QFrame::setMargin( 0 ); - cols->setRange( 1, 40 ); - cols->setSteps( 1, 0 ); - cols->setPrefix( "" ); - cols->setSuffix( "" ); - cols->setSpecialValueText( "" ); - cols->setWrapping( false ); - - if (qtarch_Insert->sizeHint().width()!=-1) - qtarch_Insert->setMinimumWidth(qtarch_Insert->sizeHint().width()); - if (qtarch_Insert->sizeHint().height()!=-1) - qtarch_Insert->setMinimumHeight(qtarch_Insert->sizeHint().height()); - if (qtarch_Insert->sizeHint().width()!=-1) - qtarch_Insert->setMaximumWidth(qtarch_Insert->sizeHint().width()); - if (qtarch_Insert->sizeHint().height()!=-1) - qtarch_Insert->setMaximumHeight(qtarch_Insert->sizeHint().height()); - if (qtarch_Cancel->sizeHint().width()!=-1) - qtarch_Cancel->setMinimumWidth(qtarch_Cancel->sizeHint().width()); - if (qtarch_Cancel->sizeHint().height()!=-1) - qtarch_Cancel->setMinimumHeight(qtarch_Cancel->sizeHint().height()); - if (qtarch_Cancel->sizeHint().width()!=-1) - qtarch_Cancel->setMaximumWidth(qtarch_Cancel->sizeHint().width()); - if (qtarch_Cancel->sizeHint().height()!=-1) - qtarch_Cancel->setMaximumHeight(qtarch_Cancel->sizeHint().height()); + spin_rows = new QSpinBox( this, "spin_rows" ); + spin_rows->setGeometry( 91, 5, 41, 21 ); + spin_rows->setMinimumSize( 0, 0 ); + spin_rows->setMaximumSize( 32767, 32767 ); + spin_rows->setFocusPolicy( QWidget::StrongFocus ); + spin_rows->setBackgroundMode( QWidget::PaletteBackground ); + spin_rows->setFontPropagation( QWidget::NoChildren ); + spin_rows->setPalettePropagation( QWidget::NoChildren ); + spin_rows->setFrameStyle( 51 ); + spin_rows->setLineWidth( 2 ); + spin_rows->setMidLineWidth( 0 ); + spin_rows->QFrame::setMargin( 0 ); + spin_rows->setRange( 1, 300 ); + spin_rows->setSteps( 1, 0 ); + spin_rows->setPrefix( "" ); + spin_rows->setSuffix( "" ); + spin_rows->setSpecialValueText( "" ); + spin_rows->setWrapping( false ); + + spin_cols = new QSpinBox( this, "spin_cols" ); + spin_cols->setGeometry( 224, 5, 40, 21 ); + spin_cols->setMinimumSize( 0, 0 ); + spin_cols->setMaximumSize( 32767, 32767 ); + spin_cols->setFocusPolicy( QWidget::StrongFocus ); + spin_cols->setBackgroundMode( QWidget::PaletteBackground ); + spin_cols->setFontPropagation( QWidget::NoChildren ); + spin_cols->setPalettePropagation( QWidget::NoChildren ); + spin_cols->setFrameStyle( 51 ); + spin_cols->setLineWidth( 2 ); + spin_cols->setMidLineWidth( 0 ); + spin_cols->QFrame::setMargin( 0 ); + spin_cols->setRange( 1, 40 ); + spin_cols->setSteps( 1, 0 ); + spin_cols->setPrefix( "" ); + spin_cols->setSuffix( "" ); + spin_cols->setSpecialValueText( "" ); + spin_cols->setWrapping( false ); + + if (button_ok->sizeHint().width()!=-1) + button_ok->setMinimumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMinimumHeight(button_ok->sizeHint().height()); + if (button_ok->sizeHint().width()!=-1) + button_ok->setMaximumWidth(button_ok->sizeHint().width()); + if (button_ok->sizeHint().height()!=-1) + button_ok->setMaximumHeight(button_ok->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMinimumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMinimumHeight(button_cancel->sizeHint().height()); + if (button_cancel->sizeHint().width()!=-1) + button_cancel->setMaximumWidth(button_cancel->sizeHint().width()); + if (button_cancel->sizeHint().height()!=-1) + button_cancel->setMaximumHeight(button_cancel->sizeHint().height()); if (qtarch_rowslabel->sizeHint().width()!=-1) qtarch_rowslabel->setMinimumWidth(qtarch_rowslabel->sizeHint().width()); if (qtarch_rowslabel->sizeHint().height()!=-1) @@ -170,18 +167,18 @@ TabularCreateDialogData::TabularCreateDialogData qtarch_columnslabel->setMinimumWidth(qtarch_columnslabel->sizeHint().width()); if (qtarch_columnslabel->sizeHint().height()!=-1) qtarch_columnslabel->setMinimumHeight(qtarch_columnslabel->sizeHint().height()); - if (rows->sizeHint().width()!=-1) - rows->setMinimumWidth(rows->sizeHint().width()); - if (rows->sizeHint().height()!=-1) - rows->setMinimumHeight(rows->sizeHint().height()); - if (rows->sizeHint().height()!=-1) - rows->setMaximumHeight(rows->sizeHint().height()); - if (cols->sizeHint().width()!=-1) - cols->setMinimumWidth(cols->sizeHint().width()); - if (cols->sizeHint().height()!=-1) - cols->setMinimumHeight(cols->sizeHint().height()); - if (cols->sizeHint().height()!=-1) - cols->setMaximumHeight(cols->sizeHint().height()); + if (spin_rows->sizeHint().width()!=-1) + spin_rows->setMinimumWidth(spin_rows->sizeHint().width()); + if (spin_rows->sizeHint().height()!=-1) + spin_rows->setMinimumHeight(spin_rows->sizeHint().height()); + if (spin_rows->sizeHint().height()!=-1) + spin_rows->setMaximumHeight(spin_rows->sizeHint().height()); + if (spin_cols->sizeHint().width()!=-1) + spin_cols->setMinimumWidth(spin_cols->sizeHint().width()); + if (spin_cols->sizeHint().height()!=-1) + spin_cols->setMinimumHeight(spin_cols->sizeHint().height()); + if (spin_cols->sizeHint().height()!=-1) + spin_cols->setMaximumHeight(spin_cols->sizeHint().height()); QBoxLayout* qtarch_layout_1 = new QBoxLayout( this, QBoxLayout::TopToBottom, 5, 5, NULL ); qtarch_layout_1->addStrut( 0 ); QBoxLayout* qtarch_layout_1_1 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); @@ -189,19 +186,19 @@ TabularCreateDialogData::TabularCreateDialogData qtarch_layout_1_1->addStrut( 0 ); qtarch_layout_1_1->addStretch( 1 ); qtarch_layout_1_1->addWidget( qtarch_rowslabel, 1, 36 ); - qtarch_layout_1_1->addWidget( rows, 1, 36 ); + qtarch_layout_1_1->addWidget( spin_rows, 1, 36 ); qtarch_layout_1_1->addStretch( 1 ); qtarch_layout_1_1->addWidget( qtarch_columnslabel, 1, 36 ); - qtarch_layout_1_1->addWidget( cols, 1, 36 ); + qtarch_layout_1_1->addWidget( spin_cols, 1, 36 ); qtarch_layout_1_1->addStretch( 1 ); qtarch_layout_1->addWidget( table, 10, 36 ); QBoxLayout* qtarch_layout_1_3 = new QBoxLayout( QBoxLayout::LeftToRight, 5, NULL ); qtarch_layout_1->addLayout( qtarch_layout_1_3, 1 ); qtarch_layout_1_3->addStrut( 0 ); qtarch_layout_1_3->addStretch( 1 ); - qtarch_layout_1_3->addWidget( qtarch_Insert, 1, 36 ); + qtarch_layout_1_3->addWidget( button_ok, 1, 36 ); qtarch_layout_1_3->addStretch( 1 ); - qtarch_layout_1_3->addWidget( qtarch_Cancel, 1, 36 ); + qtarch_layout_1_3->addWidget( button_cancel, 1, 36 ); qtarch_layout_1_3->addStretch( 1 ); resize( 310,275 ); setMinimumSize( 0, 0 ); diff --git a/src/frontends/kde/dlg/tabcreatedlgdata.h b/src/frontends/kde/dlg/tabcreatedlgdata.h index 6cd0b0c309..9ce01afd43 100644 --- a/src/frontends/kde/dlg/tabcreatedlgdata.h +++ b/src/frontends/kde/dlg/tabcreatedlgdata.h @@ -3,7 +3,7 @@ --- Qt Architect 1.4-6 generated file --- File: tabcreatedlgdata.h - Last generated: Sat Feb 10 21:08:55 2001 + Last generated: Sat Mar 31 17:24:11 2001 DO NOT EDIT!!! This file will be automatically regenerated by qtarch. All changes will be lost. @@ -14,6 +14,7 @@ #define TabularCreateDialogData_included #include +#include #include #include "emptytable.h" @@ -39,10 +40,12 @@ protected slots: virtual void clickedCancel(); virtual void clickedInsert(); -protected: +public: + QPushButton* button_ok; + QPushButton* button_cancel; EmptyTable* table; - QSpinBox* rows; - QSpinBox* cols; + QSpinBox* spin_rows; + QSpinBox* spin_cols; }; diff --git a/src/frontends/kde/dlg/tabstack.h b/src/frontends/kde/dlg/tabstack.h index d32833db82..219de77506 100644 --- a/src/frontends/kde/dlg/tabstack.h +++ b/src/frontends/kde/dlg/tabstack.h @@ -28,7 +28,7 @@ class QBoxLayout; * This widget provides a tab bar which can switch between a stack * of QFrames. */ -class TabStack : public QWidget, public noncopyable { +class TabStack : public QWidget, public boost::noncopyable { Q_OBJECT public: TabStack(QWidget * parent = 0, const char * name = 0); diff --git a/src/frontends/kde/docdlg.C b/src/frontends/kde/docdlg.C index d6d32f29be..7170ec4fcf 100644 --- a/src/frontends/kde/docdlg.C +++ b/src/frontends/kde/docdlg.C @@ -49,141 +49,141 @@ DocDialog::DocDialog(FormDocument * form, QWidget * parent, char const * name, b // document classes for (LyXTextClassList::const_iterator cit = textclasslist.begin(); cit != textclasslist.end(); ++cit) - settings->docclass->insertItem((*cit).description().c_str()); - setSizeHint(settings->docclass); + settings->combo_docclass->insertItem((*cit).description().c_str()); + setSizeHint(settings->combo_docclass); - settings->pagestyle->insertItem(_("default")); - settings->pagestyle->insertItem(_("empty")); - settings->pagestyle->insertItem(_("plain")); - settings->pagestyle->insertItem(_("headings")); - settings->pagestyle->insertItem(_("fancy")); - setSizeHint(settings->pagestyle); + settings->combo_pagestyle->insertItem(_("default")); + settings->combo_pagestyle->insertItem(_("empty")); + settings->combo_pagestyle->insertItem(_("plain")); + settings->combo_pagestyle->insertItem(_("headings")); + settings->combo_pagestyle->insertItem(_("fancy")); + setSizeHint(settings->combo_pagestyle); // available fonts for (int i=0; tex_fonts[i][0]; i++) - settings->font->insertItem(tex_fonts[i]); - setSizeHint(settings->font); - - settings->fontsize->insertItem(_("default")); - settings->fontsize->insertItem(_("10 point")); - settings->fontsize->insertItem(_("11 point")); - settings->fontsize->insertItem(_("12 point")); - setSizeHint(settings->fontsize); + settings->combo_font->insertItem(tex_fonts[i]); + setSizeHint(settings->combo_font); + + settings->combo_fontsize->insertItem(_("default")); + settings->combo_fontsize->insertItem(_("10 point")); + settings->combo_fontsize->insertItem(_("11 point")); + settings->combo_fontsize->insertItem(_("12 point")); + setSizeHint(settings->combo_fontsize); - settings->linespacing->insertItem(_("single")); - settings->linespacing->insertItem(_("1 1/2 spacing")); - settings->linespacing->insertItem(_("double")); - settings->linespacing->insertItem(_("custom")); - setSizeHint(settings->linespacing); + settings->combo_linespacing->insertItem(_("single")); + settings->combo_linespacing->insertItem(_("1 1/2 spacing")); + settings->combo_linespacing->insertItem(_("double")); + settings->combo_linespacing->insertItem(_("custom")); + setSizeHint(settings->combo_linespacing); - connect(settings->linespacing, SIGNAL(highlighted(const char *)), + connect(settings->combo_linespacing, SIGNAL(highlighted(const char *)), this, SLOT(linespacingChanged(const char *))); - settings->paraspacing->insertItem(_("small")); - settings->paraspacing->insertItem(_("medium")); - settings->paraspacing->insertItem(_("big")); - settings->paraspacing->insertItem(_("custom")); - setSizeHint(settings->paraspacing); + settings->combo_paraspacing->insertItem(_("small")); + settings->combo_paraspacing->insertItem(_("medium")); + settings->combo_paraspacing->insertItem(_("big")); + settings->combo_paraspacing->insertItem(_("custom")); + setSizeHint(settings->combo_paraspacing); - connect(settings->paraspacing, SIGNAL(highlighted(const char *)), + connect(settings->combo_paraspacing, SIGNAL(highlighted(const char *)), this, SLOT(paraspacingChanged(const char *))); - connect(settings->addspace, SIGNAL(toggled(bool)), + connect(settings->check_addspace, SIGNAL(toggled(bool)), this, SLOT(addspaceChanged(bool))); - extra->first->insertItem(_("Here")); - extra->first->insertItem(_("Bottom of page")); - extra->first->insertItem(_("Top of page")); - extra->first->insertItem(_("Separate page")); - extra->first->insertItem(_("Not set")); - extra->second->insertItem(_("Here")); - extra->second->insertItem(_("Bottom of page")); - extra->second->insertItem(_("Top of page")); - extra->second->insertItem(_("Separate page")); - extra->second->insertItem(_("Not set")); - extra->third->insertItem(_("Here")); - extra->third->insertItem(_("Bottom of page")); - extra->third->insertItem(_("Top of page")); - extra->third->insertItem(_("Separate page")); - extra->third->insertItem(_("Not set")); - extra->fourth->insertItem(_("Here")); - extra->fourth->insertItem(_("Bottom of page")); - extra->fourth->insertItem(_("Top of page")); - extra->fourth->insertItem(_("Separate page")); - extra->fourth->insertItem(_("Not set")); + extra->combo_first->insertItem(_("Here")); + extra->combo_first->insertItem(_("Bottom of page")); + extra->combo_first->insertItem(_("Top of page")); + extra->combo_first->insertItem(_("Separate page")); + extra->combo_first->insertItem(_("Not set")); + extra->combo_second->insertItem(_("Here")); + extra->combo_second->insertItem(_("Bottom of page")); + extra->combo_second->insertItem(_("Top of page")); + extra->combo_second->insertItem(_("Separate page")); + extra->combo_second->insertItem(_("Not set")); + extra->combo_third->insertItem(_("Here")); + extra->combo_third->insertItem(_("Bottom of page")); + extra->combo_third->insertItem(_("Top of page")); + extra->combo_third->insertItem(_("Separate page")); + extra->combo_third->insertItem(_("Not set")); + extra->combo_fourth->insertItem(_("Here")); + extra->combo_fourth->insertItem(_("Bottom of page")); + extra->combo_fourth->insertItem(_("Top of page")); + extra->combo_fourth->insertItem(_("Separate page")); + extra->combo_fourth->insertItem(_("Not set")); // ps driver options for (int i = 0; tex_graphics[i][0]; i++) - extra->psdriver->insertItem(tex_graphics[i]); - setSizeHint(extra->psdriver); - - geometry->papersize->insertItem(_("default")); - geometry->papersize->insertItem(_("US letter")); - geometry->papersize->insertItem(_("US legal")); - geometry->papersize->insertItem(_("US executive")); - geometry->papersize->insertItem("A3"); - geometry->papersize->insertItem("A4"); - geometry->papersize->insertItem("A5"); - geometry->papersize->insertItem("B3"); - geometry->papersize->insertItem("B4"); - geometry->papersize->insertItem("B5"); - setSizeHint(geometry->papersize); + extra->combo_psdriver->insertItem(tex_graphics[i]); + setSizeHint(extra->combo_psdriver); + + geometry->combo_papersize->insertItem(_("default")); + geometry->combo_papersize->insertItem(_("US letter")); + geometry->combo_papersize->insertItem(_("US legal")); + geometry->combo_papersize->insertItem(_("US executive")); + geometry->combo_papersize->insertItem("A3"); + geometry->combo_papersize->insertItem("A4"); + geometry->combo_papersize->insertItem("A5"); + geometry->combo_papersize->insertItem("B3"); + geometry->combo_papersize->insertItem("B4"); + geometry->combo_papersize->insertItem("B5"); + setSizeHint(geometry->combo_papersize); - geometry->margins->insertItem(_("default")); - geometry->margins->insertItem(_("A4 small margins")); - geometry->margins->insertItem(_("A4 very small margins")); - geometry->margins->insertItem(_("A4 very wide margins")); - setSizeHint(geometry->margins); + geometry->combo_margins->insertItem(_("default")); + geometry->combo_margins->insertItem(_("A4 small margins")); + geometry->combo_margins->insertItem(_("A4 very small margins")); + geometry->combo_margins->insertItem(_("A4 very wide margins")); + setSizeHint(geometry->combo_margins); for (Languages::const_iterator cit = languages.begin(); cit != languages.end(); ++cit) - language->language->insertItem((*cit).second.lang().c_str()); - setSizeHint(language->language); + language->combo_language->insertItem((*cit).second.lang().c_str()); + setSizeHint(language->combo_language); - language->encoding->insertItem(_("default")); - language->encoding->insertItem(_("auto")); - language->encoding->insertItem(_("latin1")); - language->encoding->insertItem(_("latin2")); - language->encoding->insertItem(_("latin5")); - language->encoding->insertItem(_("koi8-r")); - language->encoding->insertItem(_("koi8-u")); - language->encoding->insertItem(_("cp866")); - language->encoding->insertItem(_("cp1251")); - language->encoding->insertItem(_("iso88595")); - setSizeHint(language->encoding); + language->combo_encoding->insertItem(_("default")); + language->combo_encoding->insertItem(_("auto")); + language->combo_encoding->insertItem(_("latin1")); + language->combo_encoding->insertItem(_("latin2")); + language->combo_encoding->insertItem(_("latin5")); + language->combo_encoding->insertItem(_("koi8-r")); + language->combo_encoding->insertItem(_("koi8-u")); + language->combo_encoding->insertItem(_("cp866")); + language->combo_encoding->insertItem(_("cp1251")); + language->combo_encoding->insertItem(_("iso88595")); + setSizeHint(language->combo_encoding); - language->quotes->insertItem(_("`text'")); - language->quotes->insertItem(_("``text''")); - language->quotes->insertItem(_("'text'")); - language->quotes->insertItem(_("''text''")); - language->quotes->insertItem(_(",text`")); - language->quotes->insertItem(_(",,text``")); - language->quotes->insertItem(_(",text'")); - language->quotes->insertItem(_(",,text''")); - language->quotes->insertItem(_("")); - language->quotes->insertItem(_("«text»")); - language->quotes->insertItem(_(">text<")); - language->quotes->insertItem(_("»text«")); - setSizeHint(language->quotes); + language->combo_quotes->insertItem(_("`text'")); + language->combo_quotes->insertItem(_("``text''")); + language->combo_quotes->insertItem(_("'text'")); + language->combo_quotes->insertItem(_("''text''")); + language->combo_quotes->insertItem(_(",text`")); + language->combo_quotes->insertItem(_(",,text``")); + language->combo_quotes->insertItem(_(",text'")); + language->combo_quotes->insertItem(_(",,text''")); + language->combo_quotes->insertItem(_("")); + language->combo_quotes->insertItem(_("«text»")); + language->combo_quotes->insertItem(_(">text<")); + language->combo_quotes->insertItem(_("»text«")); + setSizeHint(language->combo_quotes); /* FIXME: bullets */ - QToolTip::add(settings->pagestyle, _("Specify header + footer style etc")); - QToolTip::add(settings->addspace, _("Add spacing between paragraphs rather\n than indenting")); - QToolTip::add(settings->linespacingVal, _("Custom line spacing in line units")); - QToolTip::add(settings->extraoptions, _("Additional LaTeX options")); - QToolTip::add(extra->first, _("Specify preferred order for\nplacing floats")); - QToolTip::add(extra->second, _("Specify preferred order for\nplacing floats")); - QToolTip::add(extra->third, _("Specify preferred order for\nplacing floats")); - QToolTip::add(extra->fourth, _("Specify preferred order for\nplacing floats")); - QToolTip::add(extra->ignore, _("Tell LaTeX to ignore usual rules\n for float placement")); - QToolTip::add(extra->sectiondepth, _("How far in the (sub)sections are numbered")); - QToolTip::add(extra->tocdepth, _("How detailed the Table of Contents is")); - QToolTip::add(extra->psdriver, _("Program to produce PostScript output")); - QToolTip::add(extra->amsmath, _("FIXME please !")); - QToolTip::add(geometry->headheight, _("FIXME please !")); - QToolTip::add(geometry->headsep, _("FIXME please !")); - QToolTip::add(geometry->footskip, _("FIXME please !")); + QToolTip::add(settings->combo_pagestyle, _("Specify header + footer style etc")); + QToolTip::add(settings->check_addspace, _("Add spacing between paragraphs rather\n than indenting")); + QToolTip::add(settings->combo_linespacing, _("Custom line spacing in line units")); + QToolTip::add(settings->line_extraoptions, _("Additional LaTeX options")); + QToolTip::add(extra->combo_first, _("Specify preferred order for\nplacing floats")); + QToolTip::add(extra->combo_second, _("Specify preferred order for\nplacing floats")); + QToolTip::add(extra->combo_third, _("Specify preferred order for\nplacing floats")); + QToolTip::add(extra->combo_fourth, _("Specify preferred order for\nplacing floats")); + QToolTip::add(extra->check_ignore, _("Tell LaTeX to ignore usual rules\n for float placement")); + QToolTip::add(extra->spin_sectiondepth, _("How far in the (sub)sections are numbered")); + QToolTip::add(extra->spin_tocdepth, _("How detailed the Table of Contents is")); + QToolTip::add(extra->combo_psdriver, _("Program to produce PostScript output")); + QToolTip::add(extra->check_amsmath, _("FIXME please !")); + QToolTip::add(geometry->length_headheight, _("FIXME please !")); + QToolTip::add(geometry->length_headsep, _("FIXME please !")); + QToolTip::add(geometry->length_footskip, _("FIXME please !")); setUpdatesEnabled(true); update(); @@ -205,7 +205,7 @@ void DocDialog::closeEvent(QCloseEvent * e) void DocDialog::setReadOnly(bool readonly) { /* FIXME */ - cancel->setText(readonly ? _("&Close") : _("&Cancel")); + button_cancel->setText(readonly ? _("&Close") : _("&Cancel")); } @@ -213,28 +213,28 @@ void DocDialog::setFromParams(BufferParams const & params) { setUpdatesEnabled(false); - if (!setComboFromStr(settings->docclass, textclasslist.DescOfClass(params.textclass))) + if (!setComboFromStr(settings->combo_docclass, textclasslist.DescOfClass(params.textclass))) lyxerr[Debug::GUI] << "Couldn't set docclass " << textclasslist.DescOfClass(params.textclass) << endl; - if (!setComboFromStr(settings->font, params.fonts)) + if (!setComboFromStr(settings->combo_font, params.fonts)) lyxerr[Debug::GUI] << "Couldn't set font " << params.fonts << endl; LyXTextClass const & tclass = textclasslist.TextClass(params.textclass); // opt_fontsize is a string like "10|11|12" - settings->fontsize->setCurrentItem(tokenPos(tclass.opt_fontsize(), '|', params.fontsize) + 1); + settings->combo_fontsize->setCurrentItem(tokenPos(tclass.opt_fontsize(), '|', params.fontsize) + 1); // "empty|plain|headings|fancy" - settings->pagestyle->setCurrentItem(tokenPos(tclass.opt_pagestyle(), '|', params.pagestyle) + 1); + settings->combo_pagestyle->setCurrentItem(tokenPos(tclass.opt_pagestyle(), '|', params.pagestyle) + 1); - settings->addspace->setChecked(params.paragraph_separation == BufferParams::PARSEP_SKIP); + settings->check_addspace->setChecked(params.paragraph_separation == BufferParams::PARSEP_SKIP); bool const isskip = (params.paragraph_separation == BufferParams::PARSEP_SKIP); - settings->paraspacing->setEnabled(isskip); - settings->paraspacingValue->setEnabled(isskip); - settings->paraspacingStretch->setEnabled(isskip); - settings->paraspacingShrink->setEnabled(isskip); + settings->combo_paraspacing->setEnabled(isskip); + settings->length_paraspacing->setEnabled(isskip); + settings->length_paraspacingstretch->setEnabled(isskip); + settings->length_paraspacingshrink->setEnabled(isskip); int item=0; @@ -247,29 +247,29 @@ void DocDialog::setFromParams(BufferParams const & params) lyxerr[Debug::GUI] << "Unknown defskip " << int(params.getDefSkip().kind()) << endl; } - settings->paraspacing->setCurrentItem(item); + settings->combo_paraspacing->setCurrentItem(item); - settings->paraspacingValue->setEnabled(item == 3); - settings->paraspacingStretch->setEnabled(item == 3); - settings->paraspacingShrink->setEnabled(item == 3); + settings->length_paraspacing->setEnabled(item == 3); + settings->length_paraspacingstretch->setEnabled(item == 3); + settings->length_paraspacingshrink->setEnabled(item == 3); if (item == 3) { LyXGlueLength const len = params.getDefSkip().length(); - settings->paraspacingValue->setValue(len.value()); - settings->paraspacingValue->setUnits(len.unit()); - settings->paraspacingStretch->setValue(len.plusValue()); - settings->paraspacingStretch->setUnits(len.plusUnit()); - settings->paraspacingShrink->setValue(len.minusValue()); - settings->paraspacingShrink->setUnits(len.minusUnit()); + settings->length_paraspacing->setValue(len.value()); + settings->length_paraspacing->setUnits(len.unit()); + settings->length_paraspacingstretch->setValue(len.plusValue()); + settings->length_paraspacingstretch->setUnits(len.plusUnit()); + settings->length_paraspacingshrink->setValue(len.minusValue()); + settings->length_paraspacingshrink->setUnits(len.minusUnit()); lyxerr[Debug::GUI] << params.getDefSkip().asLyXCommand() << endl;; } else { - settings->paraspacingValue->setFromLengthStr("0cm"); - settings->paraspacingStretch->setFromLengthStr("0cm"); - settings->paraspacingShrink->setFromLengthStr("0cm"); + settings->length_paraspacing->setFromLengthStr("0cm"); + settings->length_paraspacingstretch->setFromLengthStr("0cm"); + settings->length_paraspacingshrink->setFromLengthStr("0cm"); } - settings->sides->setChecked(params.sides == LyXTextClass::TwoSides); - settings->columns->setChecked(params.columns == 2); + settings->check_sides->setChecked(params.sides == LyXTextClass::TwoSides); + settings->check_columns->setChecked(params.columns == 2); switch (params.spacing.getSpace()) { case Spacing::Default: @@ -281,44 +281,44 @@ void DocDialog::setFromParams(BufferParams const & params) lyxerr[Debug::GUI] << "Unknown line spacing " << int(params.spacing.getSpace()) << endl; } - settings->linespacing->setCurrentItem(item); - settings->linespacingVal->setEnabled(item == 3); + settings->combo_linespacing->setCurrentItem(item); + settings->line_linespacing->setEnabled(item == 3); if (item == 3) - settings->linespacingVal->setText(tostr(params.spacing.getValue()).c_str()); + settings->line_linespacing->setText(tostr(params.spacing.getValue()).c_str()); else - settings->linespacingVal->setText(""); + settings->line_linespacing->setText(""); if (params.options.empty()) - settings->extraoptions->setText(""); + settings->line_extraoptions->setText(""); else - settings->extraoptions->setText(params.options.c_str()); + settings->line_extraoptions->setText(params.options.c_str()); // geometry page - geometry->papersize->setCurrentItem(params.papersize2); + geometry->combo_papersize->setCurrentItem(params.papersize2); - geometry->margins->setCurrentItem(params.paperpackage); + geometry->combo_margins->setCurrentItem(params.paperpackage); - geometry->portrait->setChecked(params.orientation == BufferParams::ORIENTATION_PORTRAIT); - geometry->landscape->setChecked(params.orientation != BufferParams::ORIENTATION_PORTRAIT); + geometry->radio_portrait->setChecked(params.orientation == BufferParams::ORIENTATION_PORTRAIT); + geometry->radio_landscape->setChecked(params.orientation != BufferParams::ORIENTATION_PORTRAIT); - geometry->width->setFromLengthStr(params.paperwidth); - geometry->height->setFromLengthStr(params.paperheight); - geometry->left->setFromLengthStr(params.leftmargin); - geometry->right->setFromLengthStr(params.rightmargin); - geometry->top->setFromLengthStr(params.topmargin); - geometry->bottom->setFromLengthStr(params.bottommargin); - geometry->headheight->setFromLengthStr(params.headheight); - geometry->headsep->setFromLengthStr(params.headsep); - geometry->footskip->setFromLengthStr(params.footskip); + geometry->length_width->setFromLengthStr(params.paperwidth); + geometry->length_height->setFromLengthStr(params.paperheight); + geometry->length_left->setFromLengthStr(params.leftmargin); + geometry->length_right->setFromLengthStr(params.rightmargin); + geometry->length_top->setFromLengthStr(params.topmargin); + geometry->length_bottom->setFromLengthStr(params.bottommargin); + geometry->length_headheight->setFromLengthStr(params.headheight); + geometry->length_headsep->setFromLengthStr(params.headsep); + geometry->length_footskip->setFromLengthStr(params.footskip); // language page - if (!setComboFromStr(language->language, params.language->lang())) + if (!setComboFromStr(language->combo_language, params.language->lang())) lyxerr[Debug::GUI] << "Couldn't set language " << params.language->lang() << endl; - if (!setComboFromStr(language->encoding, params.inputenc)) + if (!setComboFromStr(language->combo_encoding, params.inputenc)) lyxerr[Debug::GUI] << "Couldn't set encoding " << params.inputenc << endl; switch (params.quotes_language) { @@ -335,37 +335,37 @@ void DocDialog::setFromParams(BufferParams const & params) if (params.quotes_times == InsetQuotes::DoubleQ) item++; - language->quotes->setCurrentItem(item); + language->combo_quotes->setCurrentItem(item); // extra page - if (!setComboFromStr(extra->psdriver, params.graphicsDriver)) + if (!setComboFromStr(extra->combo_psdriver, params.graphicsDriver)) lyxerr[Debug::GUI] << "Couldn't set psdriver " << params.graphicsDriver << endl; - extra->amsmath->setChecked(params.use_amsmath); - extra->sectiondepth->setValue(params.secnumdepth); - extra->tocdepth->setValue(params.tocdepth); + extra->check_amsmath->setChecked(params.use_amsmath); + extra->spin_sectiondepth->setValue(params.secnumdepth); + extra->spin_tocdepth->setValue(params.tocdepth); string const place = params.float_placement; int count = 0; QComboBox * box; - extra->ignore->setChecked(false); - setComboFromStr(extra->first, _("Not set")); - setComboFromStr(extra->second, _("Not set")); - setComboFromStr(extra->third, _("Not set")); - setComboFromStr(extra->fourth, _("Not set")); + extra->check_ignore->setChecked(false); + setComboFromStr(extra->combo_first, _("Not set")); + setComboFromStr(extra->combo_second, _("Not set")); + setComboFromStr(extra->combo_third, _("Not set")); + setComboFromStr(extra->combo_fourth, _("Not set")); for (string::const_iterator iter = place.begin(); iter != place.end(); ++count, ++iter) { switch (count) { - case 0: box = extra->first; break; - case 1: box = extra->second; break; - case 2: box = extra->third; break; - default: box = extra->fourth; break; + case 0: box = extra->combo_first; break; + case 1: box = extra->combo_second; break; + case 2: box = extra->combo_third; break; + default: box = extra->combo_fourth; break; }; if (*iter == '!') { - extra->ignore->setChecked(true); + extra->check_ignore->setChecked(true); continue; } @@ -390,20 +390,20 @@ bool DocDialog::updateParams(BufferParams & params) { bool redo = false; - params.fonts = string(settings->font->currentText()); + params.fonts = string(settings->combo_font->currentText()); LyXTextClass const & tclass = textclasslist.TextClass(params.textclass); - params.fontsize = token(tclass.opt_fontsize(), '|', settings->fontsize->currentItem() - 1); - params.pagestyle = token(tclass.opt_pagestyle(), '|', settings->pagestyle->currentItem() - 1); + params.fontsize = token(tclass.opt_fontsize(), '|', settings->combo_fontsize->currentItem() - 1); + params.pagestyle = token(tclass.opt_pagestyle(), '|', settings->combo_pagestyle->currentItem() - 1); // set and update class - unsigned int const new_class = settings->docclass->currentItem(); + unsigned int const new_class = settings->combo_docclass->currentItem(); if (new_class != params.textclass) { if (!form_->changeClass(params, new_class)) { // FIXME: error msg // restore old class - if (!setComboFromStr(settings->docclass, textclasslist.DescOfClass(params.textclass))) + if (!setComboFromStr(settings->combo_docclass, textclasslist.DescOfClass(params.textclass))) lyxerr[Debug::GUI] << "Couldn't set docclass " << textclasslist.DescOfClass(params.textclass) << endl; } else redo = true; @@ -411,7 +411,7 @@ bool DocDialog::updateParams(BufferParams & params) BufferParams::PARSEP tmpsep = params.paragraph_separation; - (settings->addspace->isChecked()) + (settings->check_addspace->isChecked()) ? params.paragraph_separation = BufferParams::PARSEP_SKIP : params.paragraph_separation = BufferParams::PARSEP_INDENT; @@ -421,18 +421,18 @@ bool DocDialog::updateParams(BufferParams & params) VSpace tmpskip; - switch (settings->paraspacing->currentItem()) { + switch (settings->combo_paraspacing->currentItem()) { case 0: tmpskip = VSpace(VSpace::SMALLSKIP); break; case 1: tmpskip = VSpace(VSpace::MEDSKIP); break; case 2: tmpskip = VSpace(VSpace::BIGSKIP); break; default: lyxerr[Debug::GUI] << "Unknown skip spacing " << - settings->paraspacing->currentItem() << endl; + settings->combo_paraspacing->currentItem() << endl; break; case 3: - string const val = settings->paraspacingValue->getLengthStr() - + "+" + settings->paraspacingStretch->getLengthStr() - + "-" + settings->paraspacingShrink->getLengthStr(); + string const val = settings->length_paraspacing->getLengthStr() + + "+" + settings->length_paraspacingstretch->getLengthStr() + + "-" + settings->length_paraspacingshrink->getLengthStr(); lyxerr[Debug::GUI] << "Read para spacing of \"" << val << "\"" << endl; LyXGlueLength length(0.0, LyXLength::PT); isValidGlueLength(val, &length); @@ -447,11 +447,11 @@ bool DocDialog::updateParams(BufferParams & params) // columns and sides - (settings->sides->isChecked()) + (settings->check_sides->isChecked()) ? params.sides = LyXTextClass::TwoSides : params.sides = LyXTextClass::OneSide; - (settings->columns->isChecked()) + (settings->check_columns->isChecked()) ? params.columns = 2 : params.columns = 1; @@ -459,16 +459,16 @@ bool DocDialog::updateParams(BufferParams & params) Spacing tmpspacing = params.spacing; - switch (settings->linespacing->currentItem()) { + switch (settings->combo_linespacing->currentItem()) { case 0: params.spacing.set(Spacing::Single); break; case 1: params.spacing.set(Spacing::Onehalf); break; case 2: params.spacing.set(Spacing::Double); break; case 3: - params.spacing.set(Spacing::Other, settings->linespacingVal->text()); + params.spacing.set(Spacing::Other, settings->line_linespacing->text()); break; default: lyxerr[Debug::GUI] << "Unknown line spacing " << - settings->linespacing->currentItem(); + settings->combo_linespacing->currentItem(); } if (tmpspacing != params.spacing) @@ -476,26 +476,26 @@ bool DocDialog::updateParams(BufferParams & params) // extra options - params.options = settings->extraoptions->text(); + params.options = settings->line_extraoptions->text(); // paper package and margin package - params.papersize2 = static_cast(geometry->papersize->currentItem()); - params.paperpackage = static_cast(geometry->margins->currentItem()); - if (geometry->landscape->isChecked()) + params.papersize2 = static_cast(geometry->combo_papersize->currentItem()); + params.paperpackage = static_cast(geometry->combo_margins->currentItem()); + if (geometry->radio_landscape->isChecked()) params.orientation = BufferParams::ORIENTATION_LANDSCAPE; else params.orientation = BufferParams::ORIENTATION_PORTRAIT; - params.paperwidth = geometry->width->getLengthStr(); - params.paperheight = geometry->height->getLengthStr(); - params.leftmargin = geometry->left->getLengthStr(); - params.rightmargin = geometry->right->getLengthStr(); - params.topmargin = geometry->top->getLengthStr(); - params.bottommargin = geometry->bottom->getLengthStr(); - params.headheight = geometry->headheight->getLengthStr(); - params.headsep = geometry->headsep->getLengthStr(); - params.footskip = geometry->footskip->getLengthStr(); + params.paperwidth = geometry->length_width->getLengthStr(); + params.paperheight = geometry->length_height->getLengthStr(); + params.leftmargin = geometry->length_left->getLengthStr(); + params.rightmargin = geometry->length_right->getLengthStr(); + params.topmargin = geometry->length_top->getLengthStr(); + params.bottommargin = geometry->length_bottom->getLengthStr(); + params.headheight = geometry->length_headheight->getLengthStr(); + params.headsep = geometry->length_headsep->getLengthStr(); + params.footskip = geometry->length_footskip->getLengthStr(); /* FIXME: is geometry required for headheight,sep,footskip ? */ params.use_geometry = @@ -506,12 +506,11 @@ bool DocDialog::updateParams(BufferParams & params) params.topmargin != "" || params.bottommargin != ""); - // language dialog InsetQuotes::quote_language lga = InsetQuotes::EnglishQ; - switch (language->quotes->currentItem()) { + switch (language->combo_quotes->currentItem()) { case 0: case 2: case 4: case 6: case 8: case 10: params.quotes_times = InsetQuotes::SingleQ; break; @@ -519,7 +518,7 @@ bool DocDialog::updateParams(BufferParams & params) params.quotes_times = InsetQuotes::DoubleQ; } - switch (language->quotes->currentItem()) { + switch (language->combo_quotes->currentItem()) { case 0: case 1: lga = InsetQuotes::EnglishQ; break; case 2: case 3: lga = InsetQuotes::SwedishQ; break; case 4: case 5: lga = InsetQuotes::GermanQ; break; @@ -528,14 +527,14 @@ bool DocDialog::updateParams(BufferParams & params) case 10: case 11: lga = InsetQuotes::DanishQ; break; default: lyxerr[Debug::GUI] << "unknown quotes style" << - language->quotes->currentItem() << endl; + language->combo_quotes->currentItem() << endl; } params.quotes_language = lga; /* wow, tongue twister */ Language const * old_language = params.language; - Language const * new_language = languages.getLanguage(language->language->currentText()); + Language const * new_language = languages.getLanguage(language->combo_language->currentText()); /* FIXME */ if (old_language != new_language @@ -547,26 +546,26 @@ bool DocDialog::updateParams(BufferParams & params) redo = (old_language != new_language) || redo; params.language = new_language; - params.inputenc = language->encoding->currentText(); + params.inputenc = language->combo_encoding->currentText(); // extra dialog - params.graphicsDriver = extra->psdriver->currentText(); - params.use_amsmath = extra->amsmath->isChecked(); + params.graphicsDriver = extra->combo_psdriver->currentText(); + params.use_amsmath = extra->check_amsmath->isChecked(); - if (extra->sectiondepth->value() != params.secnumdepth) { + if (extra->spin_sectiondepth->value() != params.secnumdepth) { redo = true; - params.secnumdepth = extra->sectiondepth->value(); + params.secnumdepth = extra->spin_sectiondepth->value(); } - params.tocdepth = extra->tocdepth->value(); + params.tocdepth = extra->spin_tocdepth->value(); string place; - place += placementString(extra->first); - place += placementString(extra->second); - place += placementString(extra->third); - place += placementString(extra->fourth); + place += placementString(extra->combo_first); + place += placementString(extra->combo_second); + place += placementString(extra->combo_third); + place += placementString(extra->combo_fourth); params.float_placement = place; /* FIXME: bullets */ @@ -591,24 +590,24 @@ void DocDialog::linespacingChanged(const char * sel) { bool const custom = !compare(sel, _("custom")); - settings->linespacingVal->setEnabled(custom); + settings->line_linespacing->setEnabled(custom); } void DocDialog::paraspacingChanged(const char * sel) { bool const custom = !compare(sel, _("custom")); - settings->paraspacingValue->setEnabled(custom); - settings->paraspacingStretch->setEnabled(custom); - settings->paraspacingShrink->setEnabled(custom); + settings->length_paraspacing->setEnabled(custom); + settings->length_paraspacingstretch->setEnabled(custom); + settings->length_paraspacingshrink->setEnabled(custom); } void DocDialog::addspaceChanged(bool on) { - settings->paraspacing->setEnabled(on); - on = (on && !compare(settings->paraspacing->currentText(), + settings->combo_paraspacing->setEnabled(on); + on = (on && !compare(settings->combo_paraspacing->currentText(), _("custom"))); - settings->paraspacingValue->setEnabled(on); - settings->paraspacingStretch->setEnabled(on); - settings->paraspacingShrink->setEnabled(on); + settings->length_paraspacing->setEnabled(on); + settings->length_paraspacingstretch->setEnabled(on); + settings->length_paraspacingshrink->setEnabled(on); } diff --git a/src/frontends/kde/indexdlg.C b/src/frontends/kde/indexdlg.C index 07332ef7f8..b1cba08557 100644 --- a/src/frontends/kde/indexdlg.C +++ b/src/frontends/kde/indexdlg.C @@ -9,8 +9,8 @@ #include #include -#include "indexdlg.h" #include "FormIndex.h" +#include "indexdlg.h" #include @@ -21,44 +21,9 @@ IndexDialog::IndexDialog(FormIndex * f, QWidget * p, char const * name) // tooltips - QToolTip::add(labelindex,_("Index entry")); - QToolTip::add(index,_("Index entry")); + QToolTip::add(label_index,_("Index entry")); + QToolTip::add(line_index,_("Index entry")); setMinimumSize(200, 65); setMaximumSize(32767, 65); } - - -IndexDialog::~IndexDialog() -{ -} - - -void IndexDialog::clickedOK() -{ - form_->apply(); - form_->close(); - hide(); -} - - -void IndexDialog::clickedCancel() -{ - form_->close(); - hide(); -} - - -void IndexDialog::setReadOnly(bool readonly) -{ - if (readonly) { - index->setFocusPolicy(QWidget::NoFocus); - buttonOk->setEnabled(false); - buttonCancel->setText(_("&Close")); - } else { - index->setFocusPolicy(QWidget::StrongFocus); - index->setFocus(); - buttonOk->setEnabled(true); - buttonCancel->setText(_("&Cancel")); - } -} diff --git a/src/frontends/kde/indexdlg.h b/src/frontends/kde/indexdlg.h index 82ea2f102a..a877dccb53 100644 --- a/src/frontends/kde/indexdlg.h +++ b/src/frontends/kde/indexdlg.h @@ -9,9 +9,10 @@ #ifndef INDEXDIALOG_H #define INDEXDIALOG_H +#include "FormIndex.h" #include "dlg/indexdlgdata.h" -class FormIndex; +// FIXME: closeEvent class IndexDialog : public IndexDialogData { @@ -19,15 +20,13 @@ Q_OBJECT public: IndexDialog (FormIndex * form, QWidget * parent = NULL, char const * name = NULL); - virtual ~IndexDialog(); - void setIndexText(char const * str) { index->setText(str); } - char const * getIndexText() { return index->text(); } - void setReadOnly(bool); + void setIndexText(char const * str) { line_index->setText(str); } + char const * getIndexText() { return line_index->text(); } private slots: - void clickedOK(); - void clickedCancel(); + void clickedOK() { form_->OKButton(); }; + void clickedCancel() { form_->CancelButton(); }; private: FormIndex * form_; diff --git a/src/frontends/kde/kdeBC.C b/src/frontends/kde/kdeBC.C index 84647ae110..0fea4e3b01 100644 --- a/src/frontends/kde/kdeBC.C +++ b/src/frontends/kde/kdeBC.C @@ -1,3 +1,11 @@ +/** + * \file kdeBC.C + * Copyright 2001 the LyX Team + * Read the file COPYING + * + * \author Angus Leeming, + */ + #include #ifdef __GNUG__ @@ -12,19 +20,19 @@ kdeBC::kdeBC(string const & cancel, string const & close) {} -void setButtonEnabled(QPushButton * btn, bool enabled) +void kdeBC::setButtonEnabled(QPushButton * btn, bool enabled) { - btn->setEnabled(true); + btn->setEnabled(enabled); } -void setWidgetEnabled(QWidget * obj, bool enabled) +void kdeBC::setWidgetEnabled(QWidget * obj, bool enabled) { - obj->setEnabled(true); + obj->setEnabled(enabled); } -void setButtonLabel(QPushButton * btn, string const & label) +void kdeBC::setButtonLabel(QPushButton * btn, string const & label) { btn->setText(label.c_str()); } diff --git a/src/frontends/kde/kdeBC.h b/src/frontends/kde/kdeBC.h index 2833dd7738..34170bfaf4 100644 --- a/src/frontends/kde/kdeBC.h +++ b/src/frontends/kde/kdeBC.h @@ -1,22 +1,14 @@ -// -*- C++ -*- -/* This file is part of - * ====================================================== +/** + * \file kdeBC.h + * Copyright 2001 the LyX Team + * Read the file COPYING * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. - * - * ====================================================== - * - * Author: Angus Leeming + * \author Angus Leeming, */ #ifndef KDEBC_H #define KDEBC_H -#include - #ifdef __GNUG__ #pragma interface #endif @@ -27,20 +19,20 @@ class QWidget; class QPushButton; -class kdeBC : public GuiBC +class kdeBC : public GuiBC { public: /// kdeBC(string const & cancel, string const & close); private: - /// Updates the button sensitivity (enabled/disabled) + /// enable or disable button void setButtonEnabled(QPushButton * btn, bool enabled); - /// Updates the widget sensitivity (enabled/disabled) + /// enable or disable button void setWidgetEnabled(QWidget * obj, bool enabled); - /// Set the label on the button + /// set the label on the button void setButtonLabel(QPushButton * btn, string const & label); }; diff --git a/src/frontends/kde/logdlg.C b/src/frontends/kde/logdlg.C index eeed8f72b5..34722a2036 100644 --- a/src/frontends/kde/logdlg.C +++ b/src/frontends/kde/logdlg.C @@ -6,44 +6,37 @@ * \author John Levon */ -#include "FormLog.h" - -#include "logdlg.h" - #include - -#include "debug.h" #include + +#include "ControlLog.h" +#include "FormLog.h" +#include "logdlg.h" -LogDialog::LogDialog (DialogBase * f, QWidget * parent, char const * name) +LogDialog::LogDialog (FormLog * f, QWidget * parent, char const * name) : LogDialogData(parent, name), form_(f) { - viewer->setMinimumWidth(50); - viewer->setMinimumHeight(50); -} - - -LogDialog::~LogDialog() -{ + line_viewer->setMinimumWidth(50); + line_viewer->setMinimumHeight(50); } void LogDialog::setLogText(string const & text) { setUpdatesEnabled(false); - viewer->setText(text.c_str()); + line_viewer->setText(text.c_str()); setUpdatesEnabled(true); update(); } void LogDialog::closePressed() { - form_->close(); - hide(); + form_->CancelButton(); } void LogDialog::updatePressed() { - form_->update(); + // FIXME: hmm + //form_->controller().setParams(); } diff --git a/src/frontends/kde/logdlg.h b/src/frontends/kde/logdlg.h index 2f28efd3f7..8ea75023fd 100644 --- a/src/frontends/kde/logdlg.h +++ b/src/frontends/kde/logdlg.h @@ -14,22 +14,25 @@ #include "dlg/logdlgdata.h" -class DialogBase; - +// FIXME: closeEvent + +class FormLog; + class LogDialog : public LogDialogData { Q_OBJECT public: - LogDialog (DialogBase * f, QWidget * parent = NULL, char const * name = NULL); - - virtual ~LogDialog(); + LogDialog(FormLog * f, QWidget * parent = NULL, char const * name = NULL); void setLogText(string const & text); -private: - DialogBase * form_; + protected slots: virtual void closePressed(); + virtual void updatePressed(); + +private: + FormLog * form_; }; #endif // LOGDLG_H diff --git a/src/frontends/kde/moc/Makefile.am b/src/frontends/kde/moc/Makefile.am index 2ab36ad063..fbf5e41aea 100644 --- a/src/frontends/kde/moc/Makefile.am +++ b/src/frontends/kde/moc/Makefile.am @@ -21,9 +21,13 @@ libkdemoc_la_SOURCES = FileDialog_private_moc.C \ printdlg_moc.C \ refdlg_moc.C \ tabcreatedlg_moc.C \ - tocdlg_moc.C \ - urldlg_moc.C + urldlg_moc.C \ + vclogdlg_moc.C +# FIXME + +#tocdlg_moc.C \ + DISTCLEANFILES = $(libkdemoc_la_SOURCES) *.orig *.rej *~ *.bak core LIBS= @@ -57,3 +61,5 @@ tocdlg_moc.C: ../tocdlg.h $(MOC) $< -o $@ urldlg_moc.C: ../urldlg.h $(MOC) $< -o $@ +vclogdlg_moc.C: ../vclogdlg.h + $(MOC) $< -o $@ diff --git a/src/frontends/kde/paradlg.C b/src/frontends/kde/paradlg.C index cf994ecf90..bfd605376d 100644 --- a/src/frontends/kde/paradlg.C +++ b/src/frontends/kde/paradlg.C @@ -52,9 +52,10 @@ void ParaDialog::closeEvent(QCloseEvent * e) void ParaDialog::setReadOnly(bool readonly) { - generalpage->justification->setEnabled(!readonly); - generalpage->lineabove->setEnabled(!readonly); - generalpage->linebelow->setEnabled(!readonly); + /* + generalpage->combo_justification->setEnabled(!readonly); + generalpage->check_lineabove->setEnabled(!readonly); + generalpage->check_linebelow->setEnabled(!readonly); generalpage->abovepage->pagebreakabove->setEnabled(!readonly); generalpage->belowpage->pagebreakbelow->setEnabled(!readonly); generalpage->abovepage->keepabove->setEnabled(!readonly); @@ -62,8 +63,8 @@ void ParaDialog::setReadOnly(bool readonly) generalpage->noindent->setEnabled(!readonly); generalpage->abovepage->spaceabove->setEnabled(!readonly); generalpage->belowpage->spacebelow->setEnabled(!readonly); - generalpage->abovepage->spaceabovevalue->setEnabled(!readonly); - generalpage->belowpage->spacebelowvalue->setEnabled(!readonly); + generalpage->abovepage->spaceabove->setEnabled(!readonly); + generalpage->belowpage->spacebelow->setEnabled(!readonly); generalpage->abovepage->spaceaboveplus->setEnabled(!readonly); generalpage->belowpage->spacebelowplus->setEnabled(!readonly); generalpage->abovepage->spaceaboveminus->setEnabled(!readonly); @@ -82,6 +83,7 @@ void ParaDialog::setReadOnly(bool readonly) apply->setEnabled(!readonly); restore->setEnabled(!readonly); cancel->setText(readonly ? _("&Close") : _("&Cancel")); + */ } @@ -89,11 +91,11 @@ void ParaDialog::setLabelWidth(char const * text) { // FIXME: should be cleverer here if (!compare(_("Senseless with this layout!"), text)) { - generalpage->labelwidth->setText(""); - generalpage->labelwidth->setEnabled(false); + generalpage->line_labelwidth->setText(""); + generalpage->line_labelwidth->setEnabled(false); } else { - generalpage->labelwidth->setText(text); - generalpage->labelwidth->setEnabled(true); + generalpage->line_labelwidth->setText(text); + generalpage->line_labelwidth->setEnabled(true); } } @@ -107,17 +109,17 @@ void ParaDialog::setAlign(int type) default: type = 0; break; } - generalpage->justification->setCurrentItem(type); + generalpage->combo_justification->setCurrentItem(type); } void ParaDialog::setChecks(bool labove, bool lbelow, bool pabove, bool pbelow, bool noindent) { - generalpage->lineabove->setChecked(labove); - generalpage->linebelow->setChecked(lbelow); - generalpage->abovepage->pagebreakabove->setChecked(pabove); - generalpage->belowpage->pagebreakbelow->setChecked(pbelow); - generalpage->noindent->setChecked(noindent); + generalpage->check_lineabove->setChecked(labove); + generalpage->check_linebelow->setChecked(lbelow); + generalpage->abovepage->check_pagebreakabove->setChecked(pabove); + generalpage->belowpage->check_pagebreakbelow->setChecked(pbelow); + generalpage->check_noindent->setChecked(noindent); } @@ -134,7 +136,7 @@ void ParaDialog::setSpace(VSpace::vspace_kind kindabove, VSpace::vspace_kind kin case VSpace::VFILL: item = 5; break; case VSpace::LENGTH: item = 6; break; } - generalpage->abovepage->spaceabove->setCurrentItem(item); + generalpage->abovepage->combo_spaceabove->setCurrentItem(item); switch (kindbelow) { case VSpace::NONE: item = 0; break; @@ -145,17 +147,17 @@ void ParaDialog::setSpace(VSpace::vspace_kind kindabove, VSpace::vspace_kind kin case VSpace::VFILL: item = 5; break; case VSpace::LENGTH: item = 6; break; } - generalpage->belowpage->spacebelow->setCurrentItem(item); + generalpage->belowpage->combo_spacebelow->setCurrentItem(item); - generalpage->abovepage->spaceabovevalue->setEnabled(kindabove == VSpace::LENGTH); - generalpage->abovepage->spaceaboveplus->setEnabled(kindabove == VSpace::LENGTH); - generalpage->abovepage->spaceaboveminus->setEnabled(kindabove == VSpace::LENGTH); - generalpage->belowpage->spacebelowvalue->setEnabled(kindbelow == VSpace::LENGTH); - generalpage->belowpage->spacebelowplus->setEnabled(kindbelow == VSpace::LENGTH); - generalpage->belowpage->spacebelowminus->setEnabled(kindbelow == VSpace::LENGTH); - - generalpage->abovepage->keepabove->setChecked(keepabove); - generalpage->belowpage->keepbelow->setChecked(keepbelow); + generalpage->abovepage->length_spaceabove->setEnabled(kindabove == VSpace::LENGTH); + generalpage->abovepage->length_spaceaboveplus->setEnabled(kindabove == VSpace::LENGTH); + generalpage->abovepage->length_spaceaboveminus->setEnabled(kindabove == VSpace::LENGTH); + generalpage->belowpage->length_spacebelow->setEnabled(kindbelow == VSpace::LENGTH); + generalpage->belowpage->length_spacebelowplus->setEnabled(kindbelow == VSpace::LENGTH); + generalpage->belowpage->length_spacebelowminus->setEnabled(kindbelow == VSpace::LENGTH); + + generalpage->abovepage->check_keepabove->setChecked(keepabove); + generalpage->belowpage->check_keepbelow->setChecked(keepbelow); } @@ -163,18 +165,18 @@ void ParaDialog::setAboveLength(float val, float plus, float minus, LyXLength::UNIT vunit, LyXLength::UNIT punit, LyXLength::UNIT munit) { if (vunit == LyXLength::UNIT_NONE) { - generalpage->abovepage->spaceabovevalue->setValue(""); - generalpage->abovepage->spaceaboveplus->setValue(""); - generalpage->abovepage->spaceaboveminus->setValue(""); + generalpage->abovepage->length_spaceabove->setValue(""); + generalpage->abovepage->length_spaceaboveplus->setValue(""); + generalpage->abovepage->length_spaceaboveminus->setValue(""); } else { - generalpage->abovepage->spaceabovevalue->setValue(tostr(val)); - generalpage->abovepage->spaceaboveplus->setValue(tostr(plus)); - generalpage->abovepage->spaceaboveminus->setValue(tostr(minus)); + generalpage->abovepage->length_spaceabove->setValue(tostr(val)); + generalpage->abovepage->length_spaceaboveplus->setValue(tostr(plus)); + generalpage->abovepage->length_spaceaboveminus->setValue(tostr(minus)); } - generalpage->abovepage->spaceabovevalue->setUnits(vunit); - generalpage->abovepage->spaceaboveplus->setUnits(punit); - generalpage->abovepage->spaceaboveminus->setUnits(munit); + generalpage->abovepage->length_spaceabove->setUnits(vunit); + generalpage->abovepage->length_spaceaboveplus->setUnits(punit); + generalpage->abovepage->length_spaceaboveminus->setUnits(munit); } @@ -182,18 +184,18 @@ void ParaDialog::setBelowLength(float val, float plus, float minus, LyXLength::UNIT vunit, LyXLength::UNIT punit, LyXLength::UNIT munit) { if (vunit == LyXLength::UNIT_NONE) { - generalpage->belowpage->spacebelowvalue->setValue(""); - generalpage->belowpage->spacebelowplus->setValue(""); - generalpage->belowpage->spacebelowminus->setValue(""); + generalpage->belowpage->length_spacebelow->setValue(""); + generalpage->belowpage->length_spacebelowplus->setValue(""); + generalpage->belowpage->length_spacebelowminus->setValue(""); } else { - generalpage->belowpage->spacebelowvalue->setValue(tostr(val)); - generalpage->belowpage->spacebelowplus->setValue(tostr(plus)); - generalpage->belowpage->spacebelowminus->setValue(tostr(minus)); + generalpage->belowpage->length_spacebelow->setValue(tostr(val)); + generalpage->belowpage->length_spacebelowplus->setValue(tostr(plus)); + generalpage->belowpage->length_spacebelowminus->setValue(tostr(minus)); } - generalpage->belowpage->spacebelowvalue->setUnits(vunit); - generalpage->belowpage->spacebelowplus->setUnits(punit); - generalpage->belowpage->spacebelowminus->setUnits(munit); + generalpage->belowpage->length_spacebelow->setUnits(vunit); + generalpage->belowpage->length_spacebelowplus->setUnits(punit); + generalpage->belowpage->length_spacebelowminus->setUnits(munit); } @@ -203,11 +205,11 @@ void ParaDialog::setExtra(float widthval, LyXLength::UNIT units, const string pe if (type!=LyXParagraph::PEXTRA_NONE) { lyxerr[Debug::GUI] << "percent : $" << percent << "$ widthval " << widthval << " unit " << long(units) << endl; if (percent != "") { - extrapage->widthvalue->setText(percent.c_str()); - extrapage->widthvalueunits->setCurrentItem(11); + extrapage->line_widthvalue->setText(percent.c_str()); + extrapage->combo_widthvalueunits->setCurrentItem(11); } else { int unit = 0; - extrapage->widthvalue->setText(tostr(widthval).c_str()); + extrapage->line_widthvalue->setText(tostr(widthval).c_str()); switch (units) { case LyXLength::CM: unit = 0; break; case LyXLength::IN: unit = 1; break; @@ -225,47 +227,47 @@ void ParaDialog::setExtra(float widthval, LyXLength::UNIT units, const string pe default: lyxerr[Debug::GUI] << "Unknown unit " << long(units) << endl; } - extrapage->widthvalueunits->setCurrentItem(unit); + extrapage->combo_widthvalueunits->setCurrentItem(unit); } } else - extrapage->widthvalue->setText(""); + extrapage->line_widthvalue->setText(""); switch (align) { case LyXParagraph::MINIPAGE_ALIGN_TOP: - extrapage->top->setChecked(true); + extrapage->radio_top->setChecked(true); break; case LyXParagraph::MINIPAGE_ALIGN_MIDDLE: - extrapage->middle->setChecked(true); + extrapage->radio_middle->setChecked(true); break; case LyXParagraph::MINIPAGE_ALIGN_BOTTOM: - extrapage->bottom->setChecked(true); + extrapage->radio_bottom->setChecked(true); break; } - extrapage->hfillbetween->setChecked(hfill); - extrapage->startnewminipage->setChecked(startminipage); + extrapage->check_hfillbetween->setChecked(hfill); + extrapage->check_startnewminipage->setChecked(startminipage); extrapage->specialalignment->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); - extrapage->top->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); - extrapage->middle->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); - extrapage->bottom->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); - extrapage->widthvalue->setEnabled(type!=LyXParagraph::PEXTRA_NONE); - extrapage->widthvalueunits->setEnabled(type!=LyXParagraph::PEXTRA_NONE); - extrapage->hfillbetween->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); - extrapage->startnewminipage->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); + extrapage->radio_top->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); + extrapage->radio_middle->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); + extrapage->radio_bottom->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); + extrapage->line_widthvalue->setEnabled(type!=LyXParagraph::PEXTRA_NONE); + extrapage->combo_widthvalueunits->setEnabled(type!=LyXParagraph::PEXTRA_NONE); + extrapage->check_hfillbetween->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); + extrapage->check_startnewminipage->setEnabled(type==LyXParagraph::PEXTRA_MINIPAGE); switch (type) { case LyXParagraph::PEXTRA_NONE: - extrapage->type->setCurrentItem(0); + extrapage->combo_type->setCurrentItem(0); break; case LyXParagraph::PEXTRA_INDENT: - extrapage->type->setCurrentItem(1); + extrapage->combo_type->setCurrentItem(1); break; case LyXParagraph::PEXTRA_MINIPAGE: - extrapage->type->setCurrentItem(2); + extrapage->combo_type->setCurrentItem(2); break; case LyXParagraph::PEXTRA_FLOATFLT: - extrapage->type->setCurrentItem(3); + extrapage->combo_type->setCurrentItem(3); break; } } @@ -274,12 +276,12 @@ void ParaDialog::setExtra(float widthval, LyXLength::UNIT units, const string pe LyXGlueLength ParaDialog::getAboveLength() const { LyXGlueLength len( - generalpage->abovepage->spaceabovevalue->getValue(), - generalpage->abovepage->spaceabovevalue->getUnits(), - generalpage->abovepage->spaceaboveplus->getValue(), - generalpage->abovepage->spaceaboveplus->getUnits(), - generalpage->abovepage->spaceaboveminus->getValue(), - generalpage->abovepage->spaceaboveminus->getUnits() + generalpage->abovepage->length_spaceabove->getValue(), + generalpage->abovepage->length_spaceabove->getUnits(), + generalpage->abovepage->length_spaceaboveplus->getValue(), + generalpage->abovepage->length_spaceaboveplus->getUnits(), + generalpage->abovepage->length_spaceaboveminus->getValue(), + generalpage->abovepage->length_spaceaboveminus->getUnits() ); return len; @@ -289,12 +291,12 @@ LyXGlueLength ParaDialog::getAboveLength() const LyXGlueLength ParaDialog::getBelowLength() const { LyXGlueLength len( - generalpage->belowpage->spacebelowvalue->getValue(), - generalpage->belowpage->spacebelowvalue->getUnits(), - generalpage->belowpage->spacebelowplus->getValue(), - generalpage->belowpage->spacebelowplus->getUnits(), - generalpage->belowpage->spacebelowminus->getValue(), - generalpage->belowpage->spacebelowminus->getUnits() + generalpage->belowpage->length_spacebelow->getValue(), + generalpage->belowpage->length_spacebelow->getUnits(), + generalpage->belowpage->length_spacebelowplus->getValue(), + generalpage->belowpage->length_spacebelowplus->getUnits(), + generalpage->belowpage->length_spacebelowminus->getValue(), + generalpage->belowpage->length_spacebelowminus->getUnits() ); return len; @@ -304,9 +306,9 @@ LyXGlueLength ParaDialog::getBelowLength() const LyXLength ParaDialog::getExtraWidth() const { - if (extrapage->widthvalueunits->currentItem() != 11) { + if (extrapage->combo_widthvalueunits->currentItem() != 11) { LyXLength::UNIT unit = LyXLength::CM; - switch (extrapage->widthvalueunits->currentItem()) { + switch (extrapage->combo_widthvalueunits->currentItem()) { case 0: unit = LyXLength::CM; break; case 1: unit = LyXLength::IN; break; case 2: unit = LyXLength::PT; break; @@ -320,9 +322,9 @@ LyXLength ParaDialog::getExtraWidth() const case 10: unit = LyXLength::CC; break; case 11: unit = LyXLength::CM; break; default: - lyxerr[Debug::GUI] << "Unknown unit " << extrapage->widthvalueunits->currentItem() << endl; + lyxerr[Debug::GUI] << "Unknown unit " << extrapage->combo_widthvalueunits->currentItem() << endl; } - LyXLength len(strToDbl(extrapage->widthvalue->text()), unit); + LyXLength len(strToDbl(extrapage->line_widthvalue->text()), unit); return len; } else { LyXLength len(0.0, LyXLength::UNIT_NONE); @@ -333,7 +335,7 @@ LyXLength ParaDialog::getExtraWidth() const string ParaDialog::getExtraWidthPercent() const { - double val = strToDbl(extrapage->widthvalue->text()); + double val = strToDbl(extrapage->line_widthvalue->text()); if (val > 100.0) val = 100.0; if (val < 0.0) diff --git a/src/frontends/kde/paradlg.h b/src/frontends/kde/paradlg.h index 4039212c05..9a080d5bdb 100644 --- a/src/frontends/kde/paradlg.h +++ b/src/frontends/kde/paradlg.h @@ -41,11 +41,11 @@ public: void setExtra(float, LyXGlueLength::UNIT, const string, int, bool, bool, LyXParagraph::PEXTRA_TYPE); char const * getLabelWidth() const { - return generalpage->labelwidth->text(); + return generalpage->line_labelwidth->text(); } LyXAlignment getAlign() const { - switch (generalpage->justification->currentItem()) { + switch (generalpage->combo_justification->currentItem()) { case 0: return LYX_ALIGN_BLOCK; case 1: return LYX_ALIGN_CENTER; case 2: return LYX_ALIGN_LEFT; @@ -55,39 +55,39 @@ public: } bool getAboveKeep() const { - return generalpage->abovepage->keepabove->isChecked(); + return generalpage->abovepage->check_keepabove->isChecked(); } bool getBelowKeep() const { - return generalpage->belowpage->keepbelow->isChecked(); + return generalpage->belowpage->check_keepbelow->isChecked(); } bool getLineAbove() const { - return generalpage->lineabove->isChecked(); + return generalpage->check_lineabove->isChecked(); } bool getLineBelow() const { - return generalpage->linebelow->isChecked(); + return generalpage->check_linebelow->isChecked(); } bool getPagebreakAbove() const { - return generalpage->abovepage->pagebreakabove->isChecked(); + return generalpage->abovepage->check_pagebreakabove->isChecked(); } bool getPagebreakBelow() const { - return generalpage->belowpage->pagebreakbelow->isChecked(); + return generalpage->belowpage->check_pagebreakbelow->isChecked(); } bool getNoIndent() const { - return generalpage->noindent->isChecked(); + return generalpage->check_noindent->isChecked(); } VSpace::vspace_kind getSpaceAboveKind() const { - return getSpaceKind(generalpage->abovepage->spaceabove->currentItem()); + return getSpaceKind(generalpage->abovepage->combo_spaceabove->currentItem()); } VSpace::vspace_kind getSpaceBelowKind() const { - return getSpaceKind(generalpage->belowpage->spacebelow->currentItem()); + return getSpaceKind(generalpage->belowpage->combo_spacebelow->currentItem()); } LyXGlueLength getAboveLength() const; @@ -98,7 +98,7 @@ public: string getExtraWidthPercent() const; LyXParagraph::PEXTRA_TYPE getExtraType() const { - switch (extrapage->type->currentItem()) { + switch (extrapage->combo_type->currentItem()) { case 0: return LyXParagraph::PEXTRA_NONE; case 1: return LyXParagraph::PEXTRA_INDENT; case 2: return LyXParagraph::PEXTRA_MINIPAGE; @@ -108,19 +108,19 @@ public: } LyXParagraph::MINIPAGE_ALIGNMENT getExtraAlign() const { - if (extrapage->top->isChecked()) + if (extrapage->radio_top->isChecked()) return LyXParagraph::MINIPAGE_ALIGN_TOP; - if (extrapage->middle->isChecked()) + if (extrapage->radio_middle->isChecked()) return LyXParagraph::MINIPAGE_ALIGN_MIDDLE; return LyXParagraph::MINIPAGE_ALIGN_BOTTOM; } bool getHfillBetween() const { - return extrapage->hfillbetween->isChecked(); + return extrapage->check_hfillbetween->isChecked(); } bool getStartNewMinipage() const { - return extrapage->startnewminipage->isChecked(); + return extrapage->check_startnewminipage->isChecked(); } protected: void closeEvent(QCloseEvent * e); @@ -132,6 +132,7 @@ private: ParaGeneralDialog * generalpage; /// the extra options tab page ParaExtraDialog * extrapage; + VSpace::vspace_kind getSpaceKind(int val) const { switch (val) { case 0: return VSpace::NONE; diff --git a/src/frontends/kde/paraextradlg.C b/src/frontends/kde/paraextradlg.C index 0b51847473..06788cf8e3 100644 --- a/src/frontends/kde/paraextradlg.C +++ b/src/frontends/kde/paraextradlg.C @@ -20,28 +20,28 @@ using kde_helpers::setSizeHint; ParaExtraDialog::ParaExtraDialog (QWidget * parent, char const * name) : ParaExtraDialogData(parent, name) { - type->insertItem(_("Normal")); - type->insertItem(_("Indented paragraph")); - type->insertItem(_("Minipage")); - type->insertItem(_("Wrap text around floats (floatflt)")); - setSizeHint(type); + combo_type->insertItem(_("Normal")); + combo_type->insertItem(_("Indented paragraph")); + combo_type->insertItem(_("Minipage")); + combo_type->insertItem(_("Wrap text around floats (floatflt)")); + setSizeHint(combo_type); - widthvalueunits->insertItem(_("Centimetres")); - widthvalueunits->insertItem(_("Inches")); - widthvalueunits->insertItem(_("Points (1/72.27 inch)")); - widthvalueunits->insertItem(_("Millimetres")); - widthvalueunits->insertItem(_("Picas")); - widthvalueunits->insertItem(_("ex units")); - widthvalueunits->insertItem(_("em units")); - widthvalueunits->insertItem(_("Scaled points (1/65536 pt)")); - widthvalueunits->insertItem(_("Big/PS points (1/72 inch)")); - widthvalueunits->insertItem(_("Didot points")); - widthvalueunits->insertItem(_("Cicero points")); - widthvalueunits->insertItem(_("Percent of column")); - setSizeHint(widthvalueunits); + combo_widthvalueunits->insertItem(_("Centimetres")); + combo_widthvalueunits->insertItem(_("Inches")); + combo_widthvalueunits->insertItem(_("Points (1/72.27 inch)")); + combo_widthvalueunits->insertItem(_("Millimetres")); + combo_widthvalueunits->insertItem(_("Picas")); + combo_widthvalueunits->insertItem(_("ex units")); + combo_widthvalueunits->insertItem(_("em units")); + combo_widthvalueunits->insertItem(_("Scaled points (1/65536 pt)")); + combo_widthvalueunits->insertItem(_("Big/PS points (1/72 inch)")); + combo_widthvalueunits->insertItem(_("Didot points")); + combo_widthvalueunits->insertItem(_("Cicero points")); + combo_widthvalueunits->insertItem(_("Percent of column")); + setSizeHint(combo_widthvalueunits); - QToolTip::add(hfillbetween, _("FIXME please !")); - QToolTip::add(startnewminipage, _("FIXME please !")); + QToolTip::add(check_hfillbetween, _("FIXME please !")); + QToolTip::add(check_startnewminipage, _("FIXME please !")); } @@ -53,11 +53,11 @@ ParaExtraDialog::~ParaExtraDialog() void ParaExtraDialog::typeHighlighted(int val) { specialalignment->setEnabled(val == 2); - top->setEnabled(val == 2); - middle->setEnabled(val == 2); - bottom->setEnabled(val == 2); - widthvalue->setEnabled(val != 0); - widthvalueunits->setEnabled(val != 0); - hfillbetween->setEnabled(val == 2); - startnewminipage->setEnabled(val == 2); + radio_top->setEnabled(val == 2); + radio_middle->setEnabled(val == 2); + radio_bottom->setEnabled(val == 2); + line_widthvalue->setEnabled(val != 0); + combo_widthvalueunits->setEnabled(val != 0); + check_hfillbetween->setEnabled(val == 2); + check_startnewminipage->setEnabled(val == 2); } diff --git a/src/frontends/kde/parageneraldlg.C b/src/frontends/kde/parageneraldlg.C index f08452151d..2789892391 100644 --- a/src/frontends/kde/parageneraldlg.C +++ b/src/frontends/kde/parageneraldlg.C @@ -24,51 +24,51 @@ ParaGeneralDialog::ParaGeneralDialog (QWidget * parent, char const * name) abovepage = new ParaAboveDialogData(this, "abovepage"); belowpage = new ParaBelowDialogData(this, "belowpage"); - spacetab->addTabPage(abovepage, _("&Spacing Above")); - spacetab->addTabPage(belowpage, _("Spacing &Below")); - - connect(abovepage->spaceabove, SIGNAL(highlighted(int)), this, SLOT(spaceaboveHighlighted(int))); - connect(belowpage->spacebelow, SIGNAL(highlighted(int)), this, SLOT(spacebelowHighlighted(int))); - - abovepage->spaceabove->insertItem(_("None")); - abovepage->spaceabove->insertItem(_("Defskip")); - abovepage->spaceabove->insertItem(_("Small skip")); - abovepage->spaceabove->insertItem(_("Medium skip")); - abovepage->spaceabove->insertItem(_("Big skip")); - abovepage->spaceabove->insertItem(_("VFill")); - abovepage->spaceabove->insertItem(_("Custom")); - setSizeHint(abovepage->spaceabove); - - belowpage->spacebelow->insertItem(_("None")); - belowpage->spacebelow->insertItem(_("Defskip")); - belowpage->spacebelow->insertItem(_("Small skip")); - belowpage->spacebelow->insertItem(_("Medium skip")); - belowpage->spacebelow->insertItem(_("Big skip")); - belowpage->spacebelow->insertItem(_("VFill")); - belowpage->spacebelow->insertItem(_("Custom")); - setSizeHint(belowpage->spacebelow); + tabstack->addTabPage(abovepage, _("&Spacing Above")); + tabstack->addTabPage(belowpage, _("Spacing &Below")); + + connect(abovepage->combo_spaceabove, SIGNAL(highlighted(int)), this, SLOT(spaceaboveHighlighted(int))); + connect(belowpage->combo_spacebelow, SIGNAL(highlighted(int)), this, SLOT(spacebelowHighlighted(int))); + + abovepage->combo_spaceabove->insertItem(_("None")); + abovepage->combo_spaceabove->insertItem(_("Defskip")); + abovepage->combo_spaceabove->insertItem(_("Small skip")); + abovepage->combo_spaceabove->insertItem(_("Medium skip")); + abovepage->combo_spaceabove->insertItem(_("Big skip")); + abovepage->combo_spaceabove->insertItem(_("VFill")); + abovepage->combo_spaceabove->insertItem(_("Custom")); + setSizeHint(abovepage->combo_spaceabove); + + belowpage->combo_spacebelow->insertItem(_("None")); + belowpage->combo_spacebelow->insertItem(_("Defskip")); + belowpage->combo_spacebelow->insertItem(_("Small skip")); + belowpage->combo_spacebelow->insertItem(_("Medium skip")); + belowpage->combo_spacebelow->insertItem(_("Big skip")); + belowpage->combo_spacebelow->insertItem(_("VFill")); + belowpage->combo_spacebelow->insertItem(_("Custom")); + setSizeHint(belowpage->combo_spacebelow); - justification->insertItem(_("Block")); - justification->insertItem(_("Centered")); - justification->insertItem(_("Left")); - justification->insertItem(_("Right")); - setSizeHint(justification); + combo_justification->insertItem(_("Block")); + combo_justification->insertItem(_("Centered")); + combo_justification->insertItem(_("Left")); + combo_justification->insertItem(_("Right")); + setSizeHint(combo_justification); - QToolTip::add(justification, _("Alignment of current paragraph")); - QToolTip::add(noindent, _("No indent on first line of paragraph")); - QToolTip::add(labelwidth, _("FIXME please !")); + QToolTip::add(combo_justification, _("Alignment of current paragraph")); + QToolTip::add(check_noindent, _("No indent on first line of paragraph")); + QToolTip::add(line_labelwidth, _("FIXME please !")); - QToolTip::add(abovepage->pagebreakabove, _("New page above this paragraph")); - QToolTip::add(abovepage->keepabove, _("Don't hug margin if at top of page")); - QToolTip::add(abovepage->spaceabovevalue, _("Size of extra space above paragraph")); - QToolTip::add(abovepage->spaceaboveplus, _("Maximum extra space that can be added")); - QToolTip::add(abovepage->spaceaboveminus, _("Minimum space required")); + QToolTip::add(abovepage->check_pagebreakabove, _("New page above this paragraph")); + QToolTip::add(abovepage->check_keepabove, _("Don't hug margin if at top of page")); + QToolTip::add(abovepage->length_spaceabove, _("Size of extra space above paragraph")); + QToolTip::add(abovepage->length_spaceaboveplus, _("Maximum extra space that can be added")); + QToolTip::add(abovepage->length_spaceaboveminus, _("Minimum space required")); - QToolTip::add(belowpage->pagebreakbelow, _("New page below this paragraph")); - QToolTip::add(belowpage->keepbelow, _("Don't hug margin if at bottom of page")); - QToolTip::add(belowpage->spacebelowvalue, _("Size of extra space below paragraph")); - QToolTip::add(belowpage->spacebelowplus, _("Maximum extra space that can be added")); - QToolTip::add(belowpage->spacebelowminus, _("Minimum space required")); + QToolTip::add(belowpage->check_pagebreakbelow, _("New page below this paragraph")); + QToolTip::add(belowpage->check_keepbelow, _("Don't hug margin if at bottom of page")); + QToolTip::add(belowpage->length_spacebelow, _("Size of extra space below paragraph")); + QToolTip::add(belowpage->length_spacebelowplus, _("Maximum extra space that can be added")); + QToolTip::add(belowpage->length_spacebelowminus, _("Minimum space required")); } @@ -79,15 +79,15 @@ ParaGeneralDialog::~ParaGeneralDialog() void ParaGeneralDialog::spaceaboveHighlighted(int val) { - abovepage->spaceabovevalue->setEnabled(val == 6); - abovepage->spaceaboveplus->setEnabled(val == 6); - abovepage->spaceaboveminus->setEnabled(val == 6); + abovepage->length_spaceabove->setEnabled(val == 6); + abovepage->length_spaceaboveplus->setEnabled(val == 6); + abovepage->length_spaceaboveminus->setEnabled(val == 6); } void ParaGeneralDialog::spacebelowHighlighted(int val) { - belowpage->spacebelowvalue->setEnabled(val == 6); - belowpage->spacebelowplus->setEnabled(val == 6); - belowpage->spacebelowminus->setEnabled(val == 6); + belowpage->length_spacebelow->setEnabled(val == 6); + belowpage->length_spacebelowplus->setEnabled(val == 6); + belowpage->length_spacebelowminus->setEnabled(val == 6); } diff --git a/src/frontends/kde/printdlg.C b/src/frontends/kde/printdlg.C index 72852c2b4c..942c1ebaa1 100644 --- a/src/frontends/kde/printdlg.C +++ b/src/frontends/kde/printdlg.C @@ -7,34 +7,35 @@ */ #include -#include "dlg/printdlgdata.h" -#include "printdlg.h" +#include +#include + #include "support/lstrings.h" #include "support/filetools.h" + +#include "printdlg.h" +#include "dlg/printdlgdata.h" #include #include -#include -#include - #define Inherited PrintDialogData PrintDialog::PrintDialog(FormPrint * f, QWidget * parent, char const * name) : PrintDialogData(parent, name), form_(f) { setCaption(name); - QToolTip::add(allpages, _("Print every page")); - QToolTip::add(oddpages, _("Print odd-numbered pages only")); - QToolTip::add(evenpages, _("Print even-numbered pages only")); - QToolTip::add(from, _("Print from page number")); - QToolTip::add(to, _("Print to page number")); - QToolTip::add(reverse, _("Print in reverse order (last page first)")); - QToolTip::add(count, _("Number of copies to print")); - QToolTip::add(sort, _("Collate multiple copies")); - QToolTip::add(printername, _("Printer name")); - QToolTip::add(filename, _("Output filename (PostScript)")); - QToolTip::add(browse, _("Select output filename")); + QToolTip::add(radio_allpages, _("Print every page")); + QToolTip::add(radio_oddpages, _("Print odd-numbered pages only")); + QToolTip::add(radio_evenpages, _("Print even-numbered pages only")); + QToolTip::add(line_from, _("Print from page number")); + QToolTip::add(line_to, _("Print to page number")); + QToolTip::add(check_reverse, _("Print in reverse order (last page first)")); + QToolTip::add(line_count, _("Number of copies to print")); + QToolTip::add(check_sort, _("Collate multiple copies")); + QToolTip::add(line_printername, _("Printer name")); + QToolTip::add(line_filename, _("Output filename (PostScript)")); + QToolTip::add(button_browse, _("Select output filename")); } @@ -47,19 +48,19 @@ void PrintDialog::clickedBrowse() { // FIXME: move into utility class later, accept URLs etc. - KFileDialog filedlg(OnlyPath(filename->text()).c_str(), "*.ps|PostScript Files (*.ps)", this, 0, true, false); + KFileDialog filedlg(OnlyPath(line_filename->text()).c_str(), "*.ps|PostScript Files (*.ps)", this, 0, true, false); if (filedlg.exec() == QDialog::Accepted) - filename->setText(filedlg.selectedFile().data()); + line_filename->setText(filedlg.selectedFile().data()); } void PrintDialog::changedCount(char const * text) { if (compare("", text) && strToInt(text) == 0) { - count->setText("1"); + line_count->setText("1"); return; } - sort->setEnabled(strToInt(text) > 1); + check_sort->setEnabled(strToInt(text) > 1); } diff --git a/src/frontends/kde/printdlg.h b/src/frontends/kde/printdlg.h index 8e8172b59d..0dc312bfa1 100644 --- a/src/frontends/kde/printdlg.h +++ b/src/frontends/kde/printdlg.h @@ -10,12 +10,16 @@ #define PRINTDLG_H +#include "FormPrint.h" + #include "dlg/printdlgdata.h" + #include "support/lstrings.h" #include "lyxrc.h" #include "PrinterParams.h" -#include "FormPrint.h" - + +// FIXME: closeEvent + class PrintDialog : public PrintDialogData { Q_OBJECT @@ -25,108 +29,105 @@ public: virtual ~PrintDialog(); char const * getFrom() { - return from->text(); + return line_from->text(); } char const * getTo() { - return to->text(); + return line_to->text(); } PrinterParams::Target getTarget() { - if (toprinter->isChecked()) + if (radio_toprinter->isChecked()) return PrinterParams::PRINTER; else return PrinterParams::FILE; } char const * getPrinter() { - return printername->text(); + return line_printername->text(); } char const * getFile() { - return filename->text(); + return line_filename->text(); } PrinterParams::WhichPages getWhichPages() { - if (oddpages->isChecked()) + if (radio_oddpages->isChecked()) return PrinterParams::ODD; - else if (evenpages->isChecked()) + else if (radio_evenpages->isChecked()) return PrinterParams::EVEN; else return PrinterParams::ALL; } bool getReverse() { - return reverse->isChecked(); + return check_reverse->isChecked(); } bool getSort() { - return sort->isChecked(); + return check_sort->isChecked(); } char const * getCount() { - return count->text(); + return line_count->text(); } void setTarget(PrinterParams::Target t) { - toprinter->setChecked(t == PrinterParams::PRINTER); - tofile->setChecked(t != PrinterParams::PRINTER); + radio_toprinter->setChecked(t == PrinterParams::PRINTER); + radio_tofile->setChecked(t != PrinterParams::PRINTER); } void setPrinter(char const * name) { - printername->setText(name); + line_printername->setText(name); } void setFile(char const * name) { - filename->setText(name); + line_filename->setText(name); } void setWhichPages(PrinterParams::WhichPages wp) { switch (wp) { case PrinterParams::ALL: - allpages->setChecked(true); + radio_allpages->setChecked(true); break; case PrinterParams::EVEN: - evenpages->setChecked(true); + radio_evenpages->setChecked(true); break; case PrinterParams::ODD: - oddpages->setChecked(true); + radio_oddpages->setChecked(true); break; } } void setReverse(bool on) { - reverse->setChecked(on); + check_reverse->setChecked(on); } void setSort(bool on) { - sort->setChecked(on); + check_sort->setChecked(on); } void setCount(int num) { - count->setText(tostr(num).c_str()); - sort->setEnabled(num > 1); + line_count->setText(tostr(num).c_str()); + check_sort->setEnabled(num > 1); } void setFrom(char const * text) { - from->setText(text); + line_from->setText(text); } void setTo(char const * text) { - to->setText(text); + line_to->setText(text); } protected slots: void clickedCancel() { - form_->close(); - hide(); + form_->CancelButton(); } void clickedPrint() { - form_->print(); - form_->close(); - hide(); + form_->OKButton(); } /// open up the browser to select ps file diff --git a/src/frontends/kde/refdlg.C b/src/frontends/kde/refdlg.C index 140d0e58ed..10b9a30dac 100644 --- a/src/frontends/kde/refdlg.C +++ b/src/frontends/kde/refdlg.C @@ -173,6 +173,6 @@ RefDialog::~RefDialog() void RefDialog::closeEvent(QCloseEvent * e) { - form_->close(); + form_->CancelButton(); e->accept(); } diff --git a/src/frontends/kde/refdlg.h b/src/frontends/kde/refdlg.h index 5fa6437cdf..ed8957b463 100644 --- a/src/frontends/kde/refdlg.h +++ b/src/frontends/kde/refdlg.h @@ -92,15 +92,12 @@ private slots: /// adaptor to FormRef::apply void apply_adaptor(void) { - form_->apply(); - form_->close(); - hide(); + form_->ApplyButton(); } /// adaptor to FormRef::close void close_adaptor(void) { - form_->close(); - hide(); + form_->CancelButton(); } }; diff --git a/src/frontends/kde/tabcreatedlg.C b/src/frontends/kde/tabcreatedlg.C index c563cb23b2..1cd0eba550 100644 --- a/src/frontends/kde/tabcreatedlg.C +++ b/src/frontends/kde/tabcreatedlg.C @@ -18,10 +18,10 @@ TabularCreateDialog::TabularCreateDialog (FormTabularCreate * form, QWidget * pa { setCaption(name); table->setMinimumSize(100,100); - rows->setValue(5); - cols->setValue(5); - connect(rows,SIGNAL(valueChanged(int)),table,SLOT(setNumberRows(int))); - connect(cols,SIGNAL(valueChanged(int)),table,SLOT(setNumberColumns(int))); + spin_rows->setValue(5); + spin_cols->setValue(5); + connect(spin_rows,SIGNAL(valueChanged(int)),table,SLOT(setNumberRows(int))); + connect(spin_cols,SIGNAL(valueChanged(int)),table,SLOT(setNumberColumns(int))); connect(table,SIGNAL(colsChanged(unsigned int)),this,SLOT(colsChanged(unsigned int))); connect(table,SIGNAL(rowsChanged(unsigned int)),this,SLOT(rowsChanged(unsigned int))); QToolTip::add(table, _("Drag with left mouse button to resize")); @@ -35,28 +35,25 @@ TabularCreateDialog::~TabularCreateDialog() void TabularCreateDialog::colsChanged(unsigned int nr_cols) { - if (nr_cols != strToUnsignedInt(cols->text())) - cols->setValue(nr_cols); + if (nr_cols != strToUnsignedInt(spin_cols->text())) + spin_cols->setValue(nr_cols); } void TabularCreateDialog::rowsChanged(unsigned int nr_rows) { - if (nr_rows != strToUnsignedInt(rows->text())) - rows->setValue(nr_rows); + if (nr_rows != strToUnsignedInt(spin_rows->text())) + spin_rows->setValue(nr_rows); } void TabularCreateDialog::clickedInsert() { - form_->apply(strToInt(rows->text()), strToInt(cols->text())); - form_->close(); - hide(); + form_->OKButton(); } void TabularCreateDialog::clickedCancel() { - form_->close(); - hide(); + form_->CancelButton(); } diff --git a/src/frontends/kde/tabcreatedlg.h b/src/frontends/kde/tabcreatedlg.h index 3c42cacc79..06beb8801e 100644 --- a/src/frontends/kde/tabcreatedlg.h +++ b/src/frontends/kde/tabcreatedlg.h @@ -9,9 +9,11 @@ #ifndef TABCREATEDIALOG_H #define TABCREATEDIALOG_H -#include "dlg/tabcreatedlgdata.h" #include "FormTabularCreate.h" +#include "dlg/tabcreatedlgdata.h" +// FIXME: closeEvent + class TabularCreateDialog : public TabularCreateDialogData { Q_OBJECT diff --git a/src/frontends/kde/urldlg.C b/src/frontends/kde/urldlg.C index b9c22ffece..37dfe45306 100644 --- a/src/frontends/kde/urldlg.C +++ b/src/frontends/kde/urldlg.C @@ -111,6 +111,6 @@ UrlDialog::~UrlDialog() void UrlDialog::closeEvent(QCloseEvent * e) { - form_->close(); + form_->CancelButton(); e->accept(); } diff --git a/src/frontends/kde/urldlg.h b/src/frontends/kde/urldlg.h index 2e99f51647..da1c38210f 100644 --- a/src/frontends/kde/urldlg.h +++ b/src/frontends/kde/urldlg.h @@ -58,15 +58,12 @@ private: private slots: /// adaptor to FormUrl::apply void apply_adaptor(void) { - form_->apply(); - form_->close(); - hide(); + form_->OKButton(); } /// adaptor to FormUrl::close void close_adaptor(void) { - form_->close(); - hide(); + form_->CancelButton(); } }; diff --git a/src/frontends/kde/vclogdlg.C b/src/frontends/kde/vclogdlg.C new file mode 100644 index 0000000000..8413639b3a --- /dev/null +++ b/src/frontends/kde/vclogdlg.C @@ -0,0 +1,43 @@ +/** + * \file vclogdlg.C + * Copyright 2001 the LyX Team + * Read the file COPYING + * + * \author John Levon + */ + +#include +#include + +#include "FormVCLog.h" +#include "ControlVCLog.h" + +#include "vclogdlg.h" + +VCLogDialog::VCLogDialog (FormVCLog * f, QWidget * parent, char const * name) + : LogDialogData(parent, name), form_(f) +{ + line_viewer->setMinimumWidth(50); + line_viewer->setMinimumHeight(50); +} + + +void VCLogDialog::setLogText(string const & text) +{ + setUpdatesEnabled(false); + line_viewer->setText(text.c_str()); + setUpdatesEnabled(true); + update(); +} + +void VCLogDialog::closePressed() +{ + form_->CancelButton(); +} + + +void VCLogDialog::updatePressed() +{ + // FIXME: hmm + //form_->controller().setParams(); +} diff --git a/src/frontends/kde/vclogdlg.h b/src/frontends/kde/vclogdlg.h new file mode 100644 index 0000000000..cae933dec3 --- /dev/null +++ b/src/frontends/kde/vclogdlg.h @@ -0,0 +1,38 @@ +/** + * \file vclogdlg.h + * Copyright 2001 the LyX Team + * Read the file COPYING + * + * \author John Levon + */ + +#ifndef VCLOGDLG_H +#define VCLOGDLG_H + +#include +#include "support/lstrings.h" + +#include "dlg/logdlgdata.h" + +// FIXME: closeEvent + +class FormVCLog; + +class VCLogDialog : public LogDialogData +{ + Q_OBJECT + +public: + VCLogDialog(FormVCLog * f, QWidget * parent = NULL, char const * name = NULL); + + void setLogText(string const & text); + +protected slots: + virtual void closePressed(); + + virtual void updatePressed(); + +private: + FormVCLog * form_; +}; +#endif // LOGVCDLG_H