Fix 80

MANIFEST.in

@@ -1,6 +1,6 @@
-include protonvpn_linux_gui/resources/ui/*.glade 
-include protonvpn_linux_gui/resources/styles/*.css 
-include protonvpn_linux_gui/resources/img/logo/*.png 
-include protonvpn_linux_gui/resources/img/utils/*.png 
-include protonvpn_linux_gui/resources/img/flags/large/*.jpg 
-include protonvpn_linux_gui/resources/img/flags/small/*.png 
+include app/resources/ui/*.glade 
+include app/resources/styles/*.css 
+include app/resources/img/logo/*.png 
+include app/resources/img/utils/*.png 
+include app/resources/img/flags/large/*.jpg 
+include app/resources/img/flags/small/*.png 

linux_gui/constants.py → app/constants.py

@@ -3,7 +3,9 @@
 USER = getpass.getuser()
 
 VERSION = "2.1.0"
-GITHUB_URL_RELEASE = "https://github.com/ProtonVPN/linux-gui/releases/latest"
+APP_NAME = "protonvpn-app"
+GITHUB_URL = "https://github.com/ProtonVPN/linux-app"
+GITHUB_URL_RELEASE = GITHUB_URL+"/releases/latest"
 
 # GUI configurations
 GUI_CONFIG_DIR = os.path.join(os.path.expanduser("~{0}".format(USER)), ".pvpn-gui")

linux_gui/indicator.py → app/indicator.py

@@ -30,6 +30,7 @@
     TRAY_CFG_DATA_TX, 
     TRAY_CFG_TIME_CONN, 
     CURRDIR,
+    APP_NAME
 )
 from .utils import get_gui_config, set_gui_config
 
@@ -257,7 +258,7 @@ def show_gui(self, _):
 
         self.notify.Notification.new(self.tray_title, "Displaying ProtonVPN GUI", LOGO_PATH).show()
 
-        process = subprocess.Popen(["protonvpn-gui"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) # nosec
+        process = subprocess.Popen([APP_NAME], stdout=subprocess.PIPE, stderr=subprocess.PIPE) # nosec
         outs, errs = process.communicate()
 
         gui_logger.debug("TRAY >>> errs: {}\nouts:{}".format(outs, errs))

linux_gui/protonvpn_gui.py → app/main.py

@@ -72,41 +72,27 @@ def init():
     )
 
     dialog_view = DialogView(interface, Gtk, queue)
-
-    if not find_cli():
-        dialog_view.display_dialog(label=CLI_ABSENCE_INFO, spinner=False, hide_close_button=True)
-    else:
-        gui_logger.debug("\n______________________________________\n\n\tINITIALIZING NEW GUI WINDOW\n______________________________________\n")
-
-        if not os.path.isfile(GUI_CONFIG_FILE):
-            initialize_gui_config()
-
-        if not os.path.isfile(CONFIG_FILE): 
-            gui_logger.debug(">>> Loading LoginWindow")
-
-            settings_service = SettingsService()
-            settings_presenter = SettingsPresenter(settings_service, queue)
-            settings_view = SettingsView(interface, Gtk, settings_presenter, queue)
-
-            dashboard_service = DashboardService()
-            dashboard_presenter = DashboardPresenter(dashboard_service, queue)
-            dashboard_view = DashboardView(interface, Gtk, dashboard_presenter, settings_view, queue)
-
-            login_service = LoginService()
-            login_presenter = LoginPresenter(login_service, queue)
-            login_view = LoginView(interface, Gtk, login_presenter, dashboard_view, queue)
-
-            login_view.display_window()
-        else:
-            gui_logger.debug(">>> Loading DashboardWindow")
-            settings_service = SettingsService()
-            settings_presenter = SettingsPresenter(settings_service, queue)
-            settings_view = SettingsView(interface, Gtk, settings_presenter, queue)
-
-            dashboard_service = DashboardService()
-            dashboard_presenter = DashboardPresenter(dashboard_service, queue)
-            dashboard_view = DashboardView(interface, Gtk, dashboard_presenter, settings_view, queue)
-
-            dashboard_view.display_window()
+
+    gui_logger.debug("\n______________________________________\n\n\tINITIALIZING NEW GUI WINDOW\n______________________________________\n")
+
+    if not os.path.isfile(GUI_CONFIG_FILE):
+        initialize_gui_config()
+
+    settings_service = SettingsService()
+    settings_presenter = SettingsPresenter(settings_service, queue)
+    settings_view = SettingsView(interface, Gtk, settings_presenter, queue)
+
+    dashboard_service = DashboardService()
+    dashboard_presenter = DashboardPresenter(dashboard_service, queue)
+    window_view = DashboardView(interface, Gtk, dashboard_presenter, settings_view, queue)
+
+    if not os.path.isfile(CONFIG_FILE): 
+        gui_logger.debug(">>> Loading LoginWindow")
+        login_service = LoginService()
+        login_presenter = LoginPresenter(login_service, queue)
+        window_view = LoginView(interface, Gtk, login_presenter, window_view, queue)
+
+    window_view.display_window()
+
     Gtk.main()
 

linux_gui/presenters/dashboard_presenter.py → app/presenters/dashboard_presenter.py

@@ -24,7 +24,7 @@
 
 # Local imports
 from ..gui_logger import gui_logger
-from ..constants import GITHUB_URL_RELEASE, VERSION, LARGE_FLAGS_BASE_PATH, SMALL_FLAGS_BASE_PATH, FEATURES_BASE_PATH
+from ..constants import GITHUB_URL, GITHUB_URL_RELEASE, VERSION, LARGE_FLAGS_BASE_PATH, SMALL_FLAGS_BASE_PATH, FEATURES_BASE_PATH, APP_NAME
 from ..utils import (
     get_server_protocol_from_cli,
     get_gui_config,
@@ -193,9 +193,9 @@ def on_check_for_updates(self):
             if VERSION < latest_release:
                 return_string = "There is a newer release, you should upgrade to <b>v{0}</b>.\n\n".format(latest_release)
                 if pip3_installed:
-                    return_string = return_string + "You can upgrade with the following command:\n\n<b>sudo pip3 install protonvpn-linux-gui-calexandru2018 --upgrade</b>\n\n"
+                    return_string = return_string + "You can upgrade with the following command:\n\n<b>sudo pip3 install "+APP_NAME+" --upgrade</b>\n\n"
                 else:
-                    return_string = return_string + "You can upgrade by <b>first removing this version</b>, and then cloning the new one with the following commands:\n\n<b>git clone https://github.com/calexandru2018/protonvpn-linux-gui</b>\n\n<b>cd protonvpn-linux-gui</b>\n\n<b>sudo python3 setup.py install</b>"
+                    return_string = return_string + "You can upgrade by <b>first removing this version</b>, and then cloning the new one with the following commands:\n\n<b>git clone "+GITHUB_URL+"</b>\n\n<b>cd linux-app</b>\n\n<b>sudo pip install -e .</b>"
                 return_val = True
 
         self.queue.put(dict(action="update_dialog", label=return_string))

linux_gui/presenters/settings_presenter.py → app/presenters/settings_presenter.py

@@ -19,7 +19,8 @@
     PATH_AUTOCONNECT_SERVICE,
     SERVICE_NAME,
     GUI_CONFIG_DIR,
-    TRAY_SUDO_TYPES
+    TRAY_SUDO_TYPES,
+    GITHUB_URL
 )
 from ..utils import (
     set_gui_config,
@@ -280,7 +281,7 @@ def load_general_settings(self, general_settings_dict):
         sudo_info_tooltip = general_settings_dict["sudo_info_tooltip"]
         setter = 0
 
-        tooltip_msg = "Could not find PolKit installed on your system. For more information, please visit: \nhttps://github.com/ProtonVPN/linux-gui"
+        tooltip_msg = "Could not find PolKit installed on your system. For more information, please visit: \n"+GITHUB_URL
 
         username = get_config_value("USER", "username")
         tier = int(get_config_value("USER", "tier"))
@@ -298,7 +299,7 @@ def load_general_settings(self, general_settings_dict):
 
             polkit_support_switch.set_property('sensitive', True)
             use_cases = "\n-Update username and password (root protected file)\n-Enable/disable autoconnect (create/remove .service file)\n-Connect/disconnect to/from VPN (run CLI commands)"
-            tooltip_msg = "Displays a window to enter sudo password, which is needed for the following cases:{}\n\nIt is recommended to enabled this if you don't want to use the GUI via the terminal.".format(use_cases)
+            tooltip_msg = "Displays a window to enter sudo password, which is needed for the following cases:{}\n\nIt is recommended to enabled this if you don't want to use the app via terminal.".format(use_cases)
 
         sudo_info_tooltip.set_tooltip_text(tooltip_msg)