[Goodies-commits] r3723 - ristretto/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-12-17 21:35:42 +0000 (Mon, 17 Dec 2007)
New Revision: 3723

Removed:
   ristretto/trunk/src/thumbnail_viewer.c
   ristretto/trunk/src/thumbnail_viewer.h
Modified:
   ristretto/trunk/src/Makefile.am
   ristretto/trunk/src/main.c
   ristretto/trunk/src/navigator.c
   ristretto/trunk/src/navigator.h
   ristretto/trunk/src/thumbnail.c
   ristretto/trunk/src/thumbnail.h
   ristretto/trunk/src/thumbnail_bar.c
Log:
Remove thumbnail-viewer
Allow toggle for thumbnails



Modified: ristretto/trunk/src/Makefile.am
===================================================================
--- ristretto/trunk/src/Makefile.am	2007-12-17 21:28:47 UTC (rev 3722)
+++ ristretto/trunk/src/Makefile.am	2007-12-17 21:35:42 UTC (rev 3723)
@@ -6,8 +6,7 @@
 	navigator.c navigator.h \
 	picture_viewer.c picture_viewer.h \
 	thumbnail.c thumbnail.h \
-	thumbnail_bar.c thumbnail_bar.h \
-	thumbnail_viewer.c thumbnail_viewer.h
+	thumbnail_bar.c thumbnail_bar.h
 
 ristretto_CFLAGS = \
 	$(GTK_CFLAGS) \

Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c	2007-12-17 21:28:47 UTC (rev 3722)
+++ ristretto/trunk/src/main.c	2007-12-17 21:35:42 UTC (rev 3723)
@@ -387,14 +387,14 @@
                                         {
                                             if (!strcmp(path_name, argv[1]))
                                             {
-                                                rstto_navigator_set_file(navigator, i);
+                                                rstto_navigator_set_file_nr(navigator, i);
                                             }
                                         }
                                         else
                                         {
                                             if (!strcmp(path_name, path_dir))
                                             {
-                                                rstto_navigator_set_file(navigator, i);
+                                                rstto_navigator_set_file_nr(navigator, i);
                                             }
 
                                         }

Modified: ristretto/trunk/src/navigator.c
===================================================================
--- ristretto/trunk/src/navigator.c	2007-12-17 21:28:47 UTC (rev 3722)
+++ ristretto/trunk/src/navigator.c	2007-12-17 21:35:42 UTC (rev 3723)
@@ -575,7 +575,7 @@
 }
 
 void
-rstto_navigator_set_file (RsttoNavigator *navigator, gint n)
+rstto_navigator_set_file_nr (RsttoNavigator *navigator, gint n)
 {
     if(navigator->file_iter)
     {

Modified: ristretto/trunk/src/navigator.h
===================================================================
--- ristretto/trunk/src/navigator.h	2007-12-17 21:28:47 UTC (rev 3722)
+++ ristretto/trunk/src/navigator.h	2007-12-17 21:35:42 UTC (rev 3723)
@@ -103,7 +103,7 @@
 RsttoNavigatorEntry *
 rstto_navigator_get_nth_file (RsttoNavigator *navigator, gint n);
 void
-rstto_navigator_set_file (RsttoNavigator *navigator, gint n);
+rstto_navigator_set_file_nr (RsttoNavigator *navigator, gint n);
 void
 rstto_navigator_clear (RsttoNavigator *navigator);
 void

Modified: ristretto/trunk/src/thumbnail.c
===================================================================
--- ristretto/trunk/src/thumbnail.c	2007-12-17 21:28:47 UTC (rev 3722)
+++ ristretto/trunk/src/thumbnail.c	2007-12-17 21:35:42 UTC (rev 3723)
@@ -74,7 +74,7 @@
             NULL
         };
 
-        rstto_thumbnail_type = g_type_register_static (GTK_TYPE_BUTTON, "RsttoThumbnail", &rstto_thumbnail_info, 0);
+        rstto_thumbnail_type = g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, "RsttoThumbnail", &rstto_thumbnail_info, 0);
     }
     return rstto_thumbnail_type;
 }
@@ -87,6 +87,8 @@
     gtk_widget_set_redraw_on_allocate(GTK_WIDGET(thumb), TRUE);
     gtk_widget_set_events (GTK_WIDGET(thumb),
                            GDK_BUTTON_PRESS_MASK);
+
+    g_signal_connect(G_OBJECT(thumb), "toggled", G_CALLBACK(cb_rstto_thumbnail_toggled), NULL);
 }
 
 static void
@@ -169,7 +171,7 @@
 
         gdk_gc_set_foreground(gc, &widget->style->fg[GTK_STATE_NORMAL]);
 
-        if(thumb->priv->selected == TRUE)
+        if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(thumb)))
         {
             gdk_draw_rectangle(GDK_DRAWABLE(pixmap),
                             gc_bg_selected,
@@ -236,5 +238,4 @@
 static void
 cb_rstto_thumbnail_toggled(RsttoThumbnail *thumb, gpointer user_data)
 {
-
 }

Modified: ristretto/trunk/src/thumbnail.h
===================================================================
--- ristretto/trunk/src/thumbnail.h	2007-12-17 21:28:47 UTC (rev 3722)
+++ ristretto/trunk/src/thumbnail.h	2007-12-17 21:35:42 UTC (rev 3723)
@@ -45,7 +45,7 @@
 
 struct _RsttoThumbnail
 {
-    GtkButton         parent;
+    GtkToggleButton     parent;
     RsttoThumbnailPriv *priv;
 };
 
@@ -53,7 +53,7 @@
 
 struct _RsttoThumbnailClass
 {
-    GtkButtonClass  parent_class;
+    GtkToggleButtonClass  parent_class;
 };
 
 GType      rstto_thumbnail_get_type();

Modified: ristretto/trunk/src/thumbnail_bar.c
===================================================================
--- ristretto/trunk/src/thumbnail_bar.c	2007-12-17 21:28:47 UTC (rev 3722)
+++ ristretto/trunk/src/thumbnail_bar.c	2007-12-17 21:35:42 UTC (rev 3723)
@@ -146,7 +146,6 @@
 static void
 rstto_thumbnail_bar_size_request(GtkWidget *widget, GtkRequisition *requisition)
 {
-    g_debug("%s: %d:%d", __FUNCTION__, requisition->width, requisition->height);
     RsttoThumbnailBar *bar = RSTTO_THUMBNAIL_BAR(widget);
     gint border_width = GTK_CONTAINER(bar)->border_width;
     gint spacing = 0;
@@ -174,7 +173,6 @@
 static void
 rstto_thumbnail_bar_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 {
-    g_debug("%s: %d:%d", __FUNCTION__, allocation->width, allocation->height);
     RsttoThumbnailBar *bar = RSTTO_THUMBNAIL_BAR(widget);
     gint border_width = GTK_CONTAINER(bar)->border_width;
     gint spacing = 0;
@@ -355,7 +353,6 @@
 static void
 cb_rstto_thumbnail_bar_nav_new_entry(RsttoNavigator *nav, gint nr, RsttoNavigatorEntry *entry, RsttoThumbnailBar *bar)
 {
-    //GtkWidget *thumb = gtk_label_new("Aaaaaaaaaaa");
     GtkWidget *thumb = rstto_thumbnail_new(entry);
     gtk_container_add(GTK_CONTAINER(bar), thumb);
 }

Deleted: ristretto/trunk/src/thumbnail_viewer.c

Deleted: ristretto/trunk/src/thumbnail_viewer.h