HPP += GuiErrorList.h
HPP += GuiERT.h
HPP += GuiExternal.h
-HPP += GuiFloatDialog.h
HPP += GuiFloat.h
HPP += GuiFontExample.h
HPP += GuiFontLoader.h
HPP += GuiFontMetrics.h
-HPP += GuiGraphicsDialog.h
HPP += GuiGraphics.h
-HPP += GuiGraphicsUi.h
HPP += GuiImage.h
HPP += GuiImplementation.h
HPP += GuiInclude.h
HPP += socket_callback.h
HPP += TocModel.h
HPP += TocWidget.h
-HPP += UrlView.h
HPP += Validator.h
CPP += Action.cpp
CPP += GuiERT.cpp
CPP += GuiExternal.cpp
CPP += GuiFloat.cpp
-CPP += GuiFloatDialog.cpp
CPP += GuiFontExample.cpp
CPP += GuiFontLoader.cpp
CPP += GuiFontMetrics.cpp
CPP += GuiGraphics.cpp
-CPP += GuiGraphicsDialog.cpp
CPP += GuiImage.cpp
CPP += GuiImplementation.cpp
CPP += GuiInclude.cpp
CPP += socket_callback.cpp
CPP += TocModel.cpp
CPP += TocWidget.cpp
-CPP += UrlView.cpp
CPP += Validator.cpp
UI += AboutUi.ui
GuiErrorList.h
GuiERT.h
GuiExternal.h
- GuiFloatDialog.h
GuiFloat.h
GuiFontExample.h
GuiFontLoader.h
- GuiGraphicsDialog.h
GuiGraphics.h
GuiGraphicsUi.h
GuiImage.h
Qt2BC.h
TocModel.h
TocWidget.h
- UrlView.h
Validator.h
qlkey.h
qt_helpers.h
GuiERT.cpp
GuiExternal.cpp
GuiFloat.cpp
- GuiFloatDialog.cpp
GuiFontExample.cpp
GuiFontLoader.cpp
GuiFontMetrics.cpp
GuiGraphics.cpp
- GuiGraphicsDialog.cpp
GuiImage.cpp
GuiImplementation.cpp
GuiInclude.cpp
Qt2BC.cpp
TocModel.cpp
TocWidget.cpp
- UrlView.cpp
Validator.cpp
alert_pimpl.cpp
qt_helpers.cpp
src/frontends/qt4/BulletsModule.cpp
src/frontends/qt4/Dialogs.cpp
src/frontends/qt4/FileDialog.cpp
-src/frontends/qt4/GuiApplication.cpp
-src/frontends/qt4/GuiView.cpp
-src/frontends/qt4/IconPalette.cpp
src/frontends/qt4/GuiAbout.cpp
+src/frontends/qt4/GuiApplication.cpp
src/frontends/qt4/GuiBibitem.cpp
src/frontends/qt4/GuiBibtex.cpp
src/frontends/qt4/GuiBox.cpp
src/frontends/qt4/GuiTexinfo.cpp
src/frontends/qt4/GuiThesaurus.cpp
src/frontends/qt4/GuiVSpace.cpp
+src/frontends/qt4/GuiView.cpp
src/frontends/qt4/GuiWrap.cpp
+src/frontends/qt4/IconPalette.cpp
src/frontends/qt4/Qt2BC.h
src/frontends/qt4/UrlView.cpp
src/frontends/qt4/Validator.cpp
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-06-01 18:19+0200\n"
"Last-Translator: Joan Montané <jmontane@gmail.com>\n"
"Language-Team: catalan <ca@li.org>\n"
msgid "Quit %1"
msgstr "Surt del LyX"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr "Icones petites"
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr "Icones normals"
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr "Icones grans"
-
-#: src/frontends/qt4/GuiView.cpp:194
-msgid "unknown version"
-msgstr "versió desconeguda"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr ""
msgid "Vertical Space Settings"
msgstr ""
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr "Icones petites"
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr "Icones normals"
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr "Icones grans"
+
+#: src/frontends/qt4/GuiView.cpp:194
+msgid "unknown version"
+msgstr "versió desconeguda"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr ""
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "espai"
msgstr ""
"Project-Id-Version: Lyx 1.5.0svn\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-07-09 04:42+0200\n"
"Last-Translator: Pavel Sanda <ps@ucw.cz>\n"
"Language-Team: Czech <LL@li.org>\n"
msgid "Quit %1"
msgstr "Ukonèit LyX"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr "Malé ikony"
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr "Normální ikony"
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr "Velké ikony"
-
-#: src/frontends/qt4/GuiView.cpp:194
-msgid "unknown version"
-msgstr "neznámá verze"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr "Kliknìte pro odpojení"
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Nastavení hesla bibliografie"
msgid "Vertical Space Settings"
msgstr "Nastavení vertikální mezery"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr "Malé ikony"
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr "Normální ikony"
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr "Velké ikony"
+
+#: src/frontends/qt4/GuiView.cpp:194
+msgid "unknown version"
+msgstr "neznámá verze"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Nastavení obtékání textu"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr "Kliknìte pro odpojení"
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "mezera"
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2006-11-07 18:46+0100\n"
"Last-Translator: Eulogio Serradilla <eulogio.sr@terra.es>\n"
"Language-Team: <es@li.org>\n"
msgid "Quit %1"
msgstr "Salir de LyX"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:194
-#, fuzzy
-msgid "unknown version"
-msgstr "Acción desconocida"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Configuración de entrada bibliográfica"
msgid "Vertical Space Settings"
msgstr "Configuración del espacio vertical"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+#, fuzzy
+msgid "unknown version"
+msgstr "Acción desconocida"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Configuración del ajuste de línea"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "espacio"
msgstr ""
"Project-Id-Version: lyx_1.5.0_eu\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2006-11-08 11:47+0000\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
msgid "Quit %1"
msgstr "Irten LyX-etik"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:194
-#, fuzzy
-msgid "unknown version"
-msgstr "Ekintza ezezaguna"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Bibliografia-sarreren ezarpenak"
msgid "Vertical Space Settings"
msgstr "Tarte bertikalaren ezarpenak"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+#, fuzzy
+msgid "unknown version"
+msgstr "Ekintza ezezaguna"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Testua doitzeko ezarpenak"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "tartea"
msgstr ""
"Project-Id-Version: LyX 1.4.3\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-07-18 08:48+0200\n"
"Last-Translator: Adrien Rebollo <adrien.rebollo@gmx.fr>\n"
"Language-Team: lyxfr \n"
msgid "Quit %1"
msgstr "Quitter %1"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:194
-#, fuzzy
-msgid "unknown version"
-msgstr "Action inconnue"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Paramètres d'Entrée de Bibliographie"
msgid "Vertical Space Settings"
msgstr "Paramètres d'espacement vertical"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+#, fuzzy
+msgid "unknown version"
+msgstr "Action inconnue"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Paramètres d'enrobage"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "espace"
msgstr ""
"Project-Id-Version: gl-1.5.0rc2\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-07-11 18:48+0200\n"
"Last-Translator: Ramon Flores <fa2ramon@usc.es>\n"
"Language-Team: Galician <gl@li.org>\n"
msgid "Quit %1"
msgstr "Sair de LyX"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr "Icones pequenos"
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr "Icones normais"
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr "Icones grandes"
-
-#: src/frontends/qt4/GuiView.cpp:194
-msgid "unknown version"
-msgstr "versión descoñecida"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr "Clique para separar"
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Configuración de entrada bibliográfica"
msgid "Vertical Space Settings"
msgstr "Configuración do espazo vertical"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr "Icones pequenos"
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr "Icones normais"
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr "Icones grandes"
+
+#: src/frontends/qt4/GuiView.cpp:194
+msgid "unknown version"
+msgstr "versión descoñecida"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Configuración do axuste de liña"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr "Clique para separar"
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "espazo"
msgstr ""
"Project-Id-Version: hu\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-07-24 18:18+0100\n"
"Last-Translator: Alex <alex@lyx.hu>\n"
"Language-Team: LyX <alex@lyx.org>\n"
msgid "Quit %1"
msgstr "Kilépés LyX-bõl"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr "Kis-méretû ikonok"
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr "Normál-méretû ikonok"
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr "Nagy-méretû ikonok"
-
-#: src/frontends/qt4/GuiView.cpp:194
-msgid "unknown version"
-msgstr "ismeretlen verzió"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr "Kattintson ide a leválasztáshoz"
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Irodalomjegyzék elem beállítások"
msgid "Vertical Space Settings"
msgstr "Függõleges kitöltés beállításai"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr "Kis-méretû ikonok"
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr "Normál-méretû ikonok"
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr "Nagy-méretû ikonok"
+
+#: src/frontends/qt4/GuiView.cpp:194
+msgid "unknown version"
+msgstr "ismeretlen verzió"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Körbefuttatás beállításai"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr "Kattintson ide a leválasztáshoz"
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "szóköz"
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2006-09-18 16:03+0200\n"
"Last-Translator: Kostantino <ciclope10ATalice.it>\n"
"Language-Team: italiano <it@li.org>\n"
msgid "Quit %1"
msgstr "Chiudi LyX"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:194
-#, fuzzy
-msgid "unknown version"
-msgstr "Azione sconosciuta"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Impostazioni voce bibliografica"
msgid "Vertical Space Settings"
msgstr "Impostazioni spazio verticale"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+#, fuzzy
+msgid "unknown version"
+msgstr "Azione sconosciuta"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Impostazioni testo a capo"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "spazio"
msgstr ""
"Project-Id-Version: LyX 1.4.4\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-05-15 16:13+0900\n"
"Last-Translator: cghan <cghan@pusan.ac.kr>\n"
"Language-Team: hangul <ko@li.org>\n"
msgid "Quit %1"
msgstr ""
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:194
-msgid "unknown version"
-msgstr "¸ð¸£´Â ÆÇ(version)"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr ""
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Âü°í ¹®Çå ¸ñ·Ï ±âÀç »çÇ× ±¸¼º(Bibliography Entry Settings)"
msgid "Vertical Space Settings"
msgstr ""
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+msgid "unknown version"
+msgstr "¸ð¸£´Â ÆÇ(version)"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr ""
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "º»¹® °¨½Î±â ±¸¼º(Text Wrap Settings)"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "°ø°£(space)"
msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-06-26 21:34+0200\n"
"Last-Translator: Ingar Pareliussen <ingarp_ved_samfundet.no>\n"
"Language-Team: Nynorsk <nn@li.org>\n"
msgid "Quit %1"
msgstr "Skru av LyX"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr "Små ikon"
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr "Normale ikon"
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr "Store ikon"
-
-#: src/frontends/qt4/GuiView.cpp:194
-msgid "unknown version"
-msgstr "ukjent versjon"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Val for litteraturnøkkel"
msgid "Vertical Space Settings"
msgstr "Val for loddrettmellomrom"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr "Små ikon"
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr "Normale ikon"
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr "Store ikon"
+
+#: src/frontends/qt4/GuiView.cpp:194
+msgid "unknown version"
+msgstr "ukjent versjon"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Tekst brekkingval"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "mellomrom"
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2006-07-04 00:28+0200\n"
"Last-Translator: Andrzej Tomaszewski <tomaszewski@wne.uw.edu.pl>\n"
"Language-Team: Polski <pl@li.org>\n"
msgid "Quit %1"
msgstr "Zamknij LyX-a"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:194
-#, fuzzy
-msgid "unknown version"
-msgstr "Nieznane polecenie"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Ustawienia pozycji bibliografii"
msgid "Vertical Space Settings"
msgstr "Ustawienia odstêpów pionowych"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+#, fuzzy
+msgid "unknown version"
+msgstr "Nieznane polecenie"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Ustawienia oblewania tekstem"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "odstêp"
msgstr ""
"Project-Id-Version: pt\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-08-13 22:59+0100\n"
"Last-Translator: Susana Barbosa <susana.barbosa@fc.up.pt>\n"
"Language-Team: <en@li.org>\n"
msgid "Quit %1"
msgstr "Sair do LyX"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr "Ícons de tamanho pequeno"
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr "Ícons de tamanho normal"
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr "Ícons de tamanho grande"
-
-#: src/frontends/qt4/GuiView.cpp:194
-msgid "unknown version"
-msgstr "versão desconhecida"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr "Clicar para destacar"
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Configurações de Ítem Bibliográfico"
msgid "Vertical Space Settings"
msgstr "Configurações de Espaço Vertical"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr "Ícons de tamanho pequeno"
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr "Ícons de tamanho normal"
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr "Ícons de tamanho grande"
+
+#: src/frontends/qt4/GuiView.cpp:194
+msgid "unknown version"
+msgstr "versão desconhecida"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Configurações de Repartição de Texto"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr "Clicar para destacar"
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "Espaço"
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2007-02-20 21:33-0500\n"
"Last-Translator: Marius Ionescu <felijohn@gmail.com>\n"
"Language-Team: Romanian <ro-kde@yahoogroups.com>\n"
msgid "Quit %1"
msgstr "Despre LyX"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:194
-#, fuzzy
-msgid "unknown version"
-msgstr "necunoscut"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr ""
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
#, fuzzy
msgid "Bibliography Entry Settings"
msgid "Vertical Space Settings"
msgstr "Spaþiere verticalã:|#e"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+#, fuzzy
+msgid "unknown version"
+msgstr "necunoscut"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr ""
+
#: src/frontends/qt4/GuiWrap.cpp:83
#, fuzzy
msgid "Text Wrap Settings"
msgstr "Setãri tabel"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
#, fuzzy
msgid "space"
msgstr ""
"Project-Id-Version: LyX 1.3.6\n"
"Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-31 20:10+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
"PO-Revision-Date: 2006-07-01 11:06+0200\n"
"Last-Translator: Gürer Özen <gurer@pardus.org.tr>\n"
"Language-Team: Turkish <tr@li.org>\n"
msgid "Quit %1"
msgstr "Çýk"
-#: src/frontends/qt4/GuiView.cpp:161
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:167
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:173
-msgid "Big-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:194
-#, fuzzy
-msgid "unknown version"
-msgstr "Bilinmeyen kullanýcý"
-
-#: src/frontends/qt4/GuiView.cpp:756
-msgid "LyX"
-msgstr "LyX"
-
-#: src/frontends/qt4/IconPalette.cpp:39
-msgid "Click to detach"
-msgstr ""
-
#: src/frontends/qt4/GuiBibitem.cpp:69
msgid "Bibliography Entry Settings"
msgstr "Kaynakça Giriþ Ayarlarý"
msgid "Vertical Space Settings"
msgstr "Düþey Boþluk Ayarlarý"
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+#, fuzzy
+msgid "unknown version"
+msgstr "Bilinmeyen kullanýcý"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
#: src/frontends/qt4/GuiWrap.cpp:83
msgid "Text Wrap Settings"
msgstr "Tablo Dönüþ Ayarlarý"
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
#: src/frontends/qt4/Validator.cpp:153
msgid "space"
msgstr "boþluk"
#include "GuiTexinfo.h"
#include "GuiToc.h"
#include "TocWidget.h"
-#include "UrlView.h"
+#include "GuiURLDialog.h"
#include "GuiVSpace.h"
#include "GuiWrap.h"
dialog->bc().bp(new OkCancelPolicy);
} else if (name == "mathdelimiter") {
dialog->setController(new ControlMath(*dialog));
- dialog->setView(new GuiMathDelimiter(*dialog));
+ dialog->setView(new GuiDelimiter(*dialog));
dialog->bc().bp(new IgnorantPolicy);
} else if (name == "mathmatrix") {
dialog->setController(new ControlMath(*dialog));
namespace frontend {
-typedef QController<ControlAboutlyx, GuiView<GuiAboutDialog> > AboutBase;
-
GuiAbout::GuiAbout(Dialog & parent)
- : AboutBase(parent, _("About LyX"))
+ : GuiView<GuiAboutDialog>(parent, _("About LyX"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef FORMABOUT_H
-#define FORMABOUT_H
+#ifndef GUIABOUT_H
+#define GUIABOUT_H
#include "GuiDialogView.h"
+#include "ControlAboutlyx.h"
#include "ui_AboutUi.h"
+
#include <QDialog>
namespace lyx {
namespace frontend {
-class ControlAboutlyx;
-
class GuiAboutDialog : public QDialog, public Ui::AboutUi {
Q_OBJECT
public:
};
-class GuiAbout
- : public QController<ControlAboutlyx, GuiView<GuiAboutDialog> >
+class GuiAbout : public GuiView<GuiAboutDialog>
{
public:
GuiAbout(Dialog &);
+ /// parent controller
+ ControlAboutlyx & controller()
+ { return static_cast<ControlAboutlyx &>(this->getController()); }
+ /// parent controller
+ ControlAboutlyx const & controller() const
+ { return static_cast<ControlAboutlyx const &>(this->getController()); }
private:
/// not needed
virtual void apply() {}
} // namespace frontend
} // namespace lyx
-#endif // FORMABOUT_H
+#endif // GUIABOUT_H
using namespace lyx::graphics;
- Image::newImage = boost::bind(&QLImage::newImage);
- Image::loadableFormats = boost::bind(&QLImage::loadableFormats);
+ Image::newImage = boost::bind(&GuiImage::newImage);
+ Image::loadableFormats = boost::bind(&GuiImage::loadableFormats);
// needs to be done before reading lyxrc
lyxrc.dpi = getDPI();
/**
- * \file qt4/GuiApplication.h
+ * \file GuiApplication.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* Full author contact details are available in file CREDITS.
*/
-#ifndef QT4_APPLICATION_H
-#define QT4_APPLICATION_H
+#ifndef GUIAPPLICATION_H
+#define GUIAPPLICATION_H
#include "ColorCache.h"
#include "GuiFontLoader.h"
/// Method inherited from \c Application class
//@{
- virtual Clipboard& clipboard();
- virtual Selection& selection();
+ virtual Clipboard & clipboard();
+ virtual Selection & selection();
virtual FontLoader & fontLoader() { return font_loader_; }
virtual int const exec();
virtual Gui & gui() { return gui_; }
} // namespace lyx
-#endif // QT4_APPLICATION_H
+#endif // GUIAPPLICATION_H
#include "Qt2BC.h"
#include "qt_helpers.h"
-#include "controllers/ControlCommand.h"
-
+#include <QCloseEvent>
#include <QLineEdit>
#include <QPushButton>
/////////////////////////////////////////////////////////////////////
//
-// QBibItemDialog
+// GuiBibItemDialog
//
/////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////
//
-// QBibItem
+// GuiBibItem
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlCommand, GuiView<GuiBibitemDialog> > BibItemBase;
-
GuiBibitem::GuiBibitem(Dialog & parent)
- : BibItemBase(parent, _("Bibliography Entry Settings"))
+ : GuiView<GuiBibitemDialog>(parent, _("Bibliography Entry Settings"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QBIBITEM_CONTROLLER_H
-#define QBIBITEM_CONTROLLER_H
+#ifndef GUIBIBITEM_H
+#define GUIBIBITEM_H
#include "GuiDialogView.h"
-
+#include "ControlCommand.h"
#include "ui_BibitemUi.h"
#include <QDialog>
-#include <QCloseEvent>
namespace lyx {
};
-class ControlCommand;
-
-class GuiBibitem
- : public QController<ControlCommand, GuiView<GuiBibitemDialog> >
+class GuiBibitem : public GuiView<GuiBibitemDialog>
{
public:
- friend class GuiBibitemDialog;
-
+ ///
GuiBibitem(Dialog &);
-
+ /// parent controller
+ ControlCommand & controller()
+ { return static_cast<ControlCommand &>(this->getController()); }
+ /// parent controller
+ ControlCommand const & controller() const
+ { return static_cast<ControlCommand const &>(this->getController()); }
protected:
virtual bool isValid();
private:
+ friend class GuiBibitemDialog;
/// Apply changes
virtual void apply();
/// update
} // namespace frontend
} // namespace lyx
-#endif // QBIBITEM_H
+#endif // GUIBIBITEM_H
#include "controllers/ControlBibtex.h"
#include "controllers/ButtonPolicy.h"
-#include "controllers/ControlBibtex.h"
-
#include "support/filetools.h" // changeExtension
#include "support/lstrings.h"
#include <QCloseEvent>
#include <QLineEdit>
-using lyx::support::changeExtension;
-using lyx::support::split;
-using lyx::support::trim;
-
-using std::vector;
-using std::string;
-
#include "debug.h"
#include "support/filetools.h"
#include "support/lstrings.h"
+using std::vector;
+using std::string;
+
namespace lyx {
namespace frontend {
+using support::changeExtension;
+using support::split;
+using support::trim;
+
/////////////////////////////////////////////////////////////////////
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlBibtex, GuiView<GuiBibtexDialog> > BibtexBase;
-
GuiBibtex::GuiBibtex(Dialog & parent)
- : BibtexBase(parent, _("BibTeX Bibliography"))
+ : GuiView<GuiBibtexDialog>(parent, _("BibTeX Bibliography"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QBIBTEX_H
-#define QBIBTEX_H
+#ifndef GUIBIBTEX_H
+#define GUIBIBTEX_H
#include "GuiDialogView.h"
-
+#include "ButtonController.h"
+#include "ControlBibtex.h"
#include "ui_BibtexUi.h"
#include "ui_BibtexAddUi.h"
-#include "ButtonController.h"
-
-#include <QCloseEvent>
#include <QDialog>
namespace lyx {
};
-class ControlBibtex;
-
-class GuiBibtex
- : public QController<ControlBibtex, GuiView<GuiBibtexDialog> >
+class GuiBibtex : public GuiView<GuiBibtexDialog>
{
public:
friend class GuiBibtexDialog;
GuiBibtex(Dialog &);
+ /// parent controller
+ ControlBibtex & controller()
+ { return static_cast<ControlBibtex &>(this->getController()); }
+ /// parent controller
+ ControlBibtex const & controller() const
+ { return static_cast<ControlBibtex const &>(this->getController()); }
protected:
virtual bool isValid();
private:
} // namespace frontend
} // namespace lyx
-#endif // QBIBTEX_H
+#endif // GUIBIBTEX_H
//
//////////////////////////////////////////////////////////////////
-typedef QController<ControlBox, GuiView<GuiBoxDialog> > box_base_class;
GuiBox::GuiBox(Dialog & parent)
- : box_base_class(parent, _("Box Settings"))
+ : GuiView<GuiBoxDialog>(parent, _("Box Settings"))
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QBOX_H
-#define QBOX_H
+#ifndef GUIBOX_H
+#define GUIBOX_H
#include "GuiDialogView.h"
-
+#include "ControlBox.h"
#include "ui_BoxUi.h"
-#include <QCloseEvent>
#include <QDialog>
#include <vector>
namespace lyx {
namespace frontend {
-class ControlBox;
class GuiBox;
class GuiBoxDialog : public QDialog, public Ui::BoxUi {
};
-///
-class GuiBox
- : public QController<ControlBox, GuiView<GuiBoxDialog> >
+class GuiBox : public GuiView<GuiBoxDialog>
{
public:
- ///
- friend class GuiBoxDialog;
///
GuiBox(Dialog &);
+ /// parent controller
+ ControlBox & controller()
+ { return static_cast<ControlBox &>(this->getController()); }
+ /// parent controller
+ ControlBox const & controller() const
+ { return static_cast<ControlBox const &>(this->getController()); }
/// add and remove special lengths
void setSpecial(bool ibox);
/// only show valid inner box items
void setInnerType(bool frameless, int i);
private:
+ ///
+ friend class GuiBoxDialog;
/// Apply changes
virtual void apply();
/// update
} // namespace frontend
} // namespace lyx
-#endif // QBOX_H
+#endif // GUIBOX_H
#include "BranchList.h"
-#include "controllers/ControlBranch.h"
-
#include "insets/InsetBranch.h"
#include <QPushButton>
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlBranch, GuiView<GuiBranchDialog> > branch_base_class;
-
GuiBranch::GuiBranch(Dialog & parent)
- : branch_base_class(parent, _("Branch Settings"))
+ : GuiView<GuiBranchDialog>(parent, _("Branch Settings"))
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QBRANCH_H
-#define QBRANCH_H
+#ifndef GUIBRANCH_H
+#define GUIBRANCH_H
#include "GuiDialogView.h"
+#include "ControlBranch.h"
#include "ui_BranchUi.h"
-#include <QCloseEvent>
#include <QDialog>
namespace lyx {
GuiBranch * form_;
};
-class ControlBranch;
/** This class provides a QT implementation of the Branch Dialog.
*/
-class GuiBranch : public QController<ControlBranch, GuiView<GuiBranchDialog> >
+class GuiBranch : public GuiView<GuiBranchDialog>
{
public:
- friend class GuiBranchDialog;
-
/// Constructor
GuiBranch(Dialog &);
+ /// parent controller
+ ControlBranch & controller()
+ { return static_cast<ControlBranch &>(this->getController()); }
+ /// parent controller
+ ControlBranch const & controller() const
+ { return static_cast<ControlBranch const &>(this->getController()); }
private:
+ friend class GuiBranchDialog;
+
/// Apply changes
virtual void apply();
/// Build the dialog
} // namespace frontend
} // namespace lyx
-#endif // QBRANCH_H
+#endif // GUIBRANCH_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QBRANCHES_H
-#define QBRANCHES_H
+#ifndef GUIBRANCHES_H
+#define GUIBRANCHES_H
#include "ui_BranchesUi.h"
#include "GuiDocument.h"
namespace frontend {
-
class GuiBranches: public QWidget, public Ui::BranchesUi
{
Q_OBJECT
void on_colorPB_clicked();
private:
-
/// Contains all legal branches for this doc
BranchList branchlist_;
-
};
} // namespace frontend
} // namespace lyx
-#endif // DOCUMENTDIALOG_H
+#endif // GUIBRANCHES
#include "support/lstrings.h"
-#include "controllers/ControlChanges.h"
-
-#include <QPushButton>
#include <QCloseEvent>
#include <QTextBrowser>
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlChanges, GuiView<GuiChangesDialog> > ChangesBase;
-
GuiChanges::GuiChanges(Dialog & parent)
- : ChangesBase(parent, _("Merge Changes"))
+ : GuiView<GuiChangesDialog>(parent, _("Merge Changes"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QCHANGES_H
-#define QCHANGES_H
+#ifndef GUICHANGES_H
+#define GUICHANGES_H
#include "GuiDialogView.h"
+#include "ControlChanges.h"
#include "ui_ChangesUi.h"
-#include <QCloseEvent>
+
#include <QDialog>
namespace lyx {
GuiChanges * form_;
};
-class ControlChanges;
-class GuiChanges
- : public QController<ControlChanges, GuiView<GuiChangesDialog> >
+class GuiChanges : public GuiView<GuiChangesDialog>
{
public:
- friend class GuiChangesDialog;
-
+ ///
GuiChanges(Dialog &);
+ /// parent controller
+ ControlChanges & controller()
+ { return static_cast<ControlChanges &>(this->getController()); }
+ /// parent controller
+ ControlChanges const & controller() const
+ { return static_cast<ControlChanges const &>(this->getController()); }
void accept();
void next();
private:
+ friend class GuiChangesDialog;
/// Apply changes
virtual void apply() {};
/// update
} // namespace frontend
} // namespace lyx
-#endif // QCHANGES_H
+#endif // GUICHANGES_H
#include <config.h>
#include "GuiCharacter.h"
-#include "ControlCharacter.h"
#include "Qt2BC.h"
#include "qt_helpers.h"
-
+#include "frontend_helpers.h"
#include "Color.h"
-
#include <QCloseEvent>
using std::vector;
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlCharacter, GuiView<GuiCharacterDialog> > CharacterBase;
GuiCharacter::GuiCharacter(Dialog & parent)
- : CharacterBase(parent, _("Text Style"))
+ : GuiView<GuiCharacterDialog>(parent, _("Text Style"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QCHARACTER_H_CONTROLLER
-#define QCHARACTER_H_CONTROLLER
+#ifndef GUICHARACTER_H
+#define GUICHARACTER_H
#include "GuiDialogView.h"
+#include "ControlCharacter.h"
#include "ui_CharacterUi.h"
-#include <QDialog>
-#include "controllers/frontend_helpers.h"
+#include <QDialog>
#include <vector>
namespace lyx {
-
-class Font;
-
namespace frontend {
class GuiCharacter;
};
-class ControlCharacter;
-
-class GuiCharacter
- : public QController<ControlCharacter, GuiView<GuiCharacterDialog> >
+class GuiCharacter : public GuiView<GuiCharacterDialog>
{
public:
friend class GuiCharacterDialog;
GuiCharacter(Dialog &);
+ /// parent controller
+ ControlCharacter & controller()
+ { return static_cast<ControlCharacter &>(this->getController()); }
+ /// parent controller
+ ControlCharacter const & controller() const
+ { return static_cast<ControlCharacter const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QCHARACTER_H
+#endif // GUICHARACTER_H
* \author Angus Leeming
* \author Kalle Dalheimer
* \author Abdelrazak Younes
- * \author Richard Heck (adapted to QSelectionManager)
+ * \author Richard Heck
*
* Full author contact details are available in file CREDITS.
*/
-#ifndef QCITATION_H
-#define QCITATION_H
+#ifndef GUICITATION_H
+#define GUICITATION_H
-#include "frontends/controllers/ControlCitation.h"
+#include "ControlCitation.h"
#include "support/docstring.h"
#include <QStringList>
private:
/// available keys.
QStringListModel available_model_;
-
/// selected keys.
QStringListModel selected_model_;
-
/// All keys.
QStringList all_keys_;
-
/// Cited keys.
QStringList cited_keys_;
};
} // namespace frontend
} // namespace lyx
-#endif // QCITATION_H
+#endif // GUICITATION_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QCITATIONDIALOG_H
-#define QCITATIONDIALOG_H
+#ifndef GUICITATIONDIALOG_H
+#define GUICITATIONDIALOG_H
#include "Dialog.h"
#include "GuiSelectionManager.h"
} // namespace frontend
} // namespace lyx
-#endif // QCITATIOINDIALOG_H
+#endif // GUICITATIOINDIALOG_H
// -*- C++ -*-
/**
- * \file qt4/GuiClipboard.h
+ * \file GuiClipboard.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* Full author contact details are available in file CREDITS.
*/
-#ifndef CLIPBOARD_H
-#define CLIPBOARD_H
+#ifndef GUICLIPBOARD_H
+#define GUICLIPBOARD_H
#include "frontends/Clipboard.h"
/**
* The Qt4 version of the Clipboard.
*/
-class GuiClipboard: public Clipboard
+class GuiClipboard : public Clipboard
{
public:
virtual ~GuiClipboard() {}
} // namespace frontend
} // namespace lyx
-#endif // CLIPBOARD_H
+#endif // GUICLIPBOARD_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QCOMMANDBUFFER_H
-#define QCOMMANDBUFFER_H
+#ifndef GUICOMMANDBUFFER_H
+#define GUICOMMANDBUFFER_H
-#include "controllers/ControlCommandBuffer.h"
+#include "ControlCommandBuffer.h"
#include <QWidget>
private:
/// owning view
GuiViewBase * view_;
-
/// controller
ControlCommandBuffer controller_;
-
/// command widget
GuiCommandEdit * edit_;
};
} // namespace frontend
} // namespace lyx
-#endif // QCOMMANDBUFFER_H
+#endif // GUICOMMANDBUFFER_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QCOMMANDEDIT_H
-#define QCOMMANDEDIT_H
+#ifndef GUICOMMANDEDIT_H
+#define GUICOMMANDEDIT_H
#include <QLineEdit>
#include <QKeyEvent>
class GuiCommandEdit : public QLineEdit {
Q_OBJECT
+
public:
GuiCommandEdit(QWidget * parent);
+
Q_SIGNALS:
/// cancel
void escapePressed();
} // namespace frontend
} // namespace lyx
-#endif // QCOMMANDEDIT_H
+#endif // GUICOMMANDEDIT_H
#include "GuiApplication.h"
#include "GuiView.h"
-
#include "qt_helpers.h"
-#include "controllers/ControlMath.h"
-
#include "gettext.h"
#include <QPixmap>
} // namespace anon
-typedef QController<ControlMath, GuiView<GuiDelimiterDialog> > delimiter_base;
-
-GuiMathDelimiter::GuiMathDelimiter(Dialog & parent)
- : delimiter_base(parent, _("Math Delimiter"))
+GuiDelimiter::GuiDelimiter(Dialog & parent)
+ : GuiView<GuiDelimiterDialog>(parent, _("Math Delimiter"))
{}
-void GuiMathDelimiter::build_dialog()
+void GuiDelimiter::build_dialog()
{
dialog_.reset(new GuiDelimiterDialog(this,
static_cast<GuiViewBase *>(controller().view())));
}
-GuiDelimiterDialog::GuiDelimiterDialog(GuiMathDelimiter * form, QWidget * parent)
+GuiDelimiterDialog::GuiDelimiterDialog(GuiDelimiter * form, QWidget * parent)
: QDialog(parent), form_(form)
{
setupUi(this);
* Full author contact details are available in file CREDITS.
*/
-#ifndef QDELIMITERDIALOG_H
-#define QDELIMITERDIALOG_H
+#ifndef GUIDELIMITERDIALOG_H
+#define GUIDELIMITERDIALOG_H
#include "GuiDialogView.h"
-
+#include "ControlMath.h"
#include "ui_DelimiterUi.h"
-#include <string>
-
class QListWidgetItem;
namespace lyx {
namespace frontend {
class ControlMath;
-class GuiMathDelimiter;
+class GuiDelimiter;
-class GuiDelimiterDialog : public QDialog, public Ui::DelimiterUi {
+class GuiDelimiterDialog : public QDialog, public Ui::DelimiterUi
+{
Q_OBJECT
public:
- GuiDelimiterDialog(GuiMathDelimiter * form, QWidget * parent);
+ GuiDelimiterDialog(GuiDelimiter * form, QWidget * parent);
public Q_SLOTS:
void on_leftLW_itemActivated(QListWidgetItem *);
void on_rightLW_itemActivated(QListWidgetItem *);
///
void updateTeXCode(int size);
/// owning form
- GuiMathDelimiter * form_;
+ GuiDelimiter * form_;
/// TeX code that will be inserted.
QString tex_code_;
};
-class GuiMathDelimiter : public QController<ControlMath, GuiView<GuiDelimiterDialog> > {
+class GuiDelimiter : public GuiView<GuiDelimiterDialog>
+{
public:
friend class GuiDelimiterDialog;
-
- GuiMathDelimiter(Dialog &);
-
+ ///
+ GuiDelimiter(Dialog &);
+ /// parent controller
+ ControlMath & controller()
+ { return static_cast<ControlMath &>(this->getController()); }
+ /// parent controller
+ ControlMath const & controller() const
+ { return static_cast<ControlMath const &>(this->getController()); }
private:
virtual void apply() {}
virtual void update_contents() {}
} // namespace frontend
} // namespace lyx
-#endif // QDELIMITERDIALOG_H
+#endif // GUIDELIMITERDIALOG_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QDIALOGVIEW_H
-#define QDIALOGVIEW_H
+#ifndef GUIDIALOGVIEW_H
+#define GUIDIALOGVIEW_H
#include "Dialog.h"
boost::scoped_ptr<GUIDialog> dialog_;
};
-
-template <class Controller, class Base>
-class QController: public Base
-{
-protected:
- ///
- QController(Dialog & p, docstring const & t): Base(p, t)
- {}
-public:
- /// The parent controller
- Controller & controller()
- { return static_cast<Controller &>(this->getController()); }
-
- /// The parent controller
- Controller const & controller() const
- { return static_cast<Controller const &>(this->getController()); }
-};
-
} // namespace frontend
} // namespace lyx
-#endif // QDIALOGVIEW_H
+#endif // GUIDIALOGVIEW_H
#include "GuiViewSource.h" // For latexHighlighter use in the preamble.
-#include "controllers/ControlDocument.h"
-
#include "BufferParams.h"
#include "Encoding.h"
#include "gettext.h"
#include "Spacing.h"
#include "insets/InsetListingsParams.h"
-#include "controllers/ControlDocument.h"
#include "support/lstrings.h"
/////////////////////////////////////////////////////////////////////
//
-// Document
+// GuiDocument
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlDocument, GuiView<GuiDocumentDialog> >
- DocumentBase;
-
GuiDocument::GuiDocument(Dialog & parent)
- : DocumentBase(parent, _("Document Settings"))
+ : GuiView<GuiDocumentDialog>(parent, _("Document Settings"))
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QDOCUMENT_H
-#define QDOCUMENT_H
+#ifndef GUIDOCUMENT_H
+#define GUIDOCUMENT_H
#include "GuiDialogView.h"
#include "BulletsModule.h"
+#include "ControlDocument.h"
#include "ui_DocumentUi.h"
#include "ui_FontUi.h"
#include "ui_BiblioUi.h"
#include "ui_NumberingUi.h"
#include "ui_MarginsUi.h"
-
-// For the Preamble module
#include "ui_PreambleUi.h"
-#include <QCloseEvent>
#include <QDialog>
#include <vector>
class FloatPlacement;
template<class UI>
-class UiWidget: public QWidget, public UI
+class UiWidget : public QWidget, public UI
{
public:
UiWidget(QWidget * parent = 0) : QWidget(parent)
};
-class ControlDocument;
-
-class GuiDocument
- : public QController<ControlDocument, GuiView<GuiDocumentDialog> >
+class GuiDocument : public GuiView<GuiDocumentDialog>
{
public:
GuiDocument(Dialog &);
void showPreamble();
-
+ /// parent controller
+ ControlDocument & controller()
+ { return static_cast<ControlDocument &>(this->getController()); }
+ /// parent controller
+ ControlDocument const & controller() const
+ { return static_cast<ControlDocument const &>(this->getController()); }
private:
/// Apply changes
void apply();
};
-
} // namespace frontend
} // namespace lyx
-#endif // QDOCUMENT_H
+#endif // GUIDOCUMENT_H
#include "GuiERT.h"
#include "Qt2BC.h"
-#include "controllers/ControlERT.h"
-
#include <QRadioButton>
#include <QPushButton>
#include <QCloseEvent>
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlERT, GuiView<GuiERTDialog> > ERTBase;
-
-
GuiERT::GuiERT(Dialog & parent)
- : ERTBase(parent, _("TeX Code Settings"))
+ : GuiView<GuiERTDialog>(parent, _("TeX Code Settings"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef GuiERT_H
-#define GuiERT_H
+#ifndef GUIERT_H
+#define GUIERT_H
#include "GuiDialogView.h"
+#include "ControlERT.h"
#include "ui_ERTUi.h"
#include <QCloseEvent>
class GuiERT;
-class GuiERTDialog : public QDialog, public Ui::ERTUi {
+class GuiERTDialog : public QDialog, public Ui::ERTUi
+{
Q_OBJECT
public:
GuiERTDialog(GuiERT * form);
};
-
-class ControlERT;
-
-class GuiERT : public QController<ControlERT, GuiView<GuiERTDialog> >
+class GuiERT : public GuiView<GuiERTDialog>
{
public:
- friend class GuiERTDialog;
-
+ /// constructor
GuiERT(Dialog &);
+ /// parent controller
+ ControlERT & controller()
+ { return static_cast<ControlERT &>(this->getController()); }
+ /// parent controller
+ ControlERT const & controller() const
+ { return static_cast<ControlERT const &>(this->getController()); }
private:
+ friend class GuiERTDialog;
/// Apply changes
virtual void apply();
/// update
} // namespace frontend
} // namespace lyx
-#endif // GuiERT_H
+#endif // GUIERT_H
#include <config.h>
-
#include "GuiEmbeddedFiles.h"
#include "Qt2BC.h"
#include "debug.h"
-using std::string;
-
namespace lyx {
namespace frontend {
// GuiEmbeddedFilesDialog
//
/////////////////////////////////////////////////////////////////////
-#define INVALID_COLOR "gray"
-#define AUTO_COLOR "green"
-#define EMBEDDED_COLOR "black"
-#define EXTERNAL_COLOR "blue"
+
+static QString const INVALID_COLOR = "gray";
+static QString const AUTO_COLOR = "green";
+static QString const EMBEDDED_COLOR = "black";
+static QString const EXTERNAL_COLOR = "blue";
GuiEmbeddedFilesDialog::GuiEmbeddedFilesDialog(GuiEmbeddedFiles * form)
: form_(form)
// FIXME.
// ACTION
- string action = fromqstr(actionCB->currentText());
+ QString action = actionCB->currentText();
if (action == "Add file") {
} else if (action == "Extract file") {
} else if (action == "Extract all") {
#include "Qt2BC.h"
#include "qt_helpers.h"
-#include "controllers/ControlErrorList.h"
-
#include <QListWidget>
#include <QTextBrowser>
#include <QPushButton>
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlErrorList, GuiView<GuiErrorListDialog> >
- ErrorListBase;
-
GuiErrorList::GuiErrorList(Dialog & parent)
- : ErrorListBase(parent, docstring())
+ : GuiView<GuiErrorListDialog>(parent, docstring())
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QERRORLIST_H
-#define QERRORLIST_H
+#ifndef GUIERRORLIST_H
+#define GUIERRORLIST_H
#include "GuiDialogView.h"
+#include "ControlErrorList.h"
#include "ui_ErrorListUi.h"
#include <QDialog>
class QListWidgetItem;
-class QCloseEvent;
-class QShowEvent;
namespace lyx {
namespace frontend {
};
-class ControlErrorList;
-
-class GuiErrorList :
- public QController<ControlErrorList, GuiView<GuiErrorListDialog> >
+class GuiErrorList : public GuiView<GuiErrorListDialog>
{
public:
friend class GuiErrorListDialog;
GuiErrorList(Dialog &);
+ /// parent controller
+ ControlErrorList & controller()
+ { return static_cast<ControlErrorList &>(this->getController()); }
+ /// parent controller
+ ControlErrorList const & controller() const
+ { return static_cast<ControlErrorList const &>(this->getController()); }
private:
/// select an entry
void select(QListWidgetItem *);
} // namespace frontend
} // namespace lyx
-#endif // QERRORLIST_H
+#endif // GUIERRORLIST_H
#include "lengthcommon.h"
#include "LyXRC.h"
-#include "controllers/ControlExternal.h"
#include "controllers/ButtonController.h"
#include "insets/ExternalTemplate.h"
} // namespace anon
-typedef QController<ControlExternal, GuiView<GuiExternalDialog> >
- ExternalBase;
-
GuiExternal::GuiExternal(Dialog & parent)
- : ExternalBase(parent, _("External Material"))
+ : GuiView<GuiExternalDialog>(parent, _("External Material"))
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QEXTERNAL_H
-#define QEXTERNAL_H
+#ifndef GUIEXTERNAL_H
+#define GUIEXTERNAL_H
#include "GuiDialogView.h"
-
+#include "ControlExternal.h"
#include "ui_ExternalUi.h"
#include <QCloseEvent>
class GuiExternal;
-class GuiExternalDialog : public QDialog, public Ui::ExternalUi {
+class GuiExternalDialog : public QDialog, public Ui::ExternalUi
+{
Q_OBJECT
public:
GuiExternalDialog(GuiExternal * form);
};
-class ControlExternal;
-
-class GuiExternal
- : public QController<ControlExternal, GuiView<GuiExternalDialog> >
+class GuiExternal : public GuiView<GuiExternalDialog>
{
public:
friend class GuiExternalDialog;
GuiExternal(Dialog &);
-
+ /// parent controller
+ ControlExternal & controller()
+ { return static_cast<ControlExternal &>(this->getController()); }
+ /// parent controller
+ ControlExternal const & controller() const
+ { return static_cast<ControlExternal const &>(this->getController()); }
+ ///
typedef std::map<std::string, QString> MapType;
-
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QEXTERNAL_H
+#endif // GUIEXTERNAL_H
#include <config.h>
#include "GuiFloat.h"
-#include "GuiFloatDialog.h"
#include "Qt2BC.h"
#include "FloatPlacement.h"
-#include "controllers/ControlFloat.h"
-
#include "insets/InsetFloat.h"
+#include <QCloseEvent>
#include <QPushButton>
namespace lyx {
namespace frontend {
-typedef QController<ControlFloat, GuiView<GuiFloatDialog> > float_base_class;
+GuiFloatDialog::GuiFloatDialog(GuiFloat * form)
+ : form_(form)
+{
+ setupUi(this);
+ connect(restorePB, SIGNAL(clicked()),
+ form, SLOT(slotRestore()));
+ connect(okPB, SIGNAL(clicked()),
+ form, SLOT(slotOK()));
+ connect(applyPB, SIGNAL(clicked()),
+ form, SLOT(slotApply()));
+ connect(closePB, SIGNAL(clicked()),
+ form, SLOT(slotClose()));
+
+ // enable span columns checkbox
+ floatFP->useWide();
+
+ // enable sideways checkbox
+ floatFP->useSideways();
+
+ connect(floatFP, SIGNAL(changed()),
+ this, SLOT(change_adaptor()));
+}
+
+
+void GuiFloatDialog::change_adaptor()
+{
+ form_->changed();
+}
+
+
+void GuiFloatDialog::closeEvent(QCloseEvent * e)
+{
+ form_->slotWMHide();
+ e->accept();
+}
GuiFloat::GuiFloat(Dialog & parent)
- : float_base_class(parent, _("Float Settings"))
+ : GuiView<GuiFloatDialog>(parent, _("Float Settings"))
{
}
} // namespace frontend
} // namespace lyx
+
+#include "GuiFloat_moc.cpp"
* Full author contact details are available in file CREDITS.
*/
-#ifndef QFLOAT_H
-#define QFLOAT_H
+#ifndef GUIFLOAT_H
+#define GUIFLOAT_H
#include "GuiDialogView.h"
-#include "GuiFloatDialog.h"
+#include "ui_FloatUi.h"
+#include "ControlFloat.h"
+
+#include <QDialog>
namespace lyx {
namespace frontend {
+class GuiFloat;
+
+class GuiFloatDialog : public QDialog, public Ui::FloatUi {
+ Q_OBJECT
+public:
+ GuiFloatDialog(GuiFloat * form);
+
+protected Q_SLOTS:
+ virtual void change_adaptor();
+
+protected:
+ virtual void closeEvent(QCloseEvent * e);
+
+private:
+ GuiFloat * form_;
+};
-class ControlFloat;
///
-class GuiFloat : public QController<ControlFloat, GuiView<GuiFloatDialog> > {
+class GuiFloat : public GuiView<GuiFloatDialog> {
public:
///
friend class GuiFloatDialog;
///
GuiFloat(Dialog &);
+ /// parent controller
+ ControlFloat & controller()
+ { return static_cast<ControlFloat &>(this->getController()); }
+ /// parent controller
+ ControlFloat const & controller() const
+ { return static_cast<ControlFloat const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QFLOAT_H
+#endif // GUIFLOAT_H
+++ /dev/null
-/**
- * \file GuiFloatDialog.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Edwin Leuven
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "GuiFloatDialog.h"
-#include "GuiFloat.h"
-
-#include <QCloseEvent>
-#include <QPushButton>
-
-#include "FloatPlacement.h"
-
-
-
-namespace lyx {
-namespace frontend {
-
-GuiFloatDialog::GuiFloatDialog(GuiFloat * form)
- : form_(form)
-{
- setupUi(this);
- connect(restorePB, SIGNAL(clicked()),
- form, SLOT(slotRestore()));
- connect(okPB, SIGNAL(clicked()),
- form, SLOT(slotOK()));
- connect(applyPB, SIGNAL(clicked()),
- form, SLOT(slotApply()));
- connect(closePB, SIGNAL(clicked()),
- form, SLOT(slotClose()));
-
- // enable span columns checkbox
- floatFP->useWide();
-
- // enable sideways checkbox
- floatFP->useSideways();
-
- connect(floatFP, SIGNAL(changed()),
- this, SLOT(change_adaptor()));
-}
-
-
-void GuiFloatDialog::change_adaptor()
-{
- form_->changed();
-}
-
-
-void GuiFloatDialog::closeEvent(QCloseEvent * e)
-{
- form_->slotWMHide();
- e->accept();
-}
-
-} // namespace frontend
-} // namespace lyx
-
-#include "GuiFloatDialog_moc.cpp"
+++ /dev/null
-// -*- C++ -*-
-/**
- * \file GuiFloatDialog.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Edwin Leuven
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef QFLOATDIALOG_H
-#define QFLOATDIALOG_H
-
-#include "ui_FloatUi.h"
-
-#include <QCloseEvent>
-#include <QDialog>
-
-namespace lyx {
-namespace frontend {
-
-class GuiFloat;
-
-class GuiFloatDialog : public QDialog, public Ui::FloatUi {
- Q_OBJECT
-public:
- GuiFloatDialog(GuiFloat * form);
-
-protected Q_SLOTS:
- virtual void change_adaptor();
-
-protected:
- virtual void closeEvent(QCloseEvent * e);
-
-private:
- GuiFloat * form_;
-};
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // QFLOATDIALOG_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QT_QFONTEXAMPLE_H
-#define QT_QFONTEXAMPLE_H
+#ifndef GUIFONTEXAMPLE_H
+#define GUIFONTEXAMPLE_H
#include <QWidget>
#include <QFont>
//} // namespace lyx
-#endif
+#endif // GUIFONTEXAMPLE_H
// -*- C++ -*-
/**
- * \file FontMetrics.h
+ * \file GuiFontMetrics.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* Full author contact details are available in file CREDITS.
*/
-#ifndef QT4_FONT_METRICS_H
-#define QT4_FONT_METRICS_H
+#ifndef GUI_FONT_METRICS_H
+#define GUI_FONT_METRICS_H
#include "frontends/FontMetrics.h"
namespace lyx {
namespace frontend {
-class GuiFontMetrics: public FontMetrics
+class GuiFontMetrics : public FontMetrics
{
public:
-
GuiFontMetrics(QFont const & font);
GuiFontMetrics(QFont const & font, QFont const & smallcaps_font);
} // namespace frontend
} // namespace lyx
-#endif // QT4_FONT_METRICS_H
+#endif // GUI_FONT_METRICS_H
#include "GuiGraphics.h"
#include "CheckedLineEdit.h"
+#include "debug.h"
#include "LengthCombo.h"
-#include "GuiGraphicsDialog.h"
-#include "Qt2BC.h"
-#include "qt_helpers.h"
-
#include "lengthcommon.h"
#include "LyXRC.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+#include "Validator.h"
-#include "controllers/ControlGraphics.h"
#include "controllers/frontend_helpers.h"
#include "insets/InsetGraphicsParams.h"
#include "support/lyxlib.h"
#include "support/os.h"
-#include <QLineEdit>
-#include <QPushButton>
+#include <cmath>
+
+#include "insets/InsetGraphicsParams.h"
+
#include <QCheckBox>
+#include <QCloseEvent>
#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QValidator>
-#include <cmath>
using lyx::support::float_equal;
using lyx::support::token;
using std::vector;
using std::string;
+
namespace lyx {
namespace frontend {
-typedef QController<ControlGraphics, GuiView<GuiGraphicsDialog> > graphics_base_class;
+
+GuiGraphicsDialog::GuiGraphicsDialog(GuiGraphics * form)
+ : form_(form)
+{
+ setupUi(this);
+ //main buttons
+ connect(okPB, SIGNAL(clicked()),
+ form, SLOT(slotOK()));
+ connect(applyPB, SIGNAL(clicked()),
+ form, SLOT(slotApply()));
+ connect(closePB, SIGNAL(clicked()),
+ form, SLOT(slotClose()));
+ connect(restorePB, SIGNAL(clicked()),
+ form, SLOT(slotRestore()));
+
+ //graphics pane
+ connect(filename, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
+ connect(WidthCB, SIGNAL( clicked()),
+ this, SLOT(change_adaptor()));
+ connect(HeightCB, SIGNAL( clicked()),
+ this, SLOT(change_adaptor()));
+ connect(Width, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
+ connect(Height, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
+ connect(heightUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
+ this, SLOT(change_adaptor()));
+ connect(widthUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
+ this, SLOT(change_adaptor()));
+ connect(aspectratio, SIGNAL(stateChanged(int)),
+ this, SLOT(change_adaptor()));
+ connect(angle, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
+ connect(origin, SIGNAL(activated(int)),
+ this, SLOT(change_adaptor()));
+ connect(scaleCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(Scale, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
+ connect(rotateOrderCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+
+ filename->setValidator(new PathValidator(true, filename));
+ setFocusProxy(filename);
+
+ QDoubleValidator * scaleValidator = new DoubleAutoValidator(Scale);
+ scaleValidator->setBottom(0);
+ scaleValidator->setDecimals(256); //I guess that will do
+ Scale->setValidator(scaleValidator);
+ Height->setValidator(unsignedLengthAutoValidator(Height));
+ Width->setValidator(unsignedLengthAutoValidator(Width));
+ angle->setValidator(new QDoubleValidator(-360, 360, 2, angle));
+
+ //clipping pane
+ connect(clip, SIGNAL(stateChanged(int)),
+ this, SLOT(change_adaptor()));
+ connect(lbY, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_bb()));
+ connect(lbYunit, SIGNAL(activated(int)),
+ this, SLOT(change_bb()));
+ connect(rtY, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_bb()));
+ connect(rtYunit, SIGNAL(activated(int)),
+ this, SLOT(change_bb()));
+ connect(lbX, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_bb()));
+ connect(lbXunit, SIGNAL(activated(int)),
+ this, SLOT(change_bb()));
+ connect(rtX, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_bb()));
+ connect(rtXunit, SIGNAL(activated(int)),
+ this, SLOT(change_bb()));
+ connect(getPB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+
+ lbX->setValidator(new QDoubleValidator(lbX));
+ lbY->setValidator(new QDoubleValidator(lbY));
+ rtX->setValidator(new QDoubleValidator(rtX));
+ rtY->setValidator(new QDoubleValidator(rtY));
+
+ //extra options pane
+ connect(latexoptions, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_adaptor()));
+ connect(draftCB, SIGNAL(stateChanged(int)),
+ this, SLOT(change_adaptor()));
+ connect(unzipCB, SIGNAL(stateChanged(int)),
+ this, SLOT(change_adaptor()));
+ // FIXME: we should connect to clicked() when we move to Qt 4.2 because
+ // the toggled(bool) signal is also trigged when we update the widgets
+ // (rgh-4/07) this isn't as much or a problem as it was, because we're now
+ // using blockSignals() to keep from triggering that signal when we call
+ // setChecked(). Note, too, that clicked() would get called whenever it
+ // is clicked, even right clicked (I think), not just whenever it is
+ // toggled.
+ connect(subfigure, SIGNAL(toggled(bool)),
+ this, SLOT(change_adaptor()));
+ connect(subcaption, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_adaptor()));
+ connect(displayGB, SIGNAL(toggled(bool)),
+ this, SLOT(change_adaptor()));
+ connect(showCB, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(change_adaptor()));
+ connect(displayscale, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_adaptor()));
+ displayscale->setValidator(new QIntValidator(displayscale));
+}
+
+
+void GuiGraphicsDialog::show()
+{
+ QDialog::show();
+}
+
+
+void GuiGraphicsDialog::change_adaptor()
+{
+ form_->changed();
+}
+
+
+void GuiGraphicsDialog::change_bb()
+{
+ form_->controller().bbChanged = true;
+ LYXERR(Debug::GRAPHICS)
+ << "[controller().bb_Changed set to true]\n";
+ form_->changed();
+}
+
+
+void GuiGraphicsDialog::closeEvent(QCloseEvent * e)
+{
+ form_->slotWMHide();
+ e->accept();
+}
+
+
+void GuiGraphicsDialog::on_browsePB_clicked()
+{
+ docstring const str =
+ form_->controller().browse(qstring_to_ucs4(filename->text()));
+ if(!str.empty()){
+ filename->setText(toqstr(str));
+ form_->changed();
+ }
+}
+
+
+void GuiGraphicsDialog::on_getPB_clicked()
+{
+ form_->getBB();
+}
+
+
+void GuiGraphicsDialog::on_editPB_clicked()
+{
+ form_->controller().editGraphics();
+}
+
+
+void GuiGraphicsDialog::on_filename_textChanged(const QString & filename)
+{
+ editPB->setDisabled(filename.isEmpty());
+}
+
+
+void GuiGraphicsDialog::setAutoText()
+{
+ if (scaleCB->isChecked()) return;
+ if (!Scale->isEnabled() && Scale->text() != "100")
+ Scale->setText(QString("auto"));
+
+ setAutoTextCB(WidthCB, Width, widthUnit);
+ setAutoTextCB(HeightCB, Height, heightUnit);
+}
+
+
+void GuiGraphicsDialog::on_scaleCB_toggled(bool setScale)
+{
+ Scale->setEnabled(setScale);
+ if (setScale) {
+ Scale->setText("100");
+ Scale->setFocus(Qt::OtherFocusReason);
+ }
+
+ WidthCB->setDisabled(setScale);
+ WidthCB->blockSignals(true);
+ WidthCB->setChecked(false);
+ WidthCB->blockSignals(false);
+ Width->setEnabled(false);
+ widthUnit->setEnabled(false);
+
+ HeightCB->setDisabled(setScale);
+ HeightCB->blockSignals(true);
+ HeightCB->setChecked(false);
+ HeightCB->blockSignals(false);
+ Height->setEnabled(false);
+ heightUnit->setEnabled(false);
+
+ aspectratio->setDisabled(true);
+ aspectratio->setChecked(true);
+
+ rotateOrderCB->setEnabled((WidthCB->isChecked() ||
+ HeightCB->isChecked() ||
+ scaleCB->isChecked()) &&
+ (angle->text() != "0"));
+
+ setAutoText();
+}
+
+void GuiGraphicsDialog::on_WidthCB_toggled(bool setWidth)
+{
+ Width->setEnabled(setWidth);
+ widthUnit->setEnabled(setWidth);
+ if (setWidth)
+ Width->setFocus(Qt::OtherFocusReason);
+
+ bool const setHeight = HeightCB->isChecked();
+ aspectratio->setEnabled(setWidth && setHeight);
+ aspectratio->blockSignals(true);
+ aspectratio->setChecked(!(setWidth && setHeight));
+ aspectratio->blockSignals(false);
+
+ scaleCB->setEnabled(!setWidth && !setHeight);
+ //already will be unchecked, so don't need to do that
+ Scale->setEnabled((!setWidth && !setHeight) //=scaleCB->isEnabled()
+ && scaleCB->isChecked()); //should be false, but let's check
+ rotateOrderCB->setEnabled((setWidth || setHeight ||
+ scaleCB->isChecked()) &&
+ (angle->text() != "0"));
+
+ setAutoText();
+}
+
+void GuiGraphicsDialog::on_HeightCB_toggled(bool setHeight)
+{
+ Height->setEnabled(setHeight);
+ heightUnit->setEnabled(setHeight);
+ if (setHeight)
+ Height->setFocus(Qt::OtherFocusReason);
+
+ bool const setWidth = WidthCB->isChecked();
+ aspectratio->setEnabled(setWidth && setHeight);
+ aspectratio->blockSignals(true);
+ aspectratio->setChecked(!(setWidth && setHeight));
+ aspectratio->blockSignals(false);
+
+ scaleCB->setEnabled(!setWidth && !setHeight);
+ //already unchecked
+ Scale->setEnabled((!setWidth && !setHeight) //=scaleCB->isEnabled()
+ && scaleCB->isChecked()); //should be false
+ rotateOrderCB->setEnabled((setWidth || setHeight ||
+ scaleCB->isChecked()) &&
+ (angle->text() != "0"));
+
+ setAutoText();
+}
+
+
+void GuiGraphicsDialog::on_angle_textChanged(const QString & filename)
+{
+ rotateOrderCB->setEnabled((WidthCB->isChecked() ||
+ HeightCB->isChecked() ||
+ scaleCB->isChecked()) &&
+ (filename != "0"));
+}
+
GuiGraphics::GuiGraphics(Dialog & parent)
- : graphics_base_class(parent, _("Graphics"))
+ : GuiView<GuiGraphicsDialog>(parent, _("Graphics"))
{
}
} // namespace frontend
} // namespace lyx
+
+
+#include "GuiGraphics_moc.cpp"
+
* Full author contact details are available in file CREDITS.
*/
-#ifndef QGRAPHICS_H
-#define QGRAPHICS_H
+#ifndef GUIGRAPHICS_H
+#define GUIGRAPHICS_H
#include "GuiDialogView.h"
-#include "GuiGraphicsDialog.h"
+#include "ui_GraphicsUi.h"
+#include "ControlGraphics.h"
+
+#include <QDialog>
#include <vector>
+class QString;
+
namespace lyx {
namespace frontend {
-class ControlGraphics;
+class GuiGraphics;
+
+class GuiGraphicsDialog : public QDialog, public Ui::GraphicsUi
+{
+ Q_OBJECT
+public:
+ GuiGraphicsDialog(GuiGraphics * form);
+ virtual void setAutoText();
+ virtual void show();
+protected Q_SLOTS:
+ virtual void change_adaptor();
+ virtual void change_bb();
+ virtual void on_browsePB_clicked();
+ virtual void on_getPB_clicked();
+ virtual void on_editPB_clicked();
+ virtual void on_filename_textChanged(const QString &);
+ virtual void on_scaleCB_toggled(bool);
+ virtual void on_WidthCB_toggled(bool);
+ virtual void on_HeightCB_toggled(bool);
+ virtual void on_angle_textChanged(const QString &);
+protected:
+ virtual void closeEvent(QCloseEvent * e);
+private:
+ GuiGraphics * form_;
+};
+
-///
-class GuiGraphics
- : public QController<ControlGraphics, GuiView<GuiGraphicsDialog> >
+class GuiGraphics : public GuiView<GuiGraphicsDialog>
{
public:
///
friend class GuiGraphicsDialog;
///
GuiGraphics(Dialog &);
+ /// parent controller
+ ControlGraphics & controller()
+ { return static_cast<ControlGraphics &>(this->getController()); }
+ /// parent controller
+ ControlGraphics const & controller() const
+ { return static_cast<ControlGraphics const &>(this->getController()); }
protected:
virtual bool isValid();
private:
} // namespace frontend
} // namespace lyx
-#endif // QGRAPHICS_H
+#endif // GUIGRAPHICS_H
+++ /dev/null
-/**
- * \file GuiGraphicsDialog.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author John Levon
- * \author Herbert Voß
- * \author Abdelrazak Younes
- * \author Richard Heck
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "GuiGraphicsDialog.h"
-#include "GuiGraphics.h"
-
-#include "LengthCombo.h"
-#include "Validator.h"
-#include "qt_helpers.h"
-
-#include "debug.h"
-
-#include "controllers/ControlGraphics.h"
-
-#include "insets/InsetGraphicsParams.h"
-
-#include <QCloseEvent>
-#include <QPushButton>
-#include <QLineEdit>
-#include <QValidator>
-
-
-using std::string;
-
-namespace lyx {
-namespace frontend {
-
-
-GuiGraphicsDialog::GuiGraphicsDialog(GuiGraphics * form)
- : form_(form)
-{
- setupUi(this);
- //main buttons
- connect(okPB, SIGNAL(clicked()),
- form, SLOT(slotOK()));
- connect(applyPB, SIGNAL(clicked()),
- form, SLOT(slotApply()));
- connect(closePB, SIGNAL(clicked()),
- form, SLOT(slotClose()));
- connect(restorePB, SIGNAL(clicked()),
- form, SLOT(slotRestore()));
-
- //graphics pane
- connect(filename, SIGNAL(textChanged(const QString &)),
- this, SLOT(change_adaptor()));
- connect(WidthCB, SIGNAL( clicked()),
- this, SLOT(change_adaptor()));
- connect(HeightCB, SIGNAL( clicked()),
- this, SLOT(change_adaptor()));
- connect(Width, SIGNAL(textChanged(const QString &)),
- this, SLOT(change_adaptor()));
- connect(Height, SIGNAL(textChanged(const QString &)),
- this, SLOT(change_adaptor()));
- connect(heightUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
- this, SLOT(change_adaptor()));
- connect(widthUnit, SIGNAL(selectionChanged(lyx::Length::UNIT)),
- this, SLOT(change_adaptor()));
- connect(aspectratio, SIGNAL(stateChanged(int)),
- this, SLOT(change_adaptor()));
- connect(angle, SIGNAL(textChanged(const QString &)),
- this, SLOT(change_adaptor()));
- connect(origin, SIGNAL(activated(int)),
- this, SLOT(change_adaptor()));
- connect(scaleCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(Scale, SIGNAL(textChanged(const QString &)),
- this, SLOT(change_adaptor()));
- connect(rotateOrderCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
-
- filename->setValidator(new PathValidator(true, filename));
- setFocusProxy(filename);
-
- QDoubleValidator * scaleValidator = new DoubleAutoValidator(Scale);
- scaleValidator->setBottom(0);
- scaleValidator->setDecimals(256); //I guess that will do
- Scale->setValidator(scaleValidator);
- Height->setValidator(unsignedLengthAutoValidator(Height));
- Width->setValidator(unsignedLengthAutoValidator(Width));
- angle->setValidator(new QDoubleValidator(-360, 360, 2, angle));
-
- //clipping pane
- connect(clip, SIGNAL(stateChanged(int)),
- this, SLOT(change_adaptor()));
- connect(lbY, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_bb()));
- connect(lbYunit, SIGNAL(activated(int)),
- this, SLOT(change_bb()));
- connect(rtY, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_bb()));
- connect(rtYunit, SIGNAL(activated(int)),
- this, SLOT(change_bb()));
- connect(lbX, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_bb()));
- connect(lbXunit, SIGNAL(activated(int)),
- this, SLOT(change_bb()));
- connect(rtX, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_bb()));
- connect(rtXunit, SIGNAL(activated(int)),
- this, SLOT(change_bb()));
- connect(getPB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
-
- lbX->setValidator(new QDoubleValidator(lbX));
- lbY->setValidator(new QDoubleValidator(lbY));
- rtX->setValidator(new QDoubleValidator(rtX));
- rtY->setValidator(new QDoubleValidator(rtY));
-
- //extra options pane
- connect(latexoptions, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_adaptor()));
- connect(draftCB, SIGNAL(stateChanged(int)),
- this, SLOT(change_adaptor()));
- connect(unzipCB, SIGNAL(stateChanged(int)),
- this, SLOT(change_adaptor()));
- // FIXME: we should connect to clicked() when we move to Qt 4.2 because
- // the toggled(bool) signal is also trigged when we update the widgets
- // (rgh-4/07) this isn't as much or a problem as it was, because we're now
- // using blockSignals() to keep from triggering that signal when we call
- // setChecked(). Note, too, that clicked() would get called whenever it
- // is clicked, even right clicked (I think), not just whenever it is
- // toggled.
- connect(subfigure, SIGNAL(toggled(bool)),
- this, SLOT(change_adaptor()));
- connect(subcaption, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_adaptor()));
- connect(displayGB, SIGNAL(toggled(bool)),
- this, SLOT(change_adaptor()));
- connect(showCB, SIGNAL(currentIndexChanged(int)),
- this, SLOT(change_adaptor()));
- connect(displayscale, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_adaptor()));
- displayscale->setValidator(new QIntValidator(displayscale));
-}
-
-
-void GuiGraphicsDialog::show()
-{
- QDialog::show();
-}
-
-
-void GuiGraphicsDialog::change_adaptor()
-{
- form_->changed();
-}
-
-
-void GuiGraphicsDialog::change_bb()
-{
- form_->controller().bbChanged = true;
- LYXERR(Debug::GRAPHICS)
- << "[controller().bb_Changed set to true]\n";
- form_->changed();
-}
-
-
-void GuiGraphicsDialog::closeEvent(QCloseEvent * e)
-{
- form_->slotWMHide();
- e->accept();
-}
-
-
-void GuiGraphicsDialog::on_browsePB_clicked()
-{
- docstring const str =
- form_->controller().browse(qstring_to_ucs4(filename->text()));
- if(!str.empty()){
- filename->setText(toqstr(str));
- form_->changed();
- }
-}
-
-
-void GuiGraphicsDialog::on_getPB_clicked()
-{
- form_->getBB();
-}
-
-
-void GuiGraphicsDialog::on_editPB_clicked()
-{
- form_->controller().editGraphics();
-}
-
-
-void GuiGraphicsDialog::on_filename_textChanged(const QString & filename)
-{
- editPB->setDisabled(filename.isEmpty());
-}
-
-
-void GuiGraphicsDialog::setAutoText()
-{
- if (scaleCB->isChecked()) return;
- if (!Scale->isEnabled() && Scale->text() != "100")
- Scale->setText(QString("auto"));
-
- setAutoTextCB(WidthCB, Width, widthUnit);
- setAutoTextCB(HeightCB, Height, heightUnit);
-}
-
-
-void GuiGraphicsDialog::on_scaleCB_toggled(bool setScale)
-{
- Scale->setEnabled(setScale);
- if (setScale) {
- Scale->setText("100");
- Scale->setFocus(Qt::OtherFocusReason);
- }
-
- WidthCB->setDisabled(setScale);
- WidthCB->blockSignals(true);
- WidthCB->setChecked(false);
- WidthCB->blockSignals(false);
- Width->setEnabled(false);
- widthUnit->setEnabled(false);
-
- HeightCB->setDisabled(setScale);
- HeightCB->blockSignals(true);
- HeightCB->setChecked(false);
- HeightCB->blockSignals(false);
- Height->setEnabled(false);
- heightUnit->setEnabled(false);
-
- aspectratio->setDisabled(true);
- aspectratio->setChecked(true);
-
- rotateOrderCB->setEnabled((WidthCB->isChecked() ||
- HeightCB->isChecked() ||
- scaleCB->isChecked()) &&
- (angle->text() != "0"));
-
- setAutoText();
-}
-
-void GuiGraphicsDialog::on_WidthCB_toggled(bool setWidth)
-{
- Width->setEnabled(setWidth);
- widthUnit->setEnabled(setWidth);
- if (setWidth)
- Width->setFocus(Qt::OtherFocusReason);
-
- bool const setHeight = HeightCB->isChecked();
- aspectratio->setEnabled(setWidth && setHeight);
- aspectratio->blockSignals(true);
- aspectratio->setChecked(!(setWidth && setHeight));
- aspectratio->blockSignals(false);
-
- scaleCB->setEnabled(!setWidth && !setHeight);
- //already will be unchecked, so don't need to do that
- Scale->setEnabled((!setWidth && !setHeight) //=scaleCB->isEnabled()
- && scaleCB->isChecked()); //should be false, but let's check
- rotateOrderCB->setEnabled((setWidth || setHeight ||
- scaleCB->isChecked()) &&
- (angle->text() != "0"));
-
- setAutoText();
-}
-
-void GuiGraphicsDialog::on_HeightCB_toggled(bool setHeight)
-{
- Height->setEnabled(setHeight);
- heightUnit->setEnabled(setHeight);
- if (setHeight)
- Height->setFocus(Qt::OtherFocusReason);
-
- bool const setWidth = WidthCB->isChecked();
- aspectratio->setEnabled(setWidth && setHeight);
- aspectratio->blockSignals(true);
- aspectratio->setChecked(!(setWidth && setHeight));
- aspectratio->blockSignals(false);
-
- scaleCB->setEnabled(!setWidth && !setHeight);
- //already unchecked
- Scale->setEnabled((!setWidth && !setHeight) //=scaleCB->isEnabled()
- && scaleCB->isChecked()); //should be false
- rotateOrderCB->setEnabled((setWidth || setHeight ||
- scaleCB->isChecked()) &&
- (angle->text() != "0"));
-
- setAutoText();
-}
-
-
-void GuiGraphicsDialog::on_angle_textChanged(const QString & filename)
-{
- rotateOrderCB->setEnabled((WidthCB->isChecked() ||
- HeightCB->isChecked() ||
- scaleCB->isChecked()) &&
- (filename != "0"));
-}
-
-
-} // namespace frontend
-} // namespace lyx
-
-#include "GuiGraphicsDialog_moc.cpp"
+++ /dev/null
-// -*- C++ -*-
-/**
- * \file GuiGraphicsDialog.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author John Levon
- * \author Herbert Voß
- * \author Richard Heck
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef QGRAPHICSDIALOG_H
-#define QGRAPHICSDIALOG_H
-
-#include "ui_GraphicsUi.h"
-
-#include <QCloseEvent>
-#include <QDialog>
-#include <QString>
-
-namespace lyx {
-namespace frontend {
-
-class GuiGraphics;
-
-class GuiGraphicsDialog : public QDialog, public Ui::GraphicsUi {
- Q_OBJECT
-public:
- GuiGraphicsDialog(GuiGraphics * form);
- virtual void setAutoText();
- virtual void show();
-protected Q_SLOTS:
- virtual void change_adaptor();
- virtual void change_bb();
- virtual void on_browsePB_clicked();
- virtual void on_getPB_clicked();
- virtual void on_editPB_clicked();
- virtual void on_filename_textChanged(const QString &);
- virtual void on_scaleCB_toggled(bool);
- virtual void on_WidthCB_toggled(bool);
- virtual void on_HeightCB_toggled(bool);
- virtual void on_angle_textChanged(const QString &);
-protected:
- virtual void closeEvent(QCloseEvent * e);
-private:
- GuiGraphics * form_;
-};
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // QGRAPHICSDIALOG_H
namespace graphics {
/// Access to this class is through this static method.
-Image::ImagePtr QLImage::newImage()
+Image::ImagePtr GuiImage::newImage()
{
ImagePtr ptr;
- ptr.reset(new QLImage);
+ ptr.reset(new GuiImage);
return ptr;
}
/// Return the list of loadable formats.
-Image::FormatList QLImage::loadableFormats()
+Image::FormatList GuiImage::loadableFormats()
{
static FormatList fmts;
}
-QLImage::QLImage()
- : Image()
-{
-}
-
-
-QLImage::QLImage(QLImage const & other)
+GuiImage::GuiImage(GuiImage const & other)
: Image(other), original_(other.original_),
transformed_(other.transformed_),
transformed_pixmap_(other.transformed_pixmap_)
{}
-Image * QLImage::clone_impl() const
+Image * GuiImage::clone_impl() const
{
- return new QLImage(*this);
+ return new GuiImage(*this);
}
-unsigned int QLImage::getWidth_impl() const
+unsigned int GuiImage::getWidth_impl() const
{
return transformed_.width();
}
-unsigned int QLImage::getHeight_impl() const
+unsigned int GuiImage::getHeight_impl() const
{
return transformed_.height();
}
-void QLImage::load_impl(support::FileName const & filename)
+void GuiImage::load_impl(support::FileName const & filename)
{
if (!original_.isNull()) {
LYXERR(Debug::GRAPHICS)
} // namespace anon
-bool QLImage::setPixmap_impl(Params const & params)
+bool GuiImage::setPixmap_impl(Params const & params)
{
if (original_.isNull() || params.display == NoDisplay)
return false;
}
-void QLImage::clip_impl(Params const & params)
+void GuiImage::clip_impl(Params const & params)
{
if (transformed_.isNull())
return;
}
-void QLImage::rotate_impl(Params const & params)
+void GuiImage::rotate_impl(Params const & params)
{
if (transformed_.isNull())
return;
}
-void QLImage::scale_impl(Params const & params)
+void GuiImage::scale_impl(Params const & params)
{
if (transformed_.isNull())
return;
* Full author contact details are available in file CREDITS.
*/
-#ifndef QLIMAGE_H
-#define QLIMAGE_H
-
+#ifndef GUIIMAGE_H
+#define GUIIMAGE_H
#include "graphics/GraphicsImage.h"
-#include <qimage.h>
-//Added by qt3to4:
+#include <QImage>
#include <QPixmap>
namespace lyx {
namespace graphics {
-class QLImage : public Image {
+class GuiImage : public Image {
public:
/// Access to this class is through this static method.
static ImagePtr newImage();
virtual void scale_impl(Params const & params);
/// Access to the class is through newImage() and clone.
- QLImage();
+ GuiImage() {}
///
- QLImage(QLImage const &);
+ GuiImage(GuiImage const &);
/// The original loaded image.
QImage original_;
} // namespace graphics
} // namespace lyx
-#endif // QLIMAGE_H
+#endif // GUIIMAGE_H
GuiImplementation();
virtual ~GuiImplementation() {}
-
virtual LyXView& createRegisteredView();
virtual bool closeAllViews();
virtual bool unregisterView(int id);
#include "LyXRC.h"
#include "insets/InsetListingsParams.h"
-#include "controllers/ControlInclude.h"
#include <QPushButton>
#include <QCheckBox>
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlInclude, GuiView<GuiIncludeDialog> > IncludeBase;
-
-
GuiInclude::GuiInclude(Dialog & parent)
- : IncludeBase(parent, _("Child Document"))
+ : GuiView<GuiIncludeDialog>(parent, _("Child Document"))
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QINCLUDE_H
-#define QINCLUDE_H
+#ifndef GUIINCLUDE_H
+#define GUIINCLUDE_H
#include "GuiDialogView.h"
-
+#include "ControlInclude.h"
#include "ui_IncludeUi.h"
#include <QDialog>
};
-class ControlInclude;
-
-///
-class GuiInclude : public QController<ControlInclude, GuiView<GuiIncludeDialog> >
+class GuiInclude : public GuiView<GuiIncludeDialog>
{
public:
///
friend class GuiIncludeDialog;
///
GuiInclude(Dialog &);
+ /// parent controller
+ ControlInclude & controller()
+ { return static_cast<ControlInclude &>(this->getController()); }
+ /// parent controller
+ ControlInclude const & controller() const
+ { return static_cast<ControlInclude const &>(this->getController()); }
protected:
virtual bool isValid();
private:
} // namespace frontend
} // namespace lyx
-#endif // QINCLUDE_H
+#endif // GUIINCLUDE_H
#include <config.h>
#include "debug.h"
-#include "ControlCommand.h"
#include "qt_helpers.h"
#include "GuiIndex.h"
#include <QLabel>
#include <QPushButton>
#include <QLineEdit>
-#include <QWhatsThis>
#include <QCloseEvent>
connect(okPB, SIGNAL(clicked()), form, SLOT(slotOK()));
connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose()));
- connect( keywordED, SIGNAL(textChanged(const QString &)),
+ connect(keywordED, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
setFocusProxy(keywordED);
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlCommand, GuiView<GuiIndexDialog> > IndexBase;
-
GuiIndex::GuiIndex(Dialog & parent, docstring const & title, QString const & label)
- : IndexBase(parent, title), label_(label)
+ : GuiView<GuiIndexDialog>(parent, title), label_(label)
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QINDEX_H
-#define QINDEX_H
+#ifndef GUIINDEX_H
+#define GUIINDEX_H
#include "GuiDialogView.h"
+#include "ControlCommand.h"
#include "ui_IndexUi.h"
#include <QDialog>
-#include <QCloseEvent>
namespace lyx {
namespace frontend {
};
-class ControlCommand;
-
-class GuiIndex :
- public QController<ControlCommand, GuiView<GuiIndexDialog> >
+class GuiIndex : public GuiView<GuiIndexDialog>
{
public:
friend class GuiIndexDialog;
GuiIndex(Dialog &, docstring const & title, QString const & label);
+ /// parent controller
+ ControlCommand & controller()
+ { return static_cast<ControlCommand &>(this->getController()); }
+ /// parent controller
+ ControlCommand const & controller() const
+ { return static_cast<ControlCommand const &>(this->getController()); }
protected:
virtual bool isValid();
private:
} // namespace frontend
} // namespace lyx
-#endif // QINDEX_H
+#endif // GUIINDEX_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QLYXKEYSYM_H
-#define QLYXKEYSYM_H
+#ifndef GUIKEYSYM_H
+#define GUIKEYSYM_H
#include "frontends/KeySymbol.h"
#include <QString>
-#include <QKeyEvent>
-
class QKeyEvent;
} // namespace lyx
-#endif // QLYXKEYSYM_H
+#endif // GUIKEYSYM_H
#include "GuiListings.h"
#include "Qt2BC.h"
#include "qt_helpers.h"
-#include "controllers/ControlListings.h"
#include "insets/InsetListingsParams.h"
#include "debug.h"
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlListings, GuiView<GuiListingsDialog> > listings_wrap_base_class;
GuiListings::GuiListings(Dialog & parent)
- : listings_wrap_base_class(parent, _("Program Listing Settings"))
+ : GuiView<GuiListingsDialog>(parent, _("Program Listing Settings"))
{
}
// -*- C++ -*-
/**
- * \file QListings.h
+ * \file GuiListings.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* Full author contact details are available in file CREDITS.
*/
-#ifndef QLISTINGS_H
-#define QLISTINGS_H
+#ifndef GUILISTINGS_H
+#define GUILISTINGS_H
#include "GuiDialogView.h"
+#include "ControlListings.h"
#include "ui_ListingsUi.h"
#include <QDialog>
-#include <QCloseEvent>
namespace lyx {
namespace frontend {
};
-class ControlListings;
-
-class GuiListings : public QController<ControlListings, GuiView<GuiListingsDialog> > {
+class GuiListings : public GuiView<GuiListingsDialog> {
public:
friend class GuiListingsDialog;
GuiListings(Dialog &);
+ /// parent controller
+ ControlListings & controller()
+ { return static_cast<ControlListings &>(this->getController()); }
+ /// parent controller
+ ControlListings const & controller() const
+ { return static_cast<ControlListings const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QLISTINGS_H
+#endif // GUILISTINGS_H
#include "frontends/Application.h"
-#include "controllers/ControlLog.h"
-
-#include <sstream>
-
+#include <QCloseEvent>
+#include <QTextBrowser>
#include <QTextBrowser>
-#include <QPushButton>
namespace lyx {
namespace frontend {
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlLog, GuiView<GuiLogDialog> > LogBase;
GuiLog::GuiLog(Dialog & parent)
- : LogBase(parent, docstring())
+ : GuiView<GuiLogDialog>(parent, docstring())
{}
#define GUILOG_H
#include "GuiDialogView.h"
-
-
+#include "ControlLog.h"
#include "ui_LogUi.h"
#include <QDialog>
-#include <QCloseEvent>
#include <QSyntaxHighlighter>
namespace lyx {
class LogHighlighter;
///
-class GuiLog
- : public QController<ControlLog, GuiView<GuiLogDialog> >
+class GuiLog : public GuiView<GuiLogDialog>
{
public:
///
friend class GuiLogDialog;
///
GuiLog(Dialog &);
+ /// parent controller
+ ControlLog & controller()
+ { return static_cast<ControlLog &>(this->getController()); }
+ /// parent controller
+ ControlLog const & controller() const
+ { return static_cast<ControlLog const &>(this->getController()); }
private:
/// Apply changes
virtual void apply() {}
#include "EmptyTable.h"
#include "qt_helpers.h"
-
-#include "controllers/ControlMath.h"
+#include "gettext.h"
#include <sstream>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-
-#include "gettext.h"
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSpinBox>
using std::ostringstream;
using std::string;
namespace lyx {
namespace frontend {
-namespace {
-
-char h_align_str[80] = "c";
-char v_align_c[] = "tcb";
-
-} // namespace anon
-
-
-typedef QController<ControlMath, GuiView<GuiMathMatrixDialog> > matrix_base;
-
-
GuiMathMatrix::GuiMathMatrix(Dialog & parent)
- : matrix_base(parent, _("Math Matrix"))
+ : GuiView<GuiMathMatrixDialog>(parent, _("Math Matrix"))
{}
void GuiMathMatrixDialog::columnsChanged(int)
{
+ char h_align_str[80] = "c";
int const nx = int(columnsSB->value());
for (int i = 0; i < nx; ++i)
h_align_str[i] = 'c';
void GuiMathMatrixDialog::slotOK()
{
+ char v_align_c[] = "tcb";
char const c = v_align_c[valignCO->currentIndex()];
string const sh = fromqstr(halignED->text());
int const nx = int(columnsSB->value());
* Full author contact details are available in file CREDITS.
*/
-#ifndef QMATHMATRIXDIALOG_H
-#define QMATHMATRIXDIALOG_H
+#ifndef GUIMATHMATRIXDIALOG_H
+#define GUIMATHMATRIXDIALOG_H
#include "GuiDialogView.h"
-
+#include "ControlMath.h"
#include "ui_MathMatrixUi.h"
#include <QDialog>
};
-class GuiMathMatrix : public QController<ControlMath, GuiView<GuiMathMatrixDialog> > {
+class GuiMathMatrix : public GuiView<GuiMathMatrixDialog> {
public:
friend class GuiMathMatrixDialog;
GuiMathMatrix(Dialog &);
-
+ /// parent controller
+ ControlMath & controller()
+ { return static_cast<ControlMath &>(this->getController()); }
+ /// parent controller
+ ControlMath const & controller() const
+ { return static_cast<ControlMath const &>(this->getController()); }
private:
virtual void apply() {}
virtual void update_contents() {}
} // namespace frontend
} // namespace lyx
-#endif // QMATHMATRIXDIALOG_H
+#endif // GUIMATHMATRIXDIALOG_H
// -*- C++ -*-
/**
- * \file qt4/GuiMenubar.h
+ * \file GuiMenubar.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* Full author contact details are available in file CREDITS.
*/
-#ifndef QLMENUBAR_H
-#define QLMENUBAR_H
+#ifndef GUIMENUBAR_H
+#define GUIMENUBAR_H
#include "GuiPopupMenu.h"
} // namespace frontend
} // namespace lyx
-#endif // QLMENUBAR_H
+#endif // GUIMENUBAR_H
#include "GuiNomencl.h"
#include "Qt2BC.h"
#include "ButtonController.h"
+
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlCommand, GuiView<GuiNomenclDialog> > NomenBase;
-
-
GuiNomencl::GuiNomencl(Dialog & parent, docstring const & title)
- : NomenBase(parent, title)
+ : GuiView<GuiNomenclDialog>(parent, title)
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QNOMENCL_H
-#define QNOMENCL_H
+#ifndef GUINOMENCL_H
+#define GUINOMENCL_H
#include "GuiDialogView.h"
+#include "ControlCommand.h"
#include "ui_NomenclUi.h"
#include <QDialog>
-class QCloseEvent;
-
namespace lyx {
namespace frontend {
};
-class ControlCommand;
-
-class GuiNomencl :
- public QController<ControlCommand, GuiView<GuiNomenclDialog> >
+class GuiNomencl : public GuiView<GuiNomenclDialog>
{
public:
friend class GuiNomenclDialog;
GuiNomencl(Dialog &, docstring const & title);
+ /// parent controller
+ ControlCommand & controller()
+ { return static_cast<ControlCommand &>(this->getController()); }
+ /// parent controller
+ ControlCommand const & controller() const
+ { return static_cast<ControlCommand const &>(this->getController()); }
protected:
virtual bool isValid();
private:
} // namespace frontend
} // namespace lyx
-#endif // QNOMENCL_H
+#endif // GUINOMENCL_H
#include "GuiNote.h"
#include "Qt2BC.h"
-#include "controllers/ControlNote.h"
-
#include "insets/InsetNote.h"
#include <QCloseEvent>
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlNote, GuiView<GuiNoteDialog> > NoteBase;
-
GuiNote::GuiNote(Dialog & parent)
- : NoteBase(parent, _("Note Settings"))
+ : GuiView<GuiNoteDialog>(parent, _("Note Settings"))
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QNOTE_H
-#define QNOTE_H
+#ifndef GUINOTE_H
+#define GUINOTE_H
#include "GuiDialogView.h"
+#include "ControlNote.h"
#include "ui_NoteUi.h"
#include <QDialog>
-class QCloseEvent;
+
namespace lyx {
namespace frontend {
};
-class ControlNote;
-
/** This class provides a QT implementation of the Note Dialog.
*/
-class GuiNote : public QController<ControlNote, GuiView<GuiNoteDialog> >
+class GuiNote : public GuiView<GuiNoteDialog>
{
public:
friend class GuiNoteDialog;
/// Constructor
GuiNote(Dialog &);
+ /// parent controller
+ ControlNote & controller()
+ { return static_cast<ControlNote &>(this->getController()); }
+ /// parent controller
+ ControlNote const & controller() const
+ { return static_cast<ControlNote const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QNOTE_H
+#endif // GUINOTE_H
} // anon namespace
-QLPainter::QLPainter(QPaintDevice * device)
+GuiPainter::GuiPainter(QPaintDevice * device)
: QPainter(device), Painter()
{
// new QPainter has default QPen:
}
-QLPainter::~QLPainter()
+GuiPainter::~GuiPainter()
{
QPainter::end();
- //lyxerr << "QLPainter::end()" << endl;
+ //lyxerr << "GuiPainter::end()" << endl;
}
-void QLPainter::setQPainterPen(Color_color col,
+void GuiPainter::setQPainterPen(Color_color col,
Painter::line_style ls, Painter::line_width lw)
{
if (col == current_color_ && ls == current_ls_ && lw == current_lw_)
}
-void QLPainter::point(int x, int y, Color_color col)
+void GuiPainter::point(int x, int y, Color_color col)
{
if (!isDrawingEnabled())
return;
}
-void QLPainter::line(int x1, int y1, int x2, int y2,
+void GuiPainter::line(int x1, int y1, int x2, int y2,
Color_color col,
line_style ls,
line_width lw)
}
-void QLPainter::lines(int const * xp, int const * yp, int np,
+void GuiPainter::lines(int const * xp, int const * yp, int np,
Color_color col,
line_style ls,
line_width lw)
}
-void QLPainter::rectangle(int x, int y, int w, int h,
+void GuiPainter::rectangle(int x, int y, int w, int h,
Color_color col,
line_style ls,
line_width lw)
}
-void QLPainter::fillRectangle(int x, int y, int w, int h, Color_color col)
+void GuiPainter::fillRectangle(int x, int y, int w, int h, Color_color col)
{
fillRect(x, y, w, h, guiApp->colorCache().get(col));
}
-void QLPainter::arc(int x, int y, unsigned int w, unsigned int h,
+void GuiPainter::arc(int x, int y, unsigned int w, unsigned int h,
int a1, int a2, Color_color col)
{
if (!isDrawingEnabled())
}
-void QLPainter::image(int x, int y, int w, int h, graphics::Image const & i)
+void GuiPainter::image(int x, int y, int w, int h, graphics::Image const & i)
{
- graphics::QLImage const & qlimage =
- static_cast<graphics::QLImage const &>(i);
+ graphics::GuiImage const & qlimage =
+ static_cast<graphics::GuiImage const &>(i);
fillRectangle(x, y, w, h, Color::graphicsbg);
}
-int QLPainter::text(int x, int y, char_type c, Font const & f)
+int GuiPainter::text(int x, int y, char_type c, Font const & f)
{
docstring s(1, c);
return text(x, y, s, f);
}
-int QLPainter::smallCapsText(int x, int y,
+int GuiPainter::smallCapsText(int x, int y,
QString const & s, Font const & f)
{
Font smallfont(f);
}
-int QLPainter::text(int x, int y, docstring const & s,
+int GuiPainter::text(int x, int y, docstring const & s,
Font const & f)
{
/* Caution: The following ucs4 to QString conversions work for symbol fonts
int const h = mA + mD;
pm = QPixmap(w, h);
pm.fill(Qt::transparent);
- QLPainter p(&pm);
+ GuiPainter p(&pm);
p.setQPainterPen(f.realColor());
if (p.font() != fi.font)
p.setFont(fi.font);
* Full author contact details are available in file CREDITS.
*/
-#ifndef QLPAINTER_H
-#define QLPAINTER_H
+#ifndef GUIPAINTER_H
+#define GUIPAINTER_H
#include "frontends/Painter.h"
namespace frontend {
/**
- * QLPainter - a painter implementation for Qt4
+ * GuiPainter - a painter implementation for Qt4
*/
-class QLPainter : public QPainter, public Painter {
+class GuiPainter : public QPainter, public Painter {
public:
- QLPainter(QPaintDevice *);
- virtual ~QLPainter();
+ GuiPainter(QPaintDevice *);
+ virtual ~GuiPainter();
/// draw a line from point to point
virtual void line(
} // namespace frontend
} // namespace lyx
-#endif // QLPAINTER_H
+#endif // GUIPAINTER_H
#include "debug.h"
#include "ParagraphParameters.h"
#include "Spacing.h"
-
-#include "controllers/ControlParagraph.h"
-#include "controllers/frontend_helpers.h"
+#include "frontend_helpers.h"
#include <QCheckBox>
+#include <QCloseEvent>
#include <QLineEdit>
#include <QPushButton>
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlParagraph, GuiView<GuiParagraphDialog> >
- ParagraphBase;
-
GuiParagraph::GuiParagraph(Dialog & parent)
- : ParagraphBase(parent, _("Paragraph Settings"))
+ : GuiView<GuiParagraphDialog>(parent, _("Paragraph Settings"))
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QPARAGRAPH_H
-#define QPARAGRAPH_H
+#ifndef GUIPARAGRAPH_H
+#define GUIPARAGRAPH_H
#include "GuiDialogView.h"
-
+#include "ControlParagraph.h"
#include "Layout.h"
#include "ui_ParagraphUi.h"
#include <QDialog>
-#include <QCloseEvent>
#include <map>
};
-class ControlParagraph;
-
-class GuiParagraph
- : public QController<ControlParagraph, GuiView<GuiParagraphDialog> >
+class GuiParagraph : public GuiView<GuiParagraphDialog>
{
public:
friend class GuiParagraphDialog;
GuiParagraph(Dialog &);
+ /// parent controller
+ ControlParagraph & controller()
+ { return static_cast<ControlParagraph &>(this->getController()); }
+ /// parent controller
+ ControlParagraph const & controller() const
+ { return static_cast<ControlParagraph const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
* Full author contact details are available in file CREDITS.
*/
-#ifndef QLPOPUPMENU_H
-#define QLPOPUPMENU_H
+#ifndef GUIPOPUPMENU_H
+#define GUIPOPUPMENU_H
#include <QMenu>
class GuiMenubar;
/// a submenu
-class GuiPopupMenu : public QMenu {
+class GuiPopupMenu : public QMenu
+{
Q_OBJECT
public:
-
- GuiPopupMenu(GuiMenubar * owner, MenuItem const & mi, bool topLevelMenu=false);
+ ///
+ GuiPopupMenu(GuiMenubar * owner, MenuItem const & mi,
+ bool topLevelMenu = false);
/// populates the menu or one of its submenu
/// This is used as a recursive function
/// populate the toplevel menu and all children
void update();
-private:
-
- /// our owning menubar
- GuiMenubar * owner_;
-
- /// the name of this menu
- docstring name_;
-
private:
/// Get a Menu item label from the menu backend
docstring const getLabel(MenuItem const & mi);
-
/// add binding keys a the menu item label.
void addBinding(docstring & label, MenuItem const & mi);
+ /// our owning menubar
+ GuiMenubar * owner_;
+ /// the name of this menu
+ docstring name_;
/// Top Level Menu
Menu topLevelMenu_;
};
} // namespace frontend
} // namespace lyx
-#endif // QLPOPUPMENU_H
+#endif // GUIPOPUPMENU_H
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlPrefs, GuiView<GuiPrefsDialog> > PrefsBase;
GuiPrefs::GuiPrefs(Dialog & parent)
- : PrefsBase(parent, _("Preferences"))
+ : GuiView<GuiPrefsDialog>(parent, _("Preferences"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QPREFS_H
-#define QPREFS_H
+#ifndef GUIPREFS_H
+#define GUIPREFS_H
#include "GuiDialogView.h"
-
+#include "ControlPrefs.h"
#include "Color.h"
#include "LyXRC.h"
#include "ui_PrefsUi.h"
-#include <vector>
-
-#include <QDialog>
-#include <QCloseEvent>
-
#include "ui_PrefPlaintextUi.h"
#include "ui_PrefDateUi.h"
#include "ui_PrefKeyboardUi.h"
#include "ui_PrefUi.h"
#include "ui_PrefIdentityUi.h"
+#include <QDialog>
+
+#include <vector>
+
namespace lyx {
class Converters;
};
-class ControlPrefs;
-
-class GuiPrefs
- : public QController<ControlPrefs, GuiView<GuiPrefsDialog> >
+class GuiPrefs : public GuiView<GuiPrefsDialog>
{
public:
GuiPrefs(Dialog &);
Converters & converters();
Formats & formats();
Movers & movers();
-
+ /// parent controller
+ ControlPrefs & controller()
+ { return static_cast<ControlPrefs &>(this->getController()); }
+ /// parent controller
+ ControlPrefs const & controller() const
+ { return static_cast<ControlPrefs const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QPREFS_H
+#endif // GUIPREFS_H
#include <config.h>
#include "GuiPrint.h"
-#include "GuiPrintDialog.h"
#include "Qt2BC.h"
#include "qt_helpers.h"
#include "PrinterParams.h"
-#include "controllers/ControlPrint.h"
-
#include "support/os.h"
#include <QLineEdit>
#include <QSpinBox>
#include <QPushButton>
-using lyx::support::os::internal_path;
-
namespace lyx {
namespace frontend {
-typedef QController<ControlPrint, GuiView<GuiPrintDialog> > print_base_class;
+GuiPrintDialog::GuiPrintDialog(GuiPrint * f)
+ : form_(f)
+{
+ setupUi(this);
+
+ connect(printPB, SIGNAL(clicked()), form_, SLOT(slotOK()));
+ connect(closePB, SIGNAL(clicked()), form_, SLOT(slotClose()));
+
+ connect(copiesSB, SIGNAL(valueChanged(int)), this, SLOT(copiesChanged(int)));
+ connect(printerED, SIGNAL(textChanged(const QString&)),
+ this, SLOT(printerChanged()));
+ connect(fileED, SIGNAL(textChanged(const QString&)),
+ this, SLOT(fileChanged() ));
+ connect(browsePB, SIGNAL(clicked()), this, SLOT(browseClicked()));
+ connect(allRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
+ connect(reverseCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
+ connect(collateCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
+ connect(fromED, SIGNAL(textChanged(const QString&)),
+ this, SLOT(pagerangeChanged()));
+ connect(fromED, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_adaptor()));
+ connect(toED, SIGNAL(textChanged(const QString&)),
+ this, SLOT(pagerangeChanged()));
+ connect(toED, SIGNAL(textChanged(const QString&)),
+ this, SLOT(change_adaptor()));
+ connect(fileRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
+ connect(printerRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
+ connect(rangeRB, SIGNAL(toggled(bool)), fromED, SLOT(setEnabled(bool)));
+ connect(rangeRB, SIGNAL(toggled(bool)), toED, SLOT(setEnabled(bool)));
+}
+
+
+void GuiPrintDialog::change_adaptor()
+{
+ form_->changed();
+}
+
+
+void GuiPrintDialog::browseClicked()
+{
+ QString file = toqstr(form_->controller().browse(docstring()));
+ if (!file.isNull()) {
+ fileED->setText(file);
+ form_->changed();
+ }
+}
+
+
+void GuiPrintDialog::fileChanged()
+{
+ if (!fileED->text().isEmpty())
+ fileRB->setChecked(true);
+ form_->changed();
+}
+
+
+void GuiPrintDialog::copiesChanged(int i)
+{
+ collateCB->setEnabled(i != 1);
+ form_->changed();
+}
+
+
+void GuiPrintDialog::printerChanged()
+{
+ printerRB->setChecked(true);
+ form_->changed();
+}
+
+
+void GuiPrintDialog::pagerangeChanged()
+{
+ form_->changed();
+}
GuiPrint::GuiPrint(Dialog & parent)
- : print_base_class(parent, _("Print Document"))
+ : GuiView<GuiPrintDialog>(parent, _("Print Document"))
{
}
PrinterParams const pp(t,
fromqstr(dialog_->printerED->text()),
- internal_path(fromqstr(dialog_->fileED->text())),
+ support::os::internal_path(fromqstr(dialog_->fileED->text())),
dialog_->allRB->isChecked(),
dialog_->fromED->text().toUInt(),
dialog_->toED->text().toUInt(),
} // namespace frontend
} // namespace lyx
+
+#include "GuiPrint_moc.cpp"
* Full author contact details are available in file CREDITS.
*/
-#ifndef QPRINT_H
-#define QPRINT_H
+#ifndef GUIPRINT_H
+#define GUIPRINT_H
#include "GuiDialogView.h"
-#include "GuiPrintDialog.h"
+#include "ControlPrint.h"
+#include "ui_PrintUi.h"
+
+#include <QDialog>
namespace lyx {
namespace frontend {
-class ControlPrint;
+class GuiPrint;
+
+class GuiPrintDialog : public QDialog, public Ui::PrintUi {
+ Q_OBJECT
+public:
+ GuiPrintDialog(GuiPrint * f);
+protected Q_SLOTS:
+ virtual void change_adaptor();
+ virtual void browseClicked();
+ virtual void fileChanged();
+ virtual void copiesChanged(int);
+ virtual void printerChanged();
+ virtual void pagerangeChanged();
+private:
+ GuiPrint * form_;
+};
+
-///
-class GuiPrint
- : public QController<ControlPrint, GuiView<GuiPrintDialog> >
+class GuiPrint : public GuiView<GuiPrintDialog>
{
public:
///
friend class GuiPrintDialog;
///
GuiPrint(Dialog &);
+ /// parent controller
+ ControlPrint & controller()
+ { return static_cast<ControlPrint &>(this->getController()); }
+ /// parent controller
+ ControlPrint const & controller() const
+ { return static_cast<ControlPrint const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QPRINT_H
+#endif // GUIPRINT_H
+++ /dev/null
-/**
- * \file GuiPrintDialog.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author John Levon
- * \author Edwin Leuven
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "controllers/ControlPrint.h"
-#include "GuiPrintDialog.h"
-#include "GuiPrint.h"
-#include "qt_helpers.h"
-
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-
-namespace lyx {
-namespace frontend {
-
-GuiPrintDialog::GuiPrintDialog(GuiPrint * f)
- : form_(f)
-{
- setupUi(this);
-
- connect(printPB, SIGNAL(clicked()), form_, SLOT(slotOK()));
- connect(closePB, SIGNAL(clicked()), form_, SLOT(slotClose()));
-
- connect(copiesSB, SIGNAL(valueChanged(int)), this, SLOT(copiesChanged(int)));
- connect(printerED, SIGNAL(textChanged(const QString&)),
- this, SLOT(printerChanged()));
- connect(fileED, SIGNAL(textChanged(const QString&)),
- this, SLOT(fileChanged() ));
- connect(browsePB, SIGNAL(clicked()), this, SLOT(browseClicked()));
- connect(allRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
- connect(reverseCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
- connect(collateCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
- connect(fromED, SIGNAL(textChanged(const QString&)),
- this, SLOT(pagerangeChanged()));
- connect(fromED, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_adaptor()));
- connect(toED, SIGNAL(textChanged(const QString&)),
- this, SLOT(pagerangeChanged()));
- connect(toED, SIGNAL(textChanged(const QString&)),
- this, SLOT(change_adaptor()));
- connect(fileRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
- connect(printerRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
- connect(rangeRB, SIGNAL(toggled(bool)), fromED, SLOT(setEnabled(bool)));
- connect(rangeRB, SIGNAL(toggled(bool)), toED, SLOT(setEnabled(bool)));
-}
-
-
-void GuiPrintDialog::change_adaptor()
-{
- form_->changed();
-}
-
-
-void GuiPrintDialog::browseClicked()
-{
- QString file = toqstr(form_->controller().browse(docstring()));
- if (!file.isNull()) {
- fileED->setText(file);
- form_->changed();
- }
-}
-
-
-void GuiPrintDialog::fileChanged()
-{
- if (!fileED->text().isEmpty())
- fileRB->setChecked(true);
- form_->changed();
-}
-
-
-void GuiPrintDialog::copiesChanged(int i)
-{
- collateCB->setEnabled(i != 1);
- form_->changed();
-}
-
-
-void GuiPrintDialog::printerChanged()
-{
- printerRB->setChecked(true);
- form_->changed();
-}
-
-
-void GuiPrintDialog::pagerangeChanged()
-{
- form_->changed();
-}
-
-} // namespace frontend
-} // namespace lyx
-
-#include "GuiPrintDialog_moc.cpp"
+++ /dev/null
-// -*- C++ -*-
-/**
- * \file GuiPrintDialog.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author John Levon
- * \author Edwin Leuven
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef QLPRINTDIALOG_H
-#define QLPRINTDIALOG_H
-
-#include "ui_PrintUi.h"
-
-#include <QDialog>
-
-namespace lyx {
-namespace frontend {
-
-class GuiPrint;
-
-class GuiPrintDialog : public QDialog, public Ui::PrintUi {
- Q_OBJECT
-public:
- GuiPrintDialog(GuiPrint * f);
-protected Q_SLOTS:
- virtual void change_adaptor();
- virtual void browseClicked();
- virtual void fileChanged();
- virtual void copiesChanged(int);
- virtual void printerChanged();
- virtual void pagerangeChanged();
-private:
- GuiPrint * form_;
-};
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // QLPRINTDIALOG_H
#include "Qt2BC.h"
#include "qt_helpers.h"
-#include "controllers/ButtonController.h"
-#include "controllers/ControlRef.h"
+#include "ButtonController.h"
#include "insets/InsetRef.h"
//
/////////////////////////////////////////////////////////////////////
-// full qualification because qt4 has also a ControlRef type
-typedef QController<lyx::frontend::ControlRef, GuiView<GuiRefDialog> > RefBase;
-
GuiRef::GuiRef(Dialog & parent)
- : RefBase(parent, _("Cross-reference")),
+ : GuiView<GuiRefDialog>(parent, _("Cross-reference")),
sort_(false), at_ref_(false)
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QREF_H
-#define QREF_H
+#ifndef GUIREF_H
+#define GUIREF_H
#include "GuiDialogView.h"
-
+#include "ControlRef.h"
#include "ui_RefUi.h"
#include <QDialog>
#include <vector>
class QListWidgetItem;
-class QCloseEvent;
namespace lyx {
namespace frontend {
};
-class ControlRef;
-
-// full qualification because qt4 has also a ControlRef type
-class GuiRef
- : public QController<lyx::frontend::ControlRef, GuiView<GuiRefDialog> >
+class GuiRef : public GuiView<GuiRefDialog>
{
public:
friend class GuiRefDialog;
GuiRef(Dialog &);
+ /// parent controller
+ ControlRef & controller()
+ { return static_cast<ControlRef &>(this->getController()); }
+ /// parent controller
+ ControlRef const & controller() const
+ { return static_cast<ControlRef const &>(this->getController()); }
protected:
virtual bool isValid();
/// is name allowed for this ?
bool nameAllowed();
-
/// is type allowed for this ?
bool typeAllowed();
-
/// go to current reference
void gotoRef();
-
/// set go back button
void setGoBack();
-
/// set goto ref button
void setGotoRef();
-
/// re-enter references
void redoRefs();
-
/// update references
void updateRefs();
/// sort or not persistent state
bool sort_;
-
/// went to a reference ?
bool at_ref_;
-
/// the last reference entered or examined
QString last_reference_;
-
/// store the buffer settings
int restored_buffer_;
-
/// the references
std::vector<docstring> refs_;
};
} // namespace frontend
} // namespace lyx
-#endif // QREF_H
+#endif // GUIREF_H
#include "qt_helpers.h"
#include "Qt2BC.h"
-#include "controllers/ControlSearch.h"
-
#include <QLineEdit>
#include <QCloseEvent>
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlSearch, GuiView<GuiSearchDialog> > SearchBase;
-
-
GuiSearch::GuiSearch(Dialog & parent)
- : SearchBase(parent, _("Find and Replace"))
+ : GuiView<GuiSearchDialog>(parent, _("Find and Replace"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QSEARCH_H
-#define QSEARCH_H
+#ifndef GUISEARCH_H
+#define GUISEARCH_H
#include "GuiDialogView.h"
+#include "ControlSearch.h"
#include "ui_SearchUi.h"
+
#include <string>
#include <QDialog>
namespace lyx {
namespace frontend {
-class ControlSearch;
-
class GuiSearch;
class GuiSearchDialog : public QDialog, public Ui::SearchUi {
virtual void closeEvent(QCloseEvent * e);
private:
- // add a string to the combo if needed
- void remember(std::string const & find, QComboBox & combo);
-
GuiSearch * form_;
};
-class GuiSearch
- : public QController<ControlSearch, GuiView<GuiSearchDialog> >
+class GuiSearch : public GuiView<GuiSearchDialog>
{
public:
///
friend class GuiSearchDialog;
///
GuiSearch(Dialog &);
+ /// parent controller
+ ControlSearch & controller()
+ { return static_cast<ControlSearch &>(this->getController()); }
+ /// parent controller
+ ControlSearch const & controller() const
+ { return static_cast<ControlSearch const &>(this->getController()); }
private:
/// Apply changes
virtual void apply() {}
} // namespace frontend
} // namespace lyx
-#endif // QSEARCH_H
+#endif // GUISEARCH_H
#include "Format.h"
-#include "controllers/ControlSendto.h"
-
#include <QListWidget>
#include <QPushButton>
#include <QCloseEvent>
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlSendto, GuiView<GuiSendtoDialog> > SendtoBase;
-
GuiSendto::GuiSendto(Dialog & parent)
- : SendtoBase(parent, _("Send Document to Command"))
+ : GuiView<GuiSendtoDialog>(parent, _("Send Document to Command"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QSENDTO_H
-#define QSENDTO_H
+#ifndef GUISENDTO_H
+#define GUISENDTO_H
#include "GuiDialogView.h"
+#include "ControlSendto.h"
#include "ui_SendtoUi.h"
#include <QDialog>
#include <vector>
-class QCloseEvent;
class QListWidgetItem;
namespace lyx {
};
-class ControlSendto;
-
/** This class provides a Qt implementation of the Custom Export Dialog.
*/
-class GuiSendto
- : public QController<ControlSendto, GuiView<GuiSendtoDialog> >
+class GuiSendto : public GuiView<GuiSendtoDialog>
{
public:
///
friend class GuiSendtoDialog;
///
GuiSendto(Dialog &);
+ /// parent controller
+ ControlSendto & controller()
+ { return static_cast<ControlSendto &>(this->getController()); }
+ /// parent controller
+ ControlSendto const & controller() const
+ { return static_cast<ControlSendto const &>(this->getController()); }
protected:
virtual bool isValid();
private:
} // namespace frontend
} // namespace lyx
-#endif // QSENDTO_H
+#endif // GUISENDTO_H
#include "Qt2BC.h"
#include "qt_helpers.h"
-#include "controllers/ControlShowFile.h"
-
#include <QTextBrowser>
#include <QPushButton>
+#include <QCloseEvent>
namespace lyx {
namespace frontend {
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlShowFile, GuiView<GuiShowFileDialog> >
- ShowFileBase;
-
GuiShowFile::GuiShowFile(Dialog & parent)
- : ShowFileBase(parent, _("Show File"))
+ : GuiView<GuiShowFileDialog>(parent, _("Show File"))
{
}
#define QSHOWFILE_H
#include "GuiDialogView.h"
-
+#include "ControlShowFile.h"
#include "ui_ShowFileUi.h"
#include <QDialog>
-#include <QCloseEvent>
+
namespace lyx {
namespace frontend {
class GuiShowFile;
-class GuiShowFileDialog : public QDialog, public Ui::ShowFileUi {
+class GuiShowFileDialog : public QDialog, public Ui::ShowFileUi
+{
Q_OBJECT
public:
GuiShowFileDialog(GuiShowFile * form);
};
-class ControlShowFile;
-
-class GuiShowFile
- : public QController<ControlShowFile, GuiView<GuiShowFileDialog> >
+class GuiShowFile : public GuiView<GuiShowFileDialog>
{
public:
friend class GuiShowFileDialog;
GuiShowFile(Dialog &);
+ /// parent controller
+ ControlShowFile & controller()
+ { return static_cast<ControlShowFile &>(this->getController()); }
+ /// parent controller
+ ControlShowFile const & controller() const
+ { return static_cast<ControlShowFile const &>(this->getController()); }
private:
/// Apply changes
virtual void apply() {}
#include "Qt2BC.h"
#include "qt_helpers.h"
-#include "controllers/ControlSpellchecker.h"
-
#include <QProgressBar>
#include <QLineEdit>
#include <QPushButton>
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlSpellchecker, GuiView<GuiSpellcheckerDialog> >
- SpellcheckerBase;
GuiSpellchecker::GuiSpellchecker(Dialog & parent)
- : SpellcheckerBase(parent, _("Spellchecker"))
+ : GuiView<GuiSpellcheckerDialog>(parent, _("Spellchecker"))
{}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QSPELLCHECKER_H
-#define QSPELLCHECKER_H
+#ifndef GUISPELLCHECKER_H
+#define GUISPELLCHECKER_H
#include "GuiDialogView.h"
+#include "ControlSpellchecker.h"
#include "ui_SpellcheckerUi.h"
#include <QDialog>
-#include <QCloseEvent>
class QListWidgetItem;
+
namespace lyx {
namespace frontend {
};
-class ControlSpellchecker;
-
-class GuiSpellchecker
- : public QController<ControlSpellchecker, GuiView<GuiSpellcheckerDialog> >
+class GuiSpellchecker : public GuiView<GuiSpellcheckerDialog>
{
public:
friend class GuiSpellcheckerDialog;
/// update from controller
void partialUpdate(int id);
+ /// parent controller
+ ControlSpellchecker & controller()
+ { return static_cast<ControlSpellchecker &>(this->getController()); }
+ /// parent controller
+ ControlSpellchecker const & controller() const
+ { return static_cast<ControlSpellchecker const &>(this->getController()); }
private:
void accept();
void add();
} // namespace frontend
} // namespace lyx
-#endif // QSPELLCHECKER_H
+#endif // GUISPELLCHECKER_H
#include <config.h>
-#include "CheckedLineEdit.h"
#include "GuiTabular.h"
+
+#include "CheckedLineEdit.h"
+#include "GuiSetBorder.h"
#include "Qt2BC.h"
#include "LengthCombo.h"
#include "qt_helpers.h"
#include "controllers/ButtonController.h"
-#include "controllers/ControlTabular.h"
#include "support/convert.h"
#include <QRadioButton>
#include <QLineEdit>
-#include "GuiSetBorder.h"
-
using std::string;
namespace lyx {
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlTabular, GuiView<GuiTabularDialog> > tabular_base_class;
GuiTabular::GuiTabular(Dialog & parent)
- : tabular_base_class(parent, _("Table Settings"))
+ : GuiView<GuiTabularDialog>(parent, _("Table Settings"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QTABULAR_H
-#define QTABULAR_H
+#ifndef GUITABULAR_H
+#define GUITABULAR_H
#include "GuiDialogView.h"
-
+#include "ControlTabular.h"
#include "ui_TabularUi.h"
#include <QDialog>
-#include <QCloseEvent>
namespace lyx {
namespace frontend {
class GuiTabular;
-class GuiTabularDialog : public QDialog, public Ui::TabularUi {
+class GuiTabularDialog : public QDialog, public Ui::TabularUi
+{
Q_OBJECT
public:
GuiTabularDialog(GuiTabular * form);
};
-class ControlTabular;
-
-class GuiTabular :
- public QController<ControlTabular, GuiView<GuiTabularDialog> >
+class GuiTabular : public GuiView<GuiTabularDialog>
{
public:
friend class GuiTabularDialog;
GuiTabular(Dialog &);
+ /// parent controller
+ ControlTabular & controller()
+ { return static_cast<ControlTabular &>(this->getController()); }
+ /// parent controller
+ ControlTabular const & controller() const
+ { return static_cast<ControlTabular const &>(this->getController()); }
protected:
virtual bool isValid();
} // namespace frontend
} // namespace lyx
-#endif // QTABULAR_H
+#endif // GUITABULAR_H
#include "Qt2BC.h"
#include "EmptyTable.h"
-#include "controllers/ControlTabularCreate.h"
-
+#include <QCloseEvent>
#include <QSpinBox>
#include <QPushButton>
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlTabularCreate, GuiView<GuiTabularCreateDialog> >
- TabularCreateBase;
-
GuiTabularCreate::GuiTabularCreate(Dialog & parent)
- : TabularCreateBase(parent, _("Insert Table"))
+ : GuiView<GuiTabularCreateDialog>(parent, _("Insert Table"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QTABULARCREATE_H
-#define QTABULARCREATE_H
+#ifndef GUITABULARCREATE_H
+#define GUITABULARCREATE_H
#include "GuiDialogView.h"
+#include "ControlTabularCreate.h"
#include "ui_TabularCreateUi.h"
#include <QDialog>
class GuiTabularCreate;
-class GuiTabularCreateDialog : public QDialog, public Ui::TabularCreateUi {
+class GuiTabularCreateDialog : public QDialog, public Ui::TabularCreateUi
+{
Q_OBJECT
public:
GuiTabularCreateDialog(GuiTabularCreate * form);
};
-class ControlTabularCreate;
-
-class GuiTabularCreate
- : public QController<ControlTabularCreate, GuiView<GuiTabularCreateDialog> >
+class GuiTabularCreate : public GuiView<GuiTabularCreateDialog>
{
public:
///
friend class GuiTabularCreateDialog;
///
GuiTabularCreate(Dialog &);
+ /// parent controller
+ ControlTabularCreate & controller()
+ { return static_cast<ControlTabularCreate &>(this->getController()); }
+ /// parent controller
+ ControlTabularCreate const & controller() const
+ { return static_cast<ControlTabularCreate const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QTABULARCREATE_H
+#endif // GUITABULARCREATE_H
#include "support/filetools.h"
+#include <QCloseEvent>
#include <QCheckBox>
#include <QListWidget>
#include <QPushButton>
}
-
/////////////////////////////////////////////////////////////////////
//
// GuiTexinfo
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlTexinfo, GuiView<GuiTexinfoDialog> >
- texinfo_base_class;
GuiTexinfo::GuiTexinfo(Dialog & parent)
- : texinfo_base_class(parent, _("TeX Information")),
+ : GuiView<GuiTexinfoDialog>(parent, _("TeX Information")),
warningPosted(false), activeStyle(ControlTexinfo::cls)
{
}
#define QTEXINFO_H
#include "GuiDialogView.h"
-
#include "ControlTexinfo.h"
#include "ui_TexinfoUi.h"
#include <QDialog>
-#include <QCloseEvent>
#include <map>
#include <vector>
class GuiTexinfo;
-class GuiTexinfoDialog : public QDialog, public Ui::TexinfoUi {
+class GuiTexinfoDialog : public QDialog, public Ui::TexinfoUi
+{
Q_OBJECT
public:
GuiTexinfoDialog(GuiTexinfo * form);
///
-class GuiTexinfo
- : public QController<ControlTexinfo, GuiView<GuiTexinfoDialog> > {
+class GuiTexinfo : public GuiView<GuiTexinfoDialog>
+{
public:
///
friend class GuiTexinfoDialog;
///
GuiTexinfo(Dialog &);
+ /// parent controller
+ ControlTexinfo & controller()
+ { return static_cast<ControlTexinfo &>(this->getController()); }
+ /// parent controller
+ ControlTexinfo const & controller() const
+ { return static_cast<ControlTexinfo const &>(this->getController()); }
private:
/// Apply changes
virtual void apply() {}
#include "qt_helpers.h"
#include "debug.h"
-#include "controllers/ControlThesaurus.h"
-
+#include <QCloseEvent>
#include <QHeaderView>
#include <QLineEdit>
#include <QPushButton>
/////////////////////////////////////////////////////////////////////
//
-// GuiThesuarus
+// GuiThesaurus
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlThesaurus, GuiView<GuiThesaurusDialog> > ThesaurusBase;
-
GuiThesaurus::GuiThesaurus(Dialog & parent)
- : ThesaurusBase(parent, _("Thesaurus"))
+ : GuiView<GuiThesaurusDialog>(parent, _("Thesaurus"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QTHESAURUS_H
-#define QTHESAURUS_H
+#ifndef GUITHESAURUS_H
+#define GUITHESAURUS_H
#include "GuiDialogView.h"
+#include "ControlThesaurus.h"
#include "ui_ThesaurusUi.h"
#include <QDialog>
-#include <QCloseEvent>
class QTreeWidgetItem;
class GuiThesaurus;
-class GuiThesaurusDialog : public QDialog, public Ui::ThesaurusUi {
+class GuiThesaurusDialog : public QDialog, public Ui::ThesaurusUi
+{
Q_OBJECT
public:
GuiThesaurusDialog(GuiThesaurus * form);
///
-class GuiThesaurus
- : public QController<ControlThesaurus, GuiView<GuiThesaurusDialog> >
+class GuiThesaurus : public GuiView<GuiThesaurusDialog>
{
public:
///
friend class GuiThesaurusDialog;
///
GuiThesaurus(Dialog &);
+ /// parent controller
+ ControlThesaurus & controller()
+ { return static_cast<ControlThesaurus &>(this->getController()); }
+ /// parent controller
+ ControlThesaurus const & controller() const
+ { return static_cast<ControlThesaurus const &>(this->getController()); }
private:
/// Apply changes
virtual void apply() {}
} // namespace frontend
} // namespace lyx
-#endif // QTHESAURUS_H
+#endif // GUITHESAURUS_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QTOC_H
-#define QTOC_H
+#ifndef GUITOC_H
+#define GUITOC_H
#include "ControlToc.h"
} // namespace frontend
} // namespace lyx
-#endif // QTOC_H
+#endif // GUITOC_H
* Full author contact details are available in file CREDITS.
*/
-#ifndef QLTOOLBAR_H
-#define QLTOOLBAR_H
+#ifndef GUITOOLBAR_H
+#define GUITOOLBAR_H
#include "frontends/Toolbars.h"
#include "Session.h"
} // namespace frontend
} // namespace lyx
-#endif // NOT QLTOOLBAR_H
+#endif // GUITOOLBAR_H
#include <config.h>
#include "GuiURLDialog.h"
-#include "UrlView.h"
+#include "Qt2BC.h"
+#include "qt_helpers.h"
+#include "ButtonController.h"
+#include <QCheckBox>
+#include <QCloseEvent>
#include <QLineEdit>
#include <QPushButton>
-#include <QCloseEvent>
+
namespace lyx {
namespace frontend {
e->accept();
}
+
+
+UrlView::UrlView(Dialog & parent)
+ : GuiView<GuiURLDialog>(parent, _("URL"))
+{
+}
+
+
+void UrlView::build_dialog()
+{
+ dialog_.reset(new GuiURLDialog(this));
+
+ bcview().setOK(dialog_->okPB);
+ bcview().setCancel(dialog_->closePB);
+ bcview().addReadOnly(dialog_->urlED);
+ bcview().addReadOnly(dialog_->nameED);
+ bcview().addReadOnly(dialog_->hyperlinkCB);
+}
+
+
+void UrlView::update_contents()
+{
+ InsetCommandParams const & params = controller().params();
+
+ dialog_->urlED->setText(toqstr(params["target"]));
+ dialog_->nameED->setText(toqstr(params["name"]));
+ dialog_->hyperlinkCB->setChecked(params.getCmdName() != "url");
+
+ bc().valid(isValid());
+}
+
+
+void UrlView::apply()
+{
+ InsetCommandParams & params = controller().params();
+
+ params["target"] = qstring_to_ucs4(dialog_->urlED->text());
+ params["name"] = qstring_to_ucs4(dialog_->nameED->text());
+
+ if (dialog_->hyperlinkCB->isChecked())
+ params.setCmdName("htmlurl");
+ else
+ params.setCmdName("url");
+}
+
+
+bool UrlView::isValid()
+{
+ QString const u = dialog_->urlED->text();
+ QString const n = dialog_->nameED->text();
+
+ return !u.isEmpty() || !n.isEmpty();
+}
+
} // namespace frontend
} // namespace lyx
#ifndef GUIURLDIALOG_H
#define GUIURLDIALOG_H
+#include "GuiDialogView.h"
+#include "ControlCommand.h"
#include "ui_URLUi.h"
#include <QDialog>
-#include <QCloseEvent>
namespace lyx {
namespace frontend {
class UrlView;
-class GuiURLDialog : public QDialog, public Ui::URLUi {
+class GuiURLDialog : public QDialog, public Ui::URLUi
+{
Q_OBJECT
public:
GuiURLDialog(UrlView * form);
UrlView * form_;
};
+
+class UrlView : public GuiView<GuiURLDialog>
+{
+public:
+ friend class QURLDialog;
+ UrlView(Dialog &);
+ /// parent controller
+ ControlCommand & controller()
+ { return static_cast<ControlCommand &>(this->getController()); }
+ /// parent controller
+ ControlCommand const & controller() const
+ { return static_cast<ControlCommand const &>(this->getController()); }
+protected:
+ virtual bool isValid();
+private:
+ /// apply dialog
+ virtual void apply();
+ /// build dialog
+ virtual void build_dialog();
+ /// update dialog
+ virtual void update_contents();
+};
+
} // namespace frontend
} // namespace lyx
}
-typedef QController<ControlVSpace, GuiView<GuiVSpaceDialog> > VSpaceBase;
-
GuiVSpace::GuiVSpace(Dialog & parent)
- : VSpaceBase(parent, _("Vertical Space Settings"))
+ : GuiView<GuiVSpaceDialog>(parent, _("Vertical Space Settings"))
{}
#define QVSPACE_H
#include "GuiDialogView.h"
-
+#include "ControlVSpace.h"
#include "ui_VSpaceUi.h"
#include <QDialog>
-class QCloseEvent;
-
namespace lyx {
namespace frontend {
-class ControlVSpace;
-
class GuiVSpace;
-
-class GuiVSpaceDialog : public QDialog, public Ui::VSpaceUi {
+class GuiVSpaceDialog : public QDialog, public Ui::VSpaceUi
+{
Q_OBJECT
public:
};
-
-class GuiVSpace
- : public QController<ControlVSpace, GuiView<GuiVSpaceDialog> >
+class GuiVSpace : public GuiView<GuiVSpaceDialog>
{
public:
///
friend class GuiVSpaceDialog;
///
GuiVSpace(Dialog &);
+ /// parent controller
+ ControlVSpace & controller()
+ { return static_cast<ControlVSpace &>(this->getController()); }
+ /// parent controller
+ ControlVSpace const & controller() const
+ { return static_cast<ControlVSpace const &>(this->getController()); }
private:
/// Build the dialog
virtual void build_dialog();
* Full author contact details are available in file CREDITS.
*/
-#ifndef QVIEWSOURCE_H
-#define QVIEWSOURCE_H
+#ifndef GUIVIEWSOURCE_H
+#define GUIVIEWSOURCE_H
-#include "frontends/controllers/ControlViewSource.h"
-#include "frontends/Application.h"
+#include "ControlViewSource.h"
+#include "Application.h"
#include "ui_ViewSourceUi.h"
#include <QWidget>
};
-
class GuiViewSource;
class GuiViewSourceDialog : public QWidget, public Ui::ViewSourceUi {
} // namespace frontend
} // namespace lyx
-#endif // QVIEWSOURCE_H
+#endif // GUIVIEWSOURCE_H
void GuiWorkArea::updateScreen()
{
- QLPainter pain(&screen_);
+ GuiPainter pain(&screen_);
verticalScrollBar()->show();
buffer_view_->draw(pain);
}
return;
}
- QLPainter pain(&screen_);
+ GuiPainter pain(&screen_);
buffer_view_->updateMetrics(false);
buffer_view_->draw(pain);
Font font = buffer_view_->cursor().getFont();
#include "LengthCombo.h"
#include "qt_helpers.h"
-#include "controllers/ControlWrap.h"
-
#include "insets/InsetWrap.h"
#include "support/convert.h"
//
/////////////////////////////////////////////////////////////////////
-typedef QController<ControlWrap, GuiView<GuiWrapDialog> > wrap_base_class;
-
GuiWrap::GuiWrap(Dialog & parent)
- : wrap_base_class(parent, _("Text Wrap Settings"))
+ : GuiView<GuiWrapDialog>(parent, _("Text Wrap Settings"))
{
}
* Full author contact details are available in file CREDITS.
*/
-#ifndef QWRAP_H
-#define QWRAP_H
+#ifndef GUIWRAP_H
+#define GUIWRAP_H
#include "GuiDialogView.h"
+#include "ControlWrap.h"
#include "ui_WrapUi.h"
#include <QDialog>
-#include <QCloseEvent>
namespace lyx {
namespace frontend {
class GuiWrap;
-class GuiWrapDialog : public QDialog, public Ui::WrapUi {
+class GuiWrapDialog : public QDialog, public Ui::WrapUi
+{
Q_OBJECT
public:
GuiWrapDialog(GuiWrap * form);
};
-class ControlWrap;
-
-class GuiWrap : public QController<ControlWrap, GuiView<GuiWrapDialog> > {
+class GuiWrap : public GuiView<GuiWrapDialog>
+{
public:
friend class GuiWrapDialog;
GuiWrap(Dialog &);
+ /// parent controller
+ ControlWrap & controller()
+ { return static_cast<ControlWrap &>(this->getController()); }
+ /// parent controller
+ ControlWrap const & controller() const
+ { return static_cast<ControlWrap const &>(this->getController()); }
private:
/// Apply changes
virtual void apply();
} // namespace frontend
} // namespace lyx
-#endif // QWRAP_H
+#endif // GUIWRAP_H
GuiERT.cpp \
GuiExternal.cpp \
GuiFloat.cpp \
- GuiFloatDialog.cpp \
GuiFontExample.cpp \
GuiFontLoader.cpp \
GuiFontMetrics.cpp \
GuiGraphics.cpp \
- GuiGraphicsDialog.cpp \
GuiImage.cpp \
GuiImplementation.cpp \
GuiInclude.cpp \
GuiPopupMenu.cpp \
GuiPrefs.cpp \
GuiPrint.cpp \
- GuiPrintDialog.cpp \
GuiRef.cpp \
GuiSearch.cpp \
GuiSelection.cpp \
socket_callback.cpp \
TocModel.cpp \
TocWidget.cpp \
- UrlView.cpp \
Validator.cpp
NOMOCHEADER = \
GuiFontLoader.h \
GuiFontMetrics.h \
GuiSelection.h \
- GuiGraphics.h \
GuiImage.h \
GuiPainter.h \
- GuiPrint.h \
Qt2BC.h \
qt_helpers.h
GuiErrorList.h \
GuiERT.h \
GuiExternal.h \
- GuiFloatDialog.h \
GuiFloat.h \
GuiFontExample.h \
- GuiGraphicsDialog.h \
+ GuiGraphics.h \
GuiImplementation.h \
GuiInclude.h \
GuiIndex.h \
GuiParagraph.h \
GuiPopupMenu.h \
GuiPrefs.h \
- GuiPrintDialog.h \
+ GuiPrint.h \
GuiRef.h \
GuiSearch.h \
GuiSelectionManager.h \
+++ /dev/null
-/**
- * \file UrlView.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author John Levon
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "UrlView.h"
-#include "GuiURLDialog.h"
-#include "Qt2BC.h"
-#include "qt_helpers.h"
-
-#include "controllers/ButtonController.h"
-#include "controllers/ControlCommand.h"
-
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QPushButton>
-
-using std::string;
-
-namespace lyx {
-namespace frontend {
-
-typedef QController< ControlCommand, GuiView<GuiURLDialog> > urlview_base_class;
-
-UrlView::UrlView(Dialog & parent)
- : urlview_base_class(parent, _("URL"))
-{
-}
-
-
-void UrlView::build_dialog()
-{
- dialog_.reset(new GuiURLDialog(this));
-
- bcview().setOK(dialog_->okPB);
- bcview().setCancel(dialog_->closePB);
- bcview().addReadOnly(dialog_->urlED);
- bcview().addReadOnly(dialog_->nameED);
- bcview().addReadOnly(dialog_->hyperlinkCB);
-}
-
-
-void UrlView::update_contents()
-{
- InsetCommandParams const & params = controller().params();
-
- dialog_->urlED->setText(toqstr(params["target"]));
- dialog_->nameED->setText(toqstr(params["name"]));
- dialog_->hyperlinkCB->setChecked(params.getCmdName() != "url");
-
- bc().valid(isValid());
-}
-
-
-void UrlView::apply()
-{
- InsetCommandParams & params = controller().params();
-
- params["target"] = qstring_to_ucs4(dialog_->urlED->text());
- params["name"] = qstring_to_ucs4(dialog_->nameED->text());
-
- if (dialog_->hyperlinkCB->isChecked())
- params.setCmdName("htmlurl");
- else
- params.setCmdName("url");
-}
-
-
-bool UrlView::isValid()
-{
- string const u(fromqstr(dialog_->urlED->text()));
- string const n(fromqstr(dialog_->nameED->text()));
-
- return !u.empty() || !n.empty();
-}
-
-} // namespace frontend
-} // namespace lyx
+++ /dev/null
-// -*- C++ -*-
-/**
- * \file UrlView.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author John Levon
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef QT4_URL_VIEW_H
-#define QT4_URL_VIEW_H
-
-#include "GuiDialogView.h"
-#include "GuiURLDialog.h"
-
-namespace lyx {
-namespace frontend {
-
-class ControlCommand;
-
-class UrlView :
- public QController<ControlCommand, GuiView<GuiURLDialog> >
-{
-public:
- friend class QURLDialog;
- UrlView(Dialog &);
-protected:
- virtual bool isValid();
-private:
- /// apply dialog
- virtual void apply();
- /// build dialog
- virtual void build_dialog();
- /// update dialog
- virtual void update_contents();
-};
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // QT4_URL_VIEW_H
projects / features.git / commitdiff