BeamMeUp

data/BeamMeUp.gresource.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/com/frac_tion/teleport">
+  <gresource prefix="/org/nekoweb/n0va/BeamMeUp">
     <file preprocess="xml-stripblanks">window.ui</file>
     <file preprocess="xml-stripblanks">settings.ui</file>
     <file preprocess="xml-stripblanks">device_settings.ui</file>

data/com.frac_tion.teleport.appdata.xml.in

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyleft 2017 Julian Sparber <julian@sparber.net> -->
-<component type="desktop">
-  <id>com.frac_tion.teleport.desktop</id>
-  <metadata_license>CC0</metadata_license>
-  <project_license>AGPL-3.0+</project_license>
-  <name>Teleport</name>
-  <summary>Share files over the local network</summary>
-
-  <description>
-    <p>
-      Teleport is a fast way to share files over the local network. It's
-      designed to be a replacement for using USB keys or emailing stuff to
-      yourself just to move them on another device on your desk.
-    </p>
-  </description>
-
-  <screenshots>
-    <screenshot type="default">
-      <caption>Teleport window with multiple devices</caption>
-      <image width="1366" height="768">https://gitlab.gnome.org/jsparber/teleport/raw/master/data/screenshots/window.png</image>
-    </screenshot>
-    <screenshot type="default">
-      <caption>Teleport notification</caption>
-      <image width="1366" height="768">https://gitlab.gnome.org/jsparber/teleport/raw/master/data/screenshots/notification.png</image>
-    </screenshot>
-  </screenshots>
-
-  <url type="homepage">https://gitlab.gnome.org/jsparber/teleport</url>
-  <url type="bugtracker">https://gitlab.gnome.org/jsparber/teleport/issues</url>
-  <project_group>GNOME</project_group>
-
-  <kudos>
-    <kudo>AppMenu</kudo>
-    <kudo>HiDpiIcon</kudo>
-    <kudo>ModernToolkit</kudo>
-    <kudo>Notifications</kudo>
-  </kudos>
-
-  <update_contact>julian@sparber.net</update_contact>
-  <translation type="gettext">teleport</translation>
-
-  <releases>    
-    <release version="0.0.1" date="2018-10-28">
-      <description>
-        <p>
-          Some small fixes.
-        </p>
-      </description>
-    </release>
-    <release version="0.0.0" date="2017-10-29">
-      <description>
-        <p>
-          This basic initial version sends files chose via the file chooser or
-          drag and drop. The Downloads directory can be set from the menu.
-        </p>
-      </description>
-    </release>
-  </releases>
-</component>

data/meson.build

