N0VA/BeamMeUp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[feat] remove not yet implemented UI elements and add correct download directory to settings popover

Browse Source
This commit is contained in:
Julian Sparber
2017-09-18 18:39:26 +02:00
parent d3c1c9149d
commit 32ac377bf0
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/settings.ui
View File

@@ -21,7 +21,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry"> <object class="GtkEntry" id="settings_download_directory">
<property name="visible">True</property> <property name="visible">True</property>
<property name="text">~/Downloads</property> <property name="text">~/Downloads</property>
</object> </object>
@@ -34,7 +34,7 @@
</child> </child>
<child> <child>
<object class="GtkButton"> <object class="GtkButton">
<property name="visible">True</property> <property name="visible">False</property>
<property name="label">Browse...</property> <property name="label">Browse...</property>
<property name="margin_start">12</property> <property name="margin_start">12</property>
</object> </object>
@@ -47,7 +47,7 @@
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Automatically enable Teleport on these networks:</property> <property name="label" translatable="yes">Automatically enable Teleport on these networks:</property>
<property name="margin_bottom">6</property> <property name="margin_bottom">6</property>
@@ -62,7 +62,7 @@
</child> </child>
<child> <child>
<object class="GtkListBox" id="general-listbox"> <object class="GtkListBox" id="general-listbox">
<property name="visible">True</property> <property name="visible">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="selection_mode">none</property> <property name="selection_mode">none</property>
<child> <child>

8
src/teleportappwin.c
View File

@@ -31,6 +31,7 @@ teleport_app_window_init (TeleportAppWindow *win)
TeleportAppWindowPrivate *priv; TeleportAppWindowPrivate *priv;
GtkBuilder *builder; GtkBuilder *builder;
GtkWidget *menu; GtkWidget *menu;
GtkEntry *downloadDir;
mainWin = win; mainWin = win;
priv = teleport_app_window_get_instance_private (win); priv = teleport_app_window_get_instance_private (win);
@@ -39,11 +40,16 @@ teleport_app_window_init (TeleportAppWindow *win)
builder = gtk_builder_new_from_resource ("/org/gtk/teleportapp/settings.ui"); builder = gtk_builder_new_from_resource ("/org/gtk/teleportapp/settings.ui");
menu = GTK_WIDGET (gtk_builder_get_object (builder, "settings")); menu = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
downloadDir = GTK_ENTRY (gtk_builder_get_object (builder, "settings_download_directory"));
gtk_menu_button_set_popover(GTK_MENU_BUTTON (priv->gears), menu); gtk_menu_button_set_popover(GTK_MENU_BUTTON (priv->gears), menu);
gtk_label_set_text(GTK_LABEL (priv->this_device_name_label), g_get_host_name()); gtk_label_set_text (GTK_LABEL (priv->this_device_name_label), g_get_host_name());
gtk_entry_set_text (downloadDir, g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD));
gtk_entry_set_width_chars(downloadDir, 30);
//g_object_unref (menu);
//g_object_unref (label);
g_object_unref (builder); g_object_unref (builder);
} }