Changeset 4216

Timestamp:

Dec 19, 2007, 7:10:47 AM (14 years ago)

Author:

charles

Message:

that last commit was kind of silly... "sort by ratio" can be merged into "sort by progress"

Location:

trunk/gtk

Files:

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

trunk/gtk/actions.c

@@ -62 +62 @@
   { "sort-by-name",       NULL, N_("Sort by _Name"),       NULL, NULL, 2 },
   { "sort-by-progress",   NULL, N_("Sort by _Progress"),   NULL, NULL, 3 },
-  { "sort-by-ratio",      NULL, N_("Sort by _Ratio"),      NULL, NULL, 4 },
-  { "sort-by-state",      NULL, N_("Sort by _State"),      NULL, NULL, 5 },
-  { "sort-by-tracker",    NULL, N_("Sort by _Tracker"),    NULL, NULL, 6 }
+  { "sort-by-state",      NULL, N_("Sort by _State"),      NULL, NULL, 4 },
+  { "sort-by-tracker",    NULL, N_("Sort by _Tracker"),    NULL, NULL, 5 }
 };
 

trunk/gtk/main.c

@@ -1029 +1029 @@
          ||  !strcmp( action_name, "sort-by-name" )
          ||  !strcmp( action_name, "sort-by-progress" )
-         ||  !strcmp( action_name, "sort-by-ratio" )
          ||  !strcmp( action_name, "sort-by-state" )
          ||  !strcmp( action_name, "sort-by-tracker" ) )

trunk/gtk/tr_core.c

@@ -172 +172 @@
 
 static int
+compareDouble( double a, double b )
+{
+    if( a < b ) return -1;
+    if( b > a ) return 1;
+    return 0;
+}
+
+static int
 compareByActivity( GtkTreeModel * model,
                    GtkTreeIter  * a,
@@ -177 +185 @@
                    gpointer       user_data UNUSED )
 {
-    int ia, ib;
+    int i;
     tr_torrent *ta, *tb;
     const tr_stat *sa, *sb;
@@ -187 +195 @@
     sb = tr_torrentStat( tb );
 
-    ia = (int)( 1024 * ( sa->rateUpload + sa->rateDownload ) );
-    ib = (int)( 1024 * ( sb->rateUpload + sb->rateDownload ) );
-    if( ia != ib )
-        return ia - ib;
+    if(( i = compareDouble( sa->rateUpload + sa->rateDownload,
+                            sb->rateUpload + sb->rateDownload ) ))
+        return i;
 
     if( sa->uploadedEver != sb->uploadedEver )
@@ -204 +211 @@
                     gpointer         user_data UNUSED )
 {
-    /* FIXME */
-    return 0;
+    return 0; /* FIXME */
 }
 
@@ -230 +236 @@
                    gpointer         user_data UNUSED )
 {
+    int ret;
     tr_torrent *ta, *tb;
     const tr_stat *sa, *sb;
-    int ret;
     gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 );
     gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 );
     sa = tr_torrentStat( ta );
     sb = tr_torrentStat( tb );
-         if( sa->percentDone < sb->percentDone ) ret = -1;
-    else if( sa->percentDone > sb->percentDone ) ret =  1;
-    else                                         ret =  0;
-    return ret;
-}
-
-static int
-compareByRatio( GtkTreeModel   * model,
-                GtkTreeIter    * a,
-                GtkTreeIter    * b,
-                gpointer         user_data UNUSED )
-{
-    tr_torrent *ta, *tb;
-    const tr_stat *sa, *sb;
-    int ret;
-    gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 );
-    gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 );
-    sa = tr_torrentStat( ta );
-    sb = tr_torrentStat( tb );
-         if( sa->ratio < sb->ratio ) ret = -1;
-    else if( sa->ratio > sb->ratio ) ret =  1;
-    else                             ret =  0;
+    ret = compareDouble( sa->percentDone, sb->percentDone );
+    if( !ret )
+        ret = compareDouble( sa->ratio, sa->ratio );
     return ret;
 }
@@ -313 +300 @@
         type = isReversed ? GTK_SORT_ASCENDING : GTK_SORT_DESCENDING;
         gtk_tree_sortable_set_sort_func( sortable, col, compareByProgress, NULL, NULL );
-    }
-    else if( !strcmp( mode, "sort-by-ratio" ) )
-    {
-        type = isReversed ? GTK_SORT_ASCENDING : GTK_SORT_DESCENDING;
-        gtk_tree_sortable_set_sort_func( sortable, col, compareByRatio, NULL, NULL );
     }
     else if( !strcmp( mode, "sort-by-state" ) )

trunk/gtk/ui.h

@@ -23 +23 @@
 "      <menuitem action='sort-by-name'/>\n"
 "      <menuitem action='sort-by-progress'/>\n"
-"      <menuitem action='sort-by-ratio'/>\n"
 "      <menuitem action='sort-by-state'/>\n"
 "      <menuitem action='sort-by-tracker'/>\n"