Changeset 3386 for trunk/jons-gtk2-gui

Timestamp:

03/20/03 01:47:13 (6 years ago)

Author:

bostjanlah

Message:

Use buttonbox for buttons
Add some border to the window
Use gtk_window_present instead of gdk_window_raise
Put textview into a frame

Files:

• trunk/jons-gtk2-gui/src/away_window.cpp (modified) (16 diffs)

trunk/jons-gtk2-gui/src/away_window.cpp

@@ -23 +23 @@
 #include "licq_icqd.h"
 #include "licq_gtk.h"
+#include "utilities.h"
 
 GSList *uaw_list;
@@ -43 +44 @@
 };
 
-void set_away_msg(GtkWidget *widget, struct away_dialog *away_d)
-{
-    GtkTextIter s, e;
-    GtkTextBuffer *tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(away_d->text));
-    gtk_text_buffer_get_start_iter(tb, &s);
-    gtk_text_buffer_get_end_iter(tb, &e);
-  gchar *txt = gtk_text_buffer_get_text(tb, &s, &e, FALSE);
+void
+set_away_msg(GtkWidget *widget, struct away_dialog *away_d)
+{
     ICQOwner *owner = gUserManager.FetchOwner(LOCK_W);
-    owner->SetAutoResponse(txt);
+    owner->SetAutoResponse(textview_get_chars(away_d->text).c_str());
     gUserManager.DropOwner();
-  g_free(txt);
 
     window_close(NULL, away_d->window);
 }
 
-void away_msg_window(gushort status)
+void
+away_msg_window(gushort status)
 {
     
@@ -66 +63 @@
     away_d = g_new0(struct away_dialog, 1);
   else {
-    gtk_widget_show(away_d->window);
+    gtk_window_present(GTK_WINDOW(away_d->window));
     return;
   }
@@ -91 +88 @@
 
     /* The boxes */
-    GtkWidget *h_box = gtk_hbox_new(TRUE, 5);
     GtkWidget *v_box = gtk_vbox_new(FALSE, 5);
 
     /* Pack the text box into the v_box */
-    gtk_box_pack_start(GTK_BOX(v_box), away_d->text, TRUE, TRUE, 0);
+  GtkWidget *frame = gtk_frame_new(NULL);
+  gtk_container_add(GTK_CONTAINER(frame), away_d->text);
+    gtk_box_pack_start(GTK_BOX(v_box), frame, TRUE, TRUE, 0);
 
     /* Make the buttons now */
@@ -102 +100 @@
 
     /* Pack the buttons */
-    gtk_box_pack_start(GTK_BOX(h_box), ok, TRUE, TRUE, 5);
-    gtk_box_pack_start(GTK_BOX(h_box), cancel, TRUE, TRUE, 5);
+    GtkWidget *h_box = hbutton_box_new();
+    gtk_container_add(GTK_CONTAINER(h_box), ok);
+    gtk_container_add(GTK_CONTAINER(h_box), cancel);
     gtk_box_pack_start(GTK_BOX(v_box), h_box, FALSE, FALSE, 0);
 
@@ -116 +115 @@
     /* Get the window ready to be shown, show it, and set is_shown */
     gtk_container_add(GTK_CONTAINER(away_d->window), v_box);
+    gtk_container_set_border_width(GTK_CONTAINER(away_d->window), 10);
+    gtk_window_set_focus(GTK_WINDOW(away_d->window), away_d->text);
     gtk_widget_show_all(away_d->window);
-    gtk_window_set_focus(GTK_WINDOW(away_d->window), away_d->text);
-    gtk_window_set_modal(GTK_WINDOW(away_d->window), TRUE);
 }
 
@@ -136 +135 @@
 }
 
-struct user_away_window *uaw_find(unsigned long uin)
+struct user_away_window *
+uaw_find(unsigned long uin)
 {
     struct user_away_window *uaw;
@@ -152 +152 @@
 }
 
-struct user_away_window *uaw_new(ICQUser *u)
+struct user_away_window *
+uaw_new(ICQUser *u)
 {
     /* Does it exist already? */
@@ -172 +173 @@
 }
 
-void list_read_message(GtkWidget *widget, ICQUser *user)
+void
+list_read_message(GtkWidget *widget, ICQUser *user)
 {
     struct user_away_window *uaw = uaw_find(user->Uin());
     
     // we're in the process of retrieving the message (or it's displayed already)
-  if (uaw != NULL)
+  if (uaw != NULL) {
+    gtk_window_present(GTK_WINDOW(uaw->window));
         return;
+  }
 
     uaw = uaw_new(user);
@@ -196 +200 @@
 
     /* Make the boxes */
-    GtkWidget *h_box = gtk_hbox_new(FALSE, 5);
     GtkWidget *v_box = gtk_vbox_new(FALSE, 5);
 
@@ -202 +205 @@
     GtkWidget *scroll = gtk_scrolled_window_new(0, 0);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
-                       GTK_POLICY_NEVER,
-                       GTK_POLICY_AUTOMATIC);
+      GTK_POLICY_NEVER,
+            GTK_POLICY_AUTOMATIC);
 
     /* The text box */
@@ -212 +215 @@
   
     /* Add the text box to the scrolling window */
+  GtkWidget *frame = gtk_frame_new(NULL);
     gtk_container_add(GTK_CONTAINER(scroll), uaw->text_box);
+    gtk_container_add(GTK_CONTAINER(frame), scroll);
 
     /* Pack the scrolled window into the v_box */
@@ -220 +225 @@
     uaw->show_again = gtk_check_button_new_with_label("Show Again");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(uaw->show_again),
-                     user->ShowAwayMsg());
+      user->ShowAwayMsg());
 
     /* The close button */
@@ -228 +233 @@
 
     /* Pack everything */
-    gtk_box_pack_start(GTK_BOX(h_box), uaw->show_again, TRUE, TRUE, 10);
-    gtk_box_pack_start(GTK_BOX(h_box), close, TRUE, TRUE, 10);
+    GtkWidget *h_box = hbutton_box_new();
+    gtk_container_add(GTK_CONTAINER(h_box), uaw->show_again);
+    gtk_container_add(GTK_CONTAINER(h_box), close);
     gtk_box_pack_start(GTK_BOX(v_box), h_box, FALSE, FALSE, 5);
 
@@ -235 +241 @@
     uaw->progress = gtk_statusbar_new();
     strcpy(uaw->buffer, "Checking Response ... ");
-    guint id = gtk_statusbar_get_context_id(GTK_STATUSBAR(uaw->progress),
-                        "prog");
-    gtk_statusbar_pop(GTK_STATUSBAR(uaw->progress), id);
-    gtk_statusbar_push(GTK_STATUSBAR(uaw->progress), id, uaw->buffer);
+    status_change(uaw->progress, "sta", uaw->buffer);
 
     /* Pack the progress bar */
     gtk_box_pack_start(GTK_BOX(v_box), uaw->progress, FALSE, FALSE, 5);
 
+    gtk_container_set_border_width(GTK_CONTAINER(uaw->window), 10);
     gtk_container_add(GTK_CONTAINER(uaw->window), v_box);
     gtk_widget_show_all(uaw->window);
@@ -257 +261 @@
 }
 
-void finish_away(ICQEvent *event)
+void
+finish_away(ICQEvent *event)
 {
     struct user_away_window *uaw = uaw_find(event->Uin());