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

Fix Compile Issue for Windows. Revamped Daily Search Help for Transaltion.

Browse Source
This commit is contained in:
LoudSnorer 2023-03-27 09:38:07 -04:00
parent f49c476a79
commit 4d6893f4cc
2 changed files with 79 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
oscar/dailySearchTab.cpp
View File

@ -19,7 +19,7 @@
#include <QPixmap> #include <QPixmap>
#include <QSize> #include <QSize>
#include <QChar> #include <QChar>
#include <QtGui> // Never include this does not work with other platforms. include <QtGui>
#include <QLineEdit> #include <QLineEdit>
#include <QSpinBox> #include <QSpinBox>
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
@ -94,8 +94,7 @@ DailySearchTab::~DailySearchTab() {
void DailySearchTab::createUi() { void DailySearchTab::createUi() {
QFont baseFont =*defaultfont; QFont baseFont = this->font();
baseFont.setPointSize(1+baseFont.pointSize());
searchTabWidget ->setFont(baseFont); searchTabWidget ->setFont(baseFont);
searchTabLayout = new QVBoxLayout(searchTabWidget); searchTabLayout = new QVBoxLayout(searchTabWidget);
@ -108,7 +107,7 @@ void DailySearchTab::createUi() {
searchTabLayout ->setContentsMargins(4, 4, 4, 4); searchTabLayout ->setContentsMargins(4, 4, 4, 4);
helpButton = new QPushButton(this); helpButton = new QPushButton(this);
helpInfo = new QLabel(this); helpText = new QTextEdit(this);
selectMatch = new QPushButton(this); selectMatch = new QPushButton(this);
selectUnits = new QLabel(this); selectUnits = new QLabel(this);
selectCommandCombo = new QComboBox(this); selectCommandCombo = new QComboBox(this);
@ -128,7 +127,7 @@ void DailySearchTab::createUi() {
guiDisplayTable = new QTableWidget(this); guiDisplayTable = new QTableWidget(this);
searchTabLayout ->addWidget(helpButton); searchTabLayout ->addWidget(helpButton);
searchTabLayout ->addWidget(helpInfo); searchTabLayout ->addWidget(helpText);
innerCriteriaLayout ->addWidget(selectCommandCombo); innerCriteriaLayout ->addWidget(selectCommandCombo);
innerCriteriaLayout ->addWidget(selectCommandButton); innerCriteriaLayout ->addWidget(selectCommandButton);
@ -171,11 +170,12 @@ void DailySearchTab::createUi() {
searchTabWidget ->setFont(baseFont); searchTabWidget ->setFont(baseFont);
helpButton ->setFont(baseFont); helpButton ->setFont(baseFont);
helpInfo ->setText(helpStr()); helpText ->setFont(baseFont);
helpInfo ->setFont(baseFont); helpText ->setReadOnly(true);
helpInfo ->setStyleSheet(" text-align:left ; padding: 4;border: 1px"); helpText ->setLineWrapMode(QTextEdit::NoWrap);
helpMode = true; helpMode = true;
on_helpButton_clicked(); on_helpButton_clicked();
helpText ->setText(helpStr());
selectMatch->setText(tr("Match:")); selectMatch->setText(tr("Match:"));
selectMatch->setIcon(*m_icon_configure); selectMatch->setIcon(*m_icon_configure);
@ -315,10 +315,10 @@ void DailySearchTab::delayedCreateUi() {
void DailySearchTab::on_helpButton_clicked() { void DailySearchTab::on_helpButton_clicked() {
helpMode = !helpMode; helpMode = !helpMode;
if (helpMode) { if (helpMode) {
helpButton->setText(tr("Click HERE to close help")); helpButton->setText(tr("Click HERE to close Help"));
helpInfo ->setVisible(true); helpText ->setVisible(true);
} else { } else {
helpInfo ->setVisible(false); helpText ->setVisible(false);
helpButton->setText(tr("Help")); helpButton->setText(tr("Help"));
} }
} }
@ -1121,28 +1121,71 @@ QString DailySearchTab::centerLine(QString line) {
return QString( "<center>%1</center>").arg(line).replace("\n","<br>"); return QString( "<center>%1</center>").arg(line).replace("\n","<br>");
} }
QString DailySearchTab::helpStr() { QString DailySearchTab::helpStr()
return (tr ( {
"Finds days that match specified criteria.\t Searches from last day to first day\n" QStringList str;
"\n" str.append(tr("Finds days that match specified criteria."));
"Click on the Match Button to start.\t\t Next choose the match topic to run\n" str.append("\n");
"\n" str.append(tr(" Searches from last day to first day."));
"Different topics use different operations \t numberic, character, or none. \n" str.append("\n");
"Numberic Operations:\t >. >=, <, <=, ==, !=.\n" str.append("\n");
"Character Operations:\t '*?' for wildcard \t" u8"\u2208" " for Normal matching\n" str.append(tr("First click on Match Button then select topic."));
"Click on the operation to change\n" str.append("\n");
"Any White Space will match any white space in the target.\n" str.append(tr(" Then click on the operation to modify it."));
"Space is always ignored at the start or end.\n" str.append("\n");
"\n" str.append(tr(" or update the value"));
"Wildcards use 3 characters: '*' asterisk, '?' Question Mark '\\' baclspace.\n" str.append("\n");
"'*' matches any number of characters.\t '?' matches a single character. \n;" str.append(tr("Topics without operations will automatically start."));
"'\\' the next character is matched.\t Allowing '*' and '?' to be matched \n" str.append("\n");
"'\\*' matchs '*' \t '\\?' matches '?' \t '\\\\' matches '\\' \n" str.append("\n");
"\n" str.append(tr("Compare Operations: numberic or character. "));
"Result Table\n" str.append("\n");
"Column One: Date of match. Clicking opens the date and checkbox marked.\n" str.append(tr(" Numberic Operations: "));
"Column two: Information. Clicking opens the date, checkbox marked, Jumps to a tab.\n" str.append(" > , >= , < , <= , == , != ");
) ); str.append("\n");
str.append(tr(" Character Operations: "));
str.append(" == , *? ");
str.append("\n");
str.append("\n");
str.append(tr("Summary Line"));
str.append("\n");
str.append(tr(" Left:Summary - Number of Day searched"));
str.append("\n");
str.append(tr(" Center:Number of Items Found"));
str.append("\n");
str.append(tr(" Right:Minimum/Maximum for item searched"));
str.append("\n");
str.append(tr("Result Table"));
str.append("\n");
str.append(tr(" Column One: Date of match. Click selects date."));
str.append("\n");
str.append(tr(" Column two: Information. Click selects date."));
str.append("\n");
str.append(tr(" Then Jumps the appropiate tab."));
str.append("\n");
str.append("\n");
str.append(tr("Wildcard Pattern Matching:"));
str.append(" *? ");
str.append("\n");
str.append(tr(" Wildcards use 3 characters:"));
str.append("\n");
str.append(tr(" Asterisk"));
str.append(" * ");
str.append(" ");
str.append(tr(" Question Mark"));
str.append(" ? ");
str.append(" ");
str.append(tr(" Backslash."));
str.append(" \\ ");
str.append("\n");
str.append(tr(" Asterisk matches any number of characters."));
str.append("\n");
str.append(tr(" Question Mark matches a single character."));
str.append("\n");
str.append(tr(" Backslash matches next character."));
str.append("\n");
QString result =str.join("");
return result;
} }
QString DailySearchTab::formatTime (qint32 ms) { QString DailySearchTab::formatTime (qint32 ms) {

4
oscar/dailySearchTab.h
View File

@ -17,6 +17,7 @@
#include <QWidget> #include <QWidget>
#include <QTabWidget> #include <QTabWidget>
#include <QMap> #include <QMap>
#include <QTextEdit>
#include "SleepLib/common.h" #include "SleepLib/common.h"
class QWidget ; class QWidget ;
@ -84,7 +85,8 @@ enum OpCode {
QHBoxLayout* summaryLayout; QHBoxLayout* summaryLayout;
QPushButton* helpButton; QPushButton* helpButton;
QLabel* helpInfo; //QLabel* helpInfo;
QTextEdit* helpText;
QComboBox* selectOperationCombo; QComboBox* selectOperationCombo;
QPushButton* selectOperationButton; QPushButton* selectOperationButton;