development/webtester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added date/time to attachment file names, so the images are sorted correctly

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-03-04 15:31:57 +00:00
parent c5b5c456ac
commit 953133e99e
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands.hxx
View File

@@ -215,9 +215,12 @@ class Screenshot: public Command {
throw DirectoryCannotBeCreated(target); throw DirectoryCannotBeCreated(target);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
QString filename(target+QDir::separator()+ QString filename(target+QDir::separator()+
QString("%1-%2-%3.html") QString("%4-%1-%2-%3.html")
.arg(base) .arg(base)
.arg(line, 4, 10, QChar('0')).arg(name)); .arg(line, 4, 10, QChar('0'))
.arg(name)
.arg(QDateTime::currentDateTime()
.toString("yyyyMMddHHmmss")));
QFile file(filename); QFile file(filename);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
throw CannotWriteSouceHTML(filename); throw CannotWriteSouceHTML(filename);
@@ -240,9 +243,12 @@ class Screenshot: public Command {
throw DirectoryCannotBeCreated(target); throw DirectoryCannotBeCreated(target);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
QString filename(target+QDir::separator()+ QString filename(target+QDir::separator()+
QString("%1-%2-%3.png") QString("%4-%1-%2-%3.png")
.arg(base) .arg(base)
.arg(line, 4, 10, QChar('0')).arg(name)); .arg(line, 4, 10, QChar('0'))
.arg(name)
.arg(QDateTime::currentDateTime()
.toString("yyyyMMddHHmmss")));
if (!image.save(filename)) throw CannotWriteScreenshot(filename); if (!image.save(filename)) throw CannotWriteScreenshot(filename);
return QDir(filename).absolutePath(); return QDir(filename).absolutePath();
} }

2
src/testgui.ui
View File

@@ -41,7 +41,7 @@
<item> <item>
<widget class="QLineEdit" name="_url"> <widget class="QLineEdit" name="_url">
<property name="text"> <property name="text">
<string>http://web9t.int.swisssign.net/joomla</string> <string>https://</string>
</property> </property>
</widget> </widget>
</item> </item>