Changeset 2182 for trunk/jons-gtk-gui

Timestamp:

07/27/00 17:53:28 (8 years ago)

Author:

emojon

Message:

Fixed a few bugs.

Added a stats window, it shows licq's uptime and all the events for today and
totals if stats are saved.

Location:

trunk/jons-gtk-gui/src

Files:

• extras.cpp (modified) (1 diff)
• licq_gtk.h (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• menu.cpp (modified) (1 diff)
• pipe.cpp (modified) (1 diff)
• plugin_window.cpp (modified) (6 diffs)
• stats_window.cpp (added)

trunk/jons-gtk-gui/src/extras.cpp

@@ -105 +105 @@
     /* Create the dialog */
     dialog = gtk_dialog_new();
+    gtk_container_set_border_width(GTK_CONTAINER(dialog), 3);
 
     /* The label */

trunk/jons-gtk-gui/src/licq_gtk.h

@@ -637 +637 @@
 /* Functions in plugin_window.cpp */
 extern void create_plugin_window();
-extern void plugin_close_callback(GtkWidget *, gpointer);
+extern gboolean plugin_close_callback(GtkWidget *, gpointer);
 extern void plugin_enable_callback(GtkWidget *, gpointer);
 extern void plugin_disable_callback(GtkWidget *, gpointer);
@@ -686 +686 @@
 extern void ok_user_security(GtkWidget *, gpointer);
 extern void remove_user_security(GtkWidget *, GdkEventButton *, gpointer);
+
+
+/* Functions in stats.cpp */
+extern void menu_daemon_stats();
+extern void stats_ok_callback(GtkWidget *, gpointer);
+extern void stats_reset_callback(GtkWidget *, gpointer);
 
 

trunk/jons-gtk-gui/src/Makefile.am

@@ -34 +34 @@
                 search_user_window.cpp \
                 security_window.cpp \
+                stats_window.cpp \
                 status.cpp \
                 system_message.cpp \

trunk/jons-gtk-gui/src/menu.cpp

@@ -160 +160 @@
     menu_separator(menu);
 
+    item = menu_new_item(menu, "Daemon Stats",
+                GTK_SIGNAL_FUNC(menu_daemon_stats));
+
     item = menu_new_item(menu, "About",
                 GTK_SIGNAL_FUNC(create_about_window));

trunk/jons-gtk-gui/src/pipe.cpp

@@ -79 +79 @@
         {
             ICQUser *u = gUserManager.FetchUser(sig->Uin(), LOCK_R);
+            if(u == NULL)
+            {
+                gUserManager.DropUser(u);
+                return;
+            }
             CUserEvent *ue = u->EventPeekLast();
             gUserManager.DropUser(u);

trunk/jons-gtk-gui/src/plugin_window.cpp

@@ -1 @@
-
+/*
+ * Licq GTK GUI Plugin
+ *
+ * Copyright (C) 2000, Jon Keating <jon@licq.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
 
 #include "licq_gtk.h"
@@ -36 +54 @@
     GtkWidget *scroll_win = gtk_scrolled_window_new(0, 0);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_win),
-        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+        GTK_POLICY_ALWAYS, GTK_POLICY_AUTOMATIC);
 
     // The loaded clist
@@ -47 +65 @@
     gtk_clist_set_column_width(GTK_CLIST(pw->l_clist), 3, 50);
     gtk_clist_set_column_width(GTK_CLIST(pw->l_clist), 4, 90);
+    gtk_widget_set_usize(pw->l_clist, 295, 100);
     gtk_container_add(GTK_CONTAINER(scroll_win), pw->l_clist);
-    gtk_widget_set_usize(scroll_win, 335, 100);
     gtk_box_pack_start(GTK_BOX(l_box), scroll_win, true, true, 5);
 
@@ -73 +91 @@
 
     // Pack the buttons into an hbox then pack the hbox into the vbox
-    GtkWidget *buttons_box = gtk_hbox_new(false, 0);
+    GtkWidget *buttons_box = gtk_hbox_new(true, 0);
     gtk_box_pack_start(GTK_BOX(buttons_box), enable, true, true, 5);
     gtk_box_pack_start(GTK_BOX(buttons_box), disable, true, true, 5);
@@ -133 +151 @@
 }
 
-void plugin_close_callback(GtkWidget *widget, gpointer data)
+gboolean plugin_close_callback(GtkWidget *widget, gpointer data)
 {
     gtk_widget_destroy(pw->window);
     g_free(pw);
     pw = 0;
+    return true;
 }
 
@@ -280 +299 @@
         gtk_clist_append(GTK_CLIST(pw->l_clist), text);
 
-        g_free(text[0]);
+        if(text[0])
+            g_free(text[0]);
     }