From: Ben Pfaff Date: Fri, 13 Jul 2012 06:41:52 +0000 (-0700) Subject: var-type-dialog: Move UI into separate .ui file. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=351eb4714c09738651e08842f23916fcfcecad52;p=pspp var-type-dialog: Move UI into separate .ui file. Putting the UI for a .c file into its own .ui file seems like a good practice. It leads to fewer merge conflicts, for example. --- diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 3af7038e2e..55f8291432 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -42,7 +42,8 @@ UI_FILES = \ src/ui/gui/variable-info.ui \ src/ui/gui/data-editor.ui \ src/ui/gui/output-viewer.ui \ - src/ui/gui/syntax-editor.ui + src/ui/gui/syntax-editor.ui \ + src/ui/gui/var-type-dialog.ui EXTRA_DIST += \ src/ui/gui/OChangeLog \ diff --git a/src/ui/gui/var-sheet-dialogs.ui b/src/ui/gui/var-sheet-dialogs.ui index 07dec18801..cfba0b53bc 100644 --- a/src/ui/gui/var-sheet-dialogs.ui +++ b/src/ui/gui/var-sheet-dialogs.ui @@ -2,419 +2,6 @@ - - 6 - Variable Type - False - True - 485 - dialog - True - True - - - True - 5 - 5 - - - True - 13 - vertical - True - - - Numeric - True - True - False - True - True - True - - - False - False - 0 - - - - - Comma - True - True - False - True - True - radiobutton1 - - - False - False - 1 - - - - - Dot - True - True - False - True - True - radiobutton1 - - - False - False - 2 - - - - - Scientific notation - True - True - False - True - True - radiobutton1 - - - False - False - 3 - - - - - Date - True - True - False - True - True - radiobutton1 - - - False - False - 4 - - - - - Dollar - True - True - False - True - True - radiobutton1 - - - False - False - 5 - - - - - Custom currency - True - True - False - True - True - radiobutton1 - - - False - False - 6 - - - - - String - True - True - False - True - True - radiobutton1 - - - False - False - 7 - - - - - False - False - 0 - - - - - True - 10 - - - 20 - 194 - True - never - in - - - True - True - False - - - - - False - False - 0 - - - - - 15 - - - 1 - 120 - True - True - never - never - in - - - True - True - False - - - - - 0 - - - - - True - 0 - - - True - 12 - - - True - vertical - True - - - True - positive - - - 0 - - - - - True - negative - - - 1 - - - - - - - - - True - Sample - True - - - - - end - 1 - - - - - 1 - - - - - True - never - in - - - True - True - False - - - - - 2 - - - - - 100 - 50 - True - 2 - 2 - 2 - 1 - - - True - - - True - Width: - right - - - False - False - end - 0 - - - - - GTK_FILL - GTK_FILL - - - - - 25 - True - True - - - 1 - 2 - 1 - 2 - - - - - - 25 - True - - - 1 - 2 - - - - - - True - 0 - Decimal Places: - right - - - 1 - 2 - GTK_FILL - - - - - - 3 - - - - - False - 1 - - - - - True - 5 - start - - - gtk-ok - True - True - True - False - True - - - False - False - 0 - - - - - gtk-cancel - True - True - True - False - True - - - False - False - 1 - - - - - gtk-help - True - True - True - False - True - - - False - False - 2 - - - - - 2 - - - - - Value Labels True diff --git a/src/ui/gui/var-type-dialog.c b/src/ui/gui/var-type-dialog.c index 359ca348a5..21d49669de 100644 --- a/src/ui/gui/var-type-dialog.c +++ b/src/ui/gui/var-type-dialog.c @@ -323,7 +323,7 @@ var_type_dialog_create (GtkWindow *toplevel) gint i; struct var_type_dialog *dialog = g_malloc (sizeof (struct var_type_dialog)); - GtkBuilder *xml = builder_new ("var-sheet-dialogs.ui"); + GtkBuilder *xml = builder_new ("var-type-dialog.ui"); dialog->window = get_widget_assert (xml,"var_type_dialog"); dialog->active_button = -1; diff --git a/src/ui/gui/var-type-dialog.ui b/src/ui/gui/var-type-dialog.ui new file mode 100644 index 0000000000..12edafd87f --- /dev/null +++ b/src/ui/gui/var-type-dialog.ui @@ -0,0 +1,418 @@ + + + + + + 6 + Variable Type + False + True + 485 + dialog + True + True + + + True + 5 + 5 + + + True + 13 + vertical + True + + + Numeric + True + True + False + True + True + True + + + False + False + 0 + + + + + Comma + True + True + False + True + True + radiobutton1 + + + False + False + 1 + + + + + Dot + True + True + False + True + True + radiobutton1 + + + False + False + 2 + + + + + Scientific notation + True + True + False + True + True + radiobutton1 + + + False + False + 3 + + + + + Date + True + True + False + True + True + radiobutton1 + + + False + False + 4 + + + + + Dollar + True + True + False + True + True + radiobutton1 + + + False + False + 5 + + + + + Custom currency + True + True + False + True + True + radiobutton1 + + + False + False + 6 + + + + + String + True + True + False + True + True + radiobutton1 + + + False + False + 7 + + + + + False + False + 0 + + + + + True + 10 + + + 20 + 194 + True + never + in + + + True + True + False + + + + + False + False + 0 + + + + + 15 + + + 1 + 120 + True + True + never + never + in + + + True + True + False + + + + + 0 + + + + + True + 0 + + + True + 12 + + + True + vertical + True + + + True + positive + + + 0 + + + + + True + negative + + + 1 + + + + + + + + + True + Sample + True + + + + + end + 1 + + + + + 1 + + + + + True + never + in + + + True + True + False + + + + + 2 + + + + + 100 + 50 + True + 2 + 2 + 2 + 1 + + + True + + + True + Width: + right + + + False + False + end + 0 + + + + + GTK_FILL + GTK_FILL + + + + + 25 + True + True + + + 1 + 2 + 1 + 2 + + + + + + 25 + True + + + 1 + 2 + + + + + + True + 0 + Decimal Places: + right + + + 1 + 2 + GTK_FILL + + + + + + 3 + + + + + False + 1 + + + + + True + 5 + start + + + gtk-ok + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + True + True + True + False + True + + + False + False + 1 + + + + + gtk-help + True + True + True + False + True + + + False + False + 2 + + + + + 2 + + + + + +