@@ -1,4 +1,4 @@
-desktop = 'com.frac_tion.teleport.desktop'
+desktop = 'org.nekoweb.n0va.BeamMeUp.desktop'
 
 i18n.merge_file(
   input: desktop + '.in',
@@ -11,8 +11,8 @@ i18n.merge_file(
 
 # Appdata file.
 appdata_file = i18n.merge_file(
-  input: 'com.frac_tion.teleport.appdata.xml.in',
-  output: 'com.frac_tion.teleport.appdata.xml',
+  input: 'org.nekoweb.n0va.BeamMeUp.appdata.xml.in',
+  output: 'org.nekoweb.n0va.BeamMeUp.appdata.xml',
   po_dir: po_dir,
   install: true,
   install_dir: join_paths(get_option('datadir'), 'appdata'),
@@ -41,7 +41,7 @@ endif
 
 schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
 install_data(
-  'com.frac_tion.teleport.gschema.xml',
+  'org.nekoweb.n0va.BeamMeUp.gschema.xml',
   install_dir: schema_dir
 )
 

data/org.nekoweb.n0va.BeamMeUp.appdata.xml.in

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyleft 2017 Julian Sparber <julian@sparber.net> -->
+<component type="desktop">
+  <id>org.nekoweb.n0va.BeamMeUp.desktop</id>
+  <metadata_license>CC0</metadata_license>
+  <project_license>AGPL-3.0+</project_license>
+  <name>BeamMeUp</name>
+  <summary>Share files over the local network</summary>
+
+  <description>
+    <p>
+      BeamMeUp is a fast way to share files over the local network. It's
+      designed to be a replacement for using USB keys or emailing stuff to
+      yourself just to move them on another device on your desk.
+    </p>
+  </description>
+
+  <url type="homepage">https://git.krzak.org/N0VA/BeamMeUp</url>
+  <url type="bugtracker">https://git.krzak.org/N0VA/BeamMeUp/issues</url>
+
+  <update_contact>n0va@krzak.org</update_contact>
+  <translation type="gettext">BeamMeUp</translation>
+
+  <releases>    
+    <release version="0.0.1" date="2018-10-28">
+      <description>
+        <p>
+          Some small fixes.
+        </p>
+      </description>
+    </release>
+    <release version="0.0.0" date="2017-10-29">
+      <description>
+        <p>
+          This basic initial version sends files chose via the file chooser or
+          drag and drop. The Downloads directory can be set from the menu.
+        </p>
+      </description>
+    </release>
+  </releases>
+</component>

data/org.nekoweb.n0va.BeamMeUp.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Teleport
+Name=BeamMeUp
 Comment=Share files on the local network
-Exec=teleport
-Icon=com.frac_tion.teleport
+Exec=BeamMeUp
+Icon=org.nekoweb.n0va.BeamMeUp
 Type=Application
 Categories=GTK;GNOME;Utility;

data/org.nekoweb.n0va.BeamMeUp.gschema.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema path="/com/frac_tion/teleport/" id="com.frac_tion.teleport">
+  <schema path="/org/nekoweb/n0va/BeamMeUp/" id="org.nekoweb.n0va.BeamMeUp">
     <key name="download-dir" type="s">
       <default>'~/Downloads'</default>
       <summary>Download directory</summary>

meson.build

@@ -1,5 +1,5 @@
 project(
-     'teleport',
+     'BeamMeUp',
               'c',
           version: '0.0.1',
           license: 'AGPL3+',

src/beam-me-up-app.c

@@ -1,4 +1,4 @@
-/* teleport-app.c
+/* beam-me-up-app.c
  * 
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  * 
@@ -22,13 +22,13 @@
 #include "config.h"
 #endif
 
-#include "teleport-app.h"
-#include "teleport-peer.h"
-#include "teleport-window.h"
-#include "teleport-browser.h"
-#include "teleport-publish.h"
-#include "teleport-server.h"
-#include "teleport-get.h"
+#include "beam-me-up-app.h"
+#include "beam-me-up-peer.h"
+#include "beam-me-up-window.h"
+#include "beam-me-up-browser.h"
+#include "beam-me-up-publish.h"
+#include "beam-me-up-server.h"
+#include "beam-me-up-get.h"
 
 
 static void save_file_callback          (GSimpleAction *simple,
@@ -236,7 +236,7 @@ open_file_callback (GSimpleAction *simple,
 
 void 
 create_user_notification (const char *file_name, const int file_size, const char *origin_device, GVariant *target) {
-  GNotification *notification = g_notification_new ("Teleport");
+  GNotification *notification = g_notification_new ("BeamMeUp");
   TeleportAppPrivate *priv = mainApplication->priv;
 
   g_notification_set_body (notification,
@@ -255,7 +255,7 @@ create_user_notification (const char *file_name, const int file_size, const char
 
 void
 create_finished_notification (const char *origin, const int filesize, const char *filename, GVariant *target) {
-  GNotification *notification = g_notification_new ("Teleport");
+  GNotification *notification = g_notification_new ("BeamMeUp");
   TeleportAppPrivate *priv = mainApplication->priv;
 
   g_notification_set_body (notification,
@@ -369,7 +369,7 @@ teleport_app_startup (GApplication *app) {
   /* CSS style */
   provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
   gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider),
-                                       "/com/frac_tion/teleport/style.css");
+                                       "/org/nekoweb/n0va/BeamMeUp/style.css");
   gtk_style_context_add_provider_for_display (gdk_display_get_default(),
                                               provider,
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
@@ -431,13 +431,15 @@ teleport_app_show_about (GSimpleAction *simple,
   g_autofree char *copyright = NULL;
   g_autoptr(GDateTime) date = g_date_time_new_now_local ();
   int created_year = 2017;
+  AdwAboutDialog *dialog;
 
   static const char *developers[] = {
-    "Julian Sparber <julian@sparber.net>",
+    "N0\\A <n0va@krzak.org>",
     NULL
   };
 
-  static const char *artists[] = {
+  static const char *original_authors[] = {
+    "Julian Sparber <julian@sparber.net>",
     "Tobias Bernard <tbernard@gnome.org>",
     NULL
   };
@@ -451,16 +453,20 @@ teleport_app_show_about (GSimpleAction *simple,
       copyright = g_strdup_printf ("Copyright \xC2\xA9 %d\xE2\x80\x93%d The Teleport authors", created_year, g_date_time_get_year (date));
     }
 
-  adw_show_about_dialog (priv->window,
-                         "application-name", "Teleport",
-                         "version", VERSION,
-                         "copyright", copyright,
-                         "license-type", GTK_LICENSE_AGPL_3_0,
-                         "developers", developers,
-                         "artists", artists,
-                         "application-icon", "com.frac_tion.teleport",
-                         "translator-credits", "translator-credits",
-                         NULL);
+  dialog = ADW_ABOUT_DIALOG (adw_about_dialog_new ());
+
+  adw_about_dialog_set_application_name (dialog, "BeamMeUp");
+  adw_about_dialog_set_version (dialog, VERSION);
+  adw_about_dialog_set_copyright (dialog, copyright);
+  adw_about_dialog_set_license_type (dialog, GTK_LICENSE_AGPL_3_0);
+  adw_about_dialog_set_developers (dialog, developers);
+  adw_about_dialog_set_application_icon (dialog, "org.nekoweb.n0va.BeamMeUp");
+  adw_about_dialog_set_translator_credits (dialog, "translator-credits");
+  adw_about_dialog_set_website (dialog, "https://git.krzak.org/N0VA/BeamMeUp");
+
+  adw_about_dialog_add_acknowledgement_section (dialog, "Original Authors", original_authors);
+
+  adw_dialog_present (ADW_DIALOG (dialog), priv->window);
 }
 
 
@@ -475,19 +481,35 @@ teleport_app_quit (GSimpleAction *simple,
 }
 
 TeleportApp *
+
 teleport_app_new (void)
+
 {
+
   return g_object_new (TELEPORT_APP_TYPE,
-                       "application-id", "com.frac_tion.teleport",
+
+                       "application-id", "org.nekoweb.n0va.BeamMeUp",
+
                        "flags", G_APPLICATION_HANDLES_OPEN,
+
                        NULL);
+
 }
 
+
+
 static void
+
 teleport_app_init (TeleportApp *app) {
+
   TeleportAppPrivate *priv = teleport_app_get_instance_private (app);
+
   app->priv = priv;
 
-  priv->settings = g_settings_new ("com.frac_tion.teleport");
+
+
+  priv->settings = g_settings_new ("org.nekoweb.n0va.BeamMeUp");
+
   init_settings (priv->settings);
+
 }

src/beam-me-up-app.h

@@ -1,4 +1,4 @@
-/* teleport-app.h
+/* beam-me-up-app.h
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -20,7 +20,7 @@
 #define __TELEPORT_APP_H
 
 #include <adwaita.h>
-#include "teleport-peer.h"
+#include "beam-me-up-peer.h"
 
 #define TELEPORT_APP_TYPE (teleport_app_get_type ())
 

src/beam-me-up-browser.c

@@ -1,4 +1,4 @@
-/* teleport-browser.c
+/* beam-me-up-browser.c
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -26,9 +26,9 @@
 #include <avahi-common/error.h>
 #include <avahi-common/thread-watch.h>
 
-#include "teleport-browser.h"
-#include "teleport-app.h"
-#include "teleport-peer.h"
+#include "beam-me-up-browser.h"
+#include "beam-me-up-app.h"
+#include "beam-me-up-peer.h"
 
 static AvahiThreadedPoll *threaded_poll = NULL;
 static AvahiClient *client = NULL;
@@ -187,7 +187,7 @@ teleport_browser_run_avahi_service (TeleportPeer *peers)
   if (!(avahi_service_browser_new(client,
                                   AVAHI_IF_UNSPEC,
                                   AVAHI_PROTO_INET,
-                                  "_teleport._tcp",
+                                  "_beammeup._tcp",
                                   NULL,
                                   0,
                                   browse_callback,

src/beam-me-up-browser.h

@@ -1,4 +1,4 @@
-/* teleport-browser.h
+/* beam-me-up-browser.h
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -19,7 +19,7 @@
 #ifndef __TELEPORT_BROWSER_H
 #define __TELEPORT_BROWSER_H
 
-#include "teleport-peer.h"
+#include "beam-me-up-peer.h"
 
 int teleport_browser_run_avahi_service(TeleportPeer *);
 void teleport_browser_avahi_shutdown(void);

src/beam-me-up-get.c

@@ -1,4 +1,4 @@
-/* teleport-get.c
+/* beam-me-up-get.c
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -21,9 +21,9 @@
 #endif
 
 #include <libsoup/soup.h>
-#include "teleport-app.h"
-#include "teleport-window.h"
-#include "teleport-get.h"
+#include "beam-me-up-app.h"
+#include "beam-me-up-window.h"
+#include "beam-me-up-get.h"
 
 static int saveFile (SoupMessage *, const gchar *, const gchar *);
 static gchar * getFilePath (const gchar *, const gchar *);

src/beam-me-up-get.h

@@ -1,4 +1,4 @@
-/* teleport-get.h
+/* beam-me-up-get.h
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *

src/beam-me-up-peer.c

@@ -1,4 +1,4 @@
-/* teleport-peer.c
+/* beam-me-up-peer.c
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -17,7 +17,7 @@
 */
 
 #include <gtk/gtk.h>
-#include "teleport-peer.h"
+#include "beam-me-up-peer.h"
 
 enum {
   ADD, REMOVE, N_SIGNALS

src/beam-me-up-peer.h

@@ -1,4 +1,4 @@
-/* teleport-peer.h
+/* beam-me-up-peer.h
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *

src/beam-me-up-publish.c

@@ -35,9 +35,9 @@
 #include <avahi-common/timeval.h>
 #include <avahi-common/thread-watch.h>
 
-#include "teleport-app.h"
-#include "teleport-peer.h"
-#include "teleport-publish.h"
+#include "beam-me-up-app.h"
+#include "beam-me-up-peer.h"
+#include "beam-me-up-publish.h"
 
 static AvahiThreadedPoll *threaded_poll = NULL;
 static AvahiEntryGroup *group = NULL;
@@ -119,8 +119,8 @@ static void create_services(AvahiClient *c) {
      * the service type (IPP vs. BSD LPR). Only services with the
      * same name should be put in the same entry group. */
 
-    /* Add the service for Teleport */
-    if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, name, "_teleport._tcp", NULL, NULL, 3000, "test=blah", r, NULL)) < 0) {
+    /* Add the service for BeamMeUp */
+    if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, name, "_beammeup._tcp", NULL, NULL, 3000, "test=blah", r, NULL)) < 0) {
 
       if (ret == AVAHI_ERR_COLLISION)
         goto collision;

src/beam-me-up-publish.h

@@ -1,4 +1,4 @@
-/* teleport-publish.h
+/* beam-me-up-publish.h
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *

src/beam-me-up-remote-device.c

@@ -1,4 +1,4 @@
-/* teleport-remote-device.c
+/* beam-me-up-remote-device.c
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -17,9 +17,9 @@
 */
 
 #include <adwaita.h>
-#include "teleport-remote-device.h"
-#include "teleport-peer.h"
-#include "teleport-server.h"
+#include "beam-me-up-remote-device.h"
+#include "beam-me-up-peer.h"
+#include "beam-me-up-server.h"
 
 enum                                                                            
 {
@@ -107,7 +107,7 @@ teleport_remote_device_class_init (TeleportRemoteDeviceClass *klass)
                                                          "The peer that this row represents",
                                                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/com/frac_tion/teleport/remote_list.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/nekoweb/n0va/BeamMeUp/remote_list.ui");
   gtk_widget_class_bind_template_child (widget_class, TeleportRemoteDevice, send_btn);
 }
 

src/beam-me-up-remote-device.h

@@ -1,4 +1,4 @@
-/* teleport-remote-device.c
+/* beam-me-up-remote-device.c
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -20,7 +20,7 @@
 #define TELEPORT_REMOTE_DEVICE_H
 
 #include <adwaita.h>
-#include "teleport-peer.h"
+#include "beam-me-up-peer.h"
 
 G_BEGIN_DECLS
 

src/beam-me-up-server.c

@@ -1,4 +1,4 @@
-/* teleport-server.c
+/* beam-me-up-server.c
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -22,9 +22,9 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include "teleport-server.h"
-#include "teleport-get.h"
-#include "teleport-app.h"
+#include "beam-me-up-server.h"
+#include "beam-me-up-get.h"
+#include "beam-me-up-app.h"
 
 static int port;
 static SoupServer *glob_server;
@@ -232,7 +232,7 @@ teleport_server_run (void) {
   GError *error = NULL;
 
   port = 3000;
-  glob_server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "teleport-httpd ",
+  glob_server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "beam-me-up-httpd ",
                                  NULL);
   soup_server_listen_all (glob_server, port, 0, &error);
 

src/beam-me-up-server.h

@@ -1,4 +1,4 @@
-/* teleport-server.h
+/* beam-me-up-server.h
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *

src/beam-me-up-window.c

@@ -1,4 +1,4 @@
-/* teleport-window.c
+/* beam-me-up-window.c
  * 
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  * 
@@ -19,11 +19,11 @@
 #include <adwaita.h>
 #include <string.h>
 
-#include "teleport-app.h"
-#include "teleport-window.h"
-#include "teleport-server.h"
-#include "teleport-peer.h"
-#include "teleport-remote-device.h"
+#include "beam-me-up-app.h"
+#include "beam-me-up-window.h"
+#include "beam-me-up-server.h"
+#include "beam-me-up-peer.h"
+#include "beam-me-up-remote-device.h"
 
 struct _TeleportWindow
 {
@@ -125,6 +125,45 @@ on_show_popover (GtkPopover *widget,
                                            "device-name"));
 }
 
+static void
+update_download_dir_display (GtkWidget *label,
+                             GtkWidget *icon,
+                             const char *path)
+{
+  g_autoptr(GFile) file = g_file_new_for_path (path);
+  g_autoptr(GFileInfo) info = g_file_query_info (file,
+                                                 G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME ","
+                                                 G_FILE_ATTRIBUTE_STANDARD_SYMBOLIC_ICON,
+                                                 G_FILE_QUERY_INFO_NONE,
+                                                 NULL, NULL);
+
+  if (info)
+    {
+      GIcon *gicon = g_file_info_get_symbolic_icon (info);
+      gtk_label_set_text (GTK_LABEL (label), g_file_info_get_display_name (info));
+      if (gicon)
+        gtk_image_set_from_gicon (GTK_IMAGE (icon), gicon);
+    }
+  else
+    {
+      gtk_label_set_text (GTK_LABEL (label), path);
+      gtk_image_set_from_icon_name (GTK_IMAGE (icon), "folder-symbolic");
+    }
+}
+
+static void
+on_download_dir_setting_changed (GSettings *settings,
+                                 const char *key,
+                                 gpointer user_data)
+{
+  GtkBuilder *builder = user_data;
+  GtkWidget *label = GTK_WIDGET (gtk_builder_get_object (builder, "settings_download_directory_label"));
+  GtkWidget *icon = GTK_WIDGET (gtk_builder_get_object (builder, "settings_download_directory_icon"));
+  g_autofree char *path = g_settings_get_string (settings, key);
+
+  update_download_dir_display (label, icon, path);
+}
+
 static void
 teleport_window_init (TeleportWindow *win)
 {
@@ -132,6 +171,8 @@ teleport_window_init (TeleportWindow *win)
   GtkBuilder *builder;
   GtkWidget *menu;
   GtkWidget *downloadDirBtn;
+  GtkWidget *downloadDirLabel;
+  GtkWidget *downloadDirIcon;
   GSettings *settings = teleport_app_get_settings ();
 
   priv = teleport_window_get_instance_private (win);
@@ -141,9 +182,11 @@ teleport_window_init (TeleportWindow *win)
   g_type_ensure (ADW_TYPE_ACTION_ROW);
   gtk_widget_init_template (GTK_WIDGET (win));
 
-  builder = gtk_builder_new_from_resource ("/com/frac_tion/teleport/settings.ui");
+  builder = gtk_builder_new_from_resource ("/org/nekoweb/n0va/BeamMeUp/settings.ui");
   menu = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
   downloadDirBtn = GTK_WIDGET (gtk_builder_get_object (builder, "settings_download_directory"));
+  downloadDirLabel = GTK_WIDGET (gtk_builder_get_object (builder, "settings_download_directory_label"));
+  downloadDirIcon = GTK_WIDGET (gtk_builder_get_object (builder, "settings_download_directory_icon"));
 
   gtk_menu_button_set_popover(GTK_MENU_BUTTON (priv->gears), menu);
 
@@ -151,12 +194,22 @@ teleport_window_init (TeleportWindow *win)
                    priv->this_device_row, "title",
                    G_SETTINGS_BIND_GET);
 
+  /* Initial update */
+  g_autofree char *path = g_settings_get_string (settings, "download-dir");
+  update_download_dir_display (downloadDirLabel, downloadDirIcon, path);
+
+  /* Update on change */
+  g_signal_connect_data (settings, "changed::download-dir",
+                         G_CALLBACK (on_download_dir_setting_changed),
+                         g_object_ref (builder),
+                         (GClosureNotify)g_object_unref, 0);
+
   g_signal_connect (downloadDirBtn, "clicked", G_CALLBACK (on_choose_download_dir_clicked), settings);
 
   g_object_unref (builder);
 
   /* Add popover for device settings */
-  builder = gtk_builder_new_from_resource ("/com/frac_tion/teleport/device_settings.ui");
+  builder = gtk_builder_new_from_resource ("/org/nekoweb/n0va/BeamMeUp/device_settings.ui");
   menu = GTK_WIDGET (gtk_builder_get_object (builder, "device-settings"));
   gtk_menu_button_set_popover(GTK_MENU_BUTTON (priv->this_device_settings_button), menu);
 
@@ -232,7 +285,7 @@ teleport_window_class_init (TeleportWindowClass *class)
   G_OBJECT_CLASS (class)->dispose = teleport_window_dispose;
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
-                                               "/com/frac_tion/teleport/window.ui");
+                                               "/org/nekoweb/n0va/BeamMeUp/window.ui");
 
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportWindow, gears);
   gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), TeleportWindow, this_device_settings_button);

