Changeset 804 for trunk

Timestamp:

Aug 20, 2006, 10:45:29 PM (16 years ago)

Author:

joshe

Message:

Add a debug output window.

Location:

trunk

Files:

• configure (modified) (1 diff)
• gtk/conf.h (modified) (1 diff)
• gtk/dialogs.c (modified) (4 diffs)
• gtk/dialogs.h (modified) (1 diff)
• gtk/main.c (modified) (15 diffs)
• gtk/msgwin.c (added)
• gtk/msgwin.h (added)
• mk/gtk.mk (modified) (1 diff)

trunk/configure

@@ -188 +188 @@
         CFLAGS_GTK=`pkg-config gtk+-2.0 --cflags`
         LDFLAGS_GTK=`pkg-config gtk+-2.0 --libs`
+        if runcmd pkg-config gthread-2.0
+        then
+          CFLAGS_GTK="$CFLAGS_GTK `pkg-config gthread-2.0 --cflags`"
+          LDFLAGS_GTK="$LDFLAGS_GTK `pkg-config gthread-2.0 --libs`"
+        fi
         if gettext_test
         then

trunk/gtk/conf.h

@@ -59 +59 @@
 #define PREF_ADDSTD             "add-behavior-standard"
 #define PREF_ADDIPC             "add-behavior-ipc"
+#define PREF_MSGLEVEL           "message-level"
 
 #endif /* TG_CONF_H */

trunk/gtk/dialogs.c

@@ -60 +60 @@
 
 static void
-windclosed(GtkWidget *widget SHUTUP, gpointer gdata);
-static void
 clicklimitbox(GtkWidget *widget, gpointer gdata);
 static void
@@ -166 +164 @@
 }
 
-void
-makeprefwindow(GtkWindow *parent, TrBackend *back, gboolean *opened) {
+GtkWidget *
+makeprefwindow(GtkWindow *parent, TrBackend *back) {
   char *title = g_strdup_printf(_("%s Preferences"), g_get_application_name());
   GtkWidget *wind = gtk_dialog_new_with_buttons(title, parent,
@@ -200 +198 @@
   GtkCellRenderer *rend;
 
-  *opened = TRUE;
-
   g_free(title);
   gtk_widget_set_name(wind, "TransmissionDialog");
@@ -303 +299 @@
   g_signal_connect_data(wind, "response", G_CALLBACK(clickdialog),
                         data, freedata, 0);
-  g_signal_connect(wind, "destroy", G_CALLBACK(windclosed), opened);
   gtk_widget_show_all(wind);
-}
-
-static void
-windclosed(GtkWidget *widget SHUTUP, gpointer gdata) {
-  gboolean *preachy_gcc = gdata;
-  
-  *preachy_gcc = FALSE;
+
+  return wind;
 }
 

trunk/gtk/dialogs.h

@@ -30 +30 @@
 #include "util.h"
 
-void
-makeprefwindow(GtkWindow *parent, TrBackend *back, gboolean *opened);
+GtkWidget *
+makeprefwindow(GtkWindow *parent, TrBackend *back);
 
 /* set the upload limit based on saved prefs */

trunk/gtk/main.c

@@ -39 +39 @@
 #include "dialogs.h"
 #include "ipc.h"
+#include "msgwin.h"
 #include "tr_backend.h"
 #include "tr_torrent.h"
@@ -63 +64 @@
   guint timer;
   gboolean prefsopen;
+  gboolean msgwinopen;
   GtkWidget *stupidpopuphack;
   gboolean closing;
@@ -113 +115 @@
 dopopupmenu(GdkEventButton *event, struct cbdata *data);
 void
+boolwindclosed(GtkWidget *widget SHUTUP, gpointer gdata);
+void
 actionclick(GtkWidget *widget, gpointer gdata);
 gint
@@ -139 +143 @@
 
 #define LIST_ACTION           "torrent-list-action"
-enum listact { ACT_OPEN, ACT_START, ACT_STOP, ACT_DELETE, ACT_INFO, ACT_PREF };
+enum listact {
+  ACT_OPEN, ACT_START, ACT_STOP, ACT_DELETE, ACT_INFO, ACT_PREF, ACT_DEBUG };
 
 struct { const gchar *name; const gchar *id; enum listact act; gboolean nomenu;
@@ -158 +163 @@
   {N_("Preferences"), GTK_STOCK_PREFERENCES,  ACT_PREF,   TRUE,   0,
    N_("Customize application behavior"), "XXX"},
+  {N_("Open debug window"), NULL, ACT_DEBUG,  FALSE,  0, NULL, NULL},
 };
 
@@ -178 +184 @@
 
   safepipe();
+  msgwin_init();
 
   argfiles = readargs(argc, argv);
@@ -222 +229 @@
         g_free(err);
       }
+
+      /* set libT message level */
+      msgwin_loadpref();
 
       back = tr_backend_new();
@@ -314 +324 @@
   data->buttons = NULL;
   data->prefsopen = FALSE;
+  data->msgwinopen = FALSE;
   data->stupidpopuphack = NULL;
   data->closing = FALSE;
@@ -393 +404 @@
 
   for(ii = 0; ii < ALEN(actionitems); ii++) {
+    if( NULL == actionitems[ii].id ) {
+      data->buttons[ii] = NULL;
+      continue;
+    }
     item = gtk_tool_button_new_from_stock(actionitems[ii].id);
     data->buttons[ii] = GTK_WIDGET(item);
@@ -519 +534 @@
     edata->timer = g_timeout_add(EXIT_CHECK_INTERVAL, exitcheck, edata);
     for(ii = 0; ii < ALEN(actionitems); ii++)
-      gtk_widget_set_sensitive(data->buttons[ii], FALSE);
+      if( NULL != data->buttons[ii] )
+        gtk_widget_set_sensitive(data->buttons[ii], FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(data->view), FALSE);
   }
@@ -821 +837 @@
     tr_backend_torrents_stopped(data->back);
 
+  /* update the message window */
+  msgwin_update();
+
   return TRUE;
 }
