Remove the advanced button, will display all information directly.
Remove the static update_status functionality, will introduce a dynamic
function to show realtime status.
Signed-off-by: Dongxiao Xu <dongxiao...@intel.com>
---
properties/Makefile.am | 3 +-
properties/advanced.c | 314 ------------------------------------------------
properties/advanced.h | 19 +++-
properties/main.c | 111 ++----------------
4 files changed, 25 insertions(+), 422 deletions(-)
diff --git a/properties/Makefile.am b/properties/Makefile.am
index ed5c62c..28546d5 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,8 +1,7 @@
noinst_PROGRAMS = connman-properties
-connman_properties_SOURCES = main.c advanced.h advanced.c \
- ethernet.c wifi.c
+connman_properties_SOURCES = main.c advanced.h ethernet.c wifi.c
connman_properties_LDADD = $(top_builddir)/common/libcommon.a \
@GTK_LIBS@ @DBUS_LIBS@
diff --git a/properties/advanced.c b/properties/advanced.c
deleted file mode 100644
index 1eb1c3d..0000000
--- a/properties/advanced.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *
- * Connection Manager
- *
- * Copyright (C) 2008 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <dbus/dbus-glib.h>
-#include <glib/gi18n.h>
-
-#include "connman-client.h"
-
-#include "advanced.h"
-
-gboolean separator_function(GtkTreeModel *model,
- GtkTreeIter *iter, gpointer user_data)
-{
- gchar *text;
- gboolean result = FALSE;
-
- gtk_tree_model_get(model, iter, 0, &text, -1);
-
- if (text && *text == '\0')
- result = TRUE;
-
- g_free(text);
-
- return result;
-}
-
-static void activate_callback(GtkWidget *button, gpointer user_data)
-{
-}
-
-static void changed_callback(GtkWidget *editable, gpointer user_data)
-{
-}
-
-static void add_network(GtkWidget *mainbox, struct config_data *data)
-{
- GtkWidget *table;
- GtkWidget *label;
- GtkWidget *entry;
- GtkWidget *combo;
- GtkWidget *button;
-
- table = gtk_table_new(3, 5, TRUE);
- gtk_table_set_row_spacings(GTK_TABLE(table), 2);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- gtk_box_pack_start(GTK_BOX(mainbox), table, FALSE, FALSE, 0);
-
- label = gtk_label_new(_("Network Name:"));
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
-
- combo = gtk_combo_box_entry_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Guest");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Off");
- gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
- separator_function, NULL, NULL);
- gtk_table_attach_defaults(GTK_TABLE(table), combo, 1, 3, 0, 1);
- //data->network.name = combo;
-
- label = gtk_label_new(_("Passphrase:"));
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
-
- entry = gtk_entry_new();
- gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
- gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 3, 1, 2);
- //data->network.passphrase = entry;
-
- button = gtk_button_new_with_label(_("Activate"));
- gtk_widget_set_sensitive(button, FALSE);
- gtk_table_attach_defaults(GTK_TABLE(table), button, 1, 2, 2, 3);
- //data->network.activate = button;
-
- g_signal_connect(G_OBJECT(combo), "changed",
- G_CALLBACK(changed_callback), data);
-
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(activate_callback), data);
-}
-
-static void set_widgets(struct config_data *data, gboolean label,
- gboolean value, gboolean entry)
-{
- int i;
-
- for (i = 0; i < 3; i++) {
- if (label == TRUE)
- gtk_widget_show(data->ipv4.label[i]);
- else
- gtk_widget_hide(data->ipv4.label[i]);
-
- if (value == TRUE)
- gtk_widget_show(data->ipv4.value[i]);
- else
- gtk_widget_hide(data->ipv4.value[i]);
-
- if (entry == TRUE)
- gtk_widget_show(data->ipv4.entry[i]);
- else
- gtk_widget_hide(data->ipv4.entry[i]);
- }
-}
-
-static void config_callback(GtkWidget *widget, gpointer user_data)
-{
- gint active;
-
- active = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
-}
-
-static void add_config(GtkWidget *mainbox, struct config_data *data)
-{
- GtkWidget *table;
- GtkWidget *label;
- GtkWidget *entry;
- GtkWidget *combo;
-
- table = gtk_table_new(5, 5, TRUE);
- gtk_table_set_row_spacings(GTK_TABLE(table), 2);
- gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- gtk_box_pack_start(GTK_BOX(mainbox), table, FALSE, FALSE, 0);
-
- label = gtk_label_new(_("Configure IPv4:"));
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
-
- combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Using DHCP");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Manually");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Off");
- gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combo),
- separator_function, NULL, NULL);
- gtk_table_attach_defaults(GTK_TABLE(table), combo, 1, 3, 0, 1);
- data->ipv4.config = combo;
-
- label = gtk_label_new(_("IP Address:"));
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
- gtk_widget_set_no_show_all(label, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
- data->ipv4.label[0] = label;
-
- label = gtk_label_new(NULL);
- gtk_label_set_selectable(GTK_LABEL(label), TRUE);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- gtk_widget_set_no_show_all(label, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 3, 1, 2);
- data->ipv4.value[0] = label;
-
- entry = gtk_entry_new();
- gtk_widget_set_no_show_all(entry, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 3, 1, 2);
- data->ipv4.entry[0] = entry;
-
- label = gtk_label_new(_("Subnet Mask:"));
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
- gtk_widget_set_no_show_all(label, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
- data->ipv4.label[1] = label;
-
- label = gtk_label_new(NULL);
- gtk_label_set_selectable(GTK_LABEL(label), TRUE);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- gtk_widget_set_no_show_all(label, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 3, 2, 3);
- data->ipv4.value[1] = label;
-
- entry = gtk_entry_new();
- gtk_widget_set_no_show_all(entry, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 3, 2, 3);
- data->ipv4.entry[1] = entry;
-
- label = gtk_label_new(_("Router:"));
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
- gtk_widget_set_no_show_all(label, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
- data->ipv4.label[2] = label;
-
- label = gtk_label_new(NULL);
- gtk_label_set_selectable(GTK_LABEL(label), TRUE);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- gtk_widget_set_no_show_all(label, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 3, 3, 4);
- data->ipv4.value[2] = label;
-
- entry = gtk_entry_new();
- gtk_widget_set_no_show_all(entry, TRUE);
- gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 3, 3, 4);
- data->ipv4.entry[2] = entry;
-
- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
- set_widgets(data, TRUE, TRUE, FALSE);
-
- g_signal_connect(G_OBJECT(combo), "changed",
- G_CALLBACK(config_callback), data);
-}
-
-static void delete_callback(GtkWidget *window, GdkEvent *event,
- gpointer user_data)
-{
- gtk_widget_hide(window);
-}
-
-static void close_callback(GtkWidget *button, gpointer user_data)
-{
- GtkWidget *window = user_data;
-
- gtk_widget_hide(window);
-}
-
-void create_advanced_dialog(struct config_data *data, guint type)
-{
- GtkWidget *dialog;
- GtkWidget *vbox;
- GtkWidget *notebook;
- GtkWidget *buttonbox;
- GtkWidget *button;
- GtkWidget *widget;
-
- dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
- gtk_window_set_transient_for(GTK_WINDOW(dialog),
- GTK_WINDOW(data->window));
- gtk_window_set_title(GTK_WINDOW(dialog), _("Advanced Settings"));
- gtk_window_set_position(GTK_WINDOW(dialog),
- GTK_WIN_POS_CENTER_ON_PARENT);
- gtk_window_set_default_size(GTK_WINDOW(dialog), 460, 320);
- g_signal_connect(G_OBJECT(dialog), "delete-event",
- G_CALLBACK(delete_callback), NULL);
-
- vbox = gtk_vbox_new(FALSE, 12);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
- gtk_container_add(GTK_CONTAINER(dialog), vbox);
-
- notebook = gtk_notebook_new();
- gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-
- buttonbox = gtk_hbutton_box_new();
- gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox), GTK_BUTTONBOX_END);
- gtk_box_set_spacing(GTK_BOX(buttonbox), 6);
- gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 0);
-
- button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- gtk_container_add(GTK_CONTAINER(buttonbox), button);
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(close_callback), dialog);
-
- button = gtk_button_new_from_stock(GTK_STOCK_OK);
- gtk_container_add(GTK_CONTAINER(buttonbox), button);
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(close_callback), dialog);
-
- if (type == CONNMAN_TYPE_WIFI) {
- widget = gtk_vbox_new(FALSE, 24);
- gtk_container_set_border_width(GTK_CONTAINER(widget), 24);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
- widget, _("Wireless"));
- add_network(widget, data);
- }
-
- widget = gtk_vbox_new(FALSE, 24);
- gtk_container_set_border_width(GTK_CONTAINER(widget), 24);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
- widget, _("TCP/IP"));
- add_config(widget, data);
-
- widget = gtk_label_new(NULL);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
- widget, _("DNS"));
-
- if (type == CONNMAN_TYPE_ETHERNET) {
- widget = gtk_label_new(NULL);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, NULL);
- gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(notebook),
- widget, _("Ethernet"));
- }
-
- data->dialog = dialog;
-}
diff --git a/properties/advanced.h b/properties/advanced.h
index f85f10d..324ec13 100644
--- a/properties/advanced.h
+++ b/properties/advanced.h
@@ -47,13 +47,24 @@ struct config_data {
} ipv4;
};
-void create_advanced_dialog(struct config_data *data, guint type);
+static inline gboolean separator_function(GtkTreeModel *model,
+ GtkTreeIter *iter, gpointer user_data)
+{
+ gchar *text;
+ gboolean result = FALSE;
+
+ gtk_tree_model_get(model, iter, 0, &text, -1);
+
+ if (text && *text == '\0')
+ result = TRUE;
+
+ g_free(text);
+
+ return result;
+}
void add_ethernet_policy(GtkWidget *mainbox, struct config_data *data);
void update_ethernet_policy(struct config_data *data, guint policy);
void add_wifi_policy(GtkWidget *mainbox, struct config_data *data);
void update_wifi_policy(struct config_data *data, guint policy);
-
-gboolean separator_function(GtkTreeModel *model,
- GtkTreeIter *iter, gpointer user_data);
diff --git a/properties/main.c b/properties/main.c
index cbe0df3..8410298 100644
--- a/properties/main.c
+++ b/properties/main.c
@@ -33,65 +33,6 @@
static ConnmanClient *client;
static GtkWidget *interface_notebook;
-static void update_status(struct config_data *data,
- guint type, gboolean inrange, guint policy,
- const gchar *network, const gchar *address)
-{
- const char *str;
- gchar *markup, *info = NULL;
-
- switch (type) {
- case CONNMAN_TYPE_ETHERNET:
- if (inrange == TRUE) {
- str = N_("Connected");
- info = g_strdup_printf(_("%s is currently active "
- "and has the IP address %s."),
- N_("Ethernet"), address);
- } else {
- str = N_("Cable Unplugged");
- info = g_strdup_printf(_("The cable for %s is "
- "not plugged in."), N_("Ethernet"));
- }
- break;
-
- case CONNMAN_TYPE_WIFI:
- if (inrange == TRUE) {
- str = N_("Connected");
- info = g_strdup_printf(_("%s is currently active "
- "and has the IP address %s."),
- N_("Wireless"), address);
- } else
- str = N_("Not Connected");
- break;
-
- default:
- if (inrange == TRUE)
- str = N_("Connected");
- else
- str = N_("Not Connected");
- break;
- }
-
- markup = g_strdup_printf("<b>%s</b>", str);
- gtk_label_set_markup(GTK_LABEL(data->title), markup);
- g_free(markup);
-
- gtk_label_set_markup(GTK_LABEL(data->label), info);
-
- g_free(info);
-
- switch (type) {
- case CONNMAN_TYPE_ETHERNET:
- update_ethernet_policy(data, policy);
- break;
- case CONNMAN_TYPE_WIFI:
- update_wifi_policy(data, policy);
- break;
- default:
- break;
- }
-}
-
static void update_config(struct config_data *data)
{
GtkTreeIter iter;
@@ -109,26 +50,16 @@ static void update_config(struct config_data *data)
g_free(network);
}
-static void advanced_callback(GtkWidget *button, gpointer user_data)
-{
- struct config_data *data = user_data;
-
- gtk_widget_show_all(data->dialog);
-}
-
static struct config_data *create_config(GtkTreeModel *model,
GtkTreeIter *iter, gpointer user_data)
{
GtkWidget *mainbox;
GtkWidget *label;
GtkWidget *hbox;
- GtkWidget *button;
struct config_data *data;
DBusGProxy *proxy;
- guint type, policy;
- gboolean inrange;
- gchar *markup, *vendor = NULL, *product = NULL;
- gchar *network = NULL, *address = NULL;
+ guint type;
+ char *state;
data = g_try_new0(struct config_data, 1);
if (data == NULL)
@@ -139,12 +70,9 @@ static struct config_data *create_config(GtkTreeModel
*model,
gtk_tree_model_get(model, iter,
CONNMAN_COLUMN_PROXY, &proxy,
CONNMAN_COLUMN_TYPE, &type,
- CONNMAN_COLUMN_ADDRESS, &address,
+ CONNMAN_COLUMN_STATE, &state,
-1);
- data->device = g_strdup(dbus_g_proxy_get_path(proxy));
- g_object_unref(proxy);
-
mainbox = gtk_vbox_new(FALSE, 6);
data->widget = mainbox;
@@ -161,6 +89,12 @@ static struct config_data *create_config(GtkTreeModel
*model,
gtk_box_pack_start(GTK_BOX(mainbox), label, FALSE, FALSE, 0);
data->label = label;
+ data->window = user_data;
+ data->model = model;
+ data->index = gtk_tree_model_get_string_from_iter(model, iter);
+ data->device = g_strdup(dbus_g_proxy_get_path(proxy));
+ g_object_unref(proxy);
+
switch (type) {
case CONNMAN_TYPE_ETHERNET:
add_ethernet_policy(mainbox, data);
@@ -181,35 +115,8 @@ static struct config_data *create_config(GtkTreeModel
*model,
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 1.0);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
- markup = g_strdup_printf("%s\n<small>%s</small>",
- vendor ? vendor : "", product ? product : "");
- gtk_label_set_markup(GTK_LABEL(label), markup);
- g_free(markup);
-
- if (0) {
- button = gtk_button_new_with_label(_("Advanced..."));
- gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(advanced_callback), data);
- data->button = button;
- }
-
- data->window = user_data;
- create_advanced_dialog(data, type);
-
- update_status(data, type, inrange, policy, network, address);
-
- g_free(network);
- g_free(address);
-
- data->model = model;
- data->index = gtk_tree_model_get_string_from_iter(model, iter);
-
gtk_widget_show_all(mainbox);
- g_free(product);
- g_free(vendor);
-
return data;
}
--
1.7.1
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
