gnome-commander r2406 - in trunk: . doc/C src
- From: epiotr svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-commander r2406 - in trunk: . doc/C src
- Date: Thu, 8 Jan 2009 22:34:29 +0000 (UTC)
Author: epiotr
Date: Thu Jan 8 22:34:29 2009
New Revision: 2406
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2406&view=rev
Log:
Support for row alternate background in colour themes
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/doc/C/gnome-commander.xml
trunk/src/gnome-cmd-data.cc
trunk/src/gnome-cmd-file-list.cc
trunk/src/gnome-cmd-options-dialog.cc
trunk/src/gnome-cmd-style.cc
trunk/src/gnome-cmd-style.h
trunk/src/gnome-cmd-types.h
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Thu Jan 8 22:34:29 2009
@@ -17,6 +17,7 @@
* Revamped advanced file rename tool (regex backreferences ('\number'), profiles,
upper/lowercase conversion, blanks trimming and much more)
* Support for metadata tags in internal viewer
+ * Support for row alternate background in colour themes
* New colour theme: cafezinho
* New or updated docs: de, en, es
* New or updated translations: ar, cs, de, es, eu, fr, pl, pt_BR
Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml (original)
+++ trunk/doc/C/gnome-commander.xml Thu Jan 8 22:34:29 2009
@@ -5651,6 +5651,20 @@
</row>
<row valign="top">
<entry><para></para></entry>
+ <entry><para>alt_bg</para></entry>
+ <entry><para></para></entry>
+ <entry><para>Alternate background</para></entry>
+ <entry><para></para></entry>
+ </row>
+ <row valign="top">
+ <entry><para></para></entry>
+ <entry><para>alt_fg</para></entry>
+ <entry><para></para></entry>
+ <entry><para>Alternate foreground</para></entry>
+ <entry><para></para></entry>
+ </row>
+ <row valign="top">
+ <entry><para></para></entry>
<entry><para>sel_bg</para></entry>
<entry><para></para></entry>
<entry><para>Selected background</para></entry>
@@ -5928,6 +5942,9 @@
<para>Support for metadata tags in internal viewer</para>
</listitem>
<listitem>
+ <para>Support for row alternate background in colour themes</para>
+ </listitem>
+ <listitem>
<para>New colour theme: cafezinho</para>
</listitem>
<listitem>
Modified: trunk/src/gnome-cmd-data.cc
==============================================================================
--- trunk/src/gnome-cmd-data.cc (original)
+++ trunk/src/gnome-cmd-data.cc Thu Jan 8 22:34:29 2009
@@ -1181,6 +1181,8 @@
priv->color_themes[GNOME_CMD_COLOR_CUSTOM].respect_theme = FALSE;
priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_fg = gdk_color_new (0xffff,0xffff,0xffff);
priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_bg = gdk_color_new (0,0,0x4444);
+ priv->color_themes[GNOME_CMD_COLOR_CUSTOM].alt_fg = gdk_color_new (0xffff,0xffff,0xffff);
+ priv->color_themes[GNOME_CMD_COLOR_CUSTOM].alt_bg = gdk_color_new (0,0,0x4444);
priv->color_themes[GNOME_CMD_COLOR_CUSTOM].sel_fg = gdk_color_new (0xffff,0,0);
priv->color_themes[GNOME_CMD_COLOR_CUSTOM].sel_bg = gdk_color_new (0,0,0x4444);
priv->color_themes[GNOME_CMD_COLOR_CUSTOM].curs_fg = gdk_color_new (0,0,0);
@@ -1189,6 +1191,8 @@
priv->color_themes[GNOME_CMD_COLOR_MODERN].respect_theme = FALSE;
priv->color_themes[GNOME_CMD_COLOR_MODERN].norm_fg = gdk_color_new (0,0,0);
priv->color_themes[GNOME_CMD_COLOR_MODERN].norm_bg = gdk_color_new (0xdddd,0xdddd,0xdddd);
+ priv->color_themes[GNOME_CMD_COLOR_MODERN].alt_fg = gdk_color_new (0,0,0);
+ priv->color_themes[GNOME_CMD_COLOR_MODERN].alt_bg = gdk_color_new (0xdddd,0xdddd,0xdddd);
priv->color_themes[GNOME_CMD_COLOR_MODERN].sel_fg = gdk_color_new (0xffff,0,0);
priv->color_themes[GNOME_CMD_COLOR_MODERN].sel_bg = gdk_color_new (0xdddd,0xdddd,0xdddd);
priv->color_themes[GNOME_CMD_COLOR_MODERN].curs_fg = gdk_color_new (0xffff,0xffff,0xffff);
@@ -1197,6 +1201,8 @@
priv->color_themes[GNOME_CMD_COLOR_FUSION].respect_theme = FALSE;
priv->color_themes[GNOME_CMD_COLOR_FUSION].norm_fg = gdk_color_new (0x8080,0xffff,0xffff);
priv->color_themes[GNOME_CMD_COLOR_FUSION].norm_bg = gdk_color_new (0,0x4040,0x8080);
+ priv->color_themes[GNOME_CMD_COLOR_FUSION].alt_fg = gdk_color_new (0x8080,0xffff,0xffff);
+ priv->color_themes[GNOME_CMD_COLOR_FUSION].alt_bg = gdk_color_new (0,0x4040,0x8080);
priv->color_themes[GNOME_CMD_COLOR_FUSION].sel_fg = gdk_color_new (0xffff,0xffff,0);
priv->color_themes[GNOME_CMD_COLOR_FUSION].sel_bg = gdk_color_new (0,0x4040,0x8080);
priv->color_themes[GNOME_CMD_COLOR_FUSION].curs_fg = gdk_color_new (0,0,0x8080);
@@ -1205,6 +1211,8 @@
priv->color_themes[GNOME_CMD_COLOR_CLASSIC].respect_theme = FALSE;
priv->color_themes[GNOME_CMD_COLOR_CLASSIC].norm_fg = gdk_color_new (0xffff,0xffff,0xffff);
priv->color_themes[GNOME_CMD_COLOR_CLASSIC].norm_bg = gdk_color_new (0,0,0x4444);
+ priv->color_themes[GNOME_CMD_COLOR_CLASSIC].alt_fg = gdk_color_new (0xffff,0xffff,0xffff);
+ priv->color_themes[GNOME_CMD_COLOR_CLASSIC].alt_bg = gdk_color_new (0,0,0x4444);
priv->color_themes[GNOME_CMD_COLOR_CLASSIC].sel_fg = gdk_color_new (0xffff,0xffff,0);
priv->color_themes[GNOME_CMD_COLOR_CLASSIC].sel_bg = gdk_color_new (0,0,0x4444);
priv->color_themes[GNOME_CMD_COLOR_CLASSIC].curs_fg = gdk_color_new (0,0,0);
@@ -1213,6 +1221,8 @@
priv->color_themes[GNOME_CMD_COLOR_DEEP_BLUE].respect_theme = FALSE;
priv->color_themes[GNOME_CMD_COLOR_DEEP_BLUE].norm_fg = gdk_color_new (0,0xffff,0xffff);
priv->color_themes[GNOME_CMD_COLOR_DEEP_BLUE].norm_bg = gdk_color_new (0,0,0x8080);
+ priv->color_themes[GNOME_CMD_COLOR_DEEP_BLUE].alt_fg = gdk_color_new (0,0xffff,0xffff);
+ priv->color_themes[GNOME_CMD_COLOR_DEEP_BLUE].alt_bg = gdk_color_new (0,0,0x8080);
priv->color_themes[GNOME_CMD_COLOR_DEEP_BLUE].sel_fg = gdk_color_new (0xffff,0xffff,0);
priv->color_themes[GNOME_CMD_COLOR_DEEP_BLUE].sel_bg = gdk_color_new (0,0,0x8080);
priv->color_themes[GNOME_CMD_COLOR_DEEP_BLUE].curs_fg = gdk_color_new (0,0,0);
@@ -1221,6 +1231,8 @@
priv->color_themes[GNOME_CMD_COLOR_CAFEZINHO].respect_theme = FALSE;
priv->color_themes[GNOME_CMD_COLOR_CAFEZINHO].norm_fg = gdk_color_new (0xe4e4,0xdede,0xd5d5);
priv->color_themes[GNOME_CMD_COLOR_CAFEZINHO].norm_bg = gdk_color_new (0x199a,0x1530,0x11a8);
+ priv->color_themes[GNOME_CMD_COLOR_CAFEZINHO].alt_fg = gdk_color_new (0xe4e4,0xdede,0xd5d5);
+ priv->color_themes[GNOME_CMD_COLOR_CAFEZINHO].alt_bg = gdk_color_new (0x199a,0x1530,0x11a8);
priv->color_themes[GNOME_CMD_COLOR_CAFEZINHO].sel_fg = gdk_color_new (0xffff,0xcfcf,0x3636);
priv->color_themes[GNOME_CMD_COLOR_CAFEZINHO].sel_bg = gdk_color_new (0x199a,0x1530,0x11a8);
priv->color_themes[GNOME_CMD_COLOR_CAFEZINHO].curs_fg = gdk_color_new (0xe4e4,0xdede,0xd5d5);
@@ -1229,6 +1241,8 @@
priv->color_themes[GNOME_CMD_COLOR_NONE].respect_theme = TRUE;
priv->color_themes[GNOME_CMD_COLOR_NONE].norm_fg = NULL;
priv->color_themes[GNOME_CMD_COLOR_NONE].norm_bg = NULL;
+ priv->color_themes[GNOME_CMD_COLOR_NONE].alt_fg = NULL;
+ priv->color_themes[GNOME_CMD_COLOR_NONE].alt_bg = NULL;
priv->color_themes[GNOME_CMD_COLOR_NONE].sel_fg = NULL;
priv->color_themes[GNOME_CMD_COLOR_NONE].sel_bg = NULL;
priv->color_themes[GNOME_CMD_COLOR_NONE].curs_fg = NULL;
@@ -1287,6 +1301,8 @@
gnome_cmd_data_get_color ("/colors/norm_fg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_fg);
gnome_cmd_data_get_color ("/colors/norm_bg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_bg);
+ gnome_cmd_data_get_color ("/colors/alt_fg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].alt_fg);
+ gnome_cmd_data_get_color ("/colors/alt_bg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].alt_bg);
gnome_cmd_data_get_color ("/colors/sel_fg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].sel_fg);
gnome_cmd_data_get_color ("/colors/sel_bg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].sel_bg);
gnome_cmd_data_get_color ("/colors/curs_fg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].curs_fg);
@@ -1671,6 +1687,8 @@
gnome_cmd_data_set_color ("/colors/norm_fg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_fg);
gnome_cmd_data_set_color ("/colors/norm_bg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_bg);
+ gnome_cmd_data_set_color ("/colors/alt_fg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].alt_fg);
+ gnome_cmd_data_set_color ("/colors/alt_bg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].alt_bg);
gnome_cmd_data_set_color ("/colors/sel_fg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].sel_fg);
gnome_cmd_data_set_color ("/colors/sel_bg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].sel_bg);
gnome_cmd_data_set_color ("/colors/curs_fg", priv->color_themes[GNOME_CMD_COLOR_CUSTOM].curs_fg);
Modified: trunk/src/gnome-cmd-file-list.cc
==============================================================================
--- trunk/src/gnome-cmd-file-list.cc (original)
+++ trunk/src/gnome-cmd-file-list.cc Thu Jan 8 22:34:29 2009
@@ -337,7 +337,7 @@
if (!gnome_cmd_data_get_use_ls_colors ())
- gtk_clist_set_row_style (*fl, row, sel_list_style);
+ gtk_clist_set_row_style (*fl, row, row%2 ? alt_sel_list_style : sel_list_style);
else
{
GnomeCmdColorTheme *colors = gnome_cmd_data_get_current_color_theme ();
@@ -374,7 +374,7 @@
fl->priv->selected_files = g_list_remove (fl->priv->selected_files, finfo);
if (!gnome_cmd_data_get_use_ls_colors ())
- gtk_clist_set_row_style (*fl, row, list_style);
+ gtk_clist_set_row_style (*fl, row, row%2 ? alt_list_style : list_style);
else
if (LsColor *col = ls_colors_get (finfo))
{
@@ -1375,7 +1375,7 @@
// Setup row data and color
if (!gnome_cmd_data_get_use_ls_colors ())
- gtk_clist_set_row_style (clist, row, list_style);
+ gtk_clist_set_row_style (clist, row, row%2 ? alt_list_style : list_style);
else
{
LsColor *col = ls_colors_get (finfo);
Modified: trunk/src/gnome-cmd-options-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-options-dialog.cc (original)
+++ trunk/src/gnome-cmd-options-dialog.cc Thu Jan 8 22:34:29 2009
@@ -338,6 +338,8 @@
{
GtkWidget *norm_fg = lookup_widget (GTK_WIDGET (dlg), "default_fg");
GtkWidget *norm_bg = lookup_widget (GTK_WIDGET (dlg), "default_bg");
+ GtkWidget *alt_fg = lookup_widget (GTK_WIDGET (dlg), "alternate_fg");
+ GtkWidget *alt_bg = lookup_widget (GTK_WIDGET (dlg), "alternate_bg");
GtkWidget *sel_fg = lookup_widget (GTK_WIDGET (dlg), "selected_fg");
GtkWidget *sel_bg = lookup_widget (GTK_WIDGET (dlg), "selected_bg");
GtkWidget *curs_fg = lookup_widget (GTK_WIDGET (dlg), "cursor_fg");
@@ -352,6 +354,12 @@
GNOME_COLOR_PICKER (norm_bg),
&colors->norm_bg->red, &colors->norm_bg->green, &colors->norm_bg->blue, &a);
gnome_color_picker_get_i16 (
+ GNOME_COLOR_PICKER (alt_fg),
+ &colors->alt_fg->red, &colors->alt_fg->green, &colors->alt_fg->blue, &a);
+ gnome_color_picker_get_i16 (
+ GNOME_COLOR_PICKER (alt_bg),
+ &colors->alt_bg->red, &colors->alt_bg->green, &colors->alt_bg->blue, &a);
+ gnome_color_picker_get_i16 (
GNOME_COLOR_PICKER (sel_fg),
&colors->sel_fg->red, &colors->sel_fg->green, &colors->sel_fg->blue, &a);
gnome_color_picker_get_i16 (
@@ -382,7 +390,7 @@
cat = create_category (dlg, cat_box, _("Colors"));
gnome_cmd_dialog_add_category (GNOME_CMD_DIALOG (dlg), cat);
- table = create_table (dlg, 4, 3);
+ table = create_table (dlg, 5, 3);
gtk_container_add (GTK_CONTAINER (cat_box), table);
cpicker = create_color_picker (dlg, "default_fg");
@@ -395,23 +403,33 @@
gnome_color_picker_set_i16 (
GNOME_COLOR_PICKER (cpicker),
colors->norm_bg->red, colors->norm_bg->green, colors->norm_bg->blue, 0);
- cpicker = create_color_picker (dlg, "selected_fg");
+ cpicker = create_color_picker (dlg, "alternate_fg");
table_add (table, cpicker, 1, 2, (GtkAttachOptions)0);
gnome_color_picker_set_i16 (
GNOME_COLOR_PICKER (cpicker),
+ colors->alt_fg->red, colors->alt_fg->green, colors->alt_fg->blue, 0);
+ cpicker = create_color_picker (dlg, "alternate_bg");
+ table_add (table, cpicker, 2, 2, (GtkAttachOptions) 0);
+ gnome_color_picker_set_i16 (
+ GNOME_COLOR_PICKER (cpicker),
+ colors->alt_bg->red, colors->alt_bg->green, colors->alt_bg->blue, 0);
+ cpicker = create_color_picker (dlg, "selected_fg");
+ table_add (table, cpicker, 1, 3, (GtkAttachOptions) 0);
+ gnome_color_picker_set_i16 (
+ GNOME_COLOR_PICKER (cpicker),
colors->sel_fg->red, colors->sel_fg->green, colors->sel_fg->blue, 0);
cpicker = create_color_picker (dlg, "selected_bg");
- table_add (table, cpicker, 2, 2, (GtkAttachOptions)0);
+ table_add (table, cpicker, 2, 3, (GtkAttachOptions) 0);
gnome_color_picker_set_i16 (
GNOME_COLOR_PICKER (cpicker),
colors->sel_bg->red, colors->sel_bg->green, colors->sel_bg->blue, 0);
cpicker = create_color_picker (dlg, "cursor_fg");
- table_add (table, cpicker, 1, 3, (GtkAttachOptions)0);
+ table_add (table, cpicker, 1, 4, (GtkAttachOptions) 0);
gnome_color_picker_set_i16 (
GNOME_COLOR_PICKER (cpicker),
colors->curs_fg->red, colors->curs_fg->green, colors->curs_fg->blue, 0);
cpicker = create_color_picker (dlg, "cursor_bg");
- table_add (table, cpicker, 2, 3, (GtkAttachOptions)0);
+ table_add (table, cpicker, 2, 4, (GtkAttachOptions) 0);
gnome_color_picker_set_i16 (
GNOME_COLOR_PICKER (cpicker),
colors->curs_bg->red, colors->curs_bg->green, colors->curs_bg->blue, 0);
@@ -422,10 +440,12 @@
table_add (table, label, 2, 0, (GtkAttachOptions) GTK_FILL);
label = create_label (dlg, _("Default:"));
table_add (table, label, 0, 1, (GtkAttachOptions) GTK_FILL);
- label = create_label (dlg, _("Selected file:"));
+ label = create_label (dlg, _("Alternate:"));
table_add (table, label, 0, 2, (GtkAttachOptions) GTK_FILL);
- label = create_label (dlg, _("Cursor:"));
+ label = create_label (dlg, _("Selected file:"));
table_add (table, label, 0, 3, (GtkAttachOptions) GTK_FILL);
+ label = create_label (dlg, _("Cursor:"));
+ table_add (table, label, 0, 4, (GtkAttachOptions) GTK_FILL);
gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dlg), GNOME_STOCK_BUTTON_CLOSE,
GTK_SIGNAL_FUNC (on_edit_colors_close), dlg);
Modified: trunk/src/gnome-cmd-style.cc
==============================================================================
--- trunk/src/gnome-cmd-style.cc (original)
+++ trunk/src/gnome-cmd-style.cc Thu Jan 8 22:34:29 2009
@@ -28,7 +28,9 @@
GtkStyle *list_style = NULL;
+GtkStyle *alt_list_style = NULL;
GtkStyle *sel_list_style = NULL;
+GtkStyle *alt_sel_list_style = NULL;
inline GtkStyle *create_list_style ()
@@ -65,13 +67,44 @@
}
-inline GtkStyle *create_sel_list_style ()
+inline GtkStyle *create_alt_list_style ()
{
- GtkStyle *style;
GnomeCmdColorTheme *cols = gnome_cmd_data_get_current_color_theme ();
const gchar *font_name = gnome_cmd_data_get_list_font ();
+ GtkStyle *style = gtk_style_new ();
+
+ if (strcmp (font_name, "default") != 0)
+ {
+ PangoFontDescription *pfont = pango_font_description_from_string (font_name);
- style = gtk_style_new ();
+ if (pfont && pango_font_description_get_size (pfont) != 0)
+ {
+ if (style->font_desc)
+ pango_font_description_free (style->font_desc);
+ style->font_desc = pfont;
+ }
+ }
+
+ if (!cols->respect_theme)
+ {
+ style->fg[GTK_STATE_SELECTED] = *cols->curs_fg;
+ style->text[GTK_STATE_NORMAL] = *cols->alt_fg;
+ style->fg[GTK_STATE_NORMAL] = *cols->alt_fg;
+
+ style->bg[GTK_STATE_SELECTED] = *cols->curs_bg;
+ style->base[GTK_STATE_NORMAL] = *cols->alt_bg;
+ style->base[GTK_STATE_ACTIVE] = *cols->alt_bg;
+ }
+
+ return style;
+}
+
+
+inline GtkStyle *create_sel_list_style ()
+{
+ GnomeCmdColorTheme *cols = gnome_cmd_data_get_current_color_theme ();
+ const gchar *font_name = gnome_cmd_data_get_list_font ();
+ GtkStyle *style = gtk_style_new ();
if (strcmp (font_name, "default") != 0)
{
@@ -101,11 +134,49 @@
}
+inline GtkStyle *create_alt_sel_list_style ()
+{
+ GnomeCmdColorTheme *cols = gnome_cmd_data_get_current_color_theme ();
+ const gchar *font_name = gnome_cmd_data_get_list_font ();
+ GtkStyle *style = gtk_style_new ();
+
+ if (strcmp (font_name, "default") != 0)
+ {
+ PangoFontDescription *pfont = pango_font_description_from_string (font_name);
+
+ if (pfont && pango_font_description_get_size (pfont) != 0)
+ {
+ if (style->font_desc)
+ pango_font_description_free (style->font_desc);
+ style->font_desc = pfont;
+ }
+ }
+
+ if (!cols->respect_theme)
+ {
+ style->fg[GTK_STATE_SELECTED] = *cols->sel_fg;
+ style->fg[GTK_STATE_NORMAL] = *cols->sel_fg;
+ style->text[GTK_STATE_NORMAL] = *cols->sel_fg;
+
+ style->bg[GTK_STATE_SELECTED] = *cols->curs_bg;
+ style->bg[GTK_STATE_NORMAL] = *cols->sel_bg;
+ style->base[GTK_STATE_NORMAL] = *cols->alt_bg;
+ style->base[GTK_STATE_ACTIVE] = *cols->alt_bg;
+ }
+
+ return style;
+}
+
+
void gnome_cmd_style_create ()
{
if (list_style) gtk_style_unref (list_style);
+ if (alt_list_style) gtk_style_unref (alt_list_style);
if (sel_list_style) gtk_style_unref (sel_list_style);
+ if (alt_sel_list_style) gtk_style_unref (alt_sel_list_style);
list_style = create_list_style ();
+ alt_list_style = create_alt_list_style ();
sel_list_style = create_sel_list_style ();
+ alt_sel_list_style = create_alt_sel_list_style ();
}
Modified: trunk/src/gnome-cmd-style.h
==============================================================================
--- trunk/src/gnome-cmd-style.h (original)
+++ trunk/src/gnome-cmd-style.h Thu Jan 8 22:34:29 2009
@@ -22,6 +22,7 @@
#define __GNOME_CMD_STYLE_H__
extern GtkStyle *list_style, *sel_list_style;
+extern GtkStyle *alt_list_style, *alt_sel_list_style;
void gnome_cmd_style_create ();
Modified: trunk/src/gnome-cmd-types.h
==============================================================================
--- trunk/src/gnome-cmd-types.h (original)
+++ trunk/src/gnome-cmd-types.h Thu Jan 8 22:34:29 2009
@@ -82,6 +82,7 @@
GdkColor *sel_fg, *sel_bg;
GdkColor *norm_fg, *norm_bg;
GdkColor *curs_fg, *curs_bg;
+ GdkColor *alt_fg, *alt_bg;
} GnomeCmdColorTheme;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
