Changeset 4903

Timestamp:

Feb 3, 2008, 1:43:47 AM (14 years ago)

Author:

charles

Message:

(gtk) #611: don't hide in the systray without letting the user know

Location:

trunk/gtk

Files:

• actions.c (modified) (1 diff)
• main.c (modified) (6 diffs)
• ui.h (modified) (3 diffs)

trunk/gtk/actions.c

@@ -102 +102 @@
   { "edit-menu", NULL, N_("_Edit"), NULL, NULL, NULL },
   { "help-menu", NULL, N_("_Help"), NULL, NULL, NULL },
-  { "add-torrent", GTK_STOCK_OPEN,
+  { "open-torrent", GTK_STOCK_OPEN,
     NULL, NULL, N_("Open Torrent"), G_CALLBACK(action_cb) },
   { "start-torrent", GTK_STOCK_MEDIA_PLAY,

trunk/gtk/main.c

@@ -109 +109 @@
     GHashTable   * tor2details;
     GHashTable   * details2tor;
+    gboolean       minimized;
 };
 
@@ -334 +335 @@
     cbdata->closing    = FALSE;
     cbdata->errqueue   = NULL;
+    cbdata->minimized  = minimized;
 
     actions_set_core( cbdata->core );
@@ -375 +377 @@
 
     /* show the window */
-    if( !minimized )
-        gtk_widget_show( GTK_WIDGET(wind) );
+    if( minimized )
+        gtk_window_iconify( wind );
+    gtk_widget_show( GTK_WIDGET( wind ) );
+}
+
+static void
+setMainWindowMinimized( struct cbdata * data, gboolean minimized )
+{
+    GtkWindow * window = GTK_WINDOW( data->wind );
+
+    if(( data->minimized = minimized ))
+        gtk_window_iconify( window );
+    else
+        gtk_window_deiconify( window );
+}
+
+static void
+toggleMainWindow( struct cbdata * data )
+{
+    setMainWindowMinimized( data, !data->minimized );
 }
 
@@ -385 +405 @@
 
     if( cbdata->icon != NULL )
-        gtk_widget_hide( GTK_WIDGET( cbdata->wind ) );
+        setMainWindowMinimized( cbdata, TRUE );
     else
         askquit( cbdata->core, cbdata->wind, wannaquit, cbdata );
@@ -915 +935 @@
 }
 
-static void
-toggleMainWindow( struct cbdata * data )
-{
-    static int x=0, y=0;
-    GtkWidget * w = GTK_WIDGET( data->wind );
-    GtkWindow * window = GTK_WINDOW( w );
-
-    if( GTK_WIDGET_VISIBLE( w ) )
-    {
-        gtk_window_get_position( window, &x, &y );
-        gtk_widget_hide( w );
-    }
-    else
-    {
-        gtk_window_move( window, x, y );
-        gtk_window_present( window );
-    }
-}
-
 void
 doAction ( const char * action_name, gpointer user_data )
@@ -940 +941 @@
     gboolean changed = FALSE;
 
-    if (!strcmp (action_name, "add-torrent"))
+    if (!strcmp (action_name, "open-torrent"))
     {
         makeaddwind( data->wind, data->core );

trunk/gtk/ui.h

@@ -3 +3 @@
 "  <menubar name='main-window-menu'>\n"
 "    <menu action='torrent-menu'>\n"
-"      <menuitem action='add-torrent'/>\n"
+"      <menuitem action='open-torrent'/>\n"
 "      <menuitem action='start-torrent'/>\n"
 "      <menuitem action='update-tracker'/>\n"
@@ -44 +44 @@
 "\n"
 "  <toolbar name='main-window-toolbar'>\n"
-"    <toolitem action='add-torrent'/>\n"
+"    <toolitem action='open-torrent'/>\n"
 "    <toolitem action='start-torrent'/>\n"
 "    <toolitem action='pause-torrent'/>\n"
@@ -64 +64 @@
 "\n"
 "  <popup name='icon-popup'>\n"
-"    <menuitem action='add-torrent'/>\n"
+"    <menuitem action='open-torrent'/>\n"
 "    <separator/>\n"
 "    <menuitem action='toggle-main-window'/>\n"