Check-in [2c605a44d9]

Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Deleted redundant / duplicated classes. Show help functionality was added.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:2c605a44d9d740686374c7a218c44099b4f4dcfb
User & Date: azadok 2013-12-17 21:17:47
Context
2013-12-22
20:41
Added support for changing noty types using arrows. GUI support. check-in: 9b95a27cc5 user: azadok tags: trunk
2013-12-17
21:17
Deleted redundant / duplicated classes. Show help functionality was added. check-in: 2c605a44d9 user: azadok tags: trunk
21:07
Class a was deleted. check-in: a48199ea63 user: azadok tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to RapidReporter2/RR2.pro.

12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
TEMPLATE = app


SOURCES += main.cpp\
        mainwindow.cpp \
    logger.cpp \
    cliparser.cpp \
    helpviewer.cpp \
    applauncher.cpp \
    htmlstring.cpp \
    screenshot.cpp \
    test.cpp \
    a.cpp \
    session.cpp \
    note.cpp \
    keyenterreceiver.cpp \
    csv2html.cpp

HEADERS  += mainwindow.h \
    logger.h \
    cliparser.h \
    helpviewer.h \
    applauncher.h \
    htmlstring.h \
    screenshot.h \
    test.h \
    a.h \
    Flags.h \
    session.h \
    note.h \
    keyenterreceiver.h \
    csv2html.h

FORMS    += mainwindow.ui

OTHER_FILES += \
    RevisionHistory.txt







<




<








<




<










12
13
14
15
16
17
18

19
20
21
22

23
24
25
26
27
28
29
30

31
32
33
34

35
36
37
38
39
40
41
42
43
44
TEMPLATE = app


SOURCES += main.cpp\
        mainwindow.cpp \
    logger.cpp \
    cliparser.cpp \

    applauncher.cpp \
    htmlstring.cpp \
    screenshot.cpp \
    test.cpp \

    session.cpp \
    note.cpp \
    keyenterreceiver.cpp \
    csv2html.cpp

HEADERS  += mainwindow.h \
    logger.h \
    cliparser.h \

    applauncher.h \
    htmlstring.h \
    screenshot.h \
    test.h \

    Flags.h \
    session.h \
    note.h \
    keyenterreceiver.h \
    csv2html.h

FORMS    += mainwindow.ui

OTHER_FILES += \
    RevisionHistory.txt

Changes to RapidReporter2/applauncher.cpp.

11
12
13
14
15
16
17
18

19
20
21
22

    connect(&cliPraser,SIGNAL(EmitStartRR2Gui()),
            w,SLOT(show()));
    connect(&cliPraser,SIGNAL(EmitStartWithSpecialUserTypes(QStringList)),
            w,SLOT(StartWithSpecialUserTypes(QStringList)));
    connect(&cliPraser,SIGNAL(EmitConvertCsvToHtml(QString)),
            &csv2Html,SLOT(StartConvertSlot(QString)));




    cliPraser.ParseCliArgs(argc,argv);
}







|
>




11
12
13
14
15
16
17
18
19
20
21
22
23

    connect(&cliPraser,SIGNAL(EmitStartRR2Gui()),
            w,SLOT(show()));
    connect(&cliPraser,SIGNAL(EmitStartWithSpecialUserTypes(QStringList)),
            w,SLOT(StartWithSpecialUserTypes(QStringList)));
    connect(&cliPraser,SIGNAL(EmitConvertCsvToHtml(QString)),
            &csv2Html,SLOT(StartConvertSlot(QString)));
    connect(&cliPraser,SIGNAL(EmitShowHelp()),
            w,SLOT(ShowHelp()));


    cliPraser.ParseCliArgs(argc,argv);
}

Deleted RapidReporter2/convert_csv2html.cpp.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
// note: to add new line in qt write out << endl and not \n

#include "convert_csv2html.h"
#include <QString>
#include <QDir>
#include <QFile>
#include <QTextStream>

using namespace std;

Convert_Csv2Html::Convert_Csv2Html()
{
    csvFile = "";
}

Convert_Csv2Html::Convert_Csv2Html(QString csvFileName)
{
    csvFile = csvFileName;
}

void Convert_Csv2Html::setCSVfile(QString csvFileName)
{
  csvFile = csvFileName;
}

