Changeset 98 for trunk/src/Config.cxx

Timestamp:

04/20/06 11:13:01 (3 years ago)

Author:

jordi

Message:

Divided the pageZoom function from the MainPter? test to ZoomInAndOut?, ZoomWidth? and ZoomFit?, because I'm planning to make ZoomToWith? and ZoomToHeigh? toggle action that deserved separate test cases.

Also added the ZoomToFit? and ZoomToWidth? options to the configuration class. Also the test case was added.

Files:

• trunk/src/Config.cxx (modified) (5 diffs)

trunk/src/Config.cxx

@@ -28 +28 @@
 static gint DEFAULT_WINDOW_X = 0;
 static gint DEFAULT_WINDOW_Y = 0;
+static gboolean DEFAULT_ZOOM_TO_FIT = FALSE;
+static gboolean DEFAULT_ZOOM_TO_WIDTH = FALSE;
 
 // Static member attributes.
@@ -105 +107 @@
 
 ///
-/// @brief Gets an integer configuration option.
+/// @brief Gets a boolean configuration option.
 ///
 /// @param group Configuration group where the key belongs.
@@ -114 +116 @@
 ///         doesn't exists.
 ///
-gint
-Config::getInteger (const gchar *group, const gchar *key, gint defaultValue)
-{
-    gint value = defaultValue;
+gboolean
+Config::getBoolean (const gchar *group, const gchar *key, gboolean defaultValue)
+{
+    gboolean value = defaultValue;
 
     if ( g_key_file_has_key (m_Values, group, key, NULL) )
     {
         GError *error = NULL;
-        gint savedValue = g_key_file_get_integer (m_Values, group, key, &error);
+        gboolean savedValue = 
+            g_key_file_get_boolean (m_Values, group, key, &error);
         if ( NULL == error )
         {
@@ -139 +142 @@
 
 ///
+/// @brief Gets an integer configuration option.
+///
+/// @param group Configuration group where the key belongs.
+/// @param key The key name to retrieve its value.
+/// @param defaultValue The default value to return if @a key doesn't exists.
+///
+/// @return The value of the @a key in @a group or @a defaultValue if @a key
+///         doesn't exists.
+///
+gint
+Config::getInteger (const gchar *group, const gchar *key, gint defaultValue)
+{
+    gint value = defaultValue;
+
+    if ( g_key_file_has_key (m_Values, group, key, NULL) )
+    {
+        GError *error = NULL;
+        gint savedValue = g_key_file_get_integer (m_Values, group, key, &error);
+        if ( NULL == error )
+        {
+            value = savedValue;
+        }
+        else
+        {
+            g_warning ("Error reading key '%s' from group '%s': %s\n", 
+                       key, group, error->message);
+            g_error_free (error);
+        }        
+    }
+
+    return value;
+}
+
+///
 /// @brief Gets an string configuration option.
 ///
@@ -299 +336 @@
     g_key_file_set_integer (m_Values, "main window", "x", x);
     g_key_file_set_integer (m_Values, "main window", "y", y);
+}
+
+///
+/// @brief Sets the zoom to fit option.
+///
+/// @param activate Set to TRUE to activate the zoom to fit option. FALSE
+///        otherwise.
+///
+void
+Config::setZoomToFit (gboolean activate)
+{
+    g_key_file_set_boolean (m_Values, "main window", "zoomToFit", activate);
+    g_key_file_set_boolean (m_Values, "main window", "zoomToWidth", 
+            !activate && zoomToWidth ());
+}
+
+///
+/// @brief Sets the zoom to with option.
+///
+/// @param activate Set to TRUE to activate the zoom to width option. FALSE
+///        otherwise.
+///
+void
+Config::setZoomToWidth (gboolean activate)
+{
+    g_key_file_set_boolean (m_Values, "main window", "zoomToFit", 
+            !activate && zoomToFit ());
+    g_key_file_set_boolean (m_Values, "main window", "zoomToWidth", activate);
+}
+
+///
+/// @brief Gets the zoom to fit option.
+///
+/// @return TRUE if the zoom to fit option is activated. FALSE otherwise.
+///
+gboolean
+Config::zoomToFit ()
+{
+    return getBoolean ("main window", "zoomToFit", DEFAULT_ZOOM_TO_FIT);
+}
+
+///
+/// @brief Gets the zoom to width option.
+///
+/// @return TRUE if the zoom to width option is activated. FALSE otherwise.
+///
+gboolean
+Config::zoomToWidth ()
+{
+    return getBoolean ("main window", "zoomToWidth", DEFAULT_ZOOM_TO_WIDTH);
 }