git-svn-id: svn://db.shs.com.ru/libs@359 a8b55f48-bf90-11e4-a774-851b48703e85

make_libs.sh

@@ -3,12 +3,4 @@ cd ..
 mkdir libs_build_linux
 cd libs_build_linux
 cmake ../libs
-cmake ../libs
 make install $@
-#for d in 'qad_widgets' 'qad_utils' 'qad_graphic' 'qad_sql_table' 'qad_application' 'qad_blockview' 'touch_widgets'; do
-#	cd $d
-#	echo "now in $(pwd -P)"
-#	qmake
-#	make install $@
-#	cd ..
-#done

qcd_utils/pult/cdpultwindow.cpp

@@ -18,6 +18,7 @@ CDPultWindow::CDPultWindow(QWidget *parent) : EMainWindow(parent), ui(new Ui::CD
 	log_icons[WaitIcon] = QIcon("://icons/timer.png");
 	ui->setupUi(this);
 	centralWidget()->hide();
+	setRecentMenu(ui->menuOpen_recent);
 	ribbon = new Ribbon(this);
 	session.setFile("session_cdpult.conf");
 	session.addEntry(this);
@@ -101,6 +102,16 @@ bool CDPultWindow::save(const QString & path) {
 }
 
 
+void CDPultWindow::loadingSession(QPIConfig & conf) {
+	setRecentFiles(conf.getValue("recent files", QStringList()));
+}
+
+
+void CDPultWindow::savingSession(QPIConfig & conf) {
+	conf.setValue("recent files", recentFiles());
+}
+
+
 void CDPultWindow::addToLog(LogIcon icon, const QString & msg) {
 	QListWidgetItem * ni = new QListWidgetItem(log_icons[icon], "(" + QTime::currentTime().toString() + ") " + msg);
 	bool s = ui->listLog->verticalScrollBar()->value() == ui->listLog->verticalScrollBar()->maximum();

qcd_utils/pult/cdpultwindow.h

@@ -29,6 +29,8 @@ private:
 	bool save(const QString & path);
 	QString loadFilter() {return "CD file(*.dat)";}
 	QString saveFilter() {return "CD file(*.dat)";}
+	void loadingSession(QPIConfig & conf);
+	void savingSession(QPIConfig & conf);
 
 	Ui::CDPultWindow *ui;
 	Ribbon * ribbon;
@@ -44,6 +46,7 @@ private slots:
 	void on_actionReceive_K_triggered();
 	void on_actionParse_triggered();
 	void on_actionCalculate_K_triggered();
+
 };
 
 #endif // CDPULTWINDOW_H

qcd_utils/pult/cdpultwindow.ui

@@ -41,7 +41,17 @@
     <property name="title">
      <string>Main</string>
     </property>
+    <widget class="QMenu" name="menuOpen_recent">
+     <property name="title">
+      <string>Open recent</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../qad/application/qad_application.qrc">
+       <normaloff>:/icons/document-open-recent.png</normaloff>:/icons/document-open-recent.png</iconset>
+     </property>
+    </widget>
     <addaction name="actionOpen"/>
+    <addaction name="menuOpen_recent"/>
     <addaction name="actionSave"/>
     <addaction name="actionSaveAs"/>
     <addaction name="separator"/>
@@ -157,7 +167,7 @@
   </action>
   <action name="actionSave">
    <property name="icon">
-    <iconset resource="../../qad/application/qad_application.qrc">
+    <iconset resource="../../qad/utils/qad_utils.qrc">
      <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
    </property>
    <property name="text">
@@ -251,6 +261,8 @@
   <addaction name="separator"/>
   <addaction name="separator"/>
   <addaction name="separator"/>
+  <addaction name="separator"/>
+  <addaction name="separator"/>
  </widget>
  <customwidgets>
   <customwidget>
@@ -272,9 +284,10 @@
   </customwidget>
  </customwidgets>
  <resources>
+  <include location="../../qad/utils/qad_utils.qrc"/>
+  <include location="../../qad/widgets/qad_widgets.qrc"/>
   <include location="../../qad/application/qad_application.qrc"/>
   <include location="../../qad/graphic/qpicalculator/qpicalculator.qrc"/>
-  <include location="../../qad/widgets/qad_widgets.qrc"/>
   <include location="cdpult.qrc"/>
  </resources>
  <connections>