From 992f526f0a28baae0d0238f77b726028f7022b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Tue, 20 Jun 2017 11:24:58 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@242
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/application/emainwindow.cpp |  2 +-
 qad/application/emainwindow.h   | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/qad/application/emainwindow.cpp b/qad/application/emainwindow.cpp
index 030a67f..70a868b 100644
--- a/qad/application/emainwindow.cpp
+++ b/qad/application/emainwindow.cpp
@@ -35,6 +35,7 @@ action_show_all_docks(this), action_hide_all_docks(this), first_show(true) {
 	action_hide_all_docks.setIcon(QIcon(":/icons/layer-visible-off.png"));
 	setChanged(false);
 	initMenus();
+	initSession();
 	tid = startTimer(200);
 }
 
@@ -200,7 +201,6 @@ void EMainWindow::initMenus() {
 void EMainWindow::initSession() {
 	connect(&session, SIGNAL(loading(QPIConfig & )), this, SLOT(sessionLoading(QPIConfig & )));
 	connect(&session, SIGNAL(saving(QPIConfig & )), this, SLOT(sessionSaving(QPIConfig & )));
-	session.addEntry("EMainWindow", this);
 }
 
 
diff --git a/qad/application/emainwindow.h b/qad/application/emainwindow.h
index 0d235a2..fa64e52 100644
--- a/qad/application/emainwindow.h
+++ b/qad/application/emainwindow.h
@@ -68,17 +68,20 @@ protected:
 	void timerEvent(QTimerEvent * e);
 	QMenu * createPopupMenu();
 
-	void init(const QString & config) {session.setFile(config); initMenus(); initSession(); loadSession();}
-	void initMenus();
-	void initSession();
-	virtual void saveSession();
-	virtual void loadSession();
+	void init(const QString & config) {session.setFile(config); initMenus(); initSession(); loadSession();} // unusable
+	void saveSession();
+	void loadSession();
+	virtual void savingSession(QPIConfig & conf) {}
+	virtual void loadingSession(QPIConfig & conf) {}
 	virtual QSize dockTabsIconSIze() const {return iconSize();}
 	virtual QString loadFilter() {return "All files(*)";}
 	virtual QString saveFilter() {return "All files(*)";}
 	
 	bool checkSave();
 	void setChanged(bool yes = true) {isChanged = yes; setWindowModified(yes);}
+
+	void initMenus();
+	void initSession();
 	
 	QAction action_show_all_tools, action_hide_all_tools, action_show_all_docks, action_hide_all_docks;
 	QString file_name, title_src;
@@ -90,10 +93,10 @@ protected:
 
 private slots:
 	void changedDock();
+	void sessionLoading(QPIConfig & conf) {loadingSession(conf);}
+	void sessionSaving(QPIConfig & conf) {savingSession(conf);}
 //	void changedDockClose(QObject * dock);
 	void closeDock(int index);
-	virtual void sessionLoading(QPIConfig & conf) {}
-	virtual void sessionSaving(QPIConfig & conf) {}
 
 public slots:
 	void changed() {setChanged(true);}