Revision: 2216
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2216&view=rev
Author: jcsjcs
Date: 2009-01-17 05:47:46 +0000 (Sat, 17 Jan 2009)
Log Message:
-----------
* src/display_tracks.c: let gtkpod remember column sizes again.
* src/prefs.c: enable horizontal scrollbar in the track view by
default.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/display_tracks.c
gtkpod/trunk/src/prefs.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2009-01-14 19:29:25 UTC (rev 2215)
+++ gtkpod/trunk/ChangeLog 2009-01-17 05:47:46 UTC (rev 2216)
@@ -1,3 +1,10 @@
+2008-01-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/display_tracks.c: let gtkpod remember column sizes again.
+
+ * src/prefs.c: enable horizontal scrollbar in the track view by
+ default.
+
2009-01-14 Todd Zullinger <tmzullinger at users.sourceforge.net>
* po/zh_CN.po: Update simple Chinese translation (Tan Zhixin)
Modified: gtkpod/trunk/src/display_tracks.c
===================================================================
--- gtkpod/trunk/src/display_tracks.c 2009-01-14 19:29:25 UTC (rev 2215)
+++ gtkpod/trunk/src/display_tracks.c 2009-01-17 05:47:46 UTC (rev 2216)
@@ -2595,8 +2595,6 @@
tm_show_preferred_columns (void)
{
gint i;
- GtkTreeViewColumn *tvc = NULL;
- gboolean visible;
gboolean horizontal_scrollbar = prefs_get_int ("horizontal_scrollbar");
GtkScrolledWindow *scroller = GTK_SCROLLED_WINDOW (gtkpod_xml_get_widget
(main_window_xml,
"track_window"));
@@ -2608,19 +2606,27 @@
for (i = 0; i < TM_NUM_COLUMNS; ++i)
{
- tvc = gtk_tree_view_get_column (track_treeview, i);
- visible = prefs_get_int_index ("col_visible",
prefs_get_int_index("col_order", i));
+ TM_item tm_item = prefs_get_int_index ("col_order", i);
+ GtkTreeViewColumn *tvc = gtk_tree_view_get_column (track_treeview, i);
+ gboolean visible = prefs_get_int_index ("col_visible", tm_item);
+ gint col_width;
+
gtk_tree_view_column_set_visible (tvc, visible);
+ col_width = prefs_get_int_index ("tm_col_width", tm_item);
+
+ if (col_width == 0)
+ col_width = 80;
+
if (horizontal_scrollbar)
{
- gtk_tree_view_column_set_fixed_width (tvc,
prefs_get_int_index("tm_col_width", i));
+ gtk_tree_view_column_set_fixed_width (tvc, col_width);
gtk_tree_view_column_set_min_width (tvc, -1);
gtk_tree_view_column_set_expand (tvc, FALSE);
}
else
{
- switch (i)
+ switch (tm_item)
{
case TM_COLUMN_TITLE:
case TM_COLUMN_ARTIST:
@@ -2645,9 +2651,7 @@
break;
default:
gtk_tree_view_column_set_min_width (tvc, 80);
- gtk_tree_view_column_set_fixed_width (tvc,
-
prefs_get_int_index("tm_col_width", i));
-
+ gtk_tree_view_column_set_fixed_width (tvc, col_width);
gtk_tree_view_column_set_expand (tvc, FALSE);
break;
}
@@ -2661,23 +2665,23 @@
column widths of track model */
void tm_update_default_sizes (void)
{
- gint i;
+ TM_item tm_item;
GtkTreeViewColumn *col;
gint col_width;
/* column widths */
- for (i=0; i<TM_NUM_COLUMNS; ++i)
+ for (tm_item=0; tm_item<TM_NUM_COLUMNS; ++tm_item)
{
- col = tm_columns [i];
+ col = tm_columns [tm_item];
if (col)
{
- col_width = gtk_tree_view_column_get_width (col);
+ col_width = gtk_tree_view_column_get_width (col);
- if (col_width > 0)
- prefs_set_int_index ("tm_col_width", i, col_width);
- else
- prefs_set_int_index ("tm_col_width", i, 80);
-
+ if (col_width > 0)
+ { /* columns not displayed seem to be 0 pixels wide --
+ only change the visible columns */
+ prefs_set_int_index ("tm_col_width", tm_item, col_width);
+ }
}
}
}
Modified: gtkpod/trunk/src/prefs.c
===================================================================
--- gtkpod/trunk/src/prefs.c 2009-01-14 19:29:25 UTC (rev 2215)
+++ gtkpod/trunk/src/prefs.c 2009-01-17 05:47:46 UTC (rev 2216)
@@ -227,31 +227,31 @@
/* Set colum preferences */
for (i = 0; i < TM_NUM_COLUMNS; i++)
{
- prefs_set_int_index("tm_col_width", i, 80);
- prefs_set_int_index("col_visible", i, FALSE);
prefs_set_int_index("col_order", i, i);
}
-
- for (i = 0; i < TM_NUM_TAGS_PREFS; i++)
- prefs_set_int_index("tag_autoset", i, FALSE);
-
- prefs_set_int_index("tag_autoset", TM_COLUMN_TITLE, TRUE);
-
+
prefs_set_int_index("col_visible", TM_COLUMN_ARTIST, TRUE);
prefs_set_int_index("col_visible", TM_COLUMN_ALBUM, TRUE);
prefs_set_int_index("col_visible", TM_COLUMN_TITLE, TRUE);
prefs_set_int_index("col_visible", TM_COLUMN_TRACKLEN, TRUE);
prefs_set_int_index("col_visible", TM_COLUMN_RATING, TRUE);
- prefs_set_int("horizontal_scrollbar", FALSE);
+ for (i = 0; i < TM_NUM_TAGS_PREFS; i++)
+ {
+ prefs_set_int_index("tag_autoset", i, FALSE);
+ }
+
+ prefs_set_int_index("tag_autoset", TM_COLUMN_TITLE, TRUE);
+
+ prefs_set_int("horizontal_scrollbar", TRUE);
prefs_set_int("filter_tabs_top", FALSE);
- /* Set pane positions--Let gtk worry about position */
+ /* Set pane positions--Let gtk worry about position */
for (i = 0; i < PANED_NUM; i++)
prefs_set_int_index("paned_pos_", i, -1);
-
+
prefs_set_int("mpl_autoselect", TRUE);
-
+
/* Set window sizes */
prefs_set_int("size_gtkpod.x", 780);
prefs_set_int("size_gtkpod.y", 580);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
