diff --git a/make_libs.sh b/make_libs.sh index e8f8fa3..ec03987 100755 --- a/make_libs.sh +++ b/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 diff --git a/qcd_utils/pult/cdpultwindow.cpp b/qcd_utils/pult/cdpultwindow.cpp index 46539c2..8fe7312 100644 --- a/qcd_utils/pult/cdpultwindow.cpp +++ b/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(); diff --git a/qcd_utils/pult/cdpultwindow.h b/qcd_utils/pult/cdpultwindow.h index 7a6c248..2fc5f10 100644 --- a/qcd_utils/pult/cdpultwindow.h +++ b/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 diff --git a/qcd_utils/pult/cdpultwindow.ui b/qcd_utils/pult/cdpultwindow.ui index 6e441ff..0136f22 100644 --- a/qcd_utils/pult/cdpultwindow.ui +++ b/qcd_utils/pult/cdpultwindow.ui @@ -41,7 +41,17 @@ Main + + + Open recent + + + + :/icons/document-open-recent.png:/icons/document-open-recent.png + + + @@ -157,7 +167,7 @@ - + :/icons/document-save.png:/icons/document-save.png @@ -251,6 +261,8 @@ + + @@ -272,9 +284,10 @@ + + -