GNOME.org
 

[gnome-disk-utility/ata-smart-ui-rework: 78/78] Merge branch 'master' into ata-smart-ui-rework

commit bde33cec711f942078299be807b37388defd8edb
Merge: 10533dc... 34fe2c9...
Author: David Zeuthen <davidz redhat com>
Date:   Tue Aug 18 16:32:35 2009 -0400

    Merge branch 'master' into ata-smart-ui-rework

 NEWS                                        |  147 +
 configure.ac                                |    2 +-
 help/Makefile.am                            |    2 +-
 help/el/el.po                               |  233 ++
 help/es/figures/main-app.png                |  Bin 0 -> 119911 bytes
 po/LINGUAS                                  |   10 +
 po/POTFILES.in                              |    4 +-
 po/cs.po                                    | 4256 +++++++++++++++++++++++++++
 po/da.po                                    | 3681 +++++++++++++++++++++++
 po/de.po                                    | 3229 +++++++++++++-------
 po/es.po                                    | 2912 +++++++++++++------
 po/et.po                                    | 3310 +++++++++++++++++++++
 po/fi.po                                    | 3084 +++++++++++++++++++
 po/fr.po                                    | 4202 ++++++++++++++++++++++++++
 po/ga.po                                    | 3964 +++++++++++++++++++++++++
 po/gl.po                                    | 4162 ++++++++++++++++++++++++++
 po/he.po                                    | 2637 ++++++++++++-----
 po/mr.po                                    | 3950 +++++++++++++++++++++++++
 po/nb.po                                    | 2124 ++++++++------
 po/pa.po                                    | 1074 ++++---
 po/pl.po                                    | 2932 +++++++++++++------
 po/pt.po                                    | 2964 +++++++++++++------
 po/pt_BR.po                                 | 3450 ++++++++++++++++++++++
 po/sv.po                                    | 3452 ++++++++++++++--------
 po/uk.po                                    |  974 ++++---
 po/zh_HK.po                                 | 3737 +++++++++++++++++++++++
 po/zh_TW.po                                 | 3787 ++++++++++++++++++++++++
 src/format-tool/gdu-format-dialog.c         |    2 +
 src/format-tool/gdu-format-tool.c           |   33 +-
 src/gdu-gtk/Makefile.am                     |   53 +-
 src/gdu-gtk/gdu-create-linux-md-dialog.c    | 1555 ++++++++++
 src/gdu-gtk/gdu-create-linux-md-dialog.h    |   66 +
 src/gdu-gtk/gdu-gtk-enums.h                 |   46 +
 src/gdu-gtk/gdu-gtk-enumtypes.h             |    6 +
 src/gdu-gtk/gdu-gtk-types.h                 |   12 +
 src/gdu-gtk/gdu-gtk.c                       |   20 +-
 src/gdu-gtk/gdu-gtk.h                       |    6 +-
 src/gdu-gtk/gdu-gtk.pc.in                   |    2 +-
 src/gdu-gtk/gdu-pool-tree-model.c           |  489 +++
 src/gdu-gtk/gdu-pool-tree-model.h           |   63 +
 src/gdu-gtk/gdu-pool-tree-view.c            |  480 +++
 src/gdu-gtk/gdu-pool-tree-view.h            |   63 +
 src/gdu-gtk/gdu-size-widget.c               |  412 +++
 src/gdu-gtk/gdu-size-widget.h               |   72 +
 src/gdu-gtk/gdu-time-label.c                |   20 +-
 src/gdu/gdu-ata-smart-attribute.c           |  178 ++-
 src/gdu/gdu-callbacks.h                     |    5 +
 src/gdu/gdu-device.c                        |   18 +
 src/gdu/gdu-device.h                        |    2 +
 src/gdu/gdu-drive.c                         |  526 ++++-
 src/gdu/gdu-drive.h                         |   10 +
 src/gdu/gdu-linux-md-drive.c                |  176 +-
 src/gdu/gdu-pool.c                          |   61 +
 src/gdu/gdu-pool.h                          |    8 +
 src/gdu/gdu-presentable.c                   |   68 +-
 src/gdu/gdu-presentable.h                   |   10 +-
 src/gdu/gdu-util.c                          |  142 +-
 src/gdu/gdu-util.h                          |    5 +-
 src/gdu/gdu-volume-hole.c                   |   43 +-
 src/gdu/gdu-volume.c                        |  197 ++-
 src/gdu/gdu.pc.in                           |    2 +-
 src/nautilus-extension/nautilus-gdu.c       |    1 +
 src/palimpsest/Makefile.am                  |    1 -
 src/palimpsest/gdu-section-health.c         |   48 +-
 src/palimpsest/gdu-section-linux-md-drive.c |   36 +-
 src/palimpsest/gdu-section-partition.c      |    1 +
 src/palimpsest/gdu-section-unallocated.c    |    6 +-
 src/palimpsest/gdu-section-unrecognized.c   |    2 +-
 src/palimpsest/gdu-shell.c                  |  326 ++-
 src/palimpsest/gdu-tree.c                   |  504 ----
 src/palimpsest/gdu-tree.h                   |   63 -
 src/playground/grid/gdu-grid-element.c      |    2 +-
 72 files changed, 61789 insertions(+), 8331 deletions(-)
