diff --git a/.gitignore b/.gitignore index 8b3deb75..965f3fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.swp bin/* subutai_tray_bin/ +subutai_control_center_bin/ libssh_app_bin/ .DS_Store build @@ -17,6 +18,7 @@ build debian/debhelper-build-stamp debian/files debian/subutai-tray +debian/subutai-control-center deb-packages/deb-packages-internal/debian/changelog # doxygen @@ -27,6 +29,7 @@ html/ darwin-packages/flat/* darwin-packages/root/* darwin-packages/SubutaiTray.app +darwin-packages/SubutraiControlCenter.app darwin-packages/*.pkg Makefile diff --git a/CHANGELOG b/CHANGELOG index 628b8191..88c8d5d4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Change Log +## [6.7.0] 2/26/2018 +* New feature File Transfer System. +* Fixed minor bugs. + ## [6.6.4] 2/16/2018 * Remote Desktop from Hub bug fixed diff --git a/Info.plist b/Info.plist index 2baf43dd..384a1305 100644 --- a/Info.plist +++ b/Info.plist @@ -13,9 +13,9 @@ CFBundleSignature ???? CFBundleExecutable - SubutaiTray + SubutaiControlCenter CFBundleIdentifier - com.subutai-io.SubutaiTray + com.subutai-io.SubutaiControlCenter LSUIElement 1 diff --git a/Jenkinsfile b/Jenkinsfile index f10e9a77..e10ecd60 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,14 +14,14 @@ try { build_path_linux = "home/builder/build_master" linux_tray_build = "build_master.sh" - upload_deb = "subutai-tray-master.deb" - upload_sh = "SubutaiTray" + upload_deb = "subutai-control-center-master.deb" + upload_sh = "SubutaiControlCenter" upload_script = "upload_master.sh" upload_script_prod ="upload_prod.sh" build_mac = "master" - upload_pkg = "subutai-tray-master.pkg" - upload_osx = "SubutaiTray_osx" + upload_pkg = "subutai-control-center-master.pkg" + upload_osx = "SubutaiControlCenter_osx" break; default: @@ -33,14 +33,14 @@ try { build_path_linux = "home/builder/build_dev" linux_tray_build = "./build_dev.sh" - upload_deb = "subutai-tray-dev.deb" - upload_sh = "SubutaiTray" + upload_deb = "subutai-control-center-dev.deb" + upload_sh = "SubutaiControlCenter" upload_script = "upload_dev.sh" upload_script_prod ="upload_prod.sh" build_mac = "dev" - upload_pkg = "subutai-tray-dev.pkg" - upload_osx = "SubutaiTray_osx" + upload_pkg = "subutai-control-center-dev.pkg" + upload_osx = "SubutaiControlCenter_osx" } /* Building agent binary. Node block used to separate agent and subos code. @@ -60,9 +60,9 @@ try { notifyBuildDetails = "\nFailed on Stage - Upload" sh """ - /Users/dev/upload/./${upload_script} /Users/dev/SRC/tray/subutai_tray_bin/${upload_pkg} - /Users/dev/upload/./${upload_script} /Users/dev/SRC/tray/subutai_tray_bin/${upload_osx} - /Users/dev/upload/./${upload_script_prod} /Users/dev/SRC/tray/subutai_tray_bin/${upload_pkg} + /Users/dev/upload/./${upload_script} /Users/dev/SRC/tray/subutai_control_center_bin/${upload_pkg} + /Users/dev/upload/./${upload_script} /Users/dev/SRC/tray/subutai_control_center_bin/${upload_osx} + /Users/dev/upload/./${upload_script_prod} /Users/dev/SRC/tray/subutai_control_center_bin/${upload_pkg} """ } diff --git a/SubutaiTray.exe.manifest b/SubutaiControlCenter.exe.manifest similarity index 80% rename from SubutaiTray.exe.manifest rename to SubutaiControlCenter.exe.manifest index 77b6dea3..bc41364d 100644 --- a/SubutaiTray.exe.manifest +++ b/SubutaiControlCenter.exe.manifest @@ -2,7 +2,7 @@ - + This application allows non technical users to manage their containers and see information about their environments, peers, balance etc. @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/SubutaiTray.pro b/SubutaiControlCenter.pro similarity index 99% rename from SubutaiTray.pro rename to SubutaiControlCenter.pro index 7461c05a..c8f5d07b 100644 --- a/SubutaiTray.pro +++ b/SubutaiControlCenter.pro @@ -11,7 +11,7 @@ CONFIG += c++11 greaterThan(QT_MAJOR_VERSION, 4) : QT += widgets -TARGET = SubutaiTray +TARGET = SubutaiControlCenter TEMPLATE = app INCLUDEPATH += commons/include diff --git a/build_linux.sh b/build_linux.sh index 41d5c101..33692a4c 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -1,16 +1,16 @@ #!/bin/bash nproc_count="$(nproc)" core_number=$((nproc_count*2+1)) -subutai_tray_bin="subutai_tray_bin" +subutai_control_center_bin="subutai_control_center_bin" -if [ -d "$subutai_tray_bin" ]; then - echo "Try to remove subutai_tray_bin" - rm -rf subutai_tray_bin +if [ -d "$subutai_control_center_bin" ]; then + echo "Try to remove subutai_control_center_bin" + rm -rf subutai_control_center_bin fi -mkdir subutai_tray_bin -cd subutai_tray_bin -lrelease ../SubutaiTray.pro -qmake ../SubutaiTray.pro -r -spec linux-g++ +mkdir subutai_control_center_bin +cd subutai_control_center_bin +lrelease ../SubutaiControlCenter.pro +qmake ../SubutaiControlCenter.pro -r -spec linux-g++ make -j$core_number rm *.o *.cpp *.h mv ../*.qm . diff --git a/build_mac.sh b/build_mac.sh index cc1415cf..792c5742 100755 --- a/build_mac.sh +++ b/build_mac.sh @@ -1,5 +1,5 @@ #!/bin/bash -build="subutai_tray_bin" +build="subutai_control_center_bin" if [ -d "$build" ]; then echo "Try to remove build" @@ -7,14 +7,14 @@ if [ -d "$build" ]; then fi mkdir -p $build cd $build -lrelease ../SubutaiTray.pro -qmake ../SubutaiTray.pro -r -spec macx-clang CONFIG+=x86_64 +lrelease ../SubutaiControlCenter.pro +qmake ../SubutaiControlCenter.pro -r -spec macx-clang CONFIG+=x86_64 make mv ../*.qm . cd ../ -macdeployqt subutai_tray_bin/SubutaiTray.app -cd subutai_tray_bin/SubutaiTray.app/Contents/MacOS/ +macdeployqt subutai_control_center_bin/SubutaiControlCenter.app +cd subutai_control_center_bin/SubutaiControlCenter.app/Contents/MacOS/ cp ../../../*.qm . #source ../../../../after_build_step_mac_os -cp SubutaiTray SubutaiTray_osx -cp SubutaiTray_osx ../../../. +cp SubutaiControlCenter SubutaiControlCenter_osx +cp SubutaiControlCenter_osx ../../../. diff --git a/build_win.bat b/build_win.bat index 48640514..74961708 100644 --- a/build_win.bat +++ b/build_win.bat @@ -1,29 +1,29 @@ set arg_vboxrt_dll=%1 -if exist "subutai_tray_bin" ( +if exist "subutai_control_center_bin" ( - echo "Try to remove subutai_tray_bin" + echo "Try to remove subutai_control_center_bin" - rd /Q /S "subutai_tray_bin" + rd /Q /S "subutai_control_center_bin" ) -md subutai_tray_bin +md subutai_control_center_bin -cd subutai_tray_bin +cd subutai_control_center_bin -qmake ..\SubutaiTray.pro -r -spec win32-msvc +qmake ..\SubutaiControlCenter.pro -r -spec win32-msvc jom cd .. -copy "libssh2\lib\win32\libssh2.dll" "subutai_tray_bin\release\" +copy "libssh2\lib\win32\libssh2.dll" "subutai_control_center_bin\release\" -cd subutai_tray_bin\release +cd subutai_control_center_bin\release del *.obj @@ -33,7 +33,7 @@ del *.h del *.moc -windeployqt --release --no-translations --compiler-runtime SubutaiTray.exe +windeployqt --release --no-translations --compiler-runtime SubutaiControlCenter.exe copy %arg_vboxrt_dll% . && echo "SUCCESS" diff --git a/commons/src/Commons.cpp.autosave b/commons/src/Commons.cpp.autosave deleted file mode 100644 index ea5b38cc..00000000 --- a/commons/src/Commons.cpp.autosave +++ /dev/null @@ -1,185 +0,0 @@ -#include "Commons.h" -#include "SystemCallWrapper.h" - -#include -#include -#include -#include -#include -#include - - - -const char* CCommons::RESTARTED_ARG = "restarted"; - -QString -CCommons::FileMd5(const QString &file_path) { - QFile f(file_path); - if (!f.exists()) return ""; - if (!f.open(QIODevice::ReadOnly)) return ""; - QString hash = QCryptographicHash::hash(f.readAll(), QCryptographicHash::Md5).toHex().constData(); - f.close(); - return hash; -} -//////////////////////////////////////////////////////////////////////////// - -QString -CCommons::NetworkErrorToString(int err_code) { - switch (err_code) { - case QNetworkReply::NoError : return QObject::tr("No error"); - - // network layer errors [relating to the destination server] (1-99): - case QNetworkReply::ConnectionRefusedError: return QObject::tr("Connection Refused Error"); - case QNetworkReply::RemoteHostClosedError : return QObject::tr("Remote Host Closed Error"); - case QNetworkReply::HostNotFoundError: return QObject::tr("Host Not Found Error"); - case QNetworkReply::TimeoutError: return QObject::tr("Timeout Error"); - case QNetworkReply::OperationCanceledError: return QObject::tr("Operation Canceled Error"); - case QNetworkReply::SslHandshakeFailedError: return QObject::tr("Ssl Handshake Failed Error"); - case QNetworkReply::TemporaryNetworkFailureError: return QObject::tr("Temporary Network Failure Error"); - case QNetworkReply::NetworkSessionFailedError: return QObject::tr("Network Session Failed Error"); - case QNetworkReply::BackgroundRequestNotAllowedError: return QObject::tr("Background Request Not Allowed Error"); - case QNetworkReply::TooManyRedirectsError: return QObject::tr("TooMany Redirects Error"); - case QNetworkReply::InsecureRedirectError: return QObject::tr("Insecure Redirect Error"); - case QNetworkReply::UnknownNetworkError: return QObject::tr("Unknown Network Error"); - - // proxy errors (101-199): - case QNetworkReply::ProxyConnectionRefusedError: return QObject::tr("Proxy Connection Refused Error"); - case QNetworkReply::ProxyConnectionClosedError: return QObject::tr("Proxy Connection Closed Error"); - case QNetworkReply::ProxyNotFoundError: return QObject::tr("Proxy Not Found Error"); - case QNetworkReply::ProxyTimeoutError: return QObject::tr("Proxy Timeout Error"); - case QNetworkReply::ProxyAuthenticationRequiredError: return QObject::tr("Proxy Authentication Required Error"); - case QNetworkReply::UnknownProxyError: return QObject::tr("Unknown Proxy Error"); - - // content errors (201-299): - case QNetworkReply:: ContentAccessDenied: return QObject::tr("Content Access Denied"); - case QNetworkReply::ContentOperationNotPermittedError: return QObject::tr("Content Operation Not Permitted Error"); - case QNetworkReply::ContentNotFoundError: return QObject::tr("Content Not Found Error"); - case QNetworkReply::AuthenticationRequiredError: return QObject::tr("Authentication Required Error"); - case QNetworkReply::ContentReSendError: return QObject::tr("Content Resend Error"); - case QNetworkReply::ContentConflictError: return QObject::tr("Content Conflict Error"); - case QNetworkReply::ContentGoneError: return QObject::tr("Content Gone Error"); - case QNetworkReply::UnknownContentError: return QObject::tr("Unknown Content Error"); - - // protocol errors - case QNetworkReply::ProtocolUnknownError: return QObject::tr("Protocol Unknown Error"); - case QNetworkReply::ProtocolInvalidOperationError: return QObject::tr("Protocol Invalid Operation Error"); - case QNetworkReply::ProtocolFailure: return QObject::tr("Protocol Failure"); - - // Server side errors (401-499) - case QNetworkReply::InternalServerError: return QObject::tr("Internal Server Error"); - case QNetworkReply::OperationNotImplementedError: return QObject::tr("Operation not implemented error"); - case QNetworkReply::ServiceUnavailableError: return QObject::tr("Service unavailable error"); - case QNetworkReply::UnknownServerError: return QObject::tr("Unknown server error"); - - default: return QObject::tr("Unknown network error"); - } -} -//////////////////////////////////////////////////////////////////////////// - -void CCommons::RestartTray() { - QStringList args; - args << RESTARTED_ARG; - QProcess::startDetached(QApplication::applicationFilePath(), args); - QApplication::exit(0); -} - -//////////////////////////////////////////////////////////////// - -bool -CCommons::IsApplicationLaunchable(const QString &file_path) { - QFileInfo fi(file_path); - if (fi.exists() && fi.isExecutable()) - return true; - QString cmd; - system_call_wrapper_error_t which_res = - CSystemCallWrapper::which(file_path, cmd); - if (which_res != SCWE_SUCCESS) return false; - QFileInfo fi2(cmd); - return fi2.exists() && fi2.isExecutable(); -} -//////////////////////////////////////////////////////////////////////////// - -bool -CCommons::IsTerminalLaunchable(const QString &terminal) { - system_call_wrapper_error_t open_res = - CSystemCallWrapper::open(terminal); - if (open_res == SCWE_SUCCESS) return true; - - return false; -} -//////////////////////////////////////////////////////////////////////////// - -static std::map dct_term_arg = { - //linux - {"xterm", "-e"}, - {"terminator", "-e"}, - {"gnome-terminal", "-x bash -c"}, - {"mate-terminal", "-x bash -c"}, - {"xfce4-terminal", "-x bash -c"}, - {"guake", "-e"}, - {"kterm", "-e bash -c"}, - {"konsole", "-e bash -c"}, - {"termit", "-e bash -c"}, - {"roxterm", "-e bash -c"}, - {"rxvt", "-e bash -c"}, - {"evilvte", "-e bash -c"}, - {"aterm", "-e bash -c"}, - {"lxterminal", "-l -e"}, - {"Terminal", "do script"}, // macos terminal - {"iTerm", "create window with default profile command"}, // macos terminal -}; - -bool -CCommons::HasRecommendedTerminalArg(const QString &terminalCmd, - QString& recommendedArg) { - QString cmd = terminalCmd; - QFileInfo fi(terminalCmd); - if (fi.exists()) - cmd = fi.fileName(); - - if (dct_term_arg.find(cmd) != dct_term_arg.end()) { - recommendedArg = dct_term_arg.at(cmd); - return true; - } - return false; -} - -QStringList -CCommons::SupportTerminals() { - QStringList lst_res; - for (auto i : dct_term_arg) { -#ifdef RT_OS_DARWIN - if (CCommons::IsTerminalLaunchable(i.first)) - lst_res << i.first; -#endif -#ifdef RT_OS_LINUX - if (CCommons::IsApplicationLaunchable(i.first)) - lst_res << i.first; -#endif - } - return lst_res; -} - -QStringList -CCommons::DefaultTerminals() { - QStringList lst_res; - for (auto i : dct_term_arg) - lst_res << i.first; - return lst_res; -} - - -QString CCommons::GetFingerprintFromUid(const QString &uid) { - QString res = ""; - if (uid.indexOf("uid") == -1) - return res; - quint16 indexUid = uid.indexOf("uid:") + QString("uid:").size(); - while (indexUid < uid.length() && uid[indexUid] != ':') { - res.append(uid[indexUid]); - indexUid ++; - } - return res; -} - - -//////////////////////////////////////////////////////////////////////////// diff --git a/commons/src/OsBranchConsts.cpp b/commons/src/OsBranchConsts.cpp index 29837c95..ca236e47 100644 --- a/commons/src/OsBranchConsts.cpp +++ b/commons/src/OsBranchConsts.cpp @@ -37,15 +37,15 @@ template const QString& tray_kurjun_file_name_temp_internal( return res; \ } -tray_kurjun_file_name_def(BT_MASTER, OS_LINUX, "SubutaiTray") -tray_kurjun_file_name_def(BT_MASTER, OS_MAC, "SubutaiTray_osx") -tray_kurjun_file_name_def(BT_MASTER, OS_WIN, "SubutaiTray.exe") -tray_kurjun_file_name_def(BT_DEV, OS_LINUX, "SubutaiTray") -tray_kurjun_file_name_def(BT_DEV, OS_MAC, "SubutaiTray_osx") -tray_kurjun_file_name_def(BT_DEV, OS_WIN, "SubutaiTray.exe") -tray_kurjun_file_name_def(BT_PROD, OS_LINUX, "SubutaiTray") -tray_kurjun_file_name_def(BT_PROD, OS_MAC, "SubutaiTray_osx") -tray_kurjun_file_name_def(BT_PROD, OS_WIN, "SubutaiTray.exe") +tray_kurjun_file_name_def(BT_MASTER, OS_LINUX, "SubutaiControlCenter") +tray_kurjun_file_name_def(BT_MASTER, OS_MAC, "SubutaiControlCenter_osx") +tray_kurjun_file_name_def(BT_MASTER, OS_WIN, "SubutaiControlCenter.exe") +tray_kurjun_file_name_def(BT_DEV, OS_LINUX, "SubutaiControlCenter") +tray_kurjun_file_name_def(BT_DEV, OS_MAC, "SubutaiControlCenter_osx") +tray_kurjun_file_name_def(BT_DEV, OS_WIN, "SubutaiControlCenter.exe") +tray_kurjun_file_name_def(BT_PROD, OS_LINUX, "SubutaiControlCenter") +tray_kurjun_file_name_def(BT_PROD, OS_MAC, "SubutaiControlCenter_osx") +tray_kurjun_file_name_def(BT_PROD, OS_WIN, "SubutaiControlCenter.exe") const QString & tray_kurjun_file_name() { @@ -62,9 +62,9 @@ template const QString& hub_post_url_temp_internal(); return res; \ } -hub_post_url_temp_internal_def(BT_PROD, "https://hub.subut.ai/rest/v1/tray/%1") -hub_post_url_temp_internal_def(BT_MASTER, "https://masterhub.subut.ai/rest/v1/tray/%1") -hub_post_url_temp_internal_def(BT_DEV, "https://devhub.subut.ai/rest/v1/tray/%1") +hub_post_url_temp_internal_def(BT_PROD, "https://bazaar.subutai.io/rest/v1/tray/%1") +hub_post_url_temp_internal_def(BT_MASTER, "https://masterbazaar.subutai.io/rest/v1/tray/%1") +hub_post_url_temp_internal_def(BT_DEV, "https://devbazaar.subutai.io/rest/v1/tray/%1") const QString & hub_post_url() { @@ -81,9 +81,9 @@ template const QString& hub_register_url_temp_internal(); return res; \ } -hub_register_url_temp_internal_def(BT_PROD, "https://hub.subut.ai/register") -hub_register_url_temp_internal_def(BT_MASTER, "https://masterhub.subut.ai/register") -hub_register_url_temp_internal_def(BT_DEV, "https://devhub.subut.ai/register") +hub_register_url_temp_internal_def(BT_PROD, "https://bazaar.subutai.io/register") +hub_register_url_temp_internal_def(BT_MASTER, "https://masterbazaar.subutai.io/register") +hub_register_url_temp_internal_def(BT_DEV, "https://devbazaar.subutai.io/register") const QString & hub_register_url() { @@ -102,9 +102,9 @@ template const QString& hub_user_profile_temp_internal(); return res; \ } -hub_user_profile_temp_internal_def(BT_PROD, "https://hub.subut.ai/users/") -hub_user_profile_temp_internal_def(BT_MASTER, "https://masterhub.subut.ai/users/") -hub_user_profile_temp_internal_def(BT_DEV, "https://devhub.subut.ai/users/") +hub_user_profile_temp_internal_def(BT_PROD, "https://bazaar.subutai.io/users/") +hub_user_profile_temp_internal_def(BT_MASTER, "https://masterbazaar.subutai.io/users/") +hub_user_profile_temp_internal_def(BT_DEV, "https://devbazaar.subutai.io/users/") const QString & hub_user_profile_url() { @@ -121,9 +121,9 @@ template const QString& hub_get_url_temp_internal(); return res; \ } -hub_get_url_temp_internal_def(BT_PROD, "https://hub.subut.ai/rest/v1/tray/%1") -hub_get_url_temp_internal_def(BT_MASTER, "https://masterhub.subut.ai/rest/v1/tray/%1") -hub_get_url_temp_internal_def(BT_DEV, "https://devhub.subut.ai/rest/v1/tray/%1") +hub_get_url_temp_internal_def(BT_PROD, "https://bazaar.subutai.io/rest/v1/tray/%1") +hub_get_url_temp_internal_def(BT_MASTER, "https://masterbazaar.subutai.io/rest/v1/tray/%1") +hub_get_url_temp_internal_def(BT_DEV, "https://devbazaar.subutai.io/rest/v1/tray/%1") const QString & hub_get_url() { @@ -149,9 +149,9 @@ template const QString& hub_healt_url_temp_internal(); return res; \ } -hub_health_url_temp_internal_def(BT_PROD, "https://hub.subut.ai/rest/v1/tray/tray-data") -hub_health_url_temp_internal_def(BT_MASTER, "https://masterhub.subut.ai/rest/v1/tray/tray-data") -hub_health_url_temp_internal_def(BT_DEV, "https://devhub.subut.ai/rest/v1/tray/tray-data") +hub_health_url_temp_internal_def(BT_PROD, "https://bazaar.subutai.io/rest/v1/tray/tray-data") +hub_health_url_temp_internal_def(BT_MASTER, "https://masterbazaar.subutai.io/rest/v1/tray/tray-data") +hub_health_url_temp_internal_def(BT_DEV, "https://devbazaar.subutai.io/rest/v1/tray/tray-data") const QString & hub_health_url() { @@ -168,9 +168,9 @@ template const QString& hub_kurjun_url_temp_internal(); return res; \ } -hub_kurjun_url_temp_internal_def(BT_PROD, "https://cdn.subut.ai:8338/kurjun/rest/%1") -hub_kurjun_url_temp_internal_def(BT_MASTER, "https://mastercdn.subut.ai:8338/kurjun/rest/%1") -hub_kurjun_url_temp_internal_def(BT_DEV, "https://devcdn.subut.ai:8338/kurjun/rest/%1") +hub_kurjun_url_temp_internal_def(BT_PROD, "https://cdn.subutai.io:8338/kurjun/rest/%1&owner=jenkins") +hub_kurjun_url_temp_internal_def(BT_MASTER, "https://mastercdn.subutai.io:8338/kurjun/rest/%1&owner=jenkins") +hub_kurjun_url_temp_internal_def(BT_DEV, "https://devcdn.subutai.io:8338/kurjun/rest/%1&owner=jenkins") const QString & hub_gorjun_url() { @@ -187,9 +187,9 @@ template const QString& hub_billing_temp_internal(); return res; \ } -hub_billing_temp_internal_def(BT_PROD, "https://hub.subut.ai/users/%1") -hub_billing_temp_internal_def(BT_MASTER, "https://masterhub.subut.ai/users/%1") -hub_billing_temp_internal_def(BT_DEV, "https://devhub.subut.ai/users/%1") +hub_billing_temp_internal_def(BT_PROD, "https://bazaar.subutai.io/users/%1") +hub_billing_temp_internal_def(BT_MASTER, "https://masterbazaar.subutai.io/users/%1") +hub_billing_temp_internal_def(BT_DEV, "https://devbazaar.subutai.io/users/%1") const QString & hub_billing_url() { @@ -253,9 +253,9 @@ template const QString& p2p_dht_arg_temp_internal(); return res; \ } -p2p_dht_arg_internal_def(BT_MASTER, "dht.mastercdn.subut.ai:6881") -p2p_dht_arg_internal_def(BT_PROD, "dht.cdn.subut.ai:6881") -p2p_dht_arg_internal_def(BT_DEV, "dht.devcdn.subut.ai:6881") +p2p_dht_arg_internal_def(BT_MASTER, "eu0.mastercdn.subutai.io:6881") +p2p_dht_arg_internal_def(BT_PROD, "eu0.cdn.subutai.io:6881") +p2p_dht_arg_internal_def(BT_DEV, "eu0.devcdn.subutai.io:6881") const QString & p2p_dht_arg() { @@ -429,9 +429,9 @@ template const QString& hub_site_temp_internal(); return res; \ } -hub_site_temp_internal_def(BT_PROD, "https://hub.subut.ai") -hub_site_temp_internal_def(BT_MASTER, "https://masterhub.subut.ai") -hub_site_temp_internal_def(BT_DEV, "https://devhub.subut.ai") +hub_site_temp_internal_def(BT_PROD, "https://bazaar.subutai.io") +hub_site_temp_internal_def(BT_MASTER, "https://masterbazaar.subutai.io") +hub_site_temp_internal_def(BT_DEV, "https://devbazaar.subutai.io") const QString & hub_site() { @@ -524,15 +524,15 @@ template const QString& p2p_package_url_temp_internal(); return res; \ } -p2p_package_url_def(BT_MASTER, OS_LINUX, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p-master.deb") -p2p_package_url_def(BT_MASTER, OS_MAC, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p-master.pkg") -p2p_package_url_def(BT_MASTER, OS_WIN, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p-master.msi") -p2p_package_url_def(BT_DEV, OS_LINUX, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p-dev.deb") -p2p_package_url_def(BT_DEV, OS_MAC, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p-dev.pkg") -p2p_package_url_def(BT_DEV, OS_WIN, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p-dev.msi") -p2p_package_url_def(BT_PROD, OS_LINUX, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p.deb") -p2p_package_url_def(BT_PROD, OS_MAC, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p.pkg") -p2p_package_url_def(BT_PROD, OS_WIN, "https://cdn.subut.ai:8338/kurjun/rest/raw/get?name=subutai-p2p.msi") +p2p_package_url_def(BT_MASTER, OS_LINUX, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p-master.deb&owner=jenkins") +p2p_package_url_def(BT_MASTER, OS_MAC, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p-master.pkg&owner=jenkins") +p2p_package_url_def(BT_MASTER, OS_WIN, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p-master.msi&owner=jenkins") +p2p_package_url_def(BT_DEV, OS_LINUX, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p-dev.deb&owner=jenkins") +p2p_package_url_def(BT_DEV, OS_MAC, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p.deb&owner=jenkins") +p2p_package_url_def(BT_DEV, OS_WIN, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p-dev.msi&owner=jenkins") +p2p_package_url_def(BT_PROD, OS_LINUX, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p.deb&owner=jenkins") +p2p_package_url_def(BT_PROD, OS_MAC, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p.pkg&owner=jenkins") +p2p_package_url_def(BT_PROD, OS_WIN, "https://cdn.subutai.io:8338/kurjun/rest/raw/get?name=subutai-p2p.msi&owner=jenkins") const QString & p2p_package_url() { diff --git a/configure b/configure index 9144e57b..150d2dea 100755 --- a/configure +++ b/configure @@ -5,11 +5,11 @@ showhelp() cat << ENDHELP usage: configure [options] -Configure Tray +Configure Control Center Options: --scheme= - Builds Tray with specified build scheme. Supported schemes is: master, dev, branch. Default: master + Builds Control Center with specified build scheme. Supported schemes is: master, dev, branch. Default: master --no-debian Disables build of deb file @@ -31,7 +31,7 @@ Options: ENDHELP } -name_prefix=tray +name_prefix=control-center scheme="master" branch=`git branch | grep \* | cut -d ' ' -f2` maintainer="Subutai Social" diff --git a/darwin-packages/Distribution.tmpl b/darwin-packages/Distribution.tmpl index 67b1b6d4..5fbd591b 100644 --- a/darwin-packages/Distribution.tmpl +++ b/darwin-packages/Distribution.tmpl @@ -1,6 +1,6 @@ - Subutai Tray {VERSION_PLACEHOLDER} + Subutai Control Center {VERSION_PLACEHOLDER} @@ -18,7 +18,7 @@ - + - #base.pkg + #base.pkg diff --git a/darwin-packages/PackageInfo.tmpl b/darwin-packages/PackageInfo.tmpl index 7dcab89c..c1421ddc 100644 --- a/darwin-packages/PackageInfo.tmpl +++ b/darwin-packages/PackageInfo.tmpl @@ -1,9 +1,9 @@ - + - + diff --git a/darwin-packages/pack.sh b/darwin-packages/pack.sh index bcd63b61..7812110e 100755 --- a/darwin-packages/pack.sh +++ b/darwin-packages/pack.sh @@ -32,14 +32,14 @@ cp ./Distribution.tmpl ./flat/Distribution sed -i -e "s/{VERSION_PLACEHOLDER}/$version/g" ./flat/Distribution sed -i -e "s/{SIZE_PLACEHOLDER}/$mbsize/g" ./flat/Distribution -PKGNAME="subutai-tray.pkg" +PKGNAME="subutai-control-center.pkg" case $BRANCH in dev) - PKGNAME="subutai-tray-dev.pkg" + PKGNAME="subutai-control-center-dev.pkg" ;; master) - PKGNAME="subutai-tray-master.pkg" + PKGNAME="subutai-control-center-master.pkg" ;; esac diff --git a/darwin-packages/scripts/postinstall b/darwin-packages/scripts/postinstall index 2fd8f361..05de1cf8 100755 --- a/darwin-packages/scripts/postinstall +++ b/darwin-packages/scripts/postinstall @@ -1,7 +1,7 @@ #!/bin/bash -chmod +x /Applications/SubutaiTray.app/Contents/MacOS/SubutaiTray -chmod +x /Applications/SubutaiTray.app/Contents/MacOS/SubutaiTray_osx +chmod +x /Applications/SubutaiControlCenter.app/Contents/MacOS/SubutaiControlCenter +chmod +x /Applications/SubutaiControlCenter.app/Contents/MacOS/SubutaiControlCenter_osx mkdir -p /Applications/Subutai chown -R $USER /Applications/Subutai* diff --git a/deb-packages/deb-packages-internal/clear.sh b/deb-packages/deb-packages-internal/clear.sh index 623f6e20..542e8a7f 100755 --- a/deb-packages/deb-packages-internal/clear.sh +++ b/deb-packages/deb-packages-internal/clear.sh @@ -1,11 +1,11 @@ #!/bin/bash -rm debian/subutai-tray.* +rm debian/subutai-control-center.* rm debian/debhelper-build-stamp -rm -rf debian/SubutaiTray.tar.gz +rm -rf debian/SubutaiControlCenter.tar.gz rm -rf debian/icons -rm -rf debian/SubutaiTray -rm -rf debian/subutai-tray +rm -rf debian/SubutaiControlCenter +rm -rf debian/subutai-control-center rm -rf debian/libicu52 for f in $(ls ../); do diff --git a/deb-packages/deb-packages-internal/debian/control b/deb-packages/deb-packages-internal/debian/control index 41801b26..a518041d 100644 --- a/deb-packages/deb-packages-internal/debian/control +++ b/deb-packages/deb-packages-internal/debian/control @@ -1,4 +1,4 @@ -Source: subutai-tray +Source: subutai-control-center Section: net Priority: optional Maintainer: Adilet Zholdoshbekov (azholdoshbekov@optimal-dynamics.com) @@ -6,7 +6,7 @@ Build-Depends: debhelper (>=9) Standards-Version: 3.9.6 Homepage: https://subutai.io/ -Package: subutai-tray +Package: subutai-control-center Architecture: all Depends: gksu, libssh2-1, @@ -18,4 +18,4 @@ Depends: gksu, libxcb-render-util0, libxcb-xinerama0, libxcb-xkb1 -Description: Subutai Tray Application +Description: Subutai Control Center Application diff --git a/deb-packages/deb-packages-internal/debian/install b/deb-packages/deb-packages-internal/debian/install index 1437ec83..0173b42a 100644 --- a/deb-packages/deb-packages-internal/debian/install +++ b/deb-packages/deb-packages-internal/debian/install @@ -1,2 +1,2 @@ debian/icons/*.png /usr/share/icons -debian/SubutaiTray.tar.gz /tmp/subutai/ +debian/SubutaiControlCenter.tar.gz /tmp/subutai/ diff --git a/deb-packages/deb-packages-internal/debian/postinst b/deb-packages/deb-packages-internal/debian/postinst index 940af3c3..f17fec1d 100644 --- a/deb-packages/deb-packages-internal/debian/postinst +++ b/deb-packages/deb-packages-internal/debian/postinst @@ -8,19 +8,19 @@ mkdir -p /opt/subutai/Libs chmod -R 0777 /opt/subutai/log chmod -R 0777 /opt/subutai/bin -tray_script=/opt/subutai/bin/SubutaiTray -tray_link=/usr/bin/SubutaiTray -tray_binary=/opt/subutai/bin/subutai-tray +tray_script=/opt/subutai/bin/SubutaiControlCenter +tray_link=/usr/bin/SubutaiControlCenter +tray_binary=/opt/subutai/bin/subutai-control-center if [ -L $tray_link ]; then rm -rf $tray_link fi -tar zxf /tmp/subutai/SubutaiTray.tar.gz -C /tmp/subutai/ +tar zxf /tmp/subutai/SubutaiControlCenter.tar.gz -C /tmp/subutai/ -cp /tmp/subutai/SubutaiTray/Libs/* /opt/subutai/Libs/ -cp /tmp/subutai/SubutaiTray/bin/*.qm /opt/subutai/bin -cp /tmp/subutai/SubutaiTray/bin/subutai-tray $tray_binary +cp /tmp/subutai/SubutaiControlCenter/Libs/* /opt/subutai/Libs/ +cp /tmp/subutai/SubutaiControlCenter/bin/*.qm /opt/subutai/bin +cp /tmp/subutai/SubutaiControlCenter/bin/subutai-control-center $tray_binary echo "#!/bin/bash" > $tray_script echo "LD_LIBRARY_PATH=/opt/subutai/Libs/ $tray_binary" >> $tray_script @@ -30,14 +30,14 @@ chmod +x $tray_script chmod +x $tray_binary -desktop_file=/tmp/SubutaiTray.desktop +desktop_file=/tmp/SubutaiControlCenter.desktop echo "[Desktop Entry]" > $desktop_file echo "Version=1.0" >> $desktop_file -echo "Name=Subutai Tray" >> $desktop_file -echo "Comment=Subutai Tray Application" >> $desktop_file +echo "Name=Subutai Control Center" >> $desktop_file +echo "Comment=Subutai Control Center Application" >> $desktop_file echo "Keywords=Internet" >> $desktop_file -echo "Exec=/usr/bin/SubutaiTray" >> $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 diff --git a/deb-packages/deb-packages-internal/debian/postrm b/deb-packages/deb-packages-internal/debian/postrm index ea6741e3..7799a925 100755 --- a/deb-packages/deb-packages-internal/debian/postrm +++ b/deb-packages/deb-packages-internal/debian/postrm @@ -16,8 +16,8 @@ if [ -d /opt/subutai/log ]; then rm -rf /opt/subutai/log fi -if [ -L /usr/bin/SubutaiTray ]; then - rm /usr/bin/SubutaiTray +if [ -L /usr/bin/SubutaiControlCenter ]; then + rm /usr/bin/SubutaiControlCenter fi count=`ls -1 /opt/subutai/bin/*.qm 2>/dev/null | wc -l` @@ -25,16 +25,16 @@ if [ $count != 0 ]; then rm /opt/subutai/bin/*.qm fi -if [ -f /opt/subutai/lbin/SubutaiTray ]; then - rm /opt/subutai/bin/SubutaiTray +if [ -f /opt/subutai/lbin/SubutaiControlCenter ]; then + rm /opt/subutai/bin/SubutaiControlCenter fi -if [ -f /opt/subutai/lbin/subutai-tray ]; then - rm /opt/subutai/bin/subutai-tray +if [ -f /opt/subutai/lbin/subutai-control-center ]; then + rm /opt/subutai/bin/subutai-control-center fi -if [ -f /usr/share/applications/SubutaiTray.desktop ]; then - rm /usr/share/applications/SubutaiTray.desktop +if [ -f /usr/share/applications/SubutaiControlCenter.desktop ]; then + rm /usr/share/applications/SubutaiControlCenter.desktop fi diff --git a/deb-packages/deb-packages-internal/pack_debian.sh b/deb-packages/deb-packages-internal/pack_debian.sh index be191ccd..0d9bd7f5 100755 --- a/deb-packages/deb-packages-internal/pack_debian.sh +++ b/deb-packages/deb-packages-internal/pack_debian.sh @@ -2,18 +2,18 @@ ./clear.sh mkdir -p debian/icons -mkdir -p debian/SubutaiTray/bin -mkdir -p debian/SubutaiTray/lib -mkdir -p debian/SubutaiTray/Libs +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 ../../subutai_tray_bin/SubutaiTray debian/SubutaiTray/bin/subutai-tray -cp ../../subutai_tray_bin/*.qm debian/SubutaiTray/bin/ -./dependencies.sh ../../subutai_tray_bin/SubutaiTray debian/SubutaiTray/Libs/ +cp ../../subutai_control_center_bin/SubutaiControlCenter debian/SubutaiControlCenter/bin/subutai-control-center +cp ../../subutai_control_center_bin/*.qm debian/SubutaiControlCenter/bin/ +./dependencies.sh ../../subutai_control_center_bin/SubutaiControlCenter debian/SubutaiControlCenter/Libs/ cd debian -tar zcvf SubutaiTray.tar.gz SubutaiTray +tar zcvf SubutaiControlCenter.tar.gz SubutaiControlCenter cd .. #debuild -B -d diff --git a/hub/forms/DlgAbout.ui b/hub/forms/DlgAbout.ui index f271bdf6..a4c1fe43 100644 --- a/hub/forms/DlgAbout.ui +++ b/hub/forms/DlgAbout.ui @@ -118,7 +118,7 @@ - Tray application version: + Control Center version: @@ -248,7 +248,7 @@ - Update tray + Update Control Center diff --git a/hub/forms/DlgEnvironment.ui b/hub/forms/DlgEnvironment.ui index 251575b6..636de6d8 100644 --- a/hub/forms/DlgEnvironment.ui +++ b/hub/forms/DlgEnvironment.ui @@ -119,7 +119,7 @@ - Open Hub + Open Bazaar diff --git a/hub/forms/DlgLogin.ui b/hub/forms/DlgLogin.ui index f4afd943..61ee13b7 100644 --- a/hub/forms/DlgLogin.ui +++ b/hub/forms/DlgLogin.ui @@ -11,7 +11,7 @@ - Hub Account Login + Bazaar Account Login diff --git a/hub/forms/DlgPeer.ui b/hub/forms/DlgPeer.ui index 6909546e..6a203557 100644 --- a/hub/forms/DlgPeer.ui +++ b/hub/forms/DlgPeer.ui @@ -116,7 +116,7 @@ - Peer on Hub + Peer on Bazaar diff --git a/hub/forms/DlgSettings.ui b/hub/forms/DlgSettings.ui index 2e1e055e..0d2fc7d4 100644 --- a/hub/forms/DlgSettings.ui +++ b/hub/forms/DlgSettings.ui @@ -65,7 +65,7 @@ - EZ-SSH User: + SSH User: @@ -762,7 +762,7 @@ - SubutaiTray check for updates frequency: + Control Center check for updates frequency: diff --git a/hub/forms/DlgTransferFile.cpp b/hub/forms/DlgTransferFile.cpp index b99a8877..06b531be 100644 --- a/hub/forms/DlgTransferFile.cpp +++ b/hub/forms/DlgTransferFile.cpp @@ -133,6 +133,9 @@ void DlgTransferFile::Init() { design_table_widget(ui->tw_transfer_file, transfer_file_field_header); refresh_local_file_system(); + + ui->local_file_system->setShowGrid(true); + ui->remote_file_system->setShowGrid(true); } ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/hub/src/TrayControlWindow.cpp b/hub/src/TrayControlWindow.cpp index 57d2e622..52dc59f9 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("Hub website"), this); + new QAction(QIcon(":/hub/Hub-07.png"), tr("Bazaar website"), this); connect(m_act_launch_Hub, &QAction::triggered, this, &TrayControlWindow::launch_Hub); @@ -960,7 +960,7 @@ void TrayControlWindow::show_settings_dialog() { QDialog* create_about_dialog(QWidget* p) { return new DlgAbout(p); } void TrayControlWindow::show_about() { - show_dialog(create_about_dialog, tr("About Subutai Tray")); + show_dialog(create_about_dialog, tr("About Subutai Control Center")); } //////////////////////////////////////////////////////////////////////////// diff --git a/main.cpp b/main.cpp index 839b1152..e901168d 100644 --- a/main.cpp +++ b/main.cpp @@ -62,8 +62,8 @@ main(int argc, char *argv[]) { } sema.release(); - QApplication::setApplicationName("SubutaiTray"); - QApplication::setOrganizationName("subut.ai"); + QApplication::setApplicationName("SubutaiControlCenter"); + QApplication::setOrganizationName("subutai.io"); QApplication app(argc, argv); @@ -132,7 +132,7 @@ main(int argc, char *argv[]) { DlgLogin dlg; dlg.setModal(true); - QPixmap pm(":/hub/tray_splash.png"); + QPixmap pm(":/hub/logo.png"); QSplashScreen sc(pm); sc.show(); diff --git a/resources/logo.png b/resources/logo.png new file mode 100644 index 00000000..c384fd7f Binary files /dev/null and b/resources/logo.png differ diff --git a/resources/resources.qrc b/resources/resources.qrc index b2d9365b..bac0fdcc 100644 --- a/resources/resources.qrc +++ b/resources/resources.qrc @@ -56,6 +56,7 @@ add_green.png add_blue.png refreshing.gif + logo.png diff --git a/root@10.66.66.1 b/root@10.66.66.1 deleted file mode 100644 index 9dad8dff..00000000 Binary files a/root@10.66.66.1 and /dev/null differ diff --git a/subutai-control-center.desktop b/subutai-control-center.desktop new file mode 100644 index 00000000..0cd52b78 --- /dev/null +++ b/subutai-control-center.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Subutai Control Center +Type=Application +Version=1.0 +Comment=Control Center for Subutai +Icon=subutai-tray +Exec=/usr/bin/subutai-control-center +Path=/opt/subutai/control-center +Categories=Network; +X-Desktop-File-Install-Version=0.22 diff --git a/subutai-tray.desktop b/subutai-tray.desktop deleted file mode 100644 index 6442b2d2..00000000 --- a/subutai-tray.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Subutai Tray -Type=Application -Version=1.0 -Comment=Tray for Subutai -Icon=subutai-tray -Exec=/usr/bin/subutai-tray -Path=/opt/subutai/tray -Categories=Network; -X-Desktop-File-Install-Version=0.22 diff --git a/tray.rc b/tray.rc index 00929c74..40b52698 100644 --- a/tray.rc +++ b/tray.rc @@ -1,7 +1,7 @@ #include -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "SubutaiTray.exe.manifest" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "SubutaiControlCenter.exe.manifest" IDI_ICON1 ICON DISCARDABLE "resources/tray_icon_set_07.ico"