void Convert_Csv2Html::StartConvert(bool relativePath)
{
    if (csvFile.isEmpty() || csvFile.isNull())
    {
        // add error to logger
        return;
    }

    QString workingDir = QDir::currentPath() + "//";

    // create instace to csv file to read
    QString fullCSVpath = (relativePath ? workingDir : "") + csvFile;
    QFile csvfile(fullCSVpath);

    // verify csv file is exist
    if (!csvfile.exists())
    {
        // to output throw the logger and to output the file not exist
        csvfile.close();
        return;
    }


    htmlFile = csvFile.replace(".csv", ".htm");
    htmlFile = relativePath ? workingDir + htmlFile : htmlFile;

    QString t = "th";
    QString tableLine = "";
    QString noteImage = "";
    QString noteRtf = "";

    bool exDrRetry = false;

    do
    {
        try
        {
            // delete old html file - if exist
            QFile oldFileDeleted (htmlFile);
            oldFileDeleted.remove();
            oldFileDeleted.close();

            // create instance to html file
            QFile htmlfile(htmlFile);
            htmlfile.open(QIODevice::WriteOnly | QIODevice::Text);
            QTextStream out(&htmlfile);

            // fill html meta-data
            out << longstrings.a_html_header;
            out << longstrings.c_javascript;
            out << longstrings.d_style;
            out << longstrings.g_html_body1;
            out << "<h1>Session Report | Powered by <a href=\"http://testing.gershon.info/reporter/\">Rapid Reporter</a></h1><br />\n";
            out << longstrings.i_toggle_auto;
            out << longstrings.j_html_bodytable1;

            // write csv file data into html file

            // open file to read
            try
            {
                csvfile.open( QIODevice::ReadOnly);
            }
            catch (int err)
            {
                htmlfile.close();
                // csvfile close automaticly on this error
                // add to logger
                return;
            }

            QTextStream in(&csvfile);
            // read the csv file
            while(!in.atEnd())
            {
                QString line = in.readLine();  // Some files have empty lines in it, we don't want to process these lines.
                noteImage = ""; noteRtf = "";  // We clean this variables in order not to carry the last ones from the last iteration

                if ("" == line) continue;

                QStringList thisLine = line.split(",");

                // Dealing with screenshot attachments (if they exist).
                //if (thisLine.length() > 4)
                if (thisLine[4].length() > 0)
                {
                    QFile File (workingDir + thisLine[4]); //(workingDir + thisLine[4]);
                    if (File.exists())
                    {
                        noteImage = "<a href=\"" + thisLine[4] + "\" target=\"_blank\"><img src=\"" + thisLine[4] + "\"></a>";
                    }
                    else noteImage = thisLine[4];
                } noteImage += "&nbsp;";

                // Dealing with the RTF note attachments (if they exist).
                //if(thisLine.length() > 5)
                if (thisLine[5].length() > 0)
                {
                    QFile File (workingDir + thisLine[5]);
                    if (File.exists())
                    {
                        noteRtf = "<a href=\"" + thisLine[5] + "\" target=\"_blank\">" + thisLine[5] + "</a>";
                    }
                    else noteRtf = thisLine[5];
                } noteRtf += "&nbsp;";

                // table line
                tableLine =
                    "<tr class=\""+thisLine[2]+"\"> <"+t+">" + thisLine[0] +
                    "</"+t+"><"+t+">"+ thisLine[1] +
                    "</"+t+"><"+t+" class=\"notetype\">"+ thisLine[2] +
                    "</"+t+"><"+t+">"+ thisLine[3].replace("\"","") +
                    "</"+t+"><"+t+">"+ noteImage +
                    "</"+t+"><"+t+">"+ noteRtf +
                    "</"+t+"></tr>\n";

                // wrinting into the html file
                out << tableLine;
                t = "td";
            }

            out << longstrings.m_html_bodytable2;
            out << longstrings.p_html_footer;

            // close csv file
            csvfile.close();

            // close html the file
            htmlfile.close();
        }

        catch(int x)
        {
            // QT not supported exceptions - http://stackoverflow.com/questions/5548951/why-doesnt-qt-use-exception-handling
            // to add failure to the looger
            // exDrRetry = logger answer (yes\no)...
        }
    } while (exDrRetry);

    // to add succesfull to the logger
}
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<












































































































































































































































































































































Deleted RapidReporter2/convert_csv2html.h.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
#ifndef CONVERT_CSV2HTML_H
#define CONVERT_CSV2HTML_H

#include <QString>

class htmlstrings
{
public:
    QString html_title;

    //  the letter at the beginning of the var name is to hint about their order
    QString a_html_header;
    QString c_javascript;
    QString d_style;
    QString g_html_body1;
    QString i_toggle_auto;
    QString j_html_bodytable1;
    QString m_html_bodytable2;
    QString p_html_footer;

