diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 90d9448a5..78da1cff5 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -47,7 +47,6 @@ images/clear_edit_16px@2x.png images/clearbreakpoints_16px.png images/clearbreakpoints_16px@2x.png - images/close.png images/cm_add.png images/cm_diff.png images/cm_erase.png @@ -181,9 +180,12 @@ images/marked_24.png images/marked_64.png images/marked_16.png - images/folder_12.png - images/file_12.png - images/empty_12.png + images/folder_12px.png + images/folder_12px@2x.png + images/file_12px.png + images/file_12px@2x.png + images/empty_12px.png + images/empty_12px@2x.png images/fit_front_24px.png images/fit_front_24px@2x.png images/fit_back_24px.png diff --git a/src/icons/images/close.png b/src/icons/images/close.png deleted file mode 100644 index 2600eb1a4..000000000 Binary files a/src/icons/images/close.png and /dev/null differ diff --git a/src/icons/images/empty_12.png b/src/icons/images/empty_12.png deleted file mode 100644 index 989ee8a3f..000000000 Binary files a/src/icons/images/empty_12.png and /dev/null differ diff --git a/src/icons/images/file_12.png b/src/icons/images/file_12.png deleted file mode 100644 index 5113c3262..000000000 Binary files a/src/icons/images/file_12.png and /dev/null differ diff --git a/src/icons/images/file_12px.png b/src/icons/images/file_12px.png new file mode 100644 index 000000000..db264cbc9 Binary files /dev/null and b/src/icons/images/file_12px.png differ diff --git a/src/icons/images/file_12px@2x.png b/src/icons/images/file_12px@2x.png new file mode 100644 index 000000000..f8a8a1afc Binary files /dev/null and b/src/icons/images/file_12px@2x.png differ diff --git a/src/icons/images/folder_12.png b/src/icons/images/folder_12.png deleted file mode 100644 index 99459e601..000000000 Binary files a/src/icons/images/folder_12.png and /dev/null differ diff --git a/src/icons/images/folder_12px.png b/src/icons/images/folder_12px.png new file mode 100644 index 000000000..4de4807ee Binary files /dev/null and b/src/icons/images/folder_12px.png differ diff --git a/src/icons/images/folder_12px@2x.png b/src/icons/images/folder_12px@2x.png new file mode 100644 index 000000000..cbd758fbd Binary files /dev/null and b/src/icons/images/folder_12px@2x.png differ diff --git a/src/icons/svg/file_12px.svg b/src/icons/svg/file_12px.svg new file mode 100644 index 000000000..df4864548 --- /dev/null +++ b/src/icons/svg/file_12px.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/svg/folder_12px.svg b/src/icons/svg/folder_12px.svg new file mode 100644 index 000000000..fbbff0764 --- /dev/null +++ b/src/icons/svg/folder_12px.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lay/lay/laySaltGrainDetailsTextWidget.cc b/src/lay/lay/laySaltGrainDetailsTextWidget.cc index 4d91af745..3bbda18a2 100644 --- a/src/lay/lay/laySaltGrainDetailsTextWidget.cc +++ b/src/lay/lay/laySaltGrainDetailsTextWidget.cc @@ -142,9 +142,9 @@ SaltGrainDetailsTextWidget::loadResource (int type, const QUrl &url) static void produce_listing (QTextStream &stream, QDir dir, int level) { for (int i = 0; i < level + 1; ++i) { - stream << "  "; + stream << "  "; } - stream << "  "; + stream << "  "; if (level > 0) { stream << tl::escaped_to_html (tl::to_string (dir.dirName ())).c_str (); } else { @@ -162,9 +162,9 @@ static void produce_listing (QTextStream &stream, QDir dir, int level) produce_listing (stream, QDir (fi.filePath ()), level); } else { for (int i = 0; i < level + 1; ++i) { - stream << "  "; + stream << "  "; } - stream << "  " << tl::escaped_to_html (tl::to_string (*e)).c_str () << "
\n"; + stream << "  " << tl::escaped_to_html (tl::to_string (*e)).c_str () << "
\n"; } }