Changeset 94

Timestamp:

04/20/06 06:29:18 (3 years ago)

Author:

jordi

Message:

When the main window is resized or moved, the current position and size is saved to the configuration values.

The configuration now is saved by main.cxx when the application quits correctly.

Location:

trunk/src

Files:

• Config.cxx (modified) (3 diffs)
• Config.h (modified) (1 diff)
• gtk/MainView.cxx (modified) (4 diffs)
• main.cxx (modified) (2 diffs)

trunk/src/Config.cxx

@@ -197 +197 @@
 
 ///
+/// @brief Save the current configuration to a file.
+///
+void
+Config::save ()
+{
+    gchar *contents = g_key_file_to_data (m_Values, NULL, NULL);
+    gchar *configFile = getConfigFileName ();
+    GError *error = NULL;
+    if ( !g_file_set_contents (configFile, contents, -1, &error) )
+    {
+        g_warning ("Couldn't write configuration file: %s\n", error->message);
+        g_error_free (error);
+    }
+    g_free (contents);
+    g_free (configFile);
+}
+
+///
 /// @brief Saves the current window's size.
 ///
@@ -255 +273 @@
     GList *dirs = NULL;
     gchar *dirName = g_strdup (path);
-    while ( !g_file_test (dirName, G_FILE_TEST_EXISTS) );
+    while ( !g_file_test (dirName, G_FILE_TEST_EXISTS) )
     {
         dirs = g_list_prepend (dirs, dirName);
@@ -263 +281 @@
     // Now create all of them.
     GList *dir = g_list_first (dirs);
-    while ( NULL != dir );
+    while ( NULL != dir )
     {
         if ( -1 == g_mkdir ((gchar *)dir->data, 0700) )

trunk/src/Config.h

@@ -43 +43 @@
             gint getWindowX (void);
             gint getWindowY (void);
+            void save(void);
             void setWindowSize (gint width, gint height);
             void setWindowPos (gint x, gint y);

trunk/src/gtk/MainView.cxx

@@ -34 +34 @@
 // Forward declarations.
 static void main_window_about_box_cb (GtkWidget *, gpointer);
+static gboolean main_window_moved_or_resized_cb (GtkWidget *, 
+                                                 GdkEventConfigure *, gpointer);
 static void main_window_go_to_first_page_cb (GtkWidget *, gpointer);
 static void main_window_go_to_last_page_cb (GtkWidget *, gpointer);
@@ -143 +145 @@
     m_MainWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     setMainWindowIcon ();
-    // Connect already the destroy signal.
+    // Connect already the destroy and delete signal.
     g_signal_connect (G_OBJECT (m_MainWindow), "destroy",
                       G_CALLBACK (main_window_quit_cb), NULL);
+    g_signal_connect (G_OBJECT (m_MainWindow), "configure-event",
+                      G_CALLBACK (main_window_moved_or_resized_cb), NULL);
     // Create the main vertical box.
     m_MainBox = gtk_vbox_new (FALSE, 0);
@@ -358 +362 @@
 MainView::show (void)
 {    
+    Config &config = Config::getConfig ();
+    gtk_window_set_default_size (GTK_WINDOW (m_MainWindow),
+                                 config.getWindowWidth (),
+                                 config.getWindowHeight ());
     gtk_widget_show (m_MainWindow);
-    gtk_window_maximize (GTK_WINDOW (m_MainWindow));
+    gtk_window_move (GTK_WINDOW (m_MainWindow), 
+                     config.getWindowX (), config.getWindowY ());
 }
 
@@ -754 +763 @@
 
 ///
+/// @brief Called when the window is moved or resized.
+///
+/// This is used to save the current window's position and size.
+///
+gboolean
+main_window_moved_or_resized_cb (GtkWidget *widget, GdkEventConfigure *event, 
+                                 gpointer data)
+{
+    // First set the window's size and position to the configuration.
+    GtkWindow *m_MainWindow = GTK_WINDOW (widget);
+    Config &config = Config::getConfig ();
+    config.setWindowSize (event->width, event->height);
+    gint x;
+    gint y;
+    gtk_window_get_position (m_MainWindow, &x, &y);
+    config.setWindowPos (x, y);
+
+    return FALSE;
+}
+
+///
 /// @brief The user tries to go to the first page.
 ///

trunk/src/main.cxx

@@ -24 +24 @@
 #include <MainView.h>
 #include "MainPter.h"
+#include "Config.h"
 
 
@@ -92 +93 @@
     // the presenter's responsibility.
     delete mainPter;
+
+    // Save the configuration.
+    Config::getConfig().save ();
+    
     // All done!.
     return EXIT_SUCCESS;