chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

redesign gui layout to work isame on both windows and linux.

Browse Source
This commit is contained in:
LoudSnorer 2023-05-08 08:47:18 -04:00
parent 85da802355
commit fa7ad0056e
2 changed files with 551 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

845
oscar/dailySearchTab.cpp
View File

File diff suppressed because it is too large Load Diff

120
oscar/dailySearchTab.h
View File

@ -1,7 +1,6 @@
/* search GUI Headers
*
* Copyright (c) 2019-2022 The OSCAR Team
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the source code
@ -12,26 +11,30 @@
#include <QDate>
#include <QTextDocument>
#include <QListWidgetItem>
#include <QList>
#include <QFrame>
#include <QWidget>
#include <QPushButton>
#include <QTabWidget>
#include <QMap>
#include <QTextEdit>
#include "SleepLib/common.h"
class GPushButton;
class QWidget ;
class QDialog ;
class QComboBox ;
class QListWidget ;
class QProgressBar ;
class QHBoxLayout ;
class QVBoxLayout ;
class QPushButton ;
class QLabel ;
class QComboBox ;
class QDoubleSpinBox ;
class QSpinBox ;
class QLineEdit ;
class QTableWidget ;
class QTableWidgetItem ;
class QSizeF ;
class Day; //forward declaration.
class Daily; //forward declaration.
@ -75,75 +78,86 @@ enum OpCode {
QWidget* parent;
QWidget* searchTabWidget;
QTabWidget* dailyTabWidget;
QVBoxLayout* searchTabLayout;
QHBoxLayout* criteriaLayout;
QFrame * innerCriteriaFrame;
QHBoxLayout* innerCriteriaLayout;
QHBoxLayout* searchLayout;
QHBoxLayout* summaryLayout;
QTableWidget* controlTable;
// Command command Widget
QWidget* commandWidget;
QHBoxLayout* commandLayout;
QPushButton* helpButton;
//QLabel* helpInfo;
QTextEdit* helpText;
QComboBox* selectOperationCombo;
QPushButton* selectOperationButton;
QComboBox* selectCommandCombo;
QPushButton* selectCommandButton;
QPushButton* selectMatch;
QLabel* selectUnits;
QProgressBar* guiProgressBar;
// control Widget
QPushButton* matchButton;
QPushButton* clearButton;
QWidget* summaryWidget;
QHBoxLayout* summaryLayout;
// Command Widget
QListWidget* commandList;
// command Widget
QPushButton* commandButton;
QComboBox* operationCombo;
QPushButton* operationButton;
QLabel* selectUnits;
QDoubleSpinBox* selectDouble;
QSpinBox* selectInteger;
QLineEdit* selectString;
// Trigger Widget
QPushButton* startButton;
QLabel* statusProgress;
QLabel* summaryProgress;
QLabel* summaryFound;
QLabel* summaryMinMax;
QDoubleSpinBox* selectDouble;
QSpinBox* selectInteger;
QLineEdit* selectString;
QPushButton* startButton;
QPushButton* clearButton;
QProgressBar* guiProgressBar;
QTableWidget* guiDisplayTable;
QTableWidgetItem* horizontalHeader0;
QTableWidgetItem* horizontalHeader1;
QIcon* m_icon_selected;
QIcon* m_icon_notSelected;
QIcon* m_icon_configure;
QMap <QString,OpCode> opCodeMap;
QString opCodeStr(OpCode);
OpCode selectOperationOpCode = OP_INVALID;
OpCode operationOpCode = OP_INVALID;
bool helpMode=false;
QString helpString = helpStr();
void createUi();
void delayedCreateUi();
void populateControl();
QSize setText(QPushButton*,QString);
QSize setText(QLabel*,QString);
QSize textsize(QFont font ,QString text);
void search(QDate date);
void find(QDate&);
void criteriaChanged();
void endOfPass();
void displayStatistics();
void setResult(int row,int column,QDate date,QString value);
void addItem(QDate date, QString value, Qt::Alignment alignment);
void setCommandPopupEnabled(bool );
void setOperationPopupEnabled(bool );
void setOperation( );
void hideResults();
void hideResults(bool);
void connectUi(bool);
QString helpStr();
QString centerLine(QString line);
QString formatTime (qint32) ;
QString convertRichText2Plain (QString rich);
QRegExp searchPatterToRegex (QString wildcard);
QListWidgetItem* calculateMaxSize(QString str,int topic);
float commandListItemMaxWidth = 0;
float commandListItemHeight = 0;
EventDataType calculateAhi(Day* day);
bool compare(int,int );
@ -151,6 +165,7 @@ enum OpCode {
bool createUiFinished=false;
bool startButtonMode=true;
bool commandPopupEnabled=false;
SearchTopic searchTopic;
int nextTab;
int channelId;
@ -166,7 +181,7 @@ enum OpCode {
int daysFound;
int passFound;
void setSelectOperation(OpCode opCode,ValueMode mode) ;
void setoperation(OpCode opCode,ValueMode mode) ;
ValueMode valueMode;
qint32 selectValue=0;
@ -188,19 +203,44 @@ enum OpCode {
public slots:
private slots:
void on_dateItemClicked(QTableWidgetItem *item);
void on_startButton_clicked();
void on_clearButton_clicked();
void on_selectMatch_clicked();
void on_selectCommandButton_clicked();
void on_selectCommandCombo_activated(int);
void on_selectOperationButton_clicked();
void on_selectOperationCombo_activated(int);
void on_matchButton_clicked();
void on_helpButton_clicked();
void on_dailyTabWidgetCurrentChanged(int);
void on_commandButton_clicked();
void on_operationButton_clicked();
void on_commandList_activated(QListWidgetItem* item);
void on_operationCombo_activated(int index);
void on_intValueChanged(int);
void on_doubleValueChanged(double);
void on_textEdited(QString);
void on_activated(GPushButton*);
};
class GPushButton : public QPushButton
{
Q_OBJECT
public:
GPushButton (int,int,QDate,DailySearchTab* parent);
virtual ~GPushButton();
int row() { return _row;};
int column() { return _column;};
QDate date() { return _date;};
void setDate(QDate date) {_date=date;};
private:
const DailySearchTab* _parent;
const int _row;
const int _column;
QDate _date;
signals:
void activated(GPushButton*);
public slots:
void on_clicked();
};
#endif // SEARCHDAILY_H