Georg Baum
dbc5bf6f8a
* readd accidentally removed code (rev 14143)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14177 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-22 09:25:02 +00:00
Jean-Marc Lasgouttes
6444095092
fix wrong path to an image (bug 2653)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14169 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-21 13:21:31 +00:00
Peter Kümmel
bc720fa2df
add release option
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14167 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-21 10:32:17 +00:00
Peter Kümmel
04cfa65a96
fix: qt3/qt4 save/restore of the window geometry and maximize status
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14166 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-21 10:30:32 +00:00
Bo Peng
fe5c0415a4
Scons: restore fast_start, remove BOOST_USER_CONFIG in boost/config.h
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14164 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 16:46:35 +00:00
Bo Peng
865e5c25f2
Scons: config.h moves to BUILDDIR/common, boost_config.h moves to BUILDDIR/boost.
...
Do not use debug libraries for win/mingw.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14163 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 14:44:46 +00:00
Abdelrazak Younes
42e04448d5
QtView renamed to GuiView
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14162 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 14:35:36 +00:00
Martin Vermeer
4cb9cd44ec
Redefine the speed-up "Wide" patch to draw proper boxes
...
in available space instead of line pairs.
* rowpainter.C
(paintPar): change background rectangle
* insets/insettext.C
(InsetText::draw):
(InsetText::drawSelection): simplify rectangle drawing
* insets/insettext.h: dump Tall()
* insets/insetcollapsable.C
(InsetCollapsable::metrics): subtract button from available
space in case of inlined inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14161 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 12:39:39 +00:00
Abdelrazak Younes
f032e0af1a
revert commit 14159
...
QtView -> GuiView at the right place this time.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14160 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 11:56:31 +00:00
Abdelrazak Younes
e2c3e46a25
QtView -> GuiView
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14159 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 11:52:13 +00:00
Martin Vermeer
2e590eeee4
* insettabular.C (drawSelection): revision of previous patch:
...
initialize table background
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14158 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 10:44:49 +00:00
Peter Kümmel
6aa29e1b9d
add qt3 support
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14157 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 09:59:48 +00:00
Peter Kümmel
118cdb2bd3
add qt3 support
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14156 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 09:57:19 +00:00
Abdelrazak Younes
d46add7754
QtView renamed to GuiView
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14154 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 09:33:01 +00:00
Abdelrazak Younes
c7d3458f99
* [qt3, xforms, gtk]/GuiImplementation::newWorkArea: return 0
...
* qt4/Application.[Ch]: was not merged (GUI API cleanup merge) for an unknown reason
* qt4/clipboard.C: ditto
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14153 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 09:17:19 +00:00
Abdelrazak Younes
d8ae51dbe1
This is the merging of the GUI API cleanup branch that was developed in svn+ssh://svn.lyx.org/lyx/lyx-devel/branches/personal/younes.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14152 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 08:39:16 +00:00
Peter Kümmel
9ae369d22f
move uic files into its own folder in the msvc project
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14147 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 15:49:48 +00:00
Jürgen Spitzmüller
54acb900ad
The Grand Font Selection Redesign:
...
* lib/lyx2lyx/LyX.py (format_relation): add file format 247 (from Georg BAUM).
* lib/lyx2lyx/lyx_1_5.py: add convert_font_settings, revert_font_settings (from Georg BAUM).
* lib/chkconfig.ltx: Test for newly supported font packages
* lib/doc/LaTeXConfig.lyx.in: document newly supported font packages
* lib/doc/UserGuide.lyx: document new UI.
* lib/doc/Extended.lyx: update PostScript font documentation
* development/FORMAT: document file format change 246->247.
* src/tex-strings.[Ch]: new strings tex_fonts_roman, tex_fonts_sans,
tex_fonts_monospaced (with GUI equivalents).
* src/buffer.C: Format up to 247.
* src/bufferparams.C:
new params fontsRoman, fontsSans, fontsTypewriter, fontsDefaultFamily,
fontsSC, fontsOSF, fontsSansScale and fontsTypewriterScale
(LyXFont const BufferParams::getFont): consider switch of default family.
(string const BufferParams::loadFonts): new method to get all the LaTeX
font stuff done.
* src/paragraph.C
(LyXFont const Paragraph::getFont):
(LyXFont const Paragraph::getLabelFont):
(LyXFont const Paragraph::getLayoutFont): user buffer's not textclass's
default font
* src/text.C
(int LyXText::leftMargin):
(int LyXText::rightMargin): user buffer's not textclass's default font
* src/text2.C
(LyXFont LyXText::getFont):
(LyXFont LyXText::getLayoutFont):
(LyXFont LyXText::getLabelFont): check if the family of the default document
font has been customized.
* src/frontends/gtk/GDocument.[Ch]: implement new font ui (from Georg BAUM).
* src/frontends/gtk/glade/document.glade: implement new font ui (from Georg BAUM).
* src/frontends/qt3/Makefile.dialogs: add new FontModuleBase
* src/frontends/qt3/ui/FontModuleBase.ui: new File
* src/frontends/qt3/ui/TextLayoutModuleBase.ui: remove font widgets
* src/frontends/qt3/QDocument.C
* src/frontends/qt3/QDocumentDialog.[Ch]: implement new font ui
* src/frontends/qt4/Makefile.dialogs: add new FontUi
* src/frontends/qt4/QDocumentDialog.[Ch]: implement new font ui
* src/frontends/qt4/ui/FontUi.ui: new File
* src/frontends/qt4/ui/TextLayoutUi.ui: remove font widgets
* src/frontends/qt4/ui/compile_uic.sh: add new FontUi
* src/frontends/xforms/FormDocument.[Ch]: implement new font ui
* src/frontends/xforms/forms/form_document.fd: add new font tab.
* src/frontends/controllers/ControlDocument.[Ch]
(char ControlDocument::fontfamilies):
(char ControlDocument::fontfamilies_gui):
(bool ControlDocument::isFontAvailable):
(bool ControlDocument::providesSC):
(bool ControlDocument::providesOSF):
(bool ControlDocument::providesScale): new methods, providing font info.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14143 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 08:10:17 +00:00
Georg Baum
3ac0c3f587
* src/format.C
...
(Formats::view): Call the viewer with the absolute filename instead
of changing the working directory to avoid a race condition on
systems with a slow fork().
(Formats::edit): Ditto (editor instead of viewer)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14142 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-18 10:51:59 +00:00
Martin Vermeer
40d8a3cce5
* insettabular.C (drawSelection): initialize cell background
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14141 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-18 09:27:57 +00:00
Peter Kümmel
1ec4d26038
restore (14087) save/load geometry logic of qt3
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14140 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-18 09:05:41 +00:00
Bo Peng
dde45f75da
Scons: link to qt debug lib in debug mode
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14139 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-18 04:04:23 +00:00
Abdelrazak Younes
30649ec3b6
Those classes (and their associated [Ch] files) are renamed :
...
QLAction -> Action
lcolorcache -> ColorCache
qfont_loader.C -> FontLoader
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14136 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-17 09:14:58 +00:00
Bo Peng
29431ace2c
Scons: imerge SConscript to SConstruct, separate config.h, code cleanup
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14133 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-17 04:43:44 +00:00
Peter Kümmel
4e7ca2d6f4
use glob instead of lists
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14131 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 17:26:32 +00:00
Peter Kümmel
585b386088
add item for QMAKESPEC
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14130 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 17:02:42 +00:00
Peter Kümmel
82db64c958
use glob instead of lists
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14129 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 16:43:17 +00:00
Jean-Marc Lasgouttes
2b8d396ef2
use our own font width cache with Qt/Mac
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14128 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 14:39:52 +00:00
Georg Baum
fbda39f77c
* lib/doc/de_Extended.lyx: mention htlatex
...
* lib/doc/Extended.lyx: ditto
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14123 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 17:08:26 +00:00
Peter Kümmel
e97a9f1043
don't break the geometry option
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14122 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 16:01:55 +00:00
Peter Kümmel
330db5cce1
correct svn properties, upadte aspell handling
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14121 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 15:11:25 +00:00
Georg Baum
8caaf338c3
* INSTALL: Change required python version from 1.5.2 to 2.3
...
* INSTALL.scons: ditto
* README: ditto
* configure.ac: ditto
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14117 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 08:44:28 +00:00
Georg Baum
d8d9db0879
* src/support/lyxalgo.h
...
(count): Compile fix (add forgotten typename)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14116 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 08:06:00 +00:00
Bo Peng
c287b1330e
Scons: bug fix for default_boost_option
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14114 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 02:45:57 +00:00
Bo Peng
b8f8bdfb69
Scons: update INSTALL.scons according to Abdel's recommended links.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14113 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 20:10:36 +00:00
Georg Baum
20802b7c9b
remove references to deleted file QtLyXView.h
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14112 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 19:26:23 +00:00
Georg Baum
9cbcb8a39e
* src/frontends/qt3/lyx_gui.C: compile fix
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14109 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 15:49:36 +00:00
Bo Peng
aa460e9217
Scons: improved option handling
...
* add option: optimization (=-O3 etc)
* add load_option=opt1,opt2 or load_option=-opt1,opt2: selectively load options
* CCFLAGS etc will replace default values, but not hardcoded ones.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14107 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 15:13:19 +00:00
Peter Kümmel
fcdbd2357d
load and restore correct windows postion
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14104 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 14:42:24 +00:00
Peter Kümmel
f6c5d0d63a
load and restore correct windows postion
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14103 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 14:34:50 +00:00
Peter Kümmel
cd53c67f79
load and restore correct windows postion
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14102 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 14:32:39 +00:00
Peter Kümmel
c02f6409ec
Fix Qt4 resize bug.
...
Don't use multiple QPainter::begin on the same QPaintDevice.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14101 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 14:23:25 +00:00
Jean-Marc Lasgouttes
794247eddd
cleanup zlib checking
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14100 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 14:07:36 +00:00
Peter Kümmel
34424bb42d
add Linux/Win GCC instructions
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14097 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 07:49:44 +00:00
Bo Peng
56134789f7
Scons: add qt2 frontend for lyx1.4
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14096 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 14:16:54 +00:00
Peter Kümmel
bbc587ee9a
coding style and readability corrections
...
Index: frontends/qt3/lyx_gui.C
===================================================================
--- frontends/qt3/lyx_gui.C (revision 14088)
+++ frontends/qt3/lyx_gui.C (working copy)
@@ -222,12 +222,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax)
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, maximize));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt3/QtView.C
===================================================================
--- frontends/qt3/QtView.C (revision 14088)
+++ frontends/qt3/QtView.C (working copy)
@@ -55,12 +55,12 @@
-QtView::QtView(unsigned int width, unsigned int height, bool isMax)
+QtView::QtView(unsigned int width, unsigned int height, bool maximize)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
- if(isMax)
+ if (maximize)
this->setWindowState(WindowMaximized);
qApp->setMainWidget(this);
@@ -164,7 +164,7 @@
void QtView::closeEvent(QCloseEvent *)
{
LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
- //don't save maximized values
+ // don't save maximized values
this->showNormal();
// save windows size and position
LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
Index: frontends/qt3/QtView.h
===================================================================
--- frontends/qt3/QtView.h (revision 14088)
+++ frontends/qt3/QtView.h (working copy)
@@ -37,7 +37,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h, bool isMax);
+ QtView(unsigned int w, unsigned int h, bool maximize);
~QtView();
Index: frontends/qt4/lyx_gui.C
===================================================================
--- frontends/qt4/lyx_gui.C (revision 14088)
+++ frontends/qt4/lyx_gui.C (working copy)
@@ -228,12 +228,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax)
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, maximize));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt4/QtView.C
===================================================================
--- frontends/qt4/QtView.C (revision 14088)
+++ frontends/qt4/QtView.C (working copy)
@@ -70,12 +70,12 @@
} // namespace anon
-QtView::QtView(unsigned int width, unsigned int height, bool isMax)
+QtView::QtView(unsigned int width, unsigned int height, bool maximize)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
- if(isMax)
+ if (maximize)
this->setWindowState(Qt::WindowMaximized);
mainWidget_ = this;
Index: frontends/qt4/QtView.h
===================================================================
--- frontends/qt4/QtView.h (revision 14088)
+++ frontends/qt4/QtView.h (working copy)
@@ -47,7 +47,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h, bool isMax);
+ QtView(unsigned int w, unsigned int h, bool maximize);
~QtView();
Index: frontends/lyx_gui.h
===================================================================
--- frontends/lyx_gui.h (revision 14088)
+++ frontends/lyx_gui.h (working copy)
@@ -57,7 +57,7 @@
* batch commands, and loading the given documents
*/
void start(std::string const & batch, std::vector<std::string> const & files,
- unsigned int width, unsigned int height, int posx, int posy, bool isMax);
+ unsigned int width, unsigned int height, int posx, int posy, bool maximize);
/**
* Enter the main event loop (\sa LyX::exec2)
Index: lyx_main.C
===================================================================
--- lyx_main.C (revision 14088)
+++ lyx_main.C (working copy)
@@ -307,7 +307,7 @@
// initial geometry
unsigned int width = 690;
unsigned int height = 510;
- bool isMax = false;
+ bool maximize = false;
// first try lyxrc
if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
width = lyxrc.geometry_width;
@@ -322,7 +322,7 @@
if (!val.empty())
height = convert<unsigned int>(val);
if (session().loadSessionInfo("WindowIsMaximized") == "yes")
- isMax = true;
+ maximize = true;
}
// if user wants to restore window position
int posx = -1;
@@ -335,7 +335,7 @@
if (!val.empty())
posy = convert<int>(val);
}
- lyx_gui::start(batch_command, files, width, height, posx, posy, isMax);
+ lyx_gui::start(batch_command, files, width, height, posx, posy, maximize);
} else {
// Something went wrong above
quitLyX(false);
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14089 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 08:24:43 +00:00
Peter Kümmel
226acfcbab
Qt3/Qt4:
...
- don't save geometry values of the maximized lyx window
- save/restore the maximized property of the lyx window
- fix changed lyx_gui::start interface for xform and gtk
Index: frontends/gtk/lyx_gui.C
===================================================================
--- frontends/gtk/lyx_gui.C (revision 14083)
+++ frontends/gtk/lyx_gui.C (working copy)
@@ -123,7 +123,7 @@
void lyx_gui::start(string const & batch, std::vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy)
+ unsigned int width, unsigned int height, int posx, int posy, bool)
{
boost::shared_ptr<GView> view_ptr(new GView);
LyX::ref().addLyXView(view_ptr);
Index: frontends/qt3/lyx_gui.C
===================================================================
--- frontends/qt3/lyx_gui.C (revision 14083)
+++ frontends/qt3/lyx_gui.C (working copy)
@@ -222,12 +222,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy)
+ unsigned int width, unsigned int height, int posx, int posy, bool isMax)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt3/QtView.C
===================================================================
--- frontends/qt3/QtView.C (revision 14083)
+++ frontends/qt3/QtView.C (working copy)
@@ -55,10 +55,13 @@
-QtView::QtView(unsigned int width, unsigned int height)
+QtView::QtView(unsigned int width, unsigned int height, bool isMax)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
+
+ if(isMax)
+ this->setWindowState(WindowMaximized);
qApp->setMainWidget(this);
@@ -160,6 +163,9 @@
void QtView::closeEvent(QCloseEvent *)
{
+ LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
+ //don't save maximized values
+ this->showNormal();
// save windows size and position
LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(height()));
Index: frontends/qt3/QtView.h
===================================================================
--- frontends/qt3/QtView.h (revision 14083)
+++ frontends/qt3/QtView.h (working copy)
@@ -37,7 +37,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h);
+ QtView(unsigned int w, unsigned int h, bool isMax);
~QtView();
Index: frontends/qt4/lyx_gui.C
===================================================================
--- frontends/qt4/lyx_gui.C (revision 14083)
+++ frontends/qt4/lyx_gui.C (working copy)
@@ -228,12 +228,12 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy)
+ unsigned int width, unsigned int height, int posx, int posy, bool isMax)
{
// this can't be done before because it needs the Languages object
initEncodings();
- boost::shared_ptr<QtView> view_ptr(new QtView(width, height));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
LyX::ref().addLyXView(view_ptr);
QtView & view = *view_ptr.get();
Index: frontends/qt4/QtView.C
===================================================================
--- frontends/qt4/QtView.C (revision 14083)
+++ frontends/qt4/QtView.C (working copy)
@@ -70,11 +70,14 @@
} // namespace anon
-QtView::QtView(unsigned int width, unsigned int height)
+QtView::QtView(unsigned int width, unsigned int height, bool isMax)
: QMainWindow(), LyXView(), commandbuffer_(0)
{
resize(width, height);
+ if(isMax)
+ this->setWindowState(Qt::WindowMaximized);
+
mainWidget_ = this;
// setToolButtonStyle(Qt::ToolButtonIconOnly);
@@ -182,11 +185,12 @@
void QtView::closeEvent(QCloseEvent *)
{
// save windows size and position
- LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
- LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(height()));
+ LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(this->normalGeometry().width()));
+ LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(this->normalGeometry().height()));
+ LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
if (lyxrc.geometry_xysaved) {
- LyX::ref().session().saveSessionInfo("WindowPosX", convert<string>(x()));
- LyX::ref().session().saveSessionInfo("WindowPosY", convert<string>(y()));
+ LyX::ref().session().saveSessionInfo("WindowPosX", convert<string>(this->normalGeometry().x()));
+ LyX::ref().session().saveSessionInfo("WindowPosY", convert<string>(this->normalGeometry().y()));
}
// trigger LFUN_LYX_QUIT instead of quit directly
// since LFUN_LYX_QUIT may have more cleanup stuff
Index: frontends/qt4/QtView.h
===================================================================
--- frontends/qt4/QtView.h (revision 14083)
+++ frontends/qt4/QtView.h (working copy)
@@ -47,7 +47,7 @@
Q_OBJECT
public:
/// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h);
+ QtView(unsigned int w, unsigned int h, bool isMax);
~QtView();
Index: frontends/xforms/lyx_gui.C
===================================================================
--- frontends/xforms/lyx_gui.C (revision 14083)
+++ frontends/xforms/lyx_gui.C (working copy)
@@ -256,7 +256,7 @@
void start(string const & batch, vector<string> const & files,
- unsigned int width, unsigned int height, int posx, int posy)
+ unsigned int width, unsigned int height, int posx, int posy, bool)
{
int const geometryBitmask =
XParseGeometry(geometry, &posx, &posy, &width, &height);
Index: frontends/lyx_gui.h
===================================================================
--- frontends/lyx_gui.h (revision 14083)
+++ frontends/lyx_gui.h (working copy)
@@ -57,7 +57,7 @@
* batch commands, and loading the given documents
*/
void start(std::string const & batch, std::vector<std::string> const & files,
- unsigned int width, unsigned int height, int posx, int posy);
+ unsigned int width, unsigned int height, int posx, int posy, bool isMax);
/**
* Enter the main event loop (\sa LyX::exec2)
Index: lyx_main.C
===================================================================
--- lyx_main.C (revision 14083)
+++ lyx_main.C (working copy)
@@ -307,6 +307,7 @@
// initial geometry
unsigned int width = 690;
unsigned int height = 510;
+ bool isMax = false;
// first try lyxrc
if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
width = lyxrc.geometry_width;
@@ -320,6 +321,8 @@
val = session().loadSessionInfo("WindowHeight");
if (!val.empty())
height = convert<unsigned int>(val);
+ if (session().loadSessionInfo("WindowIsMaximized") == "yes")
+ isMax = true;
}
// if user wants to restore window position
int posx = -1;
@@ -332,7 +335,7 @@
if (!val.empty())
posy = convert<int>(val);
}
- lyx_gui::start(batch_command, files, width, height, posx, posy);
+ lyx_gui::start(batch_command, files, width, height, posx, posy, isMax);
} else {
// Something went wrong above
quitLyX(false);
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14088 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 08:05:00 +00:00
Abdelrazak Younes
7efc6e9e0a
Deleted because not used anywhere.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14079 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-11 21:45:01 +00:00
Abdelrazak Younes
5c4d89d816
Simple optimisation: reuse current QPainter if no there's no change in settings.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14078 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-11 21:22:36 +00:00
Edwin Leuven
73a4be7143
more cleanup: some formatting and handle mouse events in their event handlers (and not in event())
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14072 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-11 14:28:10 +00:00
