From 5cd869d52d1955145b855379dbc56bdb1c3f86fa Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 13 Oct 2000 08:44:10 +0000 Subject: [PATCH] Apply KDE formcopyright patch git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1111 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 37 ++-- development/Code_rules/Rules | 46 ++--- po/POTFILES.in | 1 + src/frontends/kde/FormCopyright.C | 4 +- src/frontends/kde/Makefile.am | 6 + src/frontends/kde/dlg/formcopyrightdialog.dlg | 176 ++++++++++++++++++ .../kde/dlg/formcopyrightdialog.kdevdlg | 87 --------- src/frontends/kde/formcopyrightdialog.C | 52 +++--- src/frontends/kde/formcopyrightdialog.h | 83 ++++----- src/frontends/kde/formcopyrightdialogdata.C | 170 +++++++++++++---- src/frontends/kde/formcopyrightdialogdata.h | 45 +++++ 11 files changed, 474 insertions(+), 233 deletions(-) create mode 100644 src/frontends/kde/dlg/formcopyrightdialog.dlg delete mode 100644 src/frontends/kde/dlg/formcopyrightdialog.kdevdlg create mode 100644 src/frontends/kde/formcopyrightdialogdata.h diff --git a/ChangeLog b/ChangeLog index c160990810..4f1585f2ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-10-12 John Levon + + * src/frontends/kde/Makefile.am: + * src/frontends/kde/FormCopyright.C: + * src/frontends/kde/formcopyrightdialog.C: + * src/frontends/kde/formcopyrightdialog.h: + * src/frontends/kde/formcopyrightdialogdata.C: + * src/frontends/kde/formcopyrightdialogdata.h: + * src/frontends/kde/dlg/formcopyrightdialog.kdevdlg: + * src/frontends/kde/dlg/formcopyrightdialog.dlg: convert + copyright to use qtarch + 2000-10-12 Dekel Tsur * src/encoding.C (read): Fixed bug that caused an error message at @@ -9,18 +21,20 @@ 2000-10-13 Allan Rae - * src/frontends/xforms/FormPreferences.C (input): reworking the checking + * src/frontends/xforms/FormPreferences.C (input): reworking the + checking (build, update, apply): New inputs in various tabfolders * src/frontends/xforms/FormToc.C: use new button policy. - * src/frontends/ButtonPolicies.h (class IgnorantPolicy): for dialogs that - either can't use any existing policy or where it just doesn't care. + * src/frontends/ButtonPolicies.h (class IgnorantPolicy): for + dialogs that either can't use any existing policy or where it just + doesn't care. * src/frontends/xforms/FormTabular.h: removed copyright notice that said it was mine. - * src/lyx_gui_misc.[Ch] (updateAllVisibleBufferRelatedDialogs): added a - bool parameter which is ignored. + * src/lyx_gui_misc.[Ch] (updateAllVisibleBufferRelatedDialogs): + added a bool parameter which is ignored. * src/buffer.C (setReadonly): * src/BufferView_pimpl.C (buffer): @@ -68,11 +82,12 @@ parameter or have two update functions. I chose to go with one. I did try removing update() from here and FormBase and defining the appropriate update signatures in FormBaseB[DI] but then ran into the - problem of the update() call in FormBase::show(). Whatever I did to get - around that would require another function and that just got more - confusing. Hence the decision to make everyone have an update(bool). - An alternative might have been to override show() in FormBaseB[DI] and - that would allow the different and appropriate update signatures. + problem of the update() call in FormBase::show(). Whatever I did + to get around that would require another function and that just + got more confusing. Hence the decision to make everyone have an + update(bool). An alternative might have been to override show() in + FormBaseB[DI] and that would allow the different and appropriate + update signatures. * src/frontends/Dialogs.h (updateBufferDependent): now takes a bool. true == buffer change occurred. I decided against using a default @@ -276,7 +291,7 @@ * src/support/fmt.C: new file (fmt): new func, can be used for a printf substitute when still - using iostreams ex. lyxerr << fmg("Hello %s", "Jürgen") << endl; + using iostreams ex. lyxerr << fmt("Hello %s", "Jürgen") << endl; * src/support/StrPool.C: add some comments diff --git a/development/Code_rules/Rules b/development/Code_rules/Rules index 230d0600a7..85bf8e8a4b 100644 --- a/development/Code_rules/Rules +++ b/development/Code_rules/Rules @@ -1,9 +1,9 @@ Rules for the code in LyX ------------------------- -[updated from the C++STYLE distrubuted with the GNU C++ Standard] +[updated from the C++STYLE distributed with the GNU C++ Standard] The aim of this file is to serve as a guide for the developers, to aid us to -get clean and uniform code. This document is still uncomplete. +get clean and uniform code. This document is still incomplete. We really like to have new developers joining the LyX Project. However since we have had problems in the past with developers leaving the @@ -24,8 +24,8 @@ In general, if you want to contribute to the main source, we expect at least that you: - the most important rule first: kiss (keep it simple stupid), always - use a simple implementation in favour of a more complicated one. - This eases maintenence a lot. + use a simple implementation in favor of a more complicated one. + This eases maintenance a lot. - write good C++ code: Readable, well commented and taking advantage of the OO model. Follow the formatting guidelines. See Formatting. - adapt the code to the structures already existing in LyX, or in case that @@ -42,16 +42,16 @@ that you: Constructs. -Submiting Code ------------------- +Submitting Code +--------------- It is implicitly understood that all patches contributed to The LyX -Project is under the Gnu General Public Lisence, it you have a problem +Project is under the Gnu General Public License, it you have a problem with that, don't contribute code. Also please don't just pup up out of the blue with a huge patch (or small) that changes something substantial in LyX. Always discuss your -ideas with the developers on the developers mailinglist. +ideas with the developers on the developers mailing list. When you create the patch, please use "diff -up" since we find that a lot easier to read than the other diff formats. Also please do not @@ -82,8 +82,8 @@ in C++. - Make the scope of a variable as small as possible. -- Prefere preincrement to postincrement whenever possible. - Preincrement has potential of beeing faster than postincrement. Just +- Prefer preincrement to postincrement whenever possible. + Preincrement has potential of being faster than postincrement. Just thing about the obvious implementations of pre/post-increment. This rule applies to decrement too. @@ -106,7 +106,7 @@ in C++. ...; } -- For functions and metods that returns a non-POD type T, return T +- For functions and methods that return a non-POD type T, return T const instead. This gives better type checking, and will give a compiler warning when temporaries are used wrongly. @@ -149,8 +149,8 @@ Sutters book[ExC++] basic guarantee can work safely in some settings. 2. Strong guarantee: If an operation terminates because of an - exception, program state will remain uncanged. - This always implies commit-or-rollback samantics, including + exception, program state will remain unchanged. + This always implies commit-or-rollback semantics, including that no references or iterators into the container be invalidated if an operation fails. For example, if a Stack client calls Top and then attempts a Push that fails because @@ -164,8 +164,8 @@ Sutters book[ExC++] Probably the most interesting point here is that when you implement the basic guarantee, the strong guarantee often comes for free. For example, in our Stack implementation, - alost everything we did was needed to satisfy just the basic - guarantee -- and what's presented above very nearly satisfires + almost everything we did was needed to satisfy just the basic + guarantee -- and what's presented above very nearly satisfies the strong guarantee, with little of no extra work. Not half bad, considering all the trouble we went to. @@ -176,7 +176,7 @@ Sutters book[ExC++] 3. Nothrow guarantee: The function will not emit an exception under any circumstances. Overall exception safety isn't possible unless certain - functions are guaranteed not to throw. In particualr, we've + functions are guaranteed not to throw. In particular, we've seen that this is true for destructors; later in this miniseries, we'll see that it's also needed in certain helper functions, such as Swap(). @@ -196,7 +196,7 @@ bad_allocation if the requested memory is not available. Formatting ---------- -* Only one delaration on each line. +* Only one declaration on each line. int a; int b; -NOT- @@ -215,7 +215,7 @@ Formatting char *p = "flop"; // wrong char &c = *p; // wrong - Some time ago we had a huge discusion on this subject and after + Some time ago we had a huge discussion on this subject and after convincing argumentation from Asger this is what we decided. Also note that we will have: char const * p; @@ -269,7 +269,7 @@ Formatting * Use existing structures - - Use string whereever possible. LyX will someday move to Unicode, and + - Use string wherever possible. LyX will someday move to Unicode, and that will be easy if everybody uses string now. - Check out the filename and path tools in filetools.h @@ -278,7 +278,7 @@ Formatting and the regex class. - Use the DebugStream class to report errors and messages using - the lyxerr instantation. + the lyxerr instantiation. [add description of other existing structures] @@ -306,7 +306,7 @@ Formatting - The documentation is generated from the header files. - You document for the other developers, not for yourself. - - You should document what the funtion do, not the implementation. + - You should document what the function does, not the implementation. - in the .C files you document the implementation. - Single line description (///), multiple lines description (/** ... */) - You make the documentation by doing "make srcdoc" in the root, @@ -355,7 +355,7 @@ deciding what kind of function to add to a class interface: if (f needs to be virtual) make f a member function of C; else if (f is operator>> or operator<<) { - make f a non-member funtion; + make f a non-member function; if (f needs access to non-public members of C) make f a friend of C; } else if (f needs type conversions on its left-most argument) { @@ -368,7 +368,7 @@ deciding what kind of function to add to a class interface: make f a member function of C; Unfortunately, to make the best use of this kind of Class API's we -need namespaces. As soon as Jean-Marc stop using gcc 2.8 and other +need namespaces. As soon as Jean-Marc stops using gcc 2.8 and other compilers seem more or less up to date on namespaces we will begin to use them. _BUT_ we should begin to use the above algoritm ASAP. We should also go through old code and apply this algorithm to the diff --git a/po/POTFILES.in b/po/POTFILES.in index 53b1e41fe9..b1c156d99a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -26,6 +26,7 @@ src/frontends/gnome/Menubar_pimpl.C src/frontends/kde/FormCitation.C src/frontends/kde/formcitationdialog.C src/frontends/kde/FormCopyright.C +src/frontends/kde/formcopyrightdialogdata.C src/frontends/kde/FormIndex.C src/frontends/kde/formindexdialog.C src/frontends/kde/FormPrint.C diff --git a/src/frontends/kde/FormCopyright.C b/src/frontends/kde/FormCopyright.C index 0711e1cbfd..64dd9ef36b 100644 --- a/src/frontends/kde/FormCopyright.C +++ b/src/frontends/kde/FormCopyright.C @@ -39,8 +39,8 @@ FormCopyright::~FormCopyright() void FormCopyright::show() { if (!dialog_) - dialog_ = new FormCopyrightDialog(0, _("Copyright and Warranty"), - false); + dialog_ = new FormCopyrightDialog(0, _("LyX: Copyright and Warranty")); + if (!dialog_->isVisible()) h_ = d_->hideAll.connect(slot(this, &FormCopyright::hide)); dialog_->show(); diff --git a/src/frontends/kde/Makefile.am b/src/frontends/kde/Makefile.am index 37d18157c0..bbd2fe7bff 100644 --- a/src/frontends/kde/Makefile.am +++ b/src/frontends/kde/Makefile.am @@ -9,6 +9,7 @@ INCLUDES = -I${top_srcdir}/src/ -I${top_srcdir}/src/frontends/ \ # just to make sure, automake makes them BUILTSOURCES = formcitationdialog_moc.C \ formcopyrightdialog_moc.C \ + formcopyrightdialogdata_moc.C \ formindexdialog_moc.C \ formindexdialogdata_moc.C \ formprintdialog_moc.C \ @@ -66,6 +67,7 @@ libkde_la_SOURCES = \ formcopyrightdialog.C \ formcopyrightdialog.h \ formcopyrightdialogdata.C \ + formcopyrightdialogdata.h \ formindexdialog.C \ formindexdialog.h \ formindexdialogdata.C \ @@ -105,6 +107,8 @@ dist-hook: # dialog file dependencies +formcopyrightdialogdata.C formcopyrightdialogdata.h: dlg/formcopyrightdialog.dlg + $(QTARCH) -g dlg/formcopyrightdialog.dlg formindexdialogdata.C formindexdialogdata.h: dlg/formindexdialog.dlg $(QTARCH) -g dlg/formindexdialog.dlg formprintdialogdata.C formprintdialogdata.h: dlg/formprintdialog.dlg @@ -120,6 +124,8 @@ formcitationdialog_moc.C: formcitationdialog.h formcopyrightdialog.C: formcopyrightdialog_moc.C formcopyrightdialog_moc.C: formcopyrightdialog.h $(MOC) formcopyrightdialog.h -o formcopyrightdialog_moc.C +formcopyrightdialogdata_moc.C: formcopyrightdialogdata.h + $(MOC) formcopyrightdialogdata.h -o formcopyrightdialogdata_moc.C formindexdialog.C: formindexdialog_moc.C formindexdialog_moc.C: formindexdialog.h diff --git a/src/frontends/kde/dlg/formcopyrightdialog.dlg b/src/frontends/kde/dlg/formcopyrightdialog.dlg new file mode 100644 index 0000000000..6266d08654 --- /dev/null +++ b/src/frontends/kde/dlg/formcopyrightdialog.dlg @@ -0,0 +1,176 @@ +DlgEdit:v1.2:Dialog: +Dialog { + ClassHeader {formcopyrightdialog.h} + ClassSource {formcopyrightdialog.C} + ClassName {FormCopyrightDialog} + DataHeader {formcopyrightdialogdata.h} + DataSource {formcopyrightdialogdata.C} + DataName {FormCopyrightDialogData} + WindowBaseClass {QWidget} + UseGetText {TRUE} + WindowFlags {53248} +} +WidgetLayout { +InitialPos {-1 -1} +Size {465 455} +MinSize {200 65} +MaxSize {32767 65} +Grid {5} + +PushButton { + ToggleButton {FALSE} + Default {FALSE} + AutoDefault {TRUE} + IsMenuButton {FALSE} + Text {&OK} + AutoRepeat {FALSE} + AutoResize {FALSE} + Rect {157 343 151 107} + Name {PushButton_OK} + Variable {buttonOk} + Signal {[Protected] clicked --> clickedOK ()} + MinimumSize {0 0} + MaximumSize {32767 32767} + BackgroundPixmap {} + UseBackgroundPixmap {FALSE} + AdjustSize {FALSE} + ReadPixmapFromData {FALSE} + DataVarName {} + DataLenName {} + minWidthSizeHint {TRUE} + minHeightSizeHint {TRUE} + maxWidthSizeHint {TRUE} + maxHeightSizeHint {TRUE} + FocusPolicy {TabFocus} + BackgroundMode {PaletteBackground} + FontPropagation {NoChildren} + PalettePropagation {NoChildren} +} +Label { + Text {LyX is Copyright (C) 1995 by Matthias Ettrich, \n1995-2000 LyX Team} + Alignment {1316} + AutoResize {FALSE} + Margin {-1} + Style {50} + LineWidth {1} + MidLineWidth {0} + FrameMargin {1} + Rect {5 5 455 108} + Name {Label_2} + MinimumSize {0 0} + MaximumSize {32767 32767} + BackgroundPixmap {} + UseBackgroundPixmap {FALSE} + AdjustSize {FALSE} + ReadPixmapFromData {FALSE} + DataVarName {} + DataLenName {} + minWidthSizeHint {TRUE} + minHeightSizeHint {TRUE} + maxWidthSizeHint {FALSE} + maxHeightSizeHint {FALSE} + FocusPolicy {NoFocus} + BackgroundMode {PaletteBackground} + FontPropagation {NoChildren} + 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.} + Alignment {1316} + AutoResize {FALSE} + Margin {-1} + Style {50} + LineWidth {1} + MidLineWidth {0} + FrameMargin {1} + Rect {5 118 455 107} + Name {Label_3} + MinimumSize {0 0} + MaximumSize {32767 32767} + BackgroundPixmap {} + UseBackgroundPixmap {FALSE} + AdjustSize {FALSE} + ReadPixmapFromData {FALSE} + DataVarName {} + DataLenName {} + minWidthSizeHint {TRUE} + minHeightSizeHint {TRUE} + maxWidthSizeHint {FALSE} + maxHeightSizeHint {FALSE} + FocusPolicy {NoFocus} + BackgroundMode {PaletteBackground} + FontPropagation {NoChildren} + 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.} + Alignment {1316} + AutoResize {FALSE} + Margin {-1} + Style {50} + LineWidth {1} + MidLineWidth {0} + FrameMargin {1} + Rect {5 230 455 108} + Name {Label_4} + MinimumSize {0 0} + MaximumSize {32767 32767} + BackgroundPixmap {} + UseBackgroundPixmap {FALSE} + AdjustSize {FALSE} + ReadPixmapFromData {FALSE} + DataVarName {} + DataLenName {} + minWidthSizeHint {TRUE} + minHeightSizeHint {TRUE} + maxWidthSizeHint {FALSE} + maxHeightSizeHint {FALSE} + FocusPolicy {NoFocus} + BackgroundMode {PaletteBackground} + FontPropagation {NoChildren} + PalettePropagation {NoChildren} +} + +Box_Layout-1{ + Direction {TopToBottom} + Border {5} + AutoBorder {5} + Name {} + Strut {0} + Stretch {1} +} +Layout_Widget-1.1{ + Widget {Label_2} + BoxStretch {1} + Alignment {36} +} +Layout_Widget-1.2{ + Widget {Label_3} + BoxStretch {1} + Alignment {36} +} +Layout_Widget-1.3{ + Widget {Label_4} + BoxStretch {1} + Alignment {36} +} +Box_Layout-1.4{ + Direction {LeftToRight} + Border {5} + AutoBorder {5} + Name {} + Strut {0} + Stretch {1} +} +Box_Stretch-1.4.1{ + Stretch {1} +} +Layout_Widget-1.4.2{ + Widget {PushButton_OK} + BoxStretch {1} + Alignment {36} +} +Box_Stretch-1.4.3{ + Stretch {1} +} +} diff --git a/src/frontends/kde/dlg/formcopyrightdialog.kdevdlg b/src/frontends/kde/dlg/formcopyrightdialog.kdevdlg deleted file mode 100644 index b6ea6d814a..0000000000 --- a/src/frontends/kde/dlg/formcopyrightdialog.kdevdlg +++ /dev/null @@ -1,87 +0,0 @@ -// KDevelop Dialog Editor File (.kdevdlg) -// -// Created by KDlgEdit Version 0.1alpha (C) 1999 by Pascal Krahmer -// Get KDevelop including KDlgEdit at "www.beast.de/kdevelop" -// -data Information -{ - Filename="/sinco/source/lyx/lyx-devel/src/frontends/kde/dlg/formcopyrightdialog.kdevdlg" - KDevelopVersion="1.1" - DlgEditVersion="0.1alpha" - LastChanged="Wed Aug 16 15:45:09 2000" -} - -data SessionManagement -{ - OpenedRoot_1="Appearance" - OpenedRoot_2="C++ Code" - OpenedRoot_3="General" - OpenedRoot_4="Geometry" - OpenedRootCount="4" -} - -item QWidget -{ - Name="NoName" - VarName="this" - X="0" - Y="0" - Width="400" - Height="400" - MinWidth="0" - MinHeight="0" - IsFixedSize="true" - - item QLabel - { - Name="NoName" - VarName="labelWho" - X="10" - Y="10" - Width="380" - Height="50" - MinWidth="0" - MinHeight="0" - Text="LyX is Copyright ( C) 1995 by Matthias Ettrich, \n1995-2000 LyX Team" - } - - item QLabel - { - Name="NoName" - VarName="labelGNU" - X="10" - Y="70" - Width="380" - Height="90" - MinWidth="0" - MinHeight="0" - 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." - } - - item QLabel - { - Name="NoName" - VarName="labelLyX" - X="10" - Y="170" - Width="380" - Height="180" - MinWidth="0" - MinHeight="0" - 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." - } - - item QPushButton - { - Name="NoName" - VarName="buttonOk" - X="130" - Y="360" - Width="140" - Height="30" - MinWidth="0" - MinHeight="0" - Text="OK" - isDefault="true" - } -} diff --git a/src/frontends/kde/formcopyrightdialog.C b/src/frontends/kde/formcopyrightdialog.C index 0d18e4bf91..52bc3a8985 100644 --- a/src/frontends/kde/formcopyrightdialog.C +++ b/src/frontends/kde/formcopyrightdialog.C @@ -1,35 +1,33 @@ -/*************************************************************************** - formcopyrightdialog.C - description - ------------------- - begin : Fri Feb 4 2000 - copyright : (C) 2000 by Jürgen Vigna - email : jug@sad.it - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/********************************************************************** + + --- Qt Architect generated file --- + + File: formcopyrightdialog.C + Last generated: Thu Oct 12 18:32:40 2000 + + *********************************************************************/ + #include "formcopyrightdialog.h" -FormCopyrightDialog::FormCopyrightDialog(QWidget *parent, const char *name, - bool, WFlags) - : QDialog(parent,name,false) +#define Inherited FormCopyrightDialogData + +FormCopyrightDialog::FormCopyrightDialog +( + QWidget* parent, + const char* name +) + : + Inherited( parent, name ) { - initDialog(); - labelWho->setAlignment(AlignHCenter | AlignVCenter); - labelWho->setFrameStyle(QFrame::Box | QFrame::Sunken); - labelGNU->setAlignment(AlignHCenter | AlignVCenter); - labelGNU->setFrameStyle(QFrame::Box | QFrame::Sunken); - labelLyX->setAlignment(AlignHCenter | AlignVCenter); - labelLyX->setFrameStyle(QFrame::Box | QFrame::Sunken); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(reject())); + setCaption(name); } + FormCopyrightDialog::~FormCopyrightDialog() { } + +void FormCopyrightDialog::clickedOK() +{ + hide(); +} diff --git a/src/frontends/kde/formcopyrightdialog.h b/src/frontends/kde/formcopyrightdialog.h index 13a073ef56..576c090027 100644 --- a/src/frontends/kde/formcopyrightdialog.h +++ b/src/frontends/kde/formcopyrightdialog.h @@ -1,52 +1,33 @@ -/*************************************************************************** - formcopyrightdialog.h - description - ------------------- - begin : Fri Feb 4 2000 - copyright : (C) 2000 by Jürgen Vigna - email : jug@sad.it - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef FORMCOPYRIGHTDIALOG_H -#define FORMCOPYRIGHTDIALOG_H - -//Generated area. DO NOT EDIT!!!(begin) -#include -#include -#include -//Generated area. DO NOT EDIT!!!(end) - -#include - -/** - *@author Jürgen Vigna - */ - -class FormCopyrightDialog : public QDialog { - Q_OBJECT -public: - FormCopyrightDialog(QWidget *parent=0, const char *name=0, - bool modal=false, WFlags f=0); - ~FormCopyrightDialog(); - -protected: - void initDialog(); - //Generated area. DO NOT EDIT!!!(begin) - QLabel *labelWho; - QLabel *labelGNU; - QLabel *labelLyX; - QPushButton *buttonOk; - //Generated area. DO NOT EDIT!!!(end) - -private: -}; +/********************************************************************** + + --- Qt Architect generated file --- + + File: formcopyrightdialog.h + Last generated: Thu Oct 12 18:32:40 2000 + + *********************************************************************/ + +#ifndef FormCopyrightDialog_included +#define FormCopyrightDialog_included + +#include "formcopyrightdialogdata.h" -#endif +class FormCopyrightDialog : public FormCopyrightDialogData +{ + Q_OBJECT + +public: + + FormCopyrightDialog + ( + QWidget* parent = NULL, + const char* name = NULL + ); + + virtual ~FormCopyrightDialog(); + +protected slots: + + virtual void clickedOK(); +}; +#endif // FormCopyrightDialog_included diff --git a/src/frontends/kde/formcopyrightdialogdata.C b/src/frontends/kde/formcopyrightdialogdata.C index 267ac84ca6..75cc7097c3 100644 --- a/src/frontends/kde/formcopyrightdialogdata.C +++ b/src/frontends/kde/formcopyrightdialogdata.C @@ -1,35 +1,141 @@ /********************************************************************** - --- KDevelop (KDlgEdit) generated file --- - - DO NOT EDIT!!! This file will be automatically - regenerated by KDevelop. All changes will be lost. - -**********************************************************************/ -#include "formcopyrightdialog.h" - -void FormCopyrightDialog::initDialog(){ - this->resize(400,400); - this->setMinimumSize(0,0); - this->setFixedSize(400,400); - labelWho= new QLabel(this,"NoName"); - labelWho->setGeometry(10,10,380,50); - labelWho->setMinimumSize(0,0); - labelWho->setText("LyX is Copyright ( C) 1995 by Matthias Ettrich, \n1995-2000 LyX Team"); - - labelGNU= new QLabel(this,"NoName"); - labelGNU->setGeometry(10,70,380,90); - labelGNU->setMinimumSize(0,0); - labelGNU->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."); - - labelLyX= new QLabel(this,"NoName"); - labelLyX->setGeometry(10,170,380,180); - labelLyX->setMinimumSize(0,0); - labelLyX->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."); - - buttonOk= new QPushButton(this,"NoName"); - buttonOk->setGeometry(130,360,140,30); - buttonOk->setMinimumSize(0,0); - buttonOk->setText("OK"); - buttonOk->setDefault(true); + --- Qt Architect generated file --- + + File: formcopyrightdialogdata.C + Last generated: Thu Oct 12 19:15:16 2000 + + DO NOT EDIT!!! This file will be automatically + regenerated by qtarch. All changes will be lost. + + *********************************************************************/ + +#include + +#include +#include +#include "formcopyrightdialogdata.h" + +#define Inherited QWidget + +#include + +FormCopyrightDialogData::FormCopyrightDialogData +( + QWidget* parent, + const char* name +) + : + Inherited( parent, name, 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( FALSE ); + buttonOk->setAutoDefault( TRUE ); + buttonOk->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-2000 LyX Team") ); + qtarch_Label_2->setAlignment( 1316 ); + qtarch_Label_2->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 ); + + 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 ); + + 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()); + 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 ); + 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->addStretch( 1 ); + resize( 465,455 ); + setMinimumSize( 200, 65 ); + setMaximumSize( 32767, 65 ); +} + + +FormCopyrightDialogData::~FormCopyrightDialogData() +{ +} +void FormCopyrightDialogData::clickedOK() +{ } diff --git a/src/frontends/kde/formcopyrightdialogdata.h b/src/frontends/kde/formcopyrightdialogdata.h new file mode 100644 index 0000000000..62e7642b3d --- /dev/null +++ b/src/frontends/kde/formcopyrightdialogdata.h @@ -0,0 +1,45 @@ +/********************************************************************** + + --- Qt Architect generated file --- + + File: formcopyrightdialogdata.h + Last generated: Thu Oct 12 19:15:16 2000 + + DO NOT EDIT!!! This file will be automatically + regenerated by qtarch. All changes will be lost. + + *********************************************************************/ + +#ifndef FormCopyrightDialogData_included +#define FormCopyrightDialogData_included + +#include +#include + +class FormCopyrightDialogData : public QWidget +{ + Q_OBJECT + +public: + + FormCopyrightDialogData + ( + QWidget* parent = NULL, + const char* name = NULL + ); + + virtual ~FormCopyrightDialogData(); + +public slots: + + +protected slots: + + virtual void clickedOK(); + +protected: + QPushButton* buttonOk; + +}; + +#endif // FormCopyrightDialogData_included -- 2.39.5