filter by directory and some filter fixes

1 files changed, 32 insertions, 15 deletions

diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c
index 3c3b5a2..2e6ed83 100644
--- a/src/trg-general-panel.c
+++ b/src/trg-general-panel.c
@@ -37,7 +37,8 @@
 static void gtk_label_clear(GtkLabel * l);
 static GtkLabel *gen_panel_label_get_key_label(GtkLabel * l);
 static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * gp,
-                                             char *key, guint col, guint row);
+                                             char *key, guint col,
+                                             guint row);
 
 G_DEFINE_TYPE(TrgGeneralPanel, trg_general_panel, GTK_TYPE_TABLE)
 #define TRG_GENERAL_PANEL_GET_PRIVATE(o) \
@@ -186,36 +187,48 @@ void trg_general_panel_update(TrgGeneralPanel * panel, JsonObject * t,
     gtk_label_set_text(GTK_LABEL(priv->gen_leechers_label), buf);
 }
 
-static GtkLabel *trg_general_panel_add_label_with_width(TrgGeneralPanel *gp,
-                                             char *key, guint col, guint row, gint width)
+static GtkLabel *trg_general_panel_add_label_with_width(TrgGeneralPanel *
+                                                        gp, char *key,
+                                                        guint col,
+                                                        guint row,
+                                                        gint width)
 {
     GtkWidget *value, *keyLabel, *alignment;
 
-    int startCol = (col == 0) ? 0 : col*2;
+    int startCol = (col == 0) ? 0 : col * 2;
 
     alignment = gtk_alignment_new(0, 0, 0, 0);
     keyLabel = gtk_label_new(NULL);
     if (strlen(key) > 0) {
         gchar *keyMarkup =
-            g_markup_printf_escaped(strlen(key) > 0 ? "<b>%s:</b>" : "", key);
+            g_markup_printf_escaped(strlen(key) > 0 ? "<b>%s:</b>" : "",
+                                    key);
         gtk_label_set_markup(GTK_LABEL(keyLabel), keyMarkup);
         g_free(keyMarkup);
     }
     gtk_container_add(GTK_CONTAINER(alignment), keyLabel);
-    gtk_table_attach(GTK_TABLE(gp), alignment, startCol, startCol+1, row, row+1, GTK_FILL, 0, TRG_GENERAL_PANEL_SPACING_X, TRG_GENERAL_PANEL_SPACING_Y);
+    gtk_table_attach(GTK_TABLE(gp), alignment, startCol, startCol + 1, row,
+                     row + 1, GTK_FILL, 0, TRG_GENERAL_PANEL_SPACING_X,
+                     TRG_GENERAL_PANEL_SPACING_Y);
 
     alignment = gtk_alignment_new(0, 0, 0, 0);
     value = gtk_label_new(NULL);
     g_object_set_data(G_OBJECT(value), "key-label", keyLabel);
     gtk_label_set_selectable(GTK_LABEL(value), TRUE);
     gtk_container_add(GTK_CONTAINER(alignment), value);
-    gtk_table_attach(GTK_TABLE(gp), alignment, startCol+1, width < 0 ? TRG_GENERAL_PANEL_COLUMNS_TOTAL-1 : startCol+1+width, row, row+1, GTK_FILL | GTK_SHRINK, 0, TRG_GENERAL_PANEL_SPACING_X, TRG_GENERAL_PANEL_SPACING_Y);
+    gtk_table_attach(GTK_TABLE(gp), alignment, startCol + 1,
+                     width <
+                     0 ? TRG_GENERAL_PANEL_COLUMNS_TOTAL - 1 : startCol +
+                     1 + width, row, row + 1, GTK_FILL | GTK_SHRINK, 0,
+                     TRG_GENERAL_PANEL_SPACING_X,
+                     TRG_GENERAL_PANEL_SPACING_Y);
 
     return GTK_LABEL(value);
 }
 
-static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel *gp,
-                                             char *key, guint col, guint row)
+static GtkLabel *trg_general_panel_add_label(TrgGeneralPanel * gp,
+                                             char *key, guint col,
+                                             guint row)
 {
     return trg_general_panel_add_label_with_width(gp, key, col, row, 1);
 }
@@ -225,9 +238,8 @@ static void trg_general_panel_init(TrgGeneralPanel * self)
     TrgGeneralPanelPrivate *priv = TRG_GENERAL_PANEL_GET_PRIVATE(self);
     int i;
 
-    g_object_set(G_OBJECT(self), "n-columns", TRG_GENERAL_PANEL_COLUMNS_TOTAL,
-            "n-rows", 7,
-            NULL);
+    g_object_set(G_OBJECT(self), "n-columns",
+                 TRG_GENERAL_PANEL_COLUMNS_TOTAL, "n-rows", 7, NULL);
 
     priv->gen_name_label =
         trg_general_panel_add_label_with_width(self, _("Name"), 0, 0, -1);
@@ -259,12 +271,17 @@ static void trg_general_panel_init(TrgGeneralPanel * self)
         trg_general_panel_add_label(self, _("Ratio"), 1, 4);
 
     priv->gen_downloaddir_label =
-        trg_general_panel_add_label_with_width(self, _("Location"), 0, 5, -1);
+        trg_general_panel_add_label_with_width(self, _("Location"), 0, 5,
+                                               -1);
 
-    priv->gen_error_label = trg_general_panel_add_label_with_width(self, "", 0, 6, -1);
+    priv->gen_error_label =
+        trg_general_panel_add_label_with_width(self, "", 0, 6, -1);
 
     for (i = 0; i < TRG_GENERAL_PANEL_COLUMNS_TOTAL; i++)
-        gtk_table_set_col_spacing(GTK_TABLE(self), i, i % 2 == 0 ? TRG_GENERAL_PANEL_WIDTH_FROM_KEY : TRG_GENERAL_PANEL_WIDTH_FROM_VALUE);
+        gtk_table_set_col_spacing(GTK_TABLE(self), i,
+                                  i % 2 ==
+                                  0 ? TRG_GENERAL_PANEL_WIDTH_FROM_KEY :
+                                  TRG_GENERAL_PANEL_WIDTH_FROM_VALUE);
 
     gtk_widget_set_sensitive(GTK_WIDGET(self), FALSE);
 }