From 1390c1426d82cc1e1598e648235cd139b248fa5a Mon Sep 17 00:00:00 2001 From: Alan Fitton Date: Tue, 8 Mar 2011 23:02:06 +0000 Subject: increase general panel spacings a little, fix backwards comparasin on filter, give error/location value labels full length --- redhat/transmission-remote-gtk.spec | 2 ++ src/trg-general-panel.c | 18 +++++++++++------- src/trg-main-window.c | 10 +++++----- src/trg-torrent-tree-view.c | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/redhat/transmission-remote-gtk.spec b/redhat/transmission-remote-gtk.spec index ddf0ceb..65cb503 100644 --- a/redhat/transmission-remote-gtk.spec +++ b/redhat/transmission-remote-gtk.spec @@ -14,10 +14,12 @@ Requires: glib2 >= 2.22 Requires: unique Requires: GConf2 Requires: libnotify +Requires: libproxy Requires: json-glib >= 0.8 Requires: libcurl BuildRequires: gtk2-devel +BuildRequires: libproxy-devel BuildRequires: glib2-devel BuildRequires: unique-devel BuildRequires: GConf2-devel diff --git a/src/trg-general-panel.c b/src/trg-general-panel.c index bed2815..c89f994 100644 --- a/src/trg-general-panel.c +++ b/src/trg-general-panel.c @@ -27,8 +27,12 @@ #include "trg-general-panel.h" #include "trg-torrent-model.h" -#define TRG_GENERAL_PANEL_COLUMNS 3 -#define TRG_GENERAL_PANEL_COLUMNS_TOTAL 6 +#define TRG_GENERAL_PANEL_WIDTH_FROM_KEY 20 +#define TRG_GENERAL_PANEL_WIDTH_FROM_VALUE 60 +#define TRG_GENERAL_PANEL_SPACING_X 4 +#define TRG_GENERAL_PANEL_SPACING_Y 2 +#define TRG_GENERAL_PANEL_COLUMNS 3 +#define TRG_GENERAL_PANEL_COLUMNS_TOTAL (TRG_GENERAL_PANEL_COLUMNS*2) static void gtk_label_clear(GtkLabel * l); static GtkLabel *gen_panel_label_get_key_label(GtkLabel * l); @@ -198,14 +202,14 @@ static GtkLabel *trg_general_panel_add_label_with_width(TrgGeneralPanel *gp, 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, 2, 2); + 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, 2, 2); + 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); } @@ -255,12 +259,12 @@ 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(self, _("Location"), 0, 5); + trg_general_panel_add_label_with_width(self, _("Location"), 0, 5, -1); - priv->gen_error_label = trg_general_panel_add_label(self, "", 0, 6); + 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 ? 20 : 40); + 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); } diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 4610b87..ed25791 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -1049,14 +1049,14 @@ trg_torrent_tree_view_visible_func(GtkTreeModel * model, const gchar *filterText = gtk_entry_get_text(GTK_ENTRY(priv->filterEntry)); if (strlen(filterText) > 0) { - gchar *filterTextFolded = g_utf8_casefold(filterText, -1); - gchar *nameFolded = g_utf8_casefold(name, -1); + gchar *filterCmp = g_utf8_casefold(filterText, -1); + gchar *nameCmp = g_utf8_casefold(name, -1); - if (strstr(nameFolded, filterTextFolded)) + if (!strstr(nameCmp, filterCmp)) visible = FALSE; - g_free(filterTextFolded); - g_free(nameFolded); + g_free(filterCmp); + g_free(nameCmp); } } diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c index fc5833f..7571adb 100644 --- a/src/trg-torrent-tree-view.c +++ b/src/trg-torrent-tree-view.c @@ -38,7 +38,7 @@ static void trg_torrent_tree_view_init(TrgTorrentTreeView * tv) trg_tree_view_add_pixbuf_text_column(TRG_TREE_VIEW(tv), TORRENT_COLUMN_ICON, TORRENT_COLUMN_NAME, _("Name"), - 300); + -1); trg_tree_view_add_size_column(TRG_TREE_VIEW(tv), _("Size"), TORRENT_COLUMN_SIZE, -1); trg_tree_view_add_prog_column(TRG_TREE_VIEW(tv), _("Done"), -- cgit v1.2.3