Check-in [fda21c348f]

Not logged in

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

Overview
Comment:{Code clean] Removed unnecessary code
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:fda21c348f5fae4ad02ece7a313c370c102cafd9
User & Date: avi 2014-09-21 20:45:37
Context
2014-09-22
19:58
[bug fix] Fixed rtf dialog GUI Leaf check-in: 25f5bc3a10 user: avi tags: trunk
2014-09-21
20:45
{Code clean] Removed unnecessary code check-in: fda21c348f user: avi tags: trunk
19:42
[bug fix] Build error check-in: 6fc8942eb3 user: avi tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to RapidReporter2/csv2html.cpp.

10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
}

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

void Csv2Html::StartConvert(bool relativePath)
{

    qDebug() << "StartConvert was called with relativePath = " + relativePath;

    if (csvFile.isEmpty() || csvFile.isNull())
    {
        // add error to logger
        return;
    }








|


|







10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
}

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

void Csv2Html::StartConvert()
{

    //qDebug() << "StartConvert was called with relativePath = " + relativePath;

    if (csvFile.isEmpty() || csvFile.isNull())
    {
        // add error to logger
        return;
    }

Changes to RapidReporter2/csv2html.h.

88
89
90
91
92
93
94
95
96
97
98
99
100
101
102

class Csv2Html : public QObject
{
    Q_OBJECT
public:
    explicit Csv2Html(QObject *parent = 0);
    void setCSVfile (QString csvFileName);
    void StartConvert(bool relativePath = true);

signals:

public slots:
    void StartConvertSlot(QString csvFileName);

private:







|







88
89
90
91
92
93
94
95
96
97
98
99
100
101
102

class Csv2Html : public QObject
{
    Q_OBJECT
public:
    explicit Csv2Html(QObject *parent = 0);
    void setCSVfile (QString csvFileName);
    void StartConvert();

signals:

public slots:
    void StartConvertSlot(QString csvFileName);

private:

Changes to RapidReporter2/dialogrtf.cpp.

17
18
19
20
21
22
23

24
25
26
27
28
29
30
...
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
DialogRtf::DialogRtf(QWidget *parent) :
    QDialog(parent),
    ui(new Ui::DialogRtf)
{
    ui->setupUi(this);

    te = new QTextEdit(ui->textEdit);

    setWindowTitle("Rich text file comments");
    //Set flags
    //        Qt::WindowFlags flags = Qt::CustomizeWindowHint; // no frame
    //        flags |= Qt::MSWindowsFixedSizeDialogHint; // fixed size
    //        dialogRtf->setWindowFlags(flags);

    new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_B), this, SLOT(SetTextBold()));
................................................................................
        messageBox.critical(0,"Error","Cannot flash to file!");
        messageBox.setFixedSize(500,200);
        return;
    }

    outfile->close();

    te->clear();

    emit RtfNoteCaptured(fullFileName);
}

QString DialogRtf::CreateRtfFileName()
{
    QString time = QTime::currentTime().toString();







>







 







|







17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
...
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
DialogRtf::DialogRtf(QWidget *parent) :
    QDialog(parent),
    ui(new Ui::DialogRtf)
{
    ui->setupUi(this);

    te = new QTextEdit(ui->textEdit);
    //te->setGeometry(100,100,100,100);
    setWindowTitle("Rich text file comments");
    //Set flags
    //        Qt::WindowFlags flags = Qt::CustomizeWindowHint; // no frame
    //        flags |= Qt::MSWindowsFixedSizeDialogHint; // fixed size
    //        dialogRtf->setWindowFlags(flags);

    new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_B), this, SLOT(SetTextBold()));
................................................................................
        messageBox.critical(0,"Error","Cannot flash to file!");
        messageBox.setFixedSize(500,200);
        return;
    }

    outfile->close();

    //te->clear();

    emit RtfNoteCaptured(fullFileName);
}