---
diff --cc src/gdu-gtk/Makefile.am
index d2a018c,989e5e9..419fa63
--- a/src/gdu-gtk/Makefile.am
+++ b/src/gdu-gtk/Makefile.am
@@@ -15,26 -25,28 +25,34 @@@ lib_LTLIBRARIES=libgdu-gtk.l
  
  libgdu_gtkincludedir=$(includedir)/gnome-disk-utility/gdu-gtk
  
- libgdu_gtkinclude_HEADERS =              						\
- 	gdu-gtk.h									\
- 	gdu-gtk-enums.h									\
- 	gdu-gtk-enumtypes.h								\
- 	gdu-gtk-types.h									\
- 	gdu-time-label.h								\
- 	gdu-ata-smart-dialog.h								\
- 	gdu-curve.h									\
- 	gdu-graph.h									\
+ libgdu_gtkinclude_HEADERS =              				\
+ 	gdu-gtk.h							\
+ 	gdu-gtk-types.h							\
+ 	gdu-gtk-enums.h							\
+ 	gdu-gtk-enumtypes.h						\
+ 	gdu-time-label.h						\
+ 	gdu-pool-tree-view.h						\
+ 	gdu-pool-tree-model.h						\
+ 	gdu-size-widget.h						\
+ 	gdu-create-linux-md-dialog.h					\
++	gdu-ata-smart-dialog.h						\
++	gdu-curve.h							\
++	gdu-graph.h							\
  	$(NULL)
  
- libgdu_gtk_la_SOURCES =                 	        	       			\
+ libgdu_gtk_la_SOURCES =                 	               				\
  	gdu-gtk.h				gdu-gtk.c				\
- 	gdu-gtk-types.h									\
  	gdu-gtk-enums.h									\
  	gdu-gtk-enumtypes.h			gdu-gtk-enumtypes.c			\
+ 	gdu-gtk-types.h									\
  	gdu-time-label.h			gdu-time-label.c			\
+ 	gdu-pool-tree-view.h			gdu-pool-tree-view.c			\
+ 	gdu-pool-tree-model.h			gdu-pool-tree-model.c			\
+ 	gdu-size-widget.h			gdu-size-widget.c			\
+ 	gdu-create-linux-md-dialog.h		gdu-create-linux-md-dialog.c		\
 +	gdu-ata-smart-dialog.h			gdu-ata-smart-dialog.c			\
 +	gdu-curve.h				gdu-curve.c				\
 +	gdu-graph.h				gdu-graph.c				\
  	$(NULL)
  
  libgdu_gtk_la_CPPFLAGS = 				\
@@@ -74,18 -86,8 +92,13 @@@ libgdu_gtk_la_LDFLAGS = -version-info $
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = gdu-gtk.pc
  
- BUILT_SOURCES =			\
- 	gdu-gtk-enumtypes.c	\
- 	gdu-gtk-enumtypes.h	\
- 	$(NULL)
- 
  CLEANFILES = $(BUILT_SOURCES) $(pkgconfig_DATA)
  
 +EXTRADIST =				\
 +	gdu-gtk-enumtypes.h.template	\
 +	gdu-gtk-enumtypes.c.template	\
 +	$(NULL)
 +
  clean-local :
  	rm -f *~ $(BUILT_SOURCES)
  