src/beam-me-up-window.h

@@ -1,4 +1,4 @@
-/* teleport-window.h
+/* beam-me-up-window.h
  *
  * Copyright 2017 Julian Sparber <julian@sparber.com>
  *
@@ -20,8 +20,8 @@
 #define __TELEPORT_WINDOW_H
 
 #include <adwaita.h>
-#include "teleport-app.h"
-#include "teleport-peer.h"
+#include "beam-me-up-app.h"
+#include "beam-me-up-peer.h"
 
 #define TELEPORT_WINDOW_TYPE (teleport_window_get_type ())
 G_DECLARE_FINAL_TYPE (TeleportWindow, 

src/main.c

@@ -18,7 +18,7 @@
 
 #include <adwaita.h>
 
-#include "teleport-app.h"
+#include "beam-me-up-app.h"
 
 int
 main (int argc, char *argv[])

src/meson.build

@@ -1,13 +1,12 @@
-
 headers = files(
-  'teleport-remote-device.h',
-  'teleport-browser.h',
-  'teleport-get.h',
-  'teleport-publish.h',
-  'teleport-server.h',
-  'teleport-window.h',
-  'teleport-peer.h',
-  'teleport-app.h'
+  'beam-me-up-remote-device.h',
+  'beam-me-up-browser.h',
+  'beam-me-up-get.h',
+  'beam-me-up-publish.h',
+  'beam-me-up-server.h',
+  'beam-me-up-window.h',
+  'beam-me-up-peer.h',
+  'beam-me-up-app.h'
 )
 
 install_headers(headers, subdir: meson.project_name())
@@ -18,22 +17,22 @@ install_headers(headers, subdir: meson.project_name())
 ################
 
 sources = files(
-  'teleport-remote-device.c',
-  'teleport-browser.c',
-  'teleport-get.c',
-  'teleport-publish.c',
-  'teleport-server.c',
-  'teleport-app.c',
-  'teleport-window.c',
-  'teleport-peer.c',
+  'beam-me-up-remote-device.c',
+  'beam-me-up-browser.c',
+  'beam-me-up-get.c',
+  'beam-me-up-publish.c',
+  'beam-me-up-server.c',
+  'beam-me-up-app.c',
+  'beam-me-up-window.c',
+  'beam-me-up-peer.c',
   'main.c'
 )
 
 sources += gnome.compile_resources(
-  'teleport-resources',
-  join_paths(data_dir, 'teleport.gresource.xml'),
+  'BeamMeUp-resources',
+  join_paths(data_dir, 'BeamMeUp.gresource.xml'),
     source_dir: [ data_dir, join_paths(meson.build_root(), 'plugins') ],
-        c_name: 'teleport',
+        c_name: 'BeamMeUp',
 #  dependencies: plugins_confs,
         export: true
 )
@@ -78,10 +77,10 @@ ldflags = [ '-Wl,--export-dynamic' ]
 
 
 ###############
-# teleport #
+# BeamMeUp #
 ###############
 
-teleport = executable(
+BeamMeUp = executable(
   meson.project_name(),
                sources,
   include_directories: incs,
@@ -98,8 +97,8 @@ teleport = executable(
 # Private library #
 ###################
 
-libteleport = shared_library(
-                'teleport',
+libBeamMeUp = shared_library(
+                'BeamMeUp',
               sources: sources,
               version: libversion,
             soversion: soversion,
@@ -108,9 +107,8 @@ libteleport = shared_library(
                c_args: cflags
 )
 
-libteleport_dep = declare_dependency(
-            link_with: libteleport,
+libBeamMeUp_dep = declare_dependency(
+            link_with: libBeamMeUp,
   include_directories: src_inc,
          dependencies: teleport_deps
 )
-

src/settings.ui

@@ -22,7 +22,23 @@
             </child>
             <child>
               <object class="GtkButton" id="settings_download_directory">
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage" id="settings_download_directory_icon">
+                        <property name="icon-name">folder-symbolic</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="settings_download_directory_label">
                         <property name="label" translatable="yes">Choose download dir</property>
+                        <property name="ellipsize">end</property>
+                        <property name="xalign">0</property>
+                      </object>
+                    </child>
+                  </object>
+                </property>
               </object>
             </child>
           </object>
@@ -34,7 +50,7 @@
             <child>
               <object class="GtkLabel">
                 <property name="margin-top">6</property>
-                <property name="label" translatable="yes">Automatically enable Teleport on these networks:</property>
+                <property name="label" translatable="yes">Automatically enable BeamMeUp on these networks:</property>
                 <property name="xalign">0</property>
               </object>
             </child>
@@ -114,7 +130,7 @@
         <child>
           <object class="GtkButton">
             <property name="action_name">app.about</property>
-            <property name="label" translatable="yes">About Teleport</property>
+            <property name="label" translatable="yes">About BeamMeUp</property>
             <style>
               <class name="flat"/>
             </style>

src/window.ui

@@ -3,7 +3,7 @@
   <requires lib="gtk" version="4.0"/>
   <requires lib="libadwaita" version="1.0"/>
   <template class="TeleportWindow" parent="AdwApplicationWindow">
-    <property name="title" translatable="yes">Teleport</property>
+    <property name="title" translatable="yes">BeamMeUp</property>
     <property name="default_width">650</property>
     <property name="default_height">500</property>
     <property name="content">