Changeset 12

Timestamp:

Jan 12, 2006, 6:48:53 PM (15 years ago)

Author:

root

Message:

Update 2005-12-07

File:

• trunk/gtk/main.c (modified) (11 diffs)

trunk/gtk/main.c

@@ -234 +234 @@
   GList *ii;
   struct cf_torrentstate *ts;
+  gint height;
 
   data->tr = tr;
@@ -244 +245 @@
   data->buttons = NULL;
 
+  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER,
+                                 GTK_POLICY_AUTOMATIC);
+
   gtk_box_pack_start(GTK_BOX(vbox), makewind_toolbar(data), FALSE, FALSE, 0);
 
   list = makewind_list(data);
-  gtk_widget_size_request(list, &req);
   gtk_container_add(GTK_CONTAINER(scroll), list);
   gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0);
@@ -255 +258 @@
 
   gtk_container_add(GTK_CONTAINER(wind), vbox);
-  gtk_window_set_default_size(GTK_WINDOW(wind), req.width, req.height);
   g_signal_connect(G_OBJECT(wind), "delete_event", G_CALLBACK(winclose), data);
-  gtk_widget_show_all(wind);
 
   for(ii = g_list_first(saved); NULL != ii; ii = ii->next) {
@@ -269 +270 @@
   data->timer = g_timeout_add(500, updatemodel, data);
   updatemodel(data);
+
+  gtk_widget_show_all(vbox);
+  gtk_widget_realize(wind);
+
+  gtk_widget_size_request(wind, &req);
+  height = req.height;
+  gtk_widget_size_request(scroll, &req);
+  height -= req.height;
+  gtk_widget_size_request(list, &req);
+  height += req.height;
+  gtk_window_set_default_size(GTK_WINDOW(wind), -1, MAX(height, 100));
+
+  gtk_widget_show(wind);
 }
 
@@ -288 +302 @@
   for(ii = tr_torrentStat(data->tr, &st); 0 < ii; ii--) {
     if(TR_TORRENT_NEEDS_STOP(st[ii-1].status)) {
-      fprintf(stderr, "quit: stopping %i %s\n", ii, st[ii-1].info.name);
+      /*fprintf(stderr, "quit: stopping %i %s\n", ii, st[ii-1].info.name);*/
       tr_torrentStop(data->tr, ii - 1);
     } else {
-      fprintf(stderr, "quit: closing %i %s\n", ii, st[ii-1].info.name);
+      /*fprintf(stderr, "quit: closing %i %s\n", ii, st[ii-1].info.name);*/
       tr_torrentClose(data->tr, ii - 1);
     }
@@ -305 +319 @@
   edata->timer = g_timeout_add(500, exitcheck, edata);
 
-  fprintf(stderr, "quit: starting timeout at %i\n", edata->started);
+  /*fprintf(stderr, "quit: starting timeout at %i\n", edata->started);*/
 
   /* returning FALSE means to destroy the window */
@@ -319 +333 @@
   for(ii = tr_torrentStat(data->cbdata->tr, &st); 0 < ii; ii--) {
     if(TR_STATUS_PAUSE == st[ii-1].status) {
-      fprintf(stderr, "quit: closing %i %s\n", ii, st[ii-1].info.name);
+      /*fprintf(stderr, "quit: closing %i %s\n", ii, st[ii-1].info.name);*/
       tr_torrentClose(data->cbdata->tr, ii - 1);
     }
@@ -325 +339 @@
   free(st);
 
-  fprintf(stderr, "quit: %i torrents left at %i\n",
-          tr_torrentCount(data->cbdata->tr), time(NULL));
+  /*fprintf(stderr, "quit: %i torrents left at %i\n",
+    tr_torrentCount(data->cbdata->tr), time(NULL));*/
   /* keep going if we still have torrents and haven't hit the exit timeout */
   if(0 < tr_torrentCount(data->cbdata->tr) &&
@@ -334 +348 @@
   }
 
-  fprintf(stderr, "quit: giving up on %i torrents\n",
-          tr_torrentCount(data->cbdata->tr));
+  /*fprintf(stderr, "quit: giving up on %i torrents\n",
+    tr_torrentCount(data->cbdata->tr));*/
 
   for(ii = tr_torrentCount(data->cbdata->tr); 0 < ii; ii--)
@@ -362 +376 @@
 
   gtk_toolbar_set_tooltips(GTK_TOOLBAR(bar), TRUE);
+  gtk_toolbar_set_show_arrow(GTK_TOOLBAR(bar), FALSE);
   gtk_toolbar_set_style(GTK_TOOLBAR(bar), GTK_TOOLBAR_BOTH);
 
@@ -571 +586 @@
 
   /* remove any excess rows */
-  if(gtk_tree_model_iter_next(GTK_TREE_MODEL(data->model), &iter))
+  if(ii ? gtk_tree_model_iter_next(GTK_TREE_MODEL(data->model), &iter) :
+     gtk_tree_model_get_iter_first(GTK_TREE_MODEL(data->model), &iter))
     while(gtk_list_store_remove(data->model, &iter))
       ;