@@ -26,6 +26,7 @@ void smartTimerLog::runLogger()
2626 QString str;
2727 bool turned;
2828 int boolTmp;
29+ QString signalPath;
2930
3031 QFile logFile (" save.txt" );
3132 if (!logFile.exists ())
@@ -39,12 +40,12 @@ void smartTimerLog::runLogger()
3940 QTextStream stream ( &logFile );
4041 while (!stream.atEnd ())
4142 {
42- stream >> tim >> str;
43+ stream >> tim >> str >> signalPath ;
4344
4445 if (str != " " )
4546 {
4647 str = toLoadFormat (str);
47- emit createTimer (WidgetSettings (tim,str));
48+ emit createTimer (WidgetSettings (tim,str, true , toLoadFormat (signalPath) ));
4849 }
4950 }
5051
@@ -65,13 +66,13 @@ void smartTimerLog::runLogger()
6566
6667 while (!stream2.atEnd ())
6768 {
68- stream2 >> tim >> str >> boolTmp;
69+ stream2 >> tim >> str >> boolTmp >> signalPath ;
6970 turned = boolTmp;
7071 if (str != " " )
7172 {
7273 str = toLoadFormat (str);
7374
74- emit createAlarm (WidgetSettings (tim,str,turned));
75+ emit createAlarm (WidgetSettings (tim,str,turned, toLoadFormat (signalPath) ));
7576 }
7677 }
7778
@@ -106,6 +107,7 @@ void smartTimerLog::saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alar
106107 std::string tmpstr;
107108 QString str;
108109 bool turned;
110+ QString signalPath;
109111
110112 QFile logFile (" save.txt" );
111113
@@ -120,7 +122,8 @@ void smartTimerLog::saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alar
120122 tim = timer->getTimerDuration ();
121123 str = timer->getTimerName ();
122124 str = toSaveFormat (str);
123- stream << tim << " " << str << " \n " ;
125+ signalPath = toSaveFormat (timer->getSettings ().signalPath );
126+ stream << tim << " " << str << " " << signalPath << " \n " ;
124127 }
125128
126129
@@ -140,9 +143,9 @@ void smartTimerLog::saveLog(QList<TimerWidget*> timers, QList<alertwidget*> alar
140143 tim = alarm->getAlertTime ();
141144 str = alarm->getName ();
142145 turned = alarm->getState ();
143-
146+ signalPath = toSaveFormat (alarm-> getSettings (). signalPath );
144147 str = toSaveFormat (str);
145- stream2 << tim << " " << str << " " << static_cast <int >(turned) << " \n " ;
148+ stream2 << tim << " " << str << " " << static_cast <int >(turned) << " " << signalPath << " \n " ;
146149 }
147150
148151 logFile2.close ();
@@ -170,7 +173,7 @@ QString smartTimerLog::toLoadFormat(const QString &str)
170173 if (str == " &" )
171174 return " " ;
172175 QString res = str;
173- res.replace (" _ " ," " );
176+ res.replace (" * " ," " );
174177 return res;
175178}
176179
@@ -179,6 +182,6 @@ QString smartTimerLog::toSaveFormat(const QString &str)
179182 if (str == " " )
180183 return " &" ;
181184 QString res = str;
182- res.replace (" " ," _ " );
185+ res.replace (" " ," * " );
183186 return res;
184187}
0 commit comments