mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
Getting rid of Application::createView()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21760 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
662b5dba03
commit
94c0fc55de
@ -626,7 +626,7 @@ void LyX::execBatchCommands()
|
||||
void LyX::restoreGuiSession()
|
||||
{
|
||||
// create the main window
|
||||
pimpl_->application_->createView(geometryArg);
|
||||
pimpl_->lyxfunc_.dispatch(FuncRequest(LFUN_WINDOW_NEW, geometryArg));
|
||||
|
||||
// if there is no valid class list, do not load any file.
|
||||
if (textclasslist.empty())
|
||||
|
@ -209,10 +209,6 @@ public:
|
||||
* @param fd socket descriptor (file/socket/etc)
|
||||
*/
|
||||
virtual void unregisterSocketCallback(int fd) = 0;
|
||||
|
||||
/// Create the main window with given geometry settings.
|
||||
/// \param geometry_arg: only for Windows platform.
|
||||
virtual void createView(std::string const & geometry_arg = std::string()) = 0;
|
||||
};
|
||||
|
||||
} // namespace frontend
|
||||
|
@ -242,7 +242,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd)
|
||||
switch(cmd.action) {
|
||||
|
||||
case LFUN_WINDOW_NEW:
|
||||
createView();
|
||||
createView(toqstr(cmd.argument()));
|
||||
break;
|
||||
|
||||
case LFUN_WINDOW_CLOSE:
|
||||
@ -305,7 +305,7 @@ static void updateIds(map<int, GuiView *> const & stdmap, vector<int> & ids)
|
||||
}
|
||||
|
||||
|
||||
void GuiApplication::createView(string const & geometry_arg)
|
||||
void GuiApplication::createView(QString const & geometry_arg)
|
||||
{
|
||||
updateIds(views_, view_ids_);
|
||||
int id = 0;
|
||||
@ -318,12 +318,12 @@ void GuiApplication::createView(string const & geometry_arg)
|
||||
theLyXFunc().setLyXView(view);
|
||||
|
||||
view->show();
|
||||
if (!geometry_arg.empty()) {
|
||||
if (!geometry_arg.isEmpty()) {
|
||||
#ifdef Q_WS_WIN
|
||||
int x, y;
|
||||
int w, h;
|
||||
QRegExp re( "[=]*(?:([0-9]+)[xX]([0-9]+)){0,1}[ ]*(?:([+-][0-9]*)([+-][0-9]*)){0,1}" );
|
||||
re.indexIn(toqstr(geometry_arg.c_str()));
|
||||
re.indexIn(geometry_arg);
|
||||
w = re.cap(1).toInt();
|
||||
h = re.cap(2).toInt();
|
||||
x = re.cap(3).toInt();
|
||||
|
@ -70,7 +70,6 @@ public:
|
||||
virtual void updateColor(ColorCode col);
|
||||
virtual void registerSocketCallback(int fd, SocketCallback func);
|
||||
void unregisterSocketCallback(int fd);
|
||||
void createView(std::string const & geometry_arg = std::string());
|
||||
//@}
|
||||
|
||||
/// Methods inherited from \c QApplication class
|
||||
@ -79,6 +78,9 @@ public:
|
||||
void commitData(QSessionManager & sm);
|
||||
//@}
|
||||
|
||||
/// Create the main window with given geometry settings.
|
||||
/// \param geometry_arg: only for Windows platform.
|
||||
void createView(QString const & geometry_arg);
|
||||
///
|
||||
GuiView const * currentView() const { return current_view_; }
|
||||
///
|
||||
|
Loading…
Reference in New Issue
Block a user