QString DialogRtf::CreateRtfFileName()
{
    QString time = QTime::currentTime().toString();

Changes to RapidReporter2/dialogrtf.ui.

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
..
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
    <rect>
     <x>10</x>
     <y>10</y>
     <width>441</width>
     <height>361</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="80,5,10">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout" stretch="5,90,5">
      <item>
       <spacer name="horizontalSpacer_2">







        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>

      </item>
      <item>
       <widget class="QTextEdit" name="textEdit">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>






        </property>
        <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Increase font size:&lt;/span&gt; Ctrl + UP&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Decrease font size:&lt;/span&gt; Ctrl + DOWN&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Bold text:&lt;/span&gt; Ctrl + B&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Underline text:&lt;/span&gt; Ctrl + U&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Italic text: &lt;/span&gt;Ctrl + I&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="frameShape">
         <enum>QFrame::StyledPanel</enum>
        </property>
................................................................................
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Please add your text here:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <zorder>verticalLayoutWidget</zorder>
  <zorder>horizontalLayoutWidget</zorder>
 </widget>
 <resources/>
 <connections>
  <connection>
   <sender>buttonBox</sender>
   <signal>accepted()</signal>
   <receiver>DialogRtf</receiver>
   <slot>accept()</slot>
   <hints>
    <hint type="sourcelabel">
     <x>248</x>
     <y>254</y>
    </hint>
    <hint type="destinationlabel">
     <x>157</x>
     <y>274</y>
    </hint>
   </hints>
  </connection>
................................................................................
  <connection>
   <sender>buttonBox</sender>
   <signal>rejected()</signal>
   <receiver>DialogRtf</receiver>
   <slot>reject()</slot>
   <hints>
    <hint type="sourcelabel">
     <x>316</x>
     <y>260</y>
    </hint>
    <hint type="destinationlabel">
     <x>286</x>
     <y>274</y>
    </hint>
   </hints>
  </connection>
 </connections>
</ui>







|

|

|
>
>
>
>
>
>
>



|
|
<
<
<

<
>











>
>
>
>
>
>







 







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


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


<
<










|
|







 







|
|









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
..
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
    <rect>
     <x>10</x>
     <y>10</y>
     <width>441</width>
     <height>361</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">
      <item>
       <widget class="QPushButton" name="pBtnClear">
        <property name="text">
         <string>Clear</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="standardButtons">
         <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>



        </property>

       </widget>
      </item>
      <item>
       <widget class="QTextEdit" name="textEdit">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="maximumSize">
         <size>
          <width>500</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Increase font size:&lt;/span&gt; Ctrl + UP&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Decrease font size:&lt;/span&gt; Ctrl + DOWN&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Bold text:&lt;/span&gt; Ctrl + B&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Underline text:&lt;/span&gt; Ctrl + U&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Italic text: &lt;/span&gt;Ctrl + I&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="frameShape">
         <enum>QFrame::StyledPanel</enum>
        </property>
................................................................................
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Please add your text here:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </item>













     </layout>
    </item>























   </layout>
  </widget>


 </widget>
 <resources/>
 <connections>
  <connection>
   <sender>buttonBox</sender>
   <signal>accepted()</signal>
   <receiver>DialogRtf</receiver>
   <slot>accept()</slot>
   <hints>
    <hint type="sourcelabel">
     <x>249</x>
     <y>369</y>
    </hint>
    <hint type="destinationlabel">
     <x>157</x>
     <y>274</y>
    </hint>
   </hints>
  </connection>
................................................................................
  <connection>
   <sender>buttonBox</sender>
   <signal>rejected()</signal>
   <receiver>DialogRtf</receiver>
   <slot>reject()</slot>
   <hints>
    <hint type="sourcelabel">
     <x>317</x>
     <y>369</y>
    </hint>
    <hint type="destinationlabel">
     <x>286</x>
     <y>274</y>
    </hint>
   </hints>
  </connection>
 </connections>
</ui>