Author: stephan
Date: 2007-08-08 22:35:54 +0000 (Wed, 08 Aug 2007)
New Revision: 2976
Modified:
ristretto/trunk/src/thumbnail_viewer.c
Log:
improve icons
Modified: ristretto/trunk/src/thumbnail_viewer.c
===================================================================
--- ristretto/trunk/src/thumbnail_viewer.c 2007-08-08 21:49:19 UTC (rev 2975)
+++ ristretto/trunk/src/thumbnail_viewer.c 2007-08-08 22:35:54 UTC (rev 2976)
@@ -214,13 +214,17 @@
{
GtkWidget *widget = GTK_WIDGET(viewer);
GdkColor color;
+ GdkColor color_1;
RsttoNavigatorEntry *current_entry = rstto_navigator_get_file(viewer->priv->navigator);
color.pixel = 0xffffffff;
+ color_1.pixel = 0x0;
GdkGC *gc = gdk_gc_new(GDK_DRAWABLE(widget->window));
+ GdkGC *gc_1 = gdk_gc_new(GDK_DRAWABLE(widget->window));
gdk_gc_set_foreground(gc, &color);
+ gdk_gc_set_foreground(gc_1, &color_1);
gint i;
switch (viewer->priv->orientation)
@@ -244,12 +248,14 @@
if(current_entry == entry)
+ {
gtk_paint_box(widget->style,
widget->window,
GTK_STATE_SELECTED,
GTK_SHADOW_NONE,
NULL,NULL,NULL,
(i*viewer->priv->dimension)+20-viewer->priv->offset, 4, viewer->priv->dimension - 8, viewer->priv->dimension - 8);
+ }
else
gtk_paint_box(widget->style,
widget->window,
@@ -268,83 +274,106 @@
-1, -1,
GDK_RGB_DITHER_NORMAL,
0, 0);
- GdkPixbufRotation rotation = rstto_navigator_entry_get_rotation(entry);
- gint arc_1 = 5760;
- gint arc_2 = 0;
- switch (rotation)
+
+ if (current_entry == entry)
{
- case GDK_PIXBUF_ROTATE_NONE:
- break;
- case GDK_PIXBUF_ROTATE_CLOCKWISE:
- arc_2 = -5760;
- break;
- case GDK_PIXBUF_ROTATE_UPSIDEDOWN:
- arc_2 = -11430;
- break;
- case GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE:
- arc_2 = -17190;
- break;
- }
- if (arc_2)
- {
- gdk_draw_arc(GDK_DRAWABLE(widget->window),
- gc,
- FALSE,
- (viewer->priv->dimension * (i+1))-8,
- viewer->priv->dimension-24,
- 16,
- 16,
- 0, 23040);
- gdk_draw_arc(GDK_DRAWABLE(widget->window),
- gc,
+ GdkPixbufRotation rotation = rstto_navigator_entry_get_rotation(entry);
+ gint arc_1 = 5760;
+ gint arc_2 = 0;
+ switch (rotation)
+ {
+ case GDK_PIXBUF_ROTATE_NONE:
+ break;
+ case GDK_PIXBUF_ROTATE_CLOCKWISE:
+ arc_2 = -5760;
+ break;
+ case GDK_PIXBUF_ROTATE_UPSIDEDOWN:
+ arc_2 = -11430;
+ break;
+ case GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE:
+ arc_2 = -17190;
+ break;
+ }
+ if (arc_2)
+ {
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc_1,
TRUE,
- (viewer->priv->dimension * (i+1))-8,
+ (viewer->priv->dimension * (i+1))-8-viewer->priv->offset,
viewer->priv->dimension-24,
16,
- 16,
- arc_1, arc_2);
- }
+ 16);
+ gdk_draw_arc(GDK_DRAWABLE(widget->window),
+ gc,
+ FALSE,
+ (viewer->priv->dimension * (i+1))-8-viewer->priv->offset,
+ viewer->priv->dimension-24,
+ 15,
+ 15,
+ 0, 23040);
+ gdk_draw_arc(GDK_DRAWABLE(widget->window),
+ gc,
+ TRUE,
+ (viewer->priv->dimension * (i+1))-8-viewer->priv->offset,
+ viewer->priv->dimension-24,
+ 15,
+ 15,
+ arc_1, arc_2);
+ }
- gboolean v_flip = rstto_navigator_entry_get_flip(entry, FALSE);
- gboolean h_flip = rstto_navigator_entry_get_flip(entry, TRUE);
+ gboolean v_flip = rstto_navigator_entry_get_flip(entry, FALSE);
+ gboolean h_flip = rstto_navigator_entry_get_flip(entry, TRUE);
- if (v_flip)
- {
- gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
- gc,
- FALSE,
- (viewer->priv->dimension * (i+1))-48,
- viewer->priv->dimension-24,
- 16,
- 16);
- gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
- gc,
+ if (v_flip)
+ {
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc_1,
TRUE,
- (viewer->priv->dimension * (i+1))-48,
+ (viewer->priv->dimension * (i+1))-48-viewer->priv->offset,
viewer->priv->dimension-24,
16,
- 8);
-
- }
-
- if (h_flip)
- {
- gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
- gc,
- FALSE,
- (viewer->priv->dimension * (i+1))-28,
- viewer->priv->dimension-24,
- 16,
16);
- gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
- gc,
- TRUE,
- (viewer->priv->dimension * (i+1))-28,
- viewer->priv->dimension-24,
- 8,
- 16);
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc,
+ FALSE,
+ (viewer->priv->dimension * (i+1))-48-viewer->priv->offset,
+ viewer->priv->dimension-24,
+ 16,
+ 16);
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc,
+ TRUE,
+ (viewer->priv->dimension * (i+1))-48-viewer->priv->offset,
+ viewer->priv->dimension-24,
+ 16,
+ 8);
+ }
+ if (h_flip)
+ {
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc_1,
+ TRUE,
+ (viewer->priv->dimension * (i+1))-28-viewer->priv->offset,
+ viewer->priv->dimension-24,
+ 16,
+ 16);
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc,
+ FALSE,
+ (viewer->priv->dimension * (i+1))-28-viewer->priv->offset,
+ viewer->priv->dimension-24,
+ 16,
+ 16);
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc,
+ TRUE,
+ (viewer->priv->dimension * (i+1))-28-viewer->priv->offset,
+ viewer->priv->dimension-24,
+ 8,
+ 16);
+ }
}
}
@@ -421,84 +450,113 @@
-1, -1,
GDK_RGB_DITHER_NORMAL,
0, 0);
- GdkPixbufRotation rotation = rstto_navigator_entry_get_rotation(entry);
- gint arc_1 = 5760;
- gint arc_2 = 0;
- switch (rotation)
+ if (current_entry == entry)
{
- case GDK_PIXBUF_ROTATE_NONE:
- break;
- case GDK_PIXBUF_ROTATE_CLOCKWISE:
- arc_2 = -5760;
- break;
- case GDK_PIXBUF_ROTATE_UPSIDEDOWN:
- arc_2 = -11430;
- break;
- case GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE:
- arc_2 = -17190;
- break;
- }
- if (arc_2)
- {
- gdk_draw_arc(GDK_DRAWABLE(widget->window),
- gc,
- FALSE,
- viewer->priv->dimension-24,
- (viewer->priv->dimension * (i+1))-8,
- 16,
- 16,
- 0, 23040);
- gdk_draw_arc(GDK_DRAWABLE(widget->window),
- gc,
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc_1,
TRUE,
- viewer->priv->dimension-24,
- (viewer->priv->dimension * (i+1))-8,
- 16,
- 16,
- arc_1, arc_2);
- }
+ 4,
+ ((i+1)*viewer->priv->dimension)-8-viewer->priv->offset,
+ viewer->priv->dimension - 8,
+ 20);
+ GdkPixbufRotation rotation = rstto_navigator_entry_get_rotation(entry);
+ gint arc_1 = 5760;
+ gint arc_2 = 0;
+ switch (rotation)
+ {
+ case GDK_PIXBUF_ROTATE_NONE:
+ break;
+ case GDK_PIXBUF_ROTATE_CLOCKWISE:
+ arc_2 = -5760;
+ break;
+ case GDK_PIXBUF_ROTATE_UPSIDEDOWN:
+ arc_2 = -11430;
+ break;
+ case GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE:
+ arc_2 = -17190;
+ break;
+ }
+ if (arc_2)
+ {
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc_1,
+ TRUE,
+ viewer->priv->dimension-24,
+ (viewer->priv->dimension * (i+1))-8,
+ 16,
+ 16);
+ gdk_draw_arc(GDK_DRAWABLE(widget->window),
+ gc,
+ FALSE,
+ viewer->priv->dimension-24,
+ (viewer->priv->dimension * (i+1))-8,
+ 15,
+ 15,
+ 0, 23040);
+ gdk_draw_arc(GDK_DRAWABLE(widget->window),
+ gc,
+ TRUE,
+ viewer->priv->dimension-24,
+ (viewer->priv->dimension * (i+1))-8,
+ 15,
+ 15,
+ arc_1, arc_2);
+ }
- gboolean v_flip = rstto_navigator_entry_get_flip(entry, FALSE);
- gboolean h_flip = rstto_navigator_entry_get_flip(entry, TRUE);
+ gboolean v_flip = rstto_navigator_entry_get_flip(entry, FALSE);
+ gboolean h_flip = rstto_navigator_entry_get_flip(entry, TRUE);
- if (v_flip)
- {
- gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
- gc,
- FALSE,
- viewer->priv->dimension-64,
- (viewer->priv->dimension * (i+1))-8,
- 16,
- 16);
- gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
- gc,
- TRUE,
- viewer->priv->dimension-64,
- (viewer->priv->dimension * (i+1))-8,
- 16,
- 8);
+ if (v_flip)
+ {
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc_1,
+ TRUE,
+ viewer->priv->dimension-64,
+ (viewer->priv->dimension * (i+1))-8,
+ 16,
+ 16);
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc,
+ FALSE,
+ viewer->priv->dimension-64,
+ (viewer->priv->dimension * (i+1))-8,
+ 16,
+ 16);
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc,
+ TRUE,
+ viewer->priv->dimension-64,
+ (viewer->priv->dimension * (i+1))-8,
+ 16,
+ 8);
+ }
+ if (h_flip)
+ {
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc_1,
+ TRUE,
+ viewer->priv->dimension-44,
+ (viewer->priv->dimension * (i+1))-8,
+ 16,
+ 16);
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc,
+ FALSE,
+ viewer->priv->dimension-44,
+ (viewer->priv->dimension * (i+1))-8,
+ 16,
+ 16);
+ gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
+ gc,
+ TRUE,
+ viewer->priv->dimension-44,
+ (viewer->priv->dimension * (i+1))-8,
+ 8,
+ 16);
+ }
}
-
- if (h_flip)
- {
- gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
- gc,
- FALSE,
- viewer->priv->dimension-44,
- (viewer->priv->dimension * (i+1))-8,
- 16,
- 16);
- gdk_draw_rectangle(GDK_DRAWABLE(widget->window),
- gc,
- TRUE,
- viewer->priv->dimension-44,
- (viewer->priv->dimension * (i+1))-8,
- 8,
- 16);
-
- }
}
gtk_paint_box(widget->style,