diff --git a/src/sview/Makefile.am b/src/sview/Makefile.am
index abd5a84317ce775dc8f9b4603301015646a31c76..10e36badf5e4b5634dbe4159e06c942b6ffedaa8 100644
--- a/src/sview/Makefile.am
+++ b/src/sview/Makefile.am
@@ -13,7 +13,7 @@ sview_LDADD = \
$(top_builddir)/src/plugins/select/bluegene/block_allocator/libbluegene_block_allocator.la
noinst_HEADERS = sview.h
-sview_SOURCES = sview.c part_info.c job_info.c \
+sview_SOURCES = sview.c popups.c part_info.c job_info.c \
block_info.c node_info.c \
submit_info.c admin_info.c common.c
diff --git a/src/sview/popups.c b/src/sview/popups.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a7f3ae53494b988f4fe2d8d1a2a0ddb9fc12a4c
--- /dev/null
+++ b/src/sview/popups.c
@@ -0,0 +1,275 @@
+/****************************************************************************\
+ * popups.c - put different popup displays here
+ *****************************************************************************
+ * Copyright (C) 2002-2006 The Regents of the University of California.
+ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ * Written by Danny Auble <da@llnl.gov>, et. al.
+ * UCRL-CODE-217948.
+ *
+ * This file is part of SLURM, a resource management program.
+ * For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ * SLURM is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * In addition, as a special exception, the copyright holders give permission
+ * to link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two. You must obey the GNU
+ * General Public License in all respects for all of the code used other than
+ * OpenSSL. If you modify file(s) with this exception, you may extend this
+ * exception to your version of the file(s), but you are not obligated to do
+ * so. If you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files in
+ * the program, then also delete it here.
+ *
+ * SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+\*****************************************************************************/
+#include "sview.h"
+
+
+extern void create_config_popup(GtkToggleAction *action, gpointer user_data)
+{
+ GtkWidget *table = gtk_table_new(1, 2, FALSE);
+ GtkWidget *label = gtk_label_new("Interval in Seconds ");
+ GtkObject *adjustment = gtk_adjustment_new(global_sleep_time,
+ 1, 10000,
+ 5, 60,
+ 1);
+ GtkWidget *spin_button =
+ gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
+ GtkWidget *popup = gtk_dialog_new_with_buttons(
+ "Refresh Interval",
+ GTK_WINDOW (user_data),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_OK,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ NULL);
+ GError *error = NULL;
+ int response = 0;
+ char *temp = NULL;
+
+ gtk_container_set_border_width(GTK_CONTAINER(table), 10);
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ table, FALSE, FALSE, 0);
+
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
+ gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
+
+ gtk_widget_show_all(popup);
+ response = gtk_dialog_run (GTK_DIALOG(popup));
+
+ if (response == GTK_RESPONSE_OK)
+ {
+ global_sleep_time =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_button));
+ temp = g_strdup_printf("Refresh Interval set to %d seconds.",
+ global_sleep_time);
+ gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
+ STATUS_REFRESH);
+ response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
+ STATUS_REFRESH,
+ temp);
+ g_free(temp);
+ if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
+ FALSE, &error))
+ {
+ g_printerr ("Failed to create refresh thread: %s\n",
+ error->message);
+ }
+ }
+
+ gtk_widget_destroy(popup);
+
+ return;
+}
+
+extern void create_deamon_popup(GtkToggleAction *action, gpointer user_data)
+{
+ GtkWidget *table = gtk_table_new(1, 2, FALSE);
+ GtkWidget *label = gtk_label_new("Interval in Seconds ");
+ GtkObject *adjustment = gtk_adjustment_new(global_sleep_time,
+ 1, 10000,
+ 5, 60,
+ 1);
+ GtkWidget *spin_button =
+ gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
+ GtkWidget *popup = gtk_dialog_new_with_buttons(
+ "Refresh Interval",
+ GTK_WINDOW (user_data),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_OK,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ NULL);
+ GError *error = NULL;
+ int response = 0;
+ char *temp = NULL;
+
+ gtk_container_set_border_width(GTK_CONTAINER(table), 10);
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ table, FALSE, FALSE, 0);
+
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
+ gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
+
+ gtk_widget_show_all(popup);
+ response = gtk_dialog_run (GTK_DIALOG(popup));
+
+ if (response == GTK_RESPONSE_OK)
+ {
+ global_sleep_time =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_button));
+ temp = g_strdup_printf("Refresh Interval set to %d seconds.",
+ global_sleep_time);
+ gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
+ STATUS_REFRESH);
+ response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
+ STATUS_REFRESH,
+ temp);
+ g_free(temp);
+ if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
+ FALSE, &error))
+ {
+ g_printerr ("Failed to create refresh thread: %s\n",
+ error->message);
+ }
+ }
+
+ gtk_widget_destroy(popup);
+
+ return;
+}
+
+extern void create_search_popup(GtkToggleAction *action, gpointer user_data)
+{
+ GtkWidget *table = gtk_table_new(1, 2, FALSE);
+ GtkWidget *label = gtk_label_new("Interval in Seconds ");
+ GtkObject *adjustment = gtk_adjustment_new(global_sleep_time,
+ 1, 10000,
+ 5, 60,
+ 1);
+ GtkWidget *spin_button =
+ gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
+ GtkWidget *popup = gtk_dialog_new_with_buttons(
+ "Refresh Interval",
+ GTK_WINDOW (user_data),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_OK,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ NULL);
+ GError *error = NULL;
+ int response = 0;
+ char *temp = NULL;
+
+ gtk_container_set_border_width(GTK_CONTAINER(table), 10);
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ table, FALSE, FALSE, 0);
+
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
+ gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
+
+ gtk_widget_show_all(popup);
+ response = gtk_dialog_run (GTK_DIALOG(popup));
+
+ if (response == GTK_RESPONSE_OK)
+ {
+ global_sleep_time =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_button));
+ temp = g_strdup_printf("Refresh Interval set to %d seconds.",
+ global_sleep_time);
+ gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
+ STATUS_REFRESH);
+ response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
+ STATUS_REFRESH,
+ temp);
+ g_free(temp);
+ if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
+ FALSE, &error))
+ {
+ g_printerr ("Failed to create refresh thread: %s\n",
+ error->message);
+ }
+ }
+
+ gtk_widget_destroy(popup);
+
+ return;
+}
+
+extern void change_refresh_popup(GtkToggleAction *action, gpointer user_data)
+{
+ GtkWidget *table = gtk_table_new(1, 2, FALSE);
+ GtkWidget *label = gtk_label_new("Interval in Seconds ");
+ GtkObject *adjustment = gtk_adjustment_new(global_sleep_time,
+ 1, 10000,
+ 5, 60,
+ 1);
+ GtkWidget *spin_button =
+ gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
+ GtkWidget *popup = gtk_dialog_new_with_buttons(
+ "Refresh Interval",
+ GTK_WINDOW (user_data),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_OK,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ NULL);
+ GError *error = NULL;
+ int response = 0;
+ char *temp = NULL;
+
+ gtk_container_set_border_width(GTK_CONTAINER(table), 10);
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ table, FALSE, FALSE, 0);
+
+ gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
+ gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
+
+ gtk_widget_show_all(popup);
+ response = gtk_dialog_run (GTK_DIALOG(popup));
+
+ if (response == GTK_RESPONSE_OK)
+ {
+ global_sleep_time =
+ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_button));
+ temp = g_strdup_printf("Refresh Interval set to %d seconds.",
+ global_sleep_time);
+ gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
+ STATUS_REFRESH);
+ response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
+ STATUS_REFRESH,
+ temp);
+ g_free(temp);
+ if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
+ FALSE, &error))
+ {
+ g_printerr ("Failed to create refresh thread: %s\n",
+ error->message);
+ }
+ }
+
+ gtk_widget_destroy(popup);
+
+ return;
+}
+
diff --git a/src/sview/sview.c b/src/sview/sview.c
index 1e533f2685c97f8c5ab04cfe281a8d3ae1dc96f8..f7daf81c697c784090c798f6ce896f9b8a4ea75e 100644
--- a/src/sview/sview.c
+++ b/src/sview/sview.c
@@ -1,28 +1,39 @@
/****************************************************************************\
* sview.c - main for sview
*****************************************************************************
- * Copyright (C) 2004 The Regents of the University of California.
+ * Copyright (C) 2002-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- * Written by Danny Auble <da@llnl.gov>
+ * Written by Danny Auble <da@llnl.gov>, et. al.
* UCRL-CODE-217948.
- *
+ *
* This file is part of SLURM, a resource management program.
* For details, see <http://www.llnl.gov/linux/slurm/>.
- *
+ *
* SLURM is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
+ * In addition, as a special exception, the copyright holders give permission
+ * to link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two. You must obey the GNU
+ * General Public License in all respects for all of the code used other than
+ * OpenSSL. If you modify file(s) with this exception, you may extend this
+ * exception to your version of the file(s), but you are not obligated to do
+ * so. If you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files in
+ * the program, then also delete it here.
+ *
* SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-\****************************************************************************/
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+\*****************************************************************************/
#include "sview.h"
@@ -198,123 +209,6 @@ static void _set_admin_mode(GtkToggleAction *action)
}
}
-static void _change_refresh(GtkToggleAction *action, gpointer user_data)
-{
- GtkWidget *table = gtk_table_new(1, 2, FALSE);
- GtkWidget *label = gtk_label_new("Interval in Seconds ");
- GtkObject *adjustment = gtk_adjustment_new(global_sleep_time,
- 1, 10000,
- 5, 60,
- 1);
- GtkWidget *spin_button =
- gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
- GtkWidget *popup = gtk_dialog_new_with_buttons(
- "Refresh Interval",
- GTK_WINDOW (user_data),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK,
- GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- NULL);
- GError *error = NULL;
- int response = 0;
- char *temp = NULL;
-
- gtk_container_set_border_width(GTK_CONTAINER(table), 10);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
- table, FALSE, FALSE, 0);
-
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
- gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
-
- gtk_widget_show_all(popup);
- response = gtk_dialog_run (GTK_DIALOG(popup));
-
- if (response == GTK_RESPONSE_OK)
- {
- global_sleep_time =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_button));
- temp = g_strdup_printf("Refresh Interval set to %d seconds.",
- global_sleep_time);
- gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
- STATUS_REFRESH);
- response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
- STATUS_REFRESH,
- temp);
- g_free(temp);
- if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
- FALSE, &error))
- {
- g_printerr ("Failed to create refresh thread: %s\n",
- error->message);
- }
- }
-
- gtk_widget_destroy(popup);
-
- return;
-}
-
-static void _create_display_popup(GtkToggleAction *action, gpointer user_data)
-{
- GtkWidget *table = gtk_table_new(1, 2, FALSE);
- GtkWidget *label = gtk_label_new("Interval in Seconds ");
- GtkObject *adjustment = gtk_adjustment_new(global_sleep_time,
- 1, 10000,
- 5, 60,
- 1);
- GtkWidget *spin_button =
- gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
- GtkWidget *popup = gtk_dialog_new_with_buttons(
- "Refresh Interval",
- GTK_WINDOW (user_data),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK,
- GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- NULL);
- GError *error = NULL;
- int response = 0;
- char *temp = NULL;
-
- gtk_container_set_border_width(GTK_CONTAINER(table), 10);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
- table, FALSE, FALSE, 0);
-
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
- gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
-
- gtk_widget_show_all(popup);
- response = gtk_dialog_run (GTK_DIALOG(popup));
-
- if (response == GTK_RESPONSE_OK)
- {
- global_sleep_time =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_button));
- temp = g_strdup_printf("Refresh Interval set to %d seconds.",
- global_sleep_time);
- gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
- STATUS_REFRESH);
- response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
- STATUS_REFRESH,
- temp);
- g_free(temp);
- if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
- FALSE, &error))
- {
- g_printerr ("Failed to create refresh thread: %s\n",
- error->message);
- }
- }
-
- gtk_widget_destroy(popup);
-
- return;
-}
static void _tab_pos(GtkRadioAction *action,
GtkRadioAction *extra,
@@ -375,10 +269,7 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
" <menu action='displays'>"
" <menuitem action='config'/>"
" <menuitem action='deamons'/>"
- " <menuitem action='nodes'/>"
- " <menuitem action='jobs'/>"
- " <menuitem action='steps'/>"
- " <menuitem action='partitions'/>"
+ " <menuitem action='search'/>"
" </menu>"
" <menu action='help'>"
" <menuitem action='about'/>"
@@ -388,11 +279,11 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
GtkActionEntry entries[] = {
{"options", NULL, "_Options"},
- {"displays", NULL, "_Static Displays"},
+ {"displays", NULL, "_Query"},
{"tab_pos", NULL, "_Tab Pos"},
{"interval", NULL, "Set _Refresh Interval",
"<control>r", "Change Refresh Interval",
- G_CALLBACK(_change_refresh)},
+ G_CALLBACK(change_refresh_popup)},
{"refresh", NULL, "Refresh",
"F5", "Refreshes page", G_CALLBACK(refresh_main)},
{"reconfig", NULL, "_SLURM Reconfigure",
@@ -400,22 +291,13 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
G_CALLBACK(slurm_reconfigure)},
{"config", NULL, "Config _Info",
"<control>i", "Displays info from slurm.conf file",
- G_CALLBACK(_create_display_popup)},
+ G_CALLBACK(create_config_popup)},
{"deamons", NULL, "_Deamons",
"<control>d", "Displays Deamons running on node",
- G_CALLBACK(_create_display_popup)},
- {"nodes", NULL, "_Nodes",
- "<control>n", "Displays info about all nodes",
- G_CALLBACK(_create_display_popup)},
- {"jobs", NULL, "_Jobs",
- "<control>j", "Displays info about all jobs",
- G_CALLBACK(_create_display_popup)},
- {"steps", NULL, "St_eps",
- "<control>e", "Displays info about all job steps",
- G_CALLBACK(_create_display_popup)},
- {"partitions", NULL, "_Partitions",
- "<control>p", "Displays info about all partitions",
- G_CALLBACK(_create_display_popup)},
+ G_CALLBACK(create_deamon_popup)},
+ {"search", NULL, "Search",
+ "<control>f", "Search through SLURM",
+ G_CALLBACK(create_search_popup)},
{"exit", NULL, "E_xit",
"<control>x", "Exits Program", G_CALLBACK(_delete)},
{"help", NULL, "_Help"},
diff --git a/src/sview/sview.h b/src/sview/sview.h
index e38e42bd986f0cfe715033b313dafe4bb7cda072..cf138c45c97df782eed23c6dddb3659acedbd292 100644
--- a/src/sview/sview.h
+++ b/src/sview/sview.h
@@ -199,6 +199,13 @@ extern void refresh_main(GtkAction *action, gpointer user_data);
extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
const display_data_t *display_data);
+//popups.c
+extern void create_config_popup(GtkToggleAction *action, gpointer user_data);
+extern void create_deamon_popup(GtkToggleAction *action, gpointer user_data);
+extern void create_search_popup(GtkToggleAction *action, gpointer user_data);
+extern void change_refresh_popup(GtkToggleAction *action, gpointer user_data);
+
+
// part_info.c
extern void refresh_part(GtkAction *action, gpointer user_data);
extern GtkListStore *create_model_part(int type);