diff --git a/Info.plist b/Info.plist
index 384a1305..03711193 100644
--- a/Info.plist
+++ b/Info.plist
@@ -5,7 +5,7 @@
NSPrincipalClass
NSApplication
CFBundleIconFile
- tray_logo.icns
+ cc_icon_mac.icns
CFBundlePackageType
APPL
CFBundleGetInfoString
diff --git a/SubutaiControlCenter.pro b/SubutaiControlCenter.pro
index 6973b472..62720578 100644
--- a/SubutaiControlCenter.pro
+++ b/SubutaiControlCenter.pro
@@ -176,7 +176,7 @@ macx: {
QMAKE_LFLAGS += -F /System/Library/Frameworks/CoreFoundation.framework/
LIBS += -framework CoreFoundation
LIBS += -ldl -lpthread
- ICON = $$PWD/resources/tray_logo.icns
+ ICON = $$PWD/resources/cc_icon_mac.icns
QMAKE_INFO_PLIST = $$PWD/Info.plist
LIBS += -L/tmp/tray-static -L/usr/local/lib/ -lssh2
# USE WITH CROSS COMPILATION
diff --git a/control-center.rc b/control-center.rc
index 40b52698..f6aa27d3 100644
--- a/control-center.rc
+++ b/control-center.rc
@@ -3,6 +3,6 @@
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "SubutaiControlCenter.exe.manifest"
-IDI_ICON1 ICON DISCARDABLE "resources/tray_icon_set_07.ico"
+IDI_ICON1 ICON DISCARDABLE "resources/cc_icon_win.ico"
diff --git a/darwin-packages/SubutaiControlCenter.icns b/darwin-packages/SubutaiControlCenter.icns
new file mode 100644
index 00000000..72e5ecd3
Binary files /dev/null and b/darwin-packages/SubutaiControlCenter.icns differ
diff --git a/darwin-packages/SubutaiTray.icns b/darwin-packages/SubutaiTray.icns
deleted file mode 100644
index 1895fada..00000000
Binary files a/darwin-packages/SubutaiTray.icns and /dev/null differ
diff --git a/deb-packages/deb-packages-internal/debian/postinst b/deb-packages/deb-packages-internal/debian/postinst
index f17fec1d..b80ffc20 100644
--- a/deb-packages/deb-packages-internal/debian/postinst
+++ b/deb-packages/deb-packages-internal/debian/postinst
@@ -40,7 +40,7 @@ echo "Keywords=Internet" >> $desktop_file
echo "Exec=/usr/bin/SubutaiControlCenter" >> $desktop_file
echo "Terminal=false" >> $desktop_file
echo "Type=Application" >> $desktop_file
-echo "Icon=/usr/share/icons/Tray_icon_set-07.png" >> $desktop_file
+echo "Icon=/usr/share/icons/cc_icon.png" >> $desktop_file
echo "Categories=GNOME;Network" >> $desktop_file
echo "StartupNotify=true" >> $desktop_file
diff --git a/deb-packages/deb-packages-internal/pack_debian.sh b/deb-packages/deb-packages-internal/pack_debian.sh
index 0d9bd7f5..0b05a3da 100755
--- a/deb-packages/deb-packages-internal/pack_debian.sh
+++ b/deb-packages/deb-packages-internal/pack_debian.sh
@@ -6,7 +6,7 @@ mkdir -p debian/SubutaiControlCenter/bin
mkdir -p debian/SubutaiControlCenter/lib
mkdir -p debian/SubutaiControlCenter/Libs
-cp $PWD/../../resources/Tray_icon_set-07.png debian/icons
+cp $PWD/../../resources/cc_icon.png debian/icons
cp ../../subutai_control_center_bin/SubutaiControlCenter debian/SubutaiControlCenter/bin/subutai-control-center
cp ../../subutai_control_center_bin/*.qm debian/SubutaiControlCenter/bin/
diff --git a/hub/forms/DlgTransferFile.cpp b/hub/forms/DlgTransferFile.cpp
index 4091367f..3d651a22 100644
--- a/hub/forms/DlgTransferFile.cpp
+++ b/hub/forms/DlgTransferFile.cpp
@@ -240,9 +240,9 @@ void DlgTransferFile::transfer_finished(int tw_row, system_call_wrapper_error_t
else {
file_to_transfer.setTransferFileStatus(FIlE_FAILED_TO_UPLOAD);
if(res == SCWE_PERMISSION_DENIED)
- twi_operation_status->setToolTip("Permision denied");
+ twi_operation_status->setText("Permision denied");
else
- twi_operation_status->setToolTip("Failed to upload");
+ twi_operation_status->setText("Failed to upload");
twi_operation_status->setIcon(transfer_failed_icon);
if(file_to_transfer.fileInfo().fileName().contains("\\"))
twi_operation_status->setText("Invalid file name");
diff --git a/hub/src/SystemCallWrapper.cpp b/hub/src/SystemCallWrapper.cpp
index f1811814..b110c4c0 100644
--- a/hub/src/SystemCallWrapper.cpp
+++ b/hub/src/SystemCallWrapper.cpp
@@ -213,7 +213,7 @@ std::pair CSystemCallWrapper::upload_f
<< "-S" << CSettingsManager::Instance().ssh_path()
<< "-i" << ssh_info.second
<< file_path
- << QString("%1@%2:\"%3\"").arg(remote_user, ip, destination);
+ << QString("%1@%2:%3").arg(remote_user, ip, destination);
qDebug() << "ARGS=" << args;
system_call_res_t res = ssystem_th(cmd, args, true, true, 97);
diff --git a/hub/src/TrayControlWindow.cpp b/hub/src/TrayControlWindow.cpp
index 52dc59f9..abd94606 100644
--- a/hub/src/TrayControlWindow.cpp
+++ b/hub/src/TrayControlWindow.cpp
@@ -188,7 +188,7 @@ void TrayControlWindow::create_tray_actions() {
&TrayControlWindow::application_quit);
m_act_launch_Hub =
- new QAction(QIcon(":/hub/Hub-07.png"), tr("Bazaar website"), this);
+ new QAction(QIcon(":/hub/Hub-07.png"), tr("Go to Bazaar"), this);
connect(m_act_launch_Hub, &QAction::triggered, this,
&TrayControlWindow::launch_Hub);
@@ -256,7 +256,7 @@ void TrayControlWindow::create_tray_icon() {
m_tray_menu->addAction(m_act_logout);
m_tray_menu->addAction(m_act_quit);
- m_sys_tray_icon->setIcon(QIcon(":/hub/Tray_icon_set-07.png"));
+ m_sys_tray_icon->setIcon(QIcon(":/hub/cc_icon.png"));
}
void TrayControlWindow::get_sys_tray_icon_coordinates_for_dialog(
diff --git a/main.cpp b/main.cpp
index 3c403887..0c991d07 100644
--- a/main.cpp
+++ b/main.cpp
@@ -132,7 +132,7 @@ main(int argc, char *argv[]) {
DlgLogin dlg;
dlg.setModal(true);
- QPixmap pm(":/hub/logo.png");
+ QPixmap pm(":/hub/cc_splash.png");
QSplashScreen sc(pm);
sc.show();
diff --git a/resources/cc_icon.png b/resources/cc_icon.png
new file mode 100644
index 00000000..8fe5e5f1
Binary files /dev/null and b/resources/cc_icon.png differ
diff --git a/resources/cc_icon_mac.icns b/resources/cc_icon_mac.icns
new file mode 100644
index 00000000..72e5ecd3
Binary files /dev/null and b/resources/cc_icon_mac.icns differ
diff --git a/resources/cc_icon_win.ico b/resources/cc_icon_win.ico
new file mode 100644
index 00000000..e9cfe599
Binary files /dev/null and b/resources/cc_icon_win.ico differ
diff --git a/resources/cc_splash.png b/resources/cc_splash.png
new file mode 100644
index 00000000..9f345dd9
Binary files /dev/null and b/resources/cc_splash.png differ
diff --git a/resources/resources.qrc b/resources/resources.qrc
index b59bc8e7..228ecab9 100644
--- a/resources/resources.qrc
+++ b/resources/resources.qrc
@@ -58,6 +58,9 @@
refreshing.gif
logo.png
upload-0.png
+ cc_splash.png
+ cc_icon.png
+ cc_icon_mac.icns