From 8b85d5b2506945a45411f160ec2d6afc8d184499 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Fri, 3 Sep 2010 09:32:25 -0400 Subject: [PATCH] Removed remaining artifacts from old hig module. --- data/ui/merge-properties-dialog.ui | 280 +++++++++++++++-------------- po/POTFILES.in | 1 - src/Makefile.am | 2 - src/hig.h | 45 ----- src/merge-properties-dialog.c | 3 - src/prefs-dialog.c | 3 - 6 files changed, 146 insertions(+), 188 deletions(-) delete mode 100644 src/hig.h diff --git a/data/ui/merge-properties-dialog.ui b/data/ui/merge-properties-dialog.ui index cda7d895..c030c387 100644 --- a/data/ui/merge-properties-dialog.ui +++ b/data/ui/merge-properties-dialog.ui @@ -9,184 +9,196 @@ vertical 6 - + True - 0 - none + 3 + vertical + 6 - + True - 12 + 0 + none - + True - 12 - 2 - 2 - 6 - 6 + 12 - + True - 0 - Format: - - - GTK_FILL - - - - - - True - False - - - 1 - 2 - GTK_FILL - - - - - True - vertical + 12 + 2 + 2 + 6 + 6 - + + True + 0 + Format: + + + GTK_FILL + + + + + + True + False + + + 1 + 2 + GTK_FILL + + + + + True + vertical + + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Location: + + + 1 + 2 + GTK_FILL + + - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - Location: - - - 1 - 2 - GTK_FILL - - + + + True + Source + + + + + + + False + 0 + - - - True - Source - - - - - - - - False - 0 - - - - - True - 0 - none - + True - 12 + 0 + none - + True - vertical - 6 - - - 500 - 350 - True - False - 6 - automatic - automatic - in - - - True - - - - - 0 - - + 12 - + True - 6 - 12 + vertical + 6 - - Select all + + 500 + 350 True - False - False - True - False + True + 6 + automatic + automatic + in + + + True + True + + - False - False 0 - - Unselect all + True - False - False - True - False + 6 + 12 + + + Select all + True + True + True + True + False + + + False + False + 0 + + + + + Unselect all + True + True + True + True + False + + + False + False + 1 + + False - False 1 - - False - 1 - + + + True + Record selection/preview + + + + + - - - - True - Record selection/preview - - - - + + 1 + - 1 + 0 diff --git a/po/POTFILES.in b/po/POTFILES.in index bf658d85..2b7e3400 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -64,7 +64,6 @@ src/font-util.c src/font-util.h src/glabels-batch.c src/glabels.c -src/hig.h src/label-barcode.c src/label-barcode.h src/label-box.c diff --git a/src/Makefile.am b/src/Makefile.am index 57d4750b..ea2bd76d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -80,7 +80,6 @@ glabels_3_SOURCES = \ prefs-model.h \ prefs-dialog.c \ prefs-dialog.h \ - hig.h \ view.c \ view.h \ view-box.c \ @@ -320,7 +319,6 @@ glabels_3_batch_SOURCES = \ color.h \ debug.c \ debug.h \ - hig.h \ cairo-label-path.c \ cairo-label-path.h \ cairo-ellipse-path.c \ diff --git a/src/hig.h b/src/hig.h deleted file mode 100644 index 7db439a8..00000000 --- a/src/hig.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * hig.h - * Copyright (C) 2001-2009 Jim Evins . - * - * This file is part of gLabels. - * - * gLabels 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 3 of the License, or - * (at your option) any later version. - * - * gLabels 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 gLabels. If not, see . - */ - -#ifndef __HIG_H__ -#define __HIG_H__ - -#include - -G_BEGIN_DECLS - -#define GL_HIG_PAD1 6 -#define GL_HIG_PAD2 12 - -G_END_DECLS - -#endif /* __HIG_H__ */ - - - - -/* - * Local Variables: -- emacs - * mode: C -- emacs - * c-basic-offset: 8 -- emacs - * tab-width: 8 -- emacs - * indent-tabs-mode: nil -- emacs - * End: -- emacs - */ diff --git a/src/merge-properties-dialog.c b/src/merge-properties-dialog.c index 6988fcbc..bce6508f 100644 --- a/src/merge-properties-dialog.c +++ b/src/merge-properties-dialog.c @@ -30,7 +30,6 @@ #include "merge.h" #include "combo-util.h" #include "builder-util.h" -#include "hig.h" #include "debug.h" @@ -155,8 +154,6 @@ gl_merge_properties_dialog_init (glMergePropertiesDialog *dialog) vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_container_set_border_width (GTK_CONTAINER(dialog), GL_HIG_PAD1); - gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE); gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 9cca2c2b..9dc28831 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -26,7 +26,6 @@ #include #include "prefs.h" -#include "hig.h" #include "color-combo.h" #include "color.h" #include "font-combo.h" @@ -159,8 +158,6 @@ gl_prefs_dialog_init (glPrefsDialog *dialog) return; } - gtk_container_set_border_width (GTK_CONTAINER(dialog), GL_HIG_PAD2); - gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE); gtk_dialog_add_button (GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); -- 2.39.2