Signed-off-by: Eduardo Lima (Etrunko) <etrunko@xxxxxxxxxx>
---
src/remote-viewer-iso-list-dialog.c | 157 ++++++++++++++++++++++++++++-
src/resources/ui/remote-viewer-iso-list.ui | 5 +-
2 files changed, 158 insertions(+), 4 deletions(-)
diff --git a/src/remote-viewer-iso-list-dialog.c b/src/remote-viewer-iso-list-dialog.c
index 7a84d0c..7fe032b 100644
--- a/src/remote-viewer-iso-list-dialog.c
+++ b/src/remote-viewer-iso-list-dialog.c
@@ -20,6 +20,7 @@
#include <config.h>
+#include <stdlib.h>
#include <glib/gi18n.h>
#include "remote-viewer-iso-list-dialog.h"
@@ -33,7 +34,9 @@ G_DEFINE_TYPE(RemoteViewerISOListDialog, remote_viewer_iso_list_dialog, GTK_TYPE
struct _RemoteViewerISOListDialogPrivate
{
+ GtkListStore *list_store;
GtkWidget *stack;
+ GtkWidget *treeview;
OvirtForeignMenu *foreign_menu;
};
@@ -43,13 +46,25 @@ enum RemoteViewerIsoListDialogPages
ISO_LIST_PAGE,
};
+enum RemoteViewerIsoListDialogModel
+{
+ ISO_IS_ACTIVE = 0,
+ ISO_NAME,
+ FONT_WEIGHT,
+};
+
+void remote_viewer_iso_list_dialog_toggled(GtkCellRendererToggle *cell_renderer, gchar *path, gpointer user_data);
+
static void
remote_viewer_iso_list_dialog_dispose(GObject *object)
{
RemoteViewerISOListDialog *self = REMOTE_VIEWER_ISO_LIST_DIALOG(object);
RemoteViewerISOListDialogPrivate *priv = self->priv;
- g_clear_object(&priv->foreign_menu);
+ if (priv->foreign_menu) {
+ g_signal_handlers_disconnect_by_data(priv->foreign_menu, object);
+ g_clear_object(&priv->foreign_menu);
+ }
G_OBJECT_CLASS(remote_viewer_iso_list_dialog_parent_class)->dispose(object);
}
@@ -64,6 +79,51 @@ remote_viewer_iso_list_dialog_class_init(RemoteViewerISOListDialogClass *klass)
}
static void
+remote_viewer_iso_list_dialog_show_files(RemoteViewerISOListDialog *self)
+{
+ RemoteViewerISOListDialogPrivate *priv = self->priv = DIALOG_PRIVATE(self);
+ gtk_stack_set_visible_child_full(GTK_STACK(priv->stack), "iso-list",
+ GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT);
+ gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_NONE, TRUE);
+}
+
+static void
+remote_viewer_iso_list_dialog_foreach(char *name, RemoteViewerISOListDialog *self)
+{
+ RemoteViewerISOListDialogPrivate *priv = self->priv;
+ char * current_iso = ovirt_foreign_menu_get_current_iso_name(self->priv->foreign_menu);
+ gboolean active = g_strcmp0(current_iso, name) == 0;
+ gint weight = active ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL;
+ GtkTreeIter iter;
+
+ gtk_list_store_append(priv->list_store, &iter);
+ gtk_list_store_set(priv->list_store, &iter,
+ ISO_IS_ACTIVE, active,
+ ISO_NAME, name,
+ FONT_WEIGHT, weight, -1);
+
+ free(current_iso);
+}
+
+static void
+remote_viewer_iso_list_dialog_refresh_iso_list(RemoteViewerISOListDialog *self,
+ gboolean refreshing)
+{
+ RemoteViewerISOListDialogPrivate *priv = self->priv;
+ GList *iso_list;
+
+ if (refreshing) {
+ gtk_list_store_clear(priv->list_store);
+ ovirt_foreign_menu_start(priv->foreign_menu);
+ return;
+ }
+
+ iso_list = ovirt_foreign_menu_get_iso_names(priv->foreign_menu);
+ g_list_foreach(iso_list, (GFunc) remote_viewer_iso_list_dialog_foreach, self);
+ remote_viewer_iso_list_dialog_show_files(self);
+}
+
+static void
remote_viewer_iso_list_dialog_response(GtkDialog *dialog,
gint response_id,
gpointer user_data G_GNUC_UNUSED)
@@ -77,7 +137,31 @@ remote_viewer_iso_list_dialog_response(GtkDialog *dialog,
gtk_stack_set_visible_child_full(GTK_STACK(priv->stack), "status",
GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT);
gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_NONE, FALSE);
- gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_CLOSE, FALSE);
+ remote_viewer_iso_list_dialog_refresh_iso_list(self, TRUE);
+}
+
+void
+remote_viewer_iso_list_dialog_toggled(GtkCellRendererToggle *cell_renderer G_GNUC_UNUSED,
+ gchar *path,
+ gpointer user_data)
+{
+ RemoteViewerISOListDialog *self = REMOTE_VIEWER_ISO_LIST_DIALOG(user_data);
+ RemoteViewerISOListDialogPrivate *priv = self->priv;
+ GtkTreeModel *model = GTK_TREE_MODEL(priv->list_store);
+ GtkTreeIter iter;
+ gboolean active;
+ gchar *name;
+
+ gtk_tree_model_get_iter_from_string(model, &iter, path);
+ gtk_tree_model_get(model, &iter,
+ ISO_IS_ACTIVE, &active,
+ ISO_NAME, &name, -1);
+
+ gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_NONE, FALSE);
+ gtk_widget_set_sensitive(priv->treeview, FALSE);
+
+ ovirt_foreign_menu_set_current_iso_name(priv->foreign_menu, active ? NULL : name);
+ g_free(name);
}
static void
@@ -86,12 +170,18 @@ remote_viewer_iso_list_dialog_init(RemoteViewerISOListDialog *self)
GtkWidget *content = gtk_dialog_get_content_area(GTK_DIALOG(self));
RemoteViewerISOListDialogPrivate *priv = self->priv = DIALOG_PRIVATE(self);
GtkBuilder *builder = virt_viewer_util_load_ui("remote-viewer-iso-list.ui");
+ GtkCellRendererToggle *cell_renderer;
gtk_builder_connect_signals(builder, self);
priv->stack = GTK_WIDGET(gtk_builder_get_object(builder, "stack"));
gtk_box_pack_start(GTK_BOX(content), priv->stack, TRUE, TRUE, 0);
+ priv->list_store = GTK_LIST_STORE(gtk_builder_get_object(builder, "liststore"));
+ priv->treeview = GTK_WIDGET(gtk_builder_get_object(builder, "view"));
+ cell_renderer = GTK_CELL_RENDERER_TOGGLE(gtk_builder_get_object(builder, "cellrenderertoggle"));
+ gtk_cell_renderer_toggle_set_radio(cell_renderer, TRUE);
+
g_object_unref(builder);
gtk_dialog_add_buttons(GTK_DIALOG(self),
@@ -101,10 +191,60 @@ remote_viewer_iso_list_dialog_init(RemoteViewerISOListDialog *self)
gtk_dialog_set_default_response(GTK_DIALOG(self), GTK_RESPONSE_CLOSE);
gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_NONE, FALSE);
- gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_CLOSE, FALSE);
g_signal_connect(self, "response", G_CALLBACK(remote_viewer_iso_list_dialog_response), NULL);
}
+static void
+ovirt_foreign_menu_notify_file(OvirtForeignMenu *foreign_menu,
+ GParamSpec *pspec G_GNUC_UNUSED,
+ RemoteViewerISOListDialog *self)
+{
+ RemoteViewerISOListDialogPrivate *priv = self->priv;
+ GtkTreeModel *model = GTK_TREE_MODEL(priv->list_store);
+ char *current_iso = ovirt_foreign_menu_get_current_iso_name(foreign_menu);
+ GtkTreeIter iter;
+ gchar *name;
+ gboolean active, match = FALSE;
+
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ goto end;
+
+ do {
+ gtk_tree_model_get(model, &iter,
+ ISO_IS_ACTIVE, &active,
+ ISO_NAME, &name, -1);
+ match = g_strcmp0(current_iso, name) == 0;
+
+ /* iso is not active anymore */
+ if (active && !match) {
+ gtk_list_store_set(priv->list_store, &iter,
+ ISO_IS_ACTIVE, FALSE,
+ FONT_WEIGHT, PANGO_WEIGHT_NORMAL, -1);
+ } else if (match) {
+ gtk_list_store_set(priv->list_store, &iter,
+ ISO_IS_ACTIVE, TRUE,
+ FONT_WEIGHT, PANGO_WEIGHT_BOLD, -1);
+ }
+
+ g_free(name);
+ } while (gtk_tree_model_iter_next(model, &iter));
+
+ gtk_dialog_set_response_sensitive(GTK_DIALOG(self), GTK_RESPONSE_NONE, TRUE);
+ gtk_widget_set_sensitive(priv->treeview, TRUE);
+
+end:
+ free(current_iso);
+}
+
+static void
+ovirt_foreign_menu_notify_files(OvirtForeignMenu *foreign_menu G_GNUC_UNUSED,
+ GParamSpec *pspec G_GNUC_UNUSED,
+ RemoteViewerISOListDialog *self)
+{
+ remote_viewer_iso_list_dialog_refresh_iso_list(self, FALSE);
+}
+
+
GtkWidget *
remote_viewer_iso_list_dialog_new(GtkWindow *parent, GObject *foreign_menu)
{
@@ -123,5 +263,16 @@ remote_viewer_iso_list_dialog_new(GtkWindow *parent, GObject *foreign_menu)
self = REMOTE_VIEWER_ISO_LIST_DIALOG(dialog);
self->priv->foreign_menu = OVIRT_FOREIGN_MENU(g_object_ref(foreign_menu));
+
+ g_signal_connect(foreign_menu,
+ "notify::file",
+ (GCallback)ovirt_foreign_menu_notify_file,
+ dialog);
+ g_signal_connect(foreign_menu,
+ "notify::files",
+ (GCallback)ovirt_foreign_menu_notify_files,
+ dialog);
+
+ remote_viewer_iso_list_dialog_refresh_iso_list(self, TRUE);
return dialog;
}
diff --git a/src/resources/ui/remote-viewer-iso-list.ui b/src/resources/ui/remote-viewer-iso-list.ui
index d6c0e28..7cd08ed 100644
--- a/src/resources/ui/remote-viewer-iso-list.ui
+++ b/src/resources/ui/remote-viewer-iso-list.ui
@@ -93,6 +93,7 @@
<property name="can_focus">False</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
+ <property name="bottom_padding">6</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
@@ -115,7 +116,9 @@
<property name="sizing">autosize</property>
<property name="title" translatable="yes">Selected</property>
<child>
- <object class="GtkCellRendererToggle" id="cellrenderertoggle"/>
+ <object class="GtkCellRendererToggle" id="cellrenderertoggle">
+ <signal name="toggled" handler="remote_viewer_iso_list_dialog_toggled" swapped="no"/>
+ </object>
<attributes>
<attribute name="active">0</attribute>
</attributes>
--
2.7.4
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
