From 0316de4c850edc5b4a801c3b0484287d68dd0995 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 12 Sep 2014 01:06:31 +0200 Subject: [PATCH] fixed layout and margins. --- src/glade/Makefile.in | 117 ++++++++++++++++++++++++++++-------------- src/glade/psensor-pref.glade | 119 +++++++++++++++++++++++++++++++++++++------ src/glade/sensor-edit.glade | 28 ++++++++++ 3 files changed, 212 insertions(+), 52 deletions(-) diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in index bfc5c71..2fdbf6b 100644 --- a/src/glade/Makefile.in +++ b/src/glade/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,15 +79,31 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/glade -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -97,9 +140,11 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(gladedir)" DATA = $(glade_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ AR = @AR@ @@ -125,7 +170,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ @@ -182,7 +226,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ -SED = @SED@ SENSORS_LIBS = @SENSORS_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -197,7 +240,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@ XEXT_LIBS = @XEXT_LIBS@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -312,11 +354,11 @@ uninstall-gladeDATA: @list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -454,16 +496,17 @@ uninstall-am: uninstall-gladeDATA .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-gladeDATA \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-gladeDATA +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-gladeDATA install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am \ + uninstall-gladeDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/glade/psensor-pref.glade b/src/glade/psensor-pref.glade index cdf5ab6..9647ab7 100644 --- a/src/glade/psensor-pref.glade +++ b/src/glade/psensor-pref.glade @@ -65,6 +65,7 @@ True False + vertical 2 @@ -115,6 +116,10 @@ True False + 4 + 4 + 4 + 4 True @@ -284,6 +289,10 @@ True False + 4 + 4 + 4 + 4 Interface @@ -294,6 +303,10 @@ True False + 4 + 4 + 4 + 4 Launch on session startup @@ -364,6 +377,10 @@ True False + 4 + 4 + 4 + 4 Startup @@ -394,7 +411,7 @@ 1 - 1 + 3 1 1 @@ -404,12 +421,15 @@ True False 14 + 4 + 4 + 4 0 Foreground: 0 - 1 + 3 1 1 @@ -419,12 +439,15 @@ True False 14 + 4 + 4 + 4 0 Background: 0 - 2 + 4 1 1 @@ -442,7 +465,7 @@ 1 - 2 + 4 1 1 @@ -452,12 +475,15 @@ True False 14 + 4 + 4 + 4 0 Background opacity: 0 - 3 + 5 1 1 @@ -468,7 +494,7 @@ False 4 4 - 4 + 8 4 0 Colors @@ -478,7 +504,7 @@ 0 - 0 + 2 2 1 @@ -488,12 +514,15 @@ True False 14 + 4 + 4 + 4 0 Monitoring duration: 0 - 5 + 7 1 1 @@ -503,12 +532,15 @@ True False 14 + 4 + 4 + 4 0 Update interval: 0 - 6 + 8 1 1 @@ -529,7 +561,7 @@ 0 - 4 + 6 2 1 @@ -588,7 +620,7 @@ 1 - 3 + 5 1 1 @@ -640,7 +672,7 @@ 1 - 6 + 8 1 1 @@ -692,11 +724,53 @@ 1 - 5 + 7 1 1 + + + Smooth curves + True + True + False + 14 + 4 + 4 + 4 + 0 + True + + + 0 + 1 + 2 + 1 + + + + + True + False + 4 + 4 + 4 + 4 + 0 + Curves + start + + + + + + 0 + 0 + 2 + 1 + + 2 @@ -706,6 +780,10 @@ True False + 4 + 4 + 4 + 4 Graph @@ -718,7 +796,10 @@ True False start - 8 + 4 + 4 + 4 + 4 True @@ -727,7 +808,7 @@ start 4 4 - 8 + 4 4 0 Measure update interval: @@ -872,6 +953,10 @@ True True + 4 + 4 + 4 + 4 • True @@ -892,6 +977,10 @@ True False + 4 + 4 + 4 + 4 Sensors diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade index 3d694e4..167c9eb 100644 --- a/src/glade/sensor-edit.glade +++ b/src/glade/sensor-edit.glade @@ -91,6 +91,10 @@ True True + 4 + 4 + 4 + 4 sensors_liststore False True @@ -122,6 +126,10 @@ True True + 4 + 4 + 4 + 4 True @@ -136,6 +144,10 @@ True True + 4 + 4 + 4 + 4 • False False @@ -283,6 +295,10 @@ True False + 4 + 4 + 4 + 4 Details @@ -389,6 +405,10 @@ True False + 4 + 4 + 4 + 4 Graph @@ -583,6 +603,10 @@ True False + 4 + 4 + 4 + 4 Alarm @@ -651,6 +675,10 @@ True False + 4 + 4 + 4 + 4 Application Indicator -- 2.7.4