@@ -906 +925 @@
 
 void
+boolwindclosed(GtkWidget *widget SHUTUP, gpointer gdata) {
+  gboolean *preachy_gcc = gdata;
+  
+  *preachy_gcc = FALSE;
+}
+
+void
 actionclick(GtkWidget *widget, gpointer gdata) {
   struct cbdata *data = gdata;
@@ -917 +943 @@
   unsigned int actoff, status;
   gboolean changed;
+  GtkWidget * win;
 
   act = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), LIST_ACTION));
@@ -925 +952 @@
       return;
     case ACT_PREF:
-      if(!data->prefsopen)
-        makeprefwindow(data->wind, data->back, &data->prefsopen);
+      if( !data->prefsopen ) {
+        data->prefsopen = TRUE;
+        win = makeprefwindow( data->wind, data->back );
+        g_signal_connect( win, "destroy", G_CALLBACK( boolwindclosed ),
+                          &data->prefsopen );
+      }
+      return;
+    case ACT_DEBUG:
+      if( !data->msgwinopen ) {
+        data->msgwinopen = TRUE;
+        win = msgwin_create();
+        g_signal_connect( win, "destroy", G_CALLBACK( boolwindclosed ),
+                          &data->msgwinopen );
+      }
       return;
     case ACT_START:
@@ -981 +1020 @@
           case ACT_OPEN:
           case ACT_PREF:
+          case ACT_DEBUG:
             break;
         }

trunk/mk/gtk.mk

@@ -4 +4 @@
 include ../mk/common.mk
 
-SRCS = conf.c dialogs.c io.c ipc.c main.c tr_backend.c tr_torrent.c \
+SRCS = conf.c dialogs.c io.c ipc.c main.c msgwin.c tr_backend.c tr_torrent.c \
         tr_cell_renderer_progress.c util.c
 OBJS = $(SRCS:%.c=%.o)