Merge pull request #706 from subutai-io/dev

Dev
subutai-io · Mar 9, 2018 · ecf3a01 · ecf3a01
2 parents 95f7b18 + ba78745
commit ecf3a01
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 11 deletions.
diff --git a/Info.plist b/Info.plist
@@ -5,7 +5,7 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>CFBundleIconFile</key>
-	<string>tray_logo.icns</string>
+	<string>cc_icon_mac.icns</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>

diff --git 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
@@ -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
diff --git a/darwin-packages/SubutaiTray.icns b/darwin-packages/SubutaiTray.icns
diff --git 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
@@ -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
@@ -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
@@ -213,7 +213,7 @@ std::pair<system_call_wrapper_error_t, QStringList> 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
@@ -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
@@ -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
diff --git a/resources/cc_icon_mac.icns b/resources/cc_icon_mac.icns
diff --git a/resources/cc_icon_win.ico b/resources/cc_icon_win.ico
diff --git a/resources/cc_splash.png b/resources/cc_splash.png
diff --git a/resources/resources.qrc b/resources/resources.qrc
@@ -58,6 +58,9 @@
         <file>refreshing.gif</file>
         <file>logo.png</file>
         <file>upload-0.png</file>
+        <file>cc_splash.png</file>
+        <file>cc_icon.png</file>
+        <file>cc_icon_mac.icns</file>
     </qresource>
     <qresource prefix="/"/>
 </RCC>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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"