    htmlstrings()
    {
        html_title = "Session Report";

        //****************************************/
        a_html_header = "<html>\n<head>\n";
        a_html_header.append("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n");
        a_html_header.append("<title>" + html_title + "</title>\n\n");

        //****************************************/
        c_javascript = "<SCRIPT>\n";
        c_javascript.append("<!--\n");
        c_javascript.append("function showRow(obj)\n");
        c_javascript.append("{\n");
        c_javascript.append("    var allTrs = document.getElementsByTagName(\"tr\");\n");
        c_javascript.append("    var display2 = \"none\";\n");
        c_javascript.append("    if(true == obj.checked)\n");
        c_javascript.append("    {\n");
        c_javascript.append("        display2 = """";\n");
        c_javascript.append("    }\n");
        c_javascript.append("    for(var i=0; i < allTrs.length ; i++)\n");
        c_javascript.append("    {\n");
        c_javascript.append("        if(\"autogenerated\" == allTrs[i].className)\n");
        c_javascript.append("        {\n");
        c_javascript.append("            allTrs[i].style.display = display2;\n");
        c_javascript.append("        }\n");
        c_javascript.append("    }\n");
        c_javascript.append("}\n");
        c_javascript.append("//-->\n");
        c_javascript.append("</SCRIPT>\n\n");

        //****************************************/
        d_style = "<style>\n";
        d_style.append("H1 {text-align: center;}\n");
        d_style.append("table {margin-left: auto; margin-right: auto;}\n");
        d_style.append("table tr img {width: 250px; resize-scale: showall;}\n");
        d_style.append("table tr.Session {font-weight: bold; background: #ffff99;}\n");
        d_style.append("table tr.Bug {background: #FF7878;}\n");
        d_style.append("table tr.Test {background: #FFFFE0;}\n");
        d_style.append("table tr.Note {background: #00FFFF;}\n");
        d_style.append("table tr.Setup {background: #E3E3E3;}\n");
        d_style.append("table tr.autogenerated {color: #C0C0C0; font-style: italic;}\n");
        d_style.append("table tr.autogenerated img {width: 100px; resize-scale: showall;}\n");
        d_style.append("table td.notetype {font-weight: bold;}\n");
        d_style.append("</style>\n");
        d_style.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\" />\n\n");

        //****************************************/
        g_html_body1 = "</head>\n<body>\n<div id=\"allbody\">\n";

        //****************************************/
        i_toggle_auto = "<input type=\"checkbox\" checked=\"true\" id=\"1\" onClick=\"showRow(this)\"/> Show autogenerated rows\n";

        //****************************************/
        j_html_bodytable1 = "<div id=\"aroundtable\">\n<table border=\"1\">\n";

        //****************************************/
        m_html_bodytable2 = "</table>\n</div>";

        //****************************************/
        p_html_footer = "</div>\n</body>\n</html>";
    }
}; // long html strings class


class Convert_Csv2Html
{

public:
    Convert_Csv2Html();
    Convert_Csv2Html(QString csvFileName);
    void setCSVfile (QString csvFileName);
    void StartConvert(bool relativePath);

private:
    QString csvFile;
    QString htmlFile;

    // long html strings:
    htmlstrings longstrings;
};



#endif // CONVERT_CSV2HTML_H
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<


















































































































































































































Deleted RapidReporter2/csv2htmlconverter.cpp.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
#include "csv2htmlconverter.h"
#include <QDebug>
#include <QRegExp>
#include "QString"

class QFile;
class QRegExp;
class QTextStream;

Csv2HtmlConverter::Csv2HtmlConverter(QString csvFilePath, QObject *parent) :
    QObject(parent)
{
    csvFile = new QFile(csvFilePath);
    QRegExp regexp("csv");
    QString htmlFileName = csvFile->fileName().replace(regexp,"htm");
    htmlFile = new QFile(htmlFileName);
}


void Csv2HtmlConverter::Convert(QString csvFileName)
{
    qDebug() <<"Converting: " << csvFileName <<  " to html\n";
}


void Csv2HtmlConverter::writeHtmlTag(Flags::HtmlTags tagName,
                                            Flags::OpenCloseTag openCloseTag)
{
    if (!htmlFile->open(QIODevice::WriteOnly | QIODevice::Text
                       | QIODevice::Append))
        return;

    QTextStream out(&(*htmlFile));
    QString closingTag = (openCloseTag == Flags::OPEN) ? "" : "/";

    //out <<startDate << " " <<  msg << endl ;

    switch (tagName) {
    case Flags::html:
        out << "<html" + closingTag + ">";

        break;
    default:
        break;
    }

    htmlFile->flush();
    htmlFile->close();
}


<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<






































































































Deleted RapidReporter2/csv2htmlconverter.h.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
#ifndef CSV2HTMLCONVERTER_H
#define CSV2HTMLCONVERTER_H

#include <QObject>
#include <QString>
#include <QFile>
#include "Flags.h"

class Csv2HtmlConverter : public QObject
{
    Q_OBJECT
public:
    QFile * csvFile;
    QFile * htmlFile;



    explicit Csv2HtmlConverter(QString csvFilePath, QObject *parent = 0);
    void writeHtmlTag(Flags::HtmlTags tagName, Flags::OpenCloseTag openCloseTag = Flags::OPEN);
    void static StartConvert();

signals:

public slots:
    void Convert(QString csvFileName);
};

#endif // CSV2HTMLCONVERTER_H
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
























































Deleted RapidReporter2/helpviewer.cpp.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
#include "helpviewer.h"
#include <QDebug>

HelpViewer::HelpViewer(QObject *parent) :
    QObject(parent)
{

}


void HelpViewer::ShowHelp()
{
//    QWidget helpWindow;
//    helpWindow.show();

    qDebug() << "I'm showing some help here!!\n";

}
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<




































Deleted RapidReporter2/helpviewer.h.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
#ifndef HELPVIEWER_H
#define HELPVIEWER_H

#include <QObject>

class HelpViewer : public QObject
{
    Q_OBJECT
public:
    explicit HelpViewer(QObject *parent = 0);

signals:

public slots:
    void ShowHelp();

};

#endif // HELPVIEWER_H
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<






































Changes to RapidReporter2/mainwindow.cpp.

12
13
14
15
16
17
18

19
20
21
22
23
24
25
..
98
99
100
101
102
103
104
105

























106
107
108
109
110
111
112
...
129
130
131
132
133
134
135





























136
137
138
139
140
141
142
    keyEnterReceiver *key = new keyEnterReceiver();
    ui->textEdit->installEventFilter(key);
    UpdateFieldLable("Reporter:");
    connect(&(*key),SIGNAL(keyEnterReceived()),
            this,SLOT(GetUserText()));
    connect(this,SIGNAL(EmitFieldContent(QString,QString)),
            this,SLOT(HandleCatchFieldContent(QString,QString)));

}

MainWindow::~MainWindow()
{
    delete ui;
}

................................................................................
void MainWindow::SessionTimeEnded()
{
    void NotifySessionTimeEnded();
}

void MainWindow::ShowHelp()
{
    ///todo

























}

void MainWindow::StartWithSpecialUserTypes(QStringList UserTypes)
{
    setUserTypeTmp(UserTypes);
    show();
}
................................................................................
}

void MainWindow::NotifySessionTimeEnded()
{
    QMessageBox::about(this, tr("Session time ended"),
            tr("Please note that the session time is ended.\nYou may continue use RR2 or initilize a new session."));
}





























QStringList MainWindow::getUserTypeTmp() const
{
    return userTypeTmp;
}

void MainWindow::setUserTypeTmp(const QStringList &value)
{







>







 







<
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
..
99
100
101
102
103
104
105

106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
...
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
    keyEnterReceiver *key = new keyEnterReceiver();
    ui->textEdit->installEventFilter(key);
    UpdateFieldLable("Reporter:");
    connect(&(*key),SIGNAL(keyEnterReceived()),
            this,SLOT(GetUserText()));
    connect(this,SIGNAL(EmitFieldContent(QString,QString)),
            this,SLOT(HandleCatchFieldContent(QString,QString)));
    setHelpString();
}

MainWindow::~MainWindow()
{
    delete ui;
}

................................................................................
void MainWindow::SessionTimeEnded()
{
    void NotifySessionTimeEnded();
}

void MainWindow::ShowHelp()
{


    helpString = "<b>Welcome to Rapid Reporter!</b>\n\n";
    helpString.append("Basic usage:\n--------------\n");
    helpString.append("1) Run the application from your working folder (no installation necessary!)\n");
    helpString.append("o   All the report files and attachments will be created in this directory.\n");
    helpString.append("2) Enter your name and your charter.\n");
    helpString.append("3) Start entering notes.\n");
    helpString.append("o   Every single note you write in the main window is saved automatically.\n");
    helpString.append("o   You can change the type of the note easily by pressing the up/down arrows, on\n");
    helpString.append("the fly .\n");
    helpString.append("4) Add screenshots to the current note by pressing the button with the 'camera' icon.\n");
    helpString.append("o   By pressing SHIFT while clicking the button you can edit the screenshot (crop\n");
    helpString.append("or highlight a part)\n");
    helpString.append("5) You can add an extended text to the current note by pressing the button with the\n");
    helpString.append("'notebook' icon.\n");
    helpString.append("o   The extended note is useful for tracking error messages, logs, pictures...\n");
    helpString.append("o   The extended note's format is rich text.\n");
    helpString.append("o   Note: This area is persistent, so you can use it as a place for persistent\n");
    helpString.append("information between notes.\n");

    QMessageBox msgBox;
        msgBox.setTextFormat(Qt::RichText);   //this is what makes the links clickable
        msgBox.setText(helpString);
        msgBox.setStandardButtons(QMessageBox::Ok);
        msgBox.exec();
}

void MainWindow::StartWithSpecialUserTypes(QStringList UserTypes)
{
    setUserTypeTmp(UserTypes);
    show();
}
................................................................................
}

void MainWindow::NotifySessionTimeEnded()
{
    QMessageBox::about(this, tr("Session time ended"),
            tr("Please note that the session time is ended.\nYou may continue use RR2 or initilize a new session."));
}
QString MainWindow::getHelpString() const
{
    return helpString;
}

void MainWindow::setHelpString()
{
    helpString = "Welcome to Rapid Reporter!\n\n";
    helpString.append("Basic usage:\n--------------\n");
    helpString.append("1) Run the application from your working folder (no installation necessary!)\n");
    helpString.append("o   All the report files and attachments will be created in this directory.\n");
    helpString.append("2) Enter your name and your charter.\n");
    helpString.append("3) Start entering notes.\n");
    helpString.append("o   Every single note you write in the main window is saved automatically.\n");
    helpString.append("o   You can change the type of the note easily by pressing the up/down arrows, on\n");
    helpString.append("the fly .\n");
    helpString.append("4) Add screenshots to the current note by pressing the button with the 'camera' icon.\n");
    helpString.append("o   By pressing SHIFT while clicking the button you can edit the screenshot (crop\n");
    helpString.append("or highlight a part)\n");
    helpString.append("5) You can add an extended text to the current note by pressing the button with the\n");
    helpString.append("'notebook' icon.\n");
    helpString.append("o   The extended note is useful for tracking error messages, logs, pictures...\n");
    helpString.append("o   The extended note's format is rich text.\n");
    helpString.append("o   Note: This area is persistent, so you can use it as a place for persistent\n");
    helpString.append("information between notes.\n");

}


QStringList MainWindow::getUserTypeTmp() const
{
    return userTypeTmp;
}

void MainWindow::setUserTypeTmp(const QStringList &value)
{

Changes to RapidReporter2/mainwindow.h.

22
23
24
25
26
27
28



29
30
31
32
33
34
35
..
49
50
51
52
53
54
55

56
57
58
59
60
61
62
63

    QString getReporterTmp() const;
    void setReporterTmp(const QString &value);

    QStringList getUserTypeTmp() const;
    void setUserTypeTmp(const QStringList &value);




public slots:

    void GetUserText();
    void on_pushButton_clicked();
    void HandleCatchFieldContent(QString,QString);
    void UpdateProgerssBar(int);
    void SessionTimeEnded();
................................................................................
    void creatAndStartSession(QString,QString);
    void UpdateFieldLable(QString);
    void NotifySessionTimeEnded();
    //void keyPressEvent(QKeyEvent *);

private:
    Ui::MainWindow *ui;

    bool sessionStarted;
    Session * session;
    QString reporterTmp;
    QStringList userTypeTmp;
    void closeEvent(QCloseEvent *);
};

#endif // MAINWINDOW_H







>
>
>







 







>








22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
..
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67

    QString getReporterTmp() const;
    void setReporterTmp(const QString &value);

    QStringList getUserTypeTmp() const;
    void setUserTypeTmp(const QStringList &value);

    QString getHelpString() const;
    void setHelpString();

public slots:

    void GetUserText();
    void on_pushButton_clicked();
    void HandleCatchFieldContent(QString,QString);
    void UpdateProgerssBar(int);
    void SessionTimeEnded();
................................................................................
    void creatAndStartSession(QString,QString);
    void UpdateFieldLable(QString);
    void NotifySessionTimeEnded();
    //void keyPressEvent(QKeyEvent *);

private:
    Ui::MainWindow *ui;
    QString helpString;
    bool sessionStarted;
    Session * session;
    QString reporterTmp;
    QStringList userTypeTmp;
    void closeEvent(QCloseEvent *);
};

#endif // MAINWINDOW_H