diff --git a/bin/assets/icon/ee-icon-web.svg b/bin/assets/icon/ee-icon-web.svg
new file mode 100644
index 000000000..95abf289d
--- /dev/null
+++ b/bin/assets/icon/ee-icon-web.svg
@@ -0,0 +1,13 @@
+
diff --git a/bin/assets/icon/ee-icon.svg b/bin/assets/icon/ee-icon.svg
new file mode 100644
index 000000000..af26ed5c6
--- /dev/null
+++ b/bin/assets/icon/ee-icon.svg
@@ -0,0 +1,107 @@
+
+
+
+
diff --git a/bin/assets/icon/ee.icns b/bin/assets/icon/ee.icns
index b9eae3d53..552807452 100644
Binary files a/bin/assets/icon/ee.icns and b/bin/assets/icon/ee.icns differ
diff --git a/bin/assets/icon/ee.ico b/bin/assets/icon/ee.ico
index df9268206..820acbeca 100644
Binary files a/bin/assets/icon/ee.ico and b/bin/assets/icon/ee.ico differ
diff --git a/bin/assets/icon/ee.png b/bin/assets/icon/ee.png
index 3b6d84140..27dc5c735 100644
Binary files a/bin/assets/icon/ee.png and b/bin/assets/icon/ee.png differ
diff --git a/bin/assets/icon/ee.res b/bin/assets/icon/ee.res
index 82b992f4b..7f3ccefb7 100644
Binary files a/bin/assets/icon/ee.res and b/bin/assets/icon/ee.res differ
diff --git a/bin/assets/icon/ee.x64.res b/bin/assets/icon/ee.x64.res
index ccfe723cf..014fdfc7f 100644
Binary files a/bin/assets/icon/ee.x64.res and b/bin/assets/icon/ee.x64.res differ
diff --git a/bin/assets/icon/eterm-icon.svg b/bin/assets/icon/eterm-icon.svg
new file mode 100644
index 000000000..00aa80a3e
--- /dev/null
+++ b/bin/assets/icon/eterm-icon.svg
@@ -0,0 +1,107 @@
+
+
+
+
diff --git a/bin/assets/icon/eterm.png b/bin/assets/icon/eterm.png
new file mode 100644
index 000000000..495c4412c
Binary files /dev/null and b/bin/assets/icon/eterm.png differ
diff --git a/src/tools/eterm/eterm.cpp b/src/tools/eterm/eterm.cpp
index 5a2cb1fd7..57f7a7d0f 100644
--- a/src/tools/eterm/eterm.cpp
+++ b/src/tools/eterm/eterm.cpp
@@ -20,8 +20,8 @@ void loadColorSchemes( const std::string& resPath ) {
auto colorSchemesFiles = FileSystem::filesGetInPath( colorSchemesPath );
for ( auto& file : colorSchemesFiles ) {
auto colorSchemesInFile = TerminalColorScheme::loadFromFile( file );
- for ( auto& coloScheme : colorSchemesInFile )
- colorSchemes.emplace_back( coloScheme );
+ std::copy( colorSchemesInFile.begin(), colorSchemesInFile.end(),
+ std::back_inserter( colorSchemes ) );
}
}
for ( auto colorScheme : colorSchemes )
@@ -205,8 +205,8 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
if ( listColorSchemes.Get() ) {
std::cout << "Color schemes:\n";
- for ( auto colorScheme : terminalColorSchemes )
- std::cout << "\t" << colorScheme.first << "\n";
+ for ( const auto& tcs : terminalColorSchemes )
+ std::cout << "\t" << tcs.first << "\n";
return EXIT_SUCCESS;
}
@@ -217,7 +217,7 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) {
Sizei winSize( width.Get(), height.Get() );
win = Engine::instance()->createWindow(
WindowSettings( winSize.getWidth(), winSize.getHeight(), "eterm", WindowStyle::Default,
- WindowBackend::Default, 32, resPath + "icon/ee.png",
+ WindowBackend::Default, 32, resPath + "icon/eterm.png",
pixelDenstiyConf ? pixelDenstiyConf.Get()
: currentDisplay->getPixelDensity() ),
ContextSettings( vsync.Get() ) );