Skip to content
Snippets Groups Projects
Commit 6b6d0379 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

FitActivityPanel: done

parent 92ed437b
No related branches found
No related tags found
1 merge request!1025GUI: remember docks sizes and tabs indices
...@@ -30,6 +30,7 @@ FitActivityPanel::FitActivityPanel(QWidget* parent) ...@@ -30,6 +30,7 @@ FitActivityPanel::FitActivityPanel(QWidget* parent)
: QWidget(parent) : QWidget(parent)
, m_realTimeWidget(nullptr) , m_realTimeWidget(nullptr)
, m_fitSessionManager(new FitSessionManager(this)) , m_fitSessionManager(new FitSessionManager(this))
, m_panelSize(100,100)
{ {
setWindowTitle(GUI::Constants::JobFitPanelName); setWindowTitle(GUI::Constants::JobFitPanelName);
setObjectName("FitActivityPanel"); setObjectName("FitActivityPanel");
...@@ -50,6 +51,14 @@ FitActivityPanel::FitActivityPanel(QWidget* parent) ...@@ -50,6 +51,14 @@ FitActivityPanel::FitActivityPanel(QWidget* parent)
m_fitSessionWidget = new FitSessionWidget(m_stack); m_fitSessionWidget = new FitSessionWidget(m_stack);
m_stack->addWidget(m_fitSessionWidget); m_stack->addWidget(m_fitSessionWidget);
readSettings();
setMinimumSize(10,10);
}
FitActivityPanel::~FitActivityPanel()
{
writeSettings();
} }
void FitActivityPanel::setRealTimeWidget(JobRealTimeWidget* realTimeWidget) void FitActivityPanel::setRealTimeWidget(JobRealTimeWidget* realTimeWidget)
...@@ -60,13 +69,15 @@ void FitActivityPanel::setRealTimeWidget(JobRealTimeWidget* realTimeWidget) ...@@ -60,13 +69,15 @@ void FitActivityPanel::setRealTimeWidget(JobRealTimeWidget* realTimeWidget)
QSize FitActivityPanel::sizeHint() const QSize FitActivityPanel::sizeHint() const
{ {
return QSize(GUI::Constants::REALTIME_WIDGET_WIDTH_HINT, // return QSize(GUI::Constants::REALTIME_WIDGET_WIDTH_HINT,
GUI::Constants::FIT_ACTIVITY_PANEL_HEIGHT); // GUI::Constants::FIT_ACTIVITY_PANEL_HEIGHT);
return m_panelSize;
} }
QSize FitActivityPanel::minimumSizeHint() const QSize FitActivityPanel::minimumSizeHint() const
{ {
return QSize(480, 430); return sizeHint();
// return QSize(480, 430);
} }
void FitActivityPanel::setJobItem(JobItem* jobItem) void FitActivityPanel::setJobItem(JobItem* jobItem)
...@@ -97,3 +108,22 @@ FitSessionWidget* FitActivityPanel::currentFitSuiteWidget() ...@@ -97,3 +108,22 @@ FitSessionWidget* FitActivityPanel::currentFitSuiteWidget()
{ {
return m_fitSessionWidget; return m_fitSessionWidget;
} }
void FitActivityPanel::readSettings()
{
QSettings settings;
if (settings.childGroups().contains(GUI::Constants::S_FIT_ACTIVITY_PANEL)) {
settings.beginGroup(GUI::Constants::S_FIT_ACTIVITY_PANEL);
m_panelSize = settings.value(GUI::Constants::S_FIT_ACTIVITY_PANEL_SIZE).toSize();
settings.endGroup();
}
}
void FitActivityPanel::writeSettings()
{
QSettings settings;
settings.beginGroup(GUI::Constants::S_FIT_ACTIVITY_PANEL);
settings.setValue(GUI::Constants::S_FIT_ACTIVITY_PANEL_SIZE, size());
settings.endGroup();
settings.sync();
}
...@@ -33,6 +33,7 @@ class FitActivityPanel : public QWidget { ...@@ -33,6 +33,7 @@ class FitActivityPanel : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
FitActivityPanel(QWidget* parent = nullptr); FitActivityPanel(QWidget* parent = nullptr);
~FitActivityPanel();
void setRealTimeWidget(JobRealTimeWidget* realTimeWidget); void setRealTimeWidget(JobRealTimeWidget* realTimeWidget);
...@@ -49,12 +50,16 @@ private: ...@@ -49,12 +50,16 @@ private:
bool isValidJobItem(JobItem* item); bool isValidJobItem(JobItem* item);
FitSessionWidget* currentFitSuiteWidget(); FitSessionWidget* currentFitSuiteWidget();
void readSettings();
void writeSettings();
QStackedWidget* m_stack; QStackedWidget* m_stack;
QWidget* m_blankWidget; QWidget* m_blankWidget;
FitSessionWidget* m_fitSessionWidget; FitSessionWidget* m_fitSessionWidget;
QLabel* m_nofitLabel; QLabel* m_nofitLabel;
JobRealTimeWidget* m_realTimeWidget; JobRealTimeWidget* m_realTimeWidget;
FitSessionManager* m_fitSessionManager; FitSessionManager* m_fitSessionManager;
QSize m_panelSize;
}; };
#endif // BORNAGAIN_GUI_VIEW_FIT_FITACTIVITYPANEL_H #endif // BORNAGAIN_GUI_VIEW_FIT_FITACTIVITYPANEL_H
...@@ -117,6 +117,7 @@ void JobView::createSubWindows() ...@@ -117,6 +117,7 @@ void JobView::createSubWindows()
m_fitActivityPanel = new FitActivityPanel(this); m_fitActivityPanel = new FitActivityPanel(this);
m_jobMessagePanel = new JobMessagePanel(this); m_jobMessagePanel = new JobMessagePanel(this);
// m_jobRealTimeWidget->hide();
m_docks->addWidget(JobViewFlags::JOB_LIST_DOCK, m_jobSelector, Qt::LeftDockWidgetArea); m_docks->addWidget(JobViewFlags::JOB_LIST_DOCK, m_jobSelector, Qt::LeftDockWidgetArea);
m_docks->addWidget(JobViewFlags::REAL_TIME_DOCK, m_jobRealTimeWidget, Qt::RightDockWidgetArea); m_docks->addWidget(JobViewFlags::REAL_TIME_DOCK, m_jobRealTimeWidget, Qt::RightDockWidgetArea);
m_docks->addWidget(JobViewFlags::FIT_PANEL_DOCK, m_fitActivityPanel, Qt::RightDockWidgetArea); m_docks->addWidget(JobViewFlags::FIT_PANEL_DOCK, m_fitActivityPanel, Qt::RightDockWidgetArea);
......
...@@ -23,6 +23,7 @@ namespace GUI::Constants { ...@@ -23,6 +23,7 @@ namespace GUI::Constants {
const char S_MAIN_WINDOW[] = "MainWindow"; const char S_MAIN_WINDOW[] = "MainWindow";
const char S_JOB_MESSAGE_PANEL[] = "JobMessagePanel"; const char S_JOB_MESSAGE_PANEL[] = "JobMessagePanel";
const char S_JOB_SELECTOR_PANEL[] = "JobSelectorPanel"; const char S_JOB_SELECTOR_PANEL[] = "JobSelectorPanel";
const char S_FIT_ACTIVITY_PANEL[] = "FitActivityPanel";
const char S_SESSION_MODEL_VIEW[] = "SessionModelView"; const char S_SESSION_MODEL_VIEW[] = "SessionModelView";
// Settings keys // Settings keys
...@@ -32,6 +33,7 @@ const char S_VIEW_IS_ACTIVE[] = "ViewIsActive"; ...@@ -32,6 +33,7 @@ const char S_VIEW_IS_ACTIVE[] = "ViewIsActive";
const char S_JOB_MESSAGE_PANEL_SIZE[] = "size"; const char S_JOB_MESSAGE_PANEL_SIZE[] = "size";
const char S_JOB_SELECTOR_PANEL_SIZE[] = "size"; const char S_JOB_SELECTOR_PANEL_SIZE[] = "size";
const char S_FIT_ACTIVITY_PANEL_SIZE[] = "size";
const int MAX_RECENT_PROJECTS = 10; const int MAX_RECENT_PROJECTS = 10;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment