mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-04 22:32:19 +00:00
bbc587ee9a
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
95 lines
1.9 KiB
C++
95 lines
1.9 KiB
C++
// -*- C++ -*-
|
|
/**
|
|
* \file QtView.h
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Lars Gullik Bjornes
|
|
* \author John Levon
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#ifndef QTVIEW_H
|
|
#define QTVIEW_H
|
|
|
|
// Must be here because of moc.
|
|
#include <config.h>
|
|
|
|
#include "frontends/LyXView.h"
|
|
|
|
#include <qmainwindow.h>
|
|
#include <qtimer.h>
|
|
|
|
class FuncRequest;
|
|
|
|
namespace lyx {
|
|
namespace frontend {
|
|
|
|
class QCommandBuffer;
|
|
|
|
/**
|
|
* QtView - Qt implementation of LyXView
|
|
*
|
|
* Qt-private implementation of the main LyX window.
|
|
*/
|
|
class QtView : public QMainWindow, public LyXView {
|
|
Q_OBJECT
|
|
public:
|
|
/// create a main window of the given dimensions
|
|
QtView(unsigned int w, unsigned int h, bool maximize);
|
|
|
|
~QtView();
|
|
|
|
/// show - display the top-level window
|
|
void show();
|
|
|
|
/// show busy cursor
|
|
virtual void busy(bool) const;
|
|
|
|
/// display a status message
|
|
virtual void message(std::string const & str);
|
|
|
|
/// clear status message
|
|
virtual void clearMessage();
|
|
|
|
/// add the command buffer
|
|
void addCommandBuffer(QWidget * parent);
|
|
|
|
/// menu item has been selected
|
|
void activated(FuncRequest const &);
|
|
|
|
// returns true if this view has the focus.
|
|
virtual bool hasFocus() const;
|
|
|
|
public slots:
|
|
/// idle timeout
|
|
void update_view_state_qt();
|
|
protected:
|
|
/// make sure we quit cleanly
|
|
virtual void closeEvent(QCloseEvent * e);
|
|
private:
|
|
/// focus the command buffer widget
|
|
void focus_command_widget();
|
|
|
|
/// update status bar
|
|
void update_view_state();
|
|
|
|
/**
|
|
* setWindowTitle - set title of window
|
|
* @param t main window title
|
|
* @param it iconified (short) title
|
|
*/
|
|
virtual void setWindowTitle(std::string const & t, std::string const & it);
|
|
|
|
QTimer statusbar_timer_;
|
|
|
|
/// command buffer
|
|
QCommandBuffer * commandbuffer_;
|
|
};
|
|
|
|
} // namespace frontend
|
|
} // namespace lyx
|
|
|
|
#endif // QTVIEW_H
|