Changeset 2558 for trunk/jons-gtk-gui

Timestamp:

06/15/01 14:27:17 (7 years ago)

Author:

emojon

Message:

Save window size and position option.

It works on KDE. I'm gonna play around with it and see if it works on other WM's as well, so if anyone sees this, I'd appreciate any feedback.

Location:

trunk/jons-gtk-gui/src

Files:

• extras.cpp (modified) (1 diff)
• licq_gtk.h (modified) (4 diffs)
• main.cpp (modified) (1 diff)
• main_window.cpp (modified) (5 diffs)
• menu.cpp (modified) (1 diff)
• option_window.cpp (modified) (7 diffs)
• register_user.cpp (modified) (1 diff)

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

@@ -164 +164 @@
         {
             wizard_message(5);
-            main_window = main_window_new(title, 445, 200);
+            main_window = main_window_new(title);
             main_window_show();
             system_status_refresh();

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

@@ -307 +307 @@
     GtkWidget *flash_events;
     GtkWidget *chkRecvColors;
+    GtkWidget *chkRememberWindowPos;
 
     // Network section
@@ -506 +507 @@
 extern bool flash_events;
 extern unsigned long auto_logon;
+extern bool remember_window_pos;
+
+/* Globals for window dimensions / location */
+extern short int windowX;
+extern short int windowY;
+extern short int windowH;
+extern short int windowW;
 
 /* Globals in random_chat.cpp */
@@ -673 +681 @@
 
 /* Functions in main_window.cpp */
-extern GtkWidget *main_window_new(const gchar *, gint, gint);
+extern GtkWidget *main_window_new(const gchar *);
 extern void main_window_show();
 
@@ -704 +712 @@
 extern void color_dlg_cancel(GtkWidget *, gpointer);
 extern void SOCKSClicked(GtkWidget *, gpointer);
+extern void save_window_pos (void);
 
 

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

@@ -99 +99 @@
     else
     {
-        main_window = main_window_new(title, 245, 160); 
+        main_window = main_window_new(title);   
         main_window_show();
         contact_list_refresh();

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

@@ -31 +31 @@
 void main_window_delete_event(GtkWidget *mainwindow, gpointer data)
 {
+    save_window_pos();
     gtk_main_quit();
 }
 
-GtkWidget* main_window_new(const gchar* window_title,
-               gint height,
-               gint width)
+GtkWidget* main_window_new(const gchar* window_title)
 {
     gtk_timeout_add(1000, flash_icons, 0);
@@ -64 +63 @@
     /* Create the main window */
     main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+    /* set the position if that option is enabled */
+    if (remember_window_pos)
+        gtk_widget_set_uposition (main_window, windowX, windowY);
 
     /* Set the title */
@@ -95 +98 @@
                        GTK_POLICY_NEVER,
                        GTK_POLICY_AUTOMATIC);
-    gtk_widget_set_usize(scroll_bar, width - 77, height - 61);
+    gtk_widget_set_usize(scroll_bar, windowW - 77, windowH - 87);
 
     /* Add in the contact list */
-    contact_list = contact_list_new(height - 30, width - 37);
+    contact_list = contact_list_new(windowH - 56, windowW - 37);
     
     gtk_container_add(GTK_CONTAINER(scroll_bar), contact_list);
@@ -109 +112 @@
 
     /* Add in the status bar menu */
-    status_bar = status_bar_new(25, width, 2);
+    status_bar = status_bar_new(25, windowW, 2);
 
     /* Add the status bar to the event box */
@@ -123 +126 @@
 
     /* Add the system status bar */
-    system_status = system_status_new(25, width, 2);
+    system_status = system_status_new(25, windowW, 2);
 
     /* Add the system status bar into the event box */

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

@@ -185 +185 @@
 void menu_system_quit(GtkWidget *blah, gpointer data)
 {
+    save_window_pos();
     gtk_main_quit();
 } 

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

@@ -34 +34 @@
 char timestamp_format[50];
 unsigned long auto_logon;
+bool remember_window_pos;
+
+// Global variables for window position and size
+short int windowX;
+short int windowY;
+short int windowH;
+short int windowW;
 
 // The "Options" selection under the menu in the main window
@@ -106 +113 @@
     ow->chkRecvColors = gtk_check_button_new_with_label("Receive Colors");
     gtk_table_attach(GTK_TABLE(table), ow->chkRecvColors, 0, 1, 3, 4,
+        GtkAttachOptions(GTK_FILL | GTK_EXPAND),
+        GTK_FILL, 3, 3);
+
+    // Remember window position
+    ow->chkRememberWindowPos = gtk_check_button_new_with_label("Save Window Size and Position");
+    gtk_table_attach(GTK_TABLE(table), ow->chkRememberWindowPos, 1, 2, 3, 4,
         GtkAttachOptions(GTK_FILL | GTK_EXPAND),
         GTK_FILL, 3, 3);
@@ -354 +367 @@
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ow->chkRecvColors),
         recv_colors);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ow->chkRememberWindowPos),
+        remember_window_pos);
 
     // Clist of servers
@@ -428 +443 @@
     recv_colors = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
         ow->chkRecvColors));
+    remember_window_pos = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+        ow->chkRememberWindowPos));
     
     // Save the daemon options
@@ -496 +513 @@
     licqConf.WriteBool("RecvColors", recv_colors);
     licqConf.WriteBool("ShowTimestamp", show_convo_timestamp);
+    licqConf.WriteBool("RememberWindowPos", remember_window_pos);
     licqConf.WriteStr("TimestampFormat", timestamp_format);
 
@@ -506 +524 @@
     // Refresh contact list
     contact_list_refresh();
+}
+
+void save_window_pos (void)
+{
+    char filename[MAX_FILENAME_LEN];
+    sprintf (filename, "%s/licq_jons-gtk-gui.conf", BASE_DIR);
+    CIniFile licqConf(INI_FxERROR | INI_FxALLOWxCREATE);
+    if(!licqConf.LoadFile(filename))
+        return;
+    gint x, y, w, h;
+
+    gdk_window_get_root_origin(main_window->window, &x, &y);
+    gdk_window_get_size(main_window->window, &w, &h);
+
+    licqConf.SetSection("appearance");
+
+    licqConf.WriteNum("windowX", (short int)x);
+    licqConf.WriteNum("windowY", (short int)y);
+    licqConf.WriteNum("windowW", (short int)w);
+    licqConf.WriteNum("windowH", (short int)h);
+    
+    licqConf.FlushFile();
+    licqConf.CloseFile();
 }
 
@@ -548 +589 @@
     licqConf.ReadBool("ShowTimestamp", show_convo_timestamp, true);
     licqConf.ReadStr("TimestampFormat", timestamp_format, "%H:%M:%S");
+    licqConf.ReadBool("RememberWindowPos", remember_window_pos, true);
+
+    // Window size & position
+    licqConf.ReadNum("windowX", windowX, 0);
+    licqConf.ReadNum("windowY", windowY, 0);
+    licqConf.ReadNum("windowH", windowH, 245);
+    licqConf.ReadNum("windowW", windowW, 160);
     
     // Auto logon

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

@@ -136 +136 @@
         wizard_message(6);
 
-        main_window = main_window_new(g_strdup_printf("%ld", _uin),
-            445, 200);
+        main_window = main_window_new(g_strdup_printf("%ld", _uin));
         main_window_show();
         system_status_refresh();