Changeset 4222

Timestamp:

Dec 19, 2007, 7:16:36 PM (14 years ago)

Author:

charles

Message:

more progress on prefs + event integration

Location:

trunk/gtk

Files:

• main.c (modified) (4 diffs)
• torrent-cell-renderer.c (modified) (3 diffs)
• tr_core.c (modified) (1 diff)
• tr_window.c (modified) (6 diffs)
• tr_window.h (modified) (2 diffs)

trunk/gtk/main.c

@@ -265 +265 @@
         ( didlock || cf_lock( &err ) ) )
     {
+        cbdata->core = tr_core_new( );
+
         /* create main window now to be a parent to any error dialogs */
-        GtkWindow * mainwind = GTK_WINDOW( tr_window_new( myUIManager ) );
+        GtkWindow * mainwind = GTK_WINDOW( tr_window_new( myUIManager, cbdata->core ) );
 
         /* set message level here before tr_init() */
         msgwin_loadpref( );
+
         appsetup( mainwind, argfiles, cbdata, startpaused );
     }
@@ -310 +313 @@
     /* fill out cbdata */
     cbdata->wind       = NULL;
-    cbdata->core       = tr_core_new();
     cbdata->icon       = NULL;
     cbdata->msgwin     = NULL;
@@ -669 +671 @@
         PREF_KEY_PEX,
         PREF_KEY_SYSTRAY,
-        PREF_KEY_SORT_MODE,
-        PREF_KEY_SORT_REVERSED,
-        PREF_KEY_MINIMAL_VIEW,
         PREF_KEY_ENCRYPTED_ONLY
     };
@@ -737 +736 @@
         gboolean enabled = pref_flag_get( key );
         tr_torrentIterate( tr, setpex, &enabled );
-    }
-    else if( !strcmp( key, PREF_KEY_MINIMAL_VIEW ) )
-    {
-        const gboolean enabled = pref_flag_get( key );
-        g_message( "minimal view: %d", enabled );
     }
 }

trunk/gtk/torrent-cell-renderer.c

@@ -300 +300 @@
         }
 
+g_message ("width %d height %d", *width, *height );
         *width = w + xpad*2;
         *height = h + ypad*2;
@@ -556 +557 @@
         case P_TORRENT:             p->tor = g_value_get_pointer( v ); break;
         case P_BAR_HEIGHT:          p->bar_height = g_value_get_int( v ); break;
-        case P_MINIMAL:             p->minimal  = g_value_get_boolean( v ); break;
+        case P_MINIMAL:             { p->minimal  = g_value_get_boolean( v ); g_message("setting minimal to %d", p->minimal ); break; }
         case P_GRADIENT:            p->gradient = g_value_get_boolean( v ); break;
         case P_SHOW_UNAVAILABLE:    p->show_unavailable = g_value_get_boolean( v ); break;
@@ -587 +588 @@
     g_value_set_string( value, buf );
 }
-
 
 static void

trunk/gtk/tr_core.c

@@ -397 +397 @@
 {
     TrCore * core = TR_CORE( g_object_new( TR_CORE_TYPE, NULL ) );
+
+    /* init from prefs & listen to pref changes */
     g_signal_connect( core, "prefs-changed", G_CALLBACK(prefsChanged), NULL );
+    prefsChanged( core, PREF_KEY_SORT_MODE, NULL );
+    prefsChanged( core, PREF_KEY_SORT_REVERSED, NULL );
+
     return core;
 }

trunk/gtk/tr_window.c

@@ -31 +31 @@
 
 #include "actions.h"
+#include "conf.h"
 #include "hig.h"
 #include "torrent-cell-renderer.h"
+#include "tr_prefs.h"
 #include "tr_torrent.h"
 #include "tr_window.h"
@@ -46 +48 @@
     GtkTreeSelection * selection;
     GtkCellRenderer  * renderer;
+    TrCore * core;
+    gulong pref_handler_id;
 }
 PrivateData;
@@ -121 +125 @@
 }
 
+static void
+prefsChanged( TrCore * core UNUSED, const char * key, gpointer wind )
+{
+    if( !strcmp( key, PREF_KEY_MINIMAL_VIEW ) )
+    {
+       PrivateData * p = get_private_data( GTK_WINDOW( wind ) );
+       g_object_set( p->renderer, "minimal", pref_flag_get( key ), NULL );
+    }
+}
+
+static void
+privateFree( gpointer vprivate )
+{
+    PrivateData * p = (PrivateData*) vprivate;
+    g_signal_handler_disconnect( p->core, p->pref_handler_id );
+    g_free( p );
+}
+
 /***
 ****  PUBLIC
@@ -126 +148 @@
 
 GtkWidget *
-tr_window_new( GtkUIManager * ui_manager )
+tr_window_new( GtkUIManager * ui_manager, TrCore * core )
 {
     PrivateData * p = g_new( PrivateData, 1 );
@@ -133 +155 @@
     /* make the window */
     self = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    g_object_set_data_full(G_OBJECT(self), PRIVATE_DATA_KEY, p, g_free );
+    g_object_set_data_full(G_OBJECT(self), PRIVATE_DATA_KEY, p, privateFree );
     gtk_window_set_title( GTK_WINDOW( self ), g_get_application_name());
     gtk_window_set_role( GTK_WINDOW( self ), "tr-main" );
@@ -177 +199 @@
     gtk_widget_show_all( vbox );
 
+    /* listen for prefs changes that affect the window */
+    prefsChanged( core, PREF_KEY_MINIMAL_VIEW, self );
+    p->core = core;
+    p->pref_handler_id = g_signal_connect( core, "prefs-changed", G_CALLBACK(prefsChanged), self );
+
     return self;
 }

trunk/gtk/tr_window.h

@@ -27 +27 @@
 
 #include <gtk/gtk.h>
+#include "tr_core.h"
 
 typedef GtkWindow TrWindow;
@@ -32 +33 @@
 GtkTreeSelection * tr_window_get_selection( TrWindow* wind );
 
-GtkWidget * tr_window_new( GtkUIManager* );
+GtkWidget * tr_window_new( GtkUIManager*, TrCore * core );
 
-void
-tr_window_update( TrWindow * wind, float downspeed, float upspeed );
+void tr_window_update( TrWindow * wind, float downspeed, float upspeed );
 
 #endif