diff --cc src/gdu-gtk/gdu-gtk-enums.h
index 3b7dfad,938f36c..844a632
--- a/src/gdu-gtk/gdu-gtk-enums.h
+++ b/src/gdu-gtk/gdu-gtk-enums.h
@@@ -28,28 -28,50 +28,74 @@@
  
  #include <glib-object.h>
  
 +typedef enum {
 +        GDU_CURVE_FLAGS_NONE                = 0,
 +        GDU_CURVE_FLAGS_FILLED              = (1 << 0),
 +        GDU_CURVE_FLAGS_FADE_EDGES          = (1 << 1),
 +        GDU_CURVE_FLAGS_AXIS_MARKERS_LEFT   = (1 << 2),
 +        GDU_CURVE_FLAGS_AXIS_MARKERS_RIGHT  = (1 << 3),
 +        GDU_CURVE_FLAGS_NORMALIZE           = (1 << 4),
 +} GduCurveFlags;
 +
 +/**
 + * GduCurveUnit:
 + * @GDU_CURVE_UNIT_FLOATING: Value is a floating point number.
 + * @GDU_CURVE_UNIT_INTEGER: Value is an integer number, such as a count of some sort.
 + * @GDU_CURVE_UNIT_TIME_SECONDS: Value is a measure of time, in seconds.
 + * @GDU_CURVE_UNIT_TEMPERATURE_KELVIN: Value is a measure of temperature, in degrees Kelvin.
 + *
 + */
 +typedef enum {
 +        GDU_CURVE_UNIT_FLOATING            = 0,
 +        GDU_CURVE_UNIT_INTEGER             = 1,
 +        GDU_CURVE_UNIT_TIME_SECONDS        = 2,
 +        GDU_CURVE_UNIT_TEMPERATURE_KELVIN  = 3
 +} GduCurveUnit;
 +
+ /**
+  * GduPoolTreeModelColumn:
+  * @GDU_POOL_TREE_MODEL_COLUMN_ICON: The #GIcon for the presentable.
+  * @GDU_POOL_TREE_MODEL_COLUMN_NAME: Human readable name of the presentable, e.g. "80 GB Solid-state Disk" or
+  * "Fedora (Rawhide)".
+  * @GDU_POOL_TREE_MODEL_COLUMN_VPD_NAME: Name for the presentable derived from Vital Product Data,
+  * e.g. "ATA INTEL SSDSA2MH080G1GC".
+  * @GDU_POOL_TREE_MODEL_COLUMN_DESCRIPTION: Human readable description of the presentable, e.g. "MBR Partition Table"
+  * or "32GB Linux ext3".
+  * @GDU_POOL_TREE_MODEL_COLUMN_PRESENTABLE: The #GduPresentable object.
+  * @GDU_POOL_TREE_MODEL_COLUMN_VISIBLE: Whether the item is visible.
+  * @GDU_POOL_TREE_MODEL_COLUMN_TOGGLED: Whether the item is toggled.
+  * @GDU_POOL_TREE_MODEL_COLUMN_CAN_BE_TOGGLED: Whether the item can be toggled.
+  *
+  * Columns used in #GduPoolTreeModel.
+  */
+ typedef enum {
+         GDU_POOL_TREE_MODEL_COLUMN_ICON,
+         GDU_POOL_TREE_MODEL_COLUMN_NAME,
+         GDU_POOL_TREE_MODEL_COLUMN_VPD_NAME,
+         GDU_POOL_TREE_MODEL_COLUMN_DESCRIPTION,
+         GDU_POOL_TREE_MODEL_COLUMN_PRESENTABLE,
+         GDU_POOL_TREE_MODEL_COLUMN_VISIBLE,
+         GDU_POOL_TREE_MODEL_COLUMN_TOGGLED,
+         GDU_POOL_TREE_MODEL_COLUMN_CAN_BE_TOGGLED,
+ } GduPoolTreeModelColumn;
+ 
+ typedef enum {
+         GDU_POOL_TREE_VIEW_FLAGS_NONE        = 0,
+         GDU_POOL_TREE_VIEW_FLAGS_SHOW_TOGGLE = (1<<0),
+ } GduPoolTreeViewFlags;
+ 
+ /**
+  * GduPoolTreeModelFlags:
+  * @GDU_POOL_TREE_MODEL_FLAGS_NONE: No flags set.
+  * @GDU_POOL_TREE_MODEL_FLAGS_NO_VOLUMES: Don't include presentables representing volumes or holes.
+  * @GDU_POOL_TREE_MODEL_FLAGS_NO_UNALLOCATABLE_DRIVES: Don't include drives that cannot be allocated to e.g. a RAID array.
+  *
+  * Flags used when creating a #GduPoolTreeModel.
+  */
+ typedef enum {
+         GDU_POOL_TREE_MODEL_FLAGS_NONE                      = 0,
+         GDU_POOL_TREE_MODEL_FLAGS_NO_VOLUMES                = (1<<0),
+         GDU_POOL_TREE_MODEL_FLAGS_NO_UNALLOCATABLE_DRIVES   = (1<<2),
+ } GduPoolTreeModelFlags;
+ 
  #endif /* GDU_GTK_ENUMS_H */
diff --cc src/gdu-gtk/gdu-gtk-enumtypes.h
index 29f1546,0000000..5df9d8b
mode 100644,000000..100644
--- a/src/gdu-gtk/gdu-gtk-enumtypes.h
+++ b/src/gdu-gtk/gdu-gtk-enumtypes.h
@@@ -1,21 -1,0 +1,27 @@@
 +
 +/* Generated data (by glib-mkenums) */
 +
 +#ifndef __GDU_GTK_ENUM_TYPES_H__
 +#define __GDU_GTK_ENUM_TYPES_H__
 +
 +#include <glib-object.h>
 +
 +G_BEGIN_DECLS
 +
 +/* enumerations from "gdu-gtk-enums.h" */
 +GType gdu_curve_flags_get_type (void) G_GNUC_CONST;
 +#define GDU_TYPE_CURVE_FLAGS (gdu_curve_flags_get_type ())
 +GType gdu_curve_unit_get_type (void) G_GNUC_CONST;
 +#define GDU_TYPE_CURVE_UNIT (gdu_curve_unit_get_type ())
++GType gdu_pool_tree_model_column_get_type (void) G_GNUC_CONST;
++#define GDU_TYPE_POOL_TREE_MODEL_COLUMN (gdu_pool_tree_model_column_get_type ())
++GType gdu_pool_tree_view_flags_get_type (void) G_GNUC_CONST;
++#define GDU_TYPE_POOL_TREE_VIEW_FLAGS (gdu_pool_tree_view_flags_get_type ())
++GType gdu_pool_tree_model_flags_get_type (void) G_GNUC_CONST;
++#define GDU_TYPE_POOL_TREE_MODEL_FLAGS (gdu_pool_tree_model_flags_get_type ())
 +G_END_DECLS
 +
 +#endif /* __GDU_GTK_ENUM_TYPES_H__ */
 +
 +/* Generated data ends here */
 +
diff --cc src/gdu-gtk/gdu-gtk-types.h
index afa97b2,ca89682..34465da
--- a/src/gdu-gtk/gdu-gtk-types.h
+++ b/src/gdu-gtk/gdu-gtk-types.h
@@@ -33,13 -33,21 +33,25 @@@
  
  G_BEGIN_DECLS
  
 -struct GduTimeLabel;
 -typedef struct GduTimeLabel             GduTimeLabel;
 +typedef struct GduSample                   GduSample;
 +typedef struct GduColor                    GduColor;
 +typedef struct GduCurve                    GduCurve;
 +typedef struct GduGraph                    GduGraph;
 +typedef struct GduTimeLabel                GduTimeLabel;
 +typedef struct GduAtaSmartDialog           GduAtaSmartDialog;
  
+ struct GduPoolTreeModel;
+ typedef struct GduPoolTreeModel         GduPoolTreeModel;
+ 
+ struct GduPoolTreeView;
+ typedef struct GduPoolTreeView          GduPoolTreeView;
+ 
+ struct GduCreateLinuxMdDialog;
+ typedef struct GduCreateLinuxMdDialog   GduCreateLinuxMdDialog;
+ 
+ struct GduSizeWidget;
+ typedef struct GduSizeWidget            GduSizeWidget;
+ 
  G_END_DECLS
  
  #endif /* __GDU_GTK_TYPES_H */
diff --cc src/gdu-gtk/gdu-gtk.h
index f3bce49,054b054..750e496
--- a/src/gdu-gtk/gdu-gtk.h
+++ b/src/gdu-gtk/gdu-gtk.h
@@@ -29,10 -29,11 +29,14 @@@
  #define __GDU_GTK_INSIDE_GDU_GTK_H
  #include <gdu-gtk/gdu-gtk-types.h>
  #include <gdu-gtk/gdu-gtk-enumtypes.h>
+ #include <gdu-gtk/gdu-time-label.h>
+ #include <gdu-gtk/gdu-pool-tree-view.h>
+ #include <gdu-gtk/gdu-pool-tree-model.h>
+ #include <gdu-gtk/gdu-size-widget.h>
+ #include <gdu-gtk/gdu-create-linux-md-dialog.h>
 +#include <gdu-gtk/gdu-curve.h>
 +#include <gdu-gtk/gdu-graph.h>
- #include <gdu-gtk/gdu-time-label.h>
 +#include <gdu-gtk/gdu-ata-smart-dialog.h>
  #undef __GDU_GTK_INSIDE_GDU_GTK_H
  
  G_BEGIN_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]