[xiph-cvs] cvs commit: postfish mainpanel.c multibar.c version.h form.c

[Monty]

xiphmont    03/10/18 03:29:48

  Modified:    .        mainpanel.c multibar.c version.h
  Removed:     .        form.c
  Log:
  edit formatting of version label
  make triangles on followers smaller.

Revision  Changes    Path
1.19      +14 -5     postfish/mainpanel.c

Index: mainpanel.c
===================================================================
RCS file: /usr/local/cvsroot/postfish/mainpanel.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mainpanel.c	17 Oct 2003 08:40:18 -0000	1.18
+++ mainpanel.c	18 Oct 2003 07:29:47 -0000	1.19
@@ -435,8 +435,20 @@
   GtkWidget *topplace,*topal;
 
   char *text_bar[7]={"[bksp]","[<]","[,]","[space]","[.]","[>]","[end]"};
-
   GdkWindow *root=gdk_get_default_root_window();
+
+  char versionnum[20];
+  char versiondate[20];
+  char versiontime[20];
+  char versionmarkup[240];
+  sscanf(VERSION,"$Id: mainpanel.c,v 1.19 2003/10/18 07:29:47 xiphmont Exp $",
+	 versionnum,versiondate,versiontime);
+  snprintf(versionmarkup,240,"<span size=\"large\" weight=\"bold\" "
+	   "style=\"italic\" foreground=\"dark blue\">"
+	   "Postfish</span>  <span size=\"small\" foreground=\"#606060\">"
+	   "version %s %s %s</span> ",
+	   versionnum,versiondate,versiontime);
+
   panel->toplevel=gtk_window_new (GTK_WINDOW_TOPLEVEL);
   panel->topframe=gtk_frame_new (NULL);
   panel->toplabel=gtk_label_new (NULL);
@@ -510,10 +522,7 @@
   gtk_container_set_border_width (GTK_CONTAINER (panel->box1), 3);
   gtk_frame_set_shadow_type(GTK_FRAME(panel->topframe),GTK_SHADOW_ETCHED_IN);
   gtk_frame_set_label_widget(GTK_FRAME(panel->topframe),panel->toplabel);
-  gtk_label_set_markup(GTK_LABEL(panel->toplabel),
-		       "<span size=\"large\" weight=\"bold\" "
-		       "style=\"italic\" foreground=\"dark blue\">"
-		       "Postfish</span> "VERSION);
+  gtk_label_set_markup(GTK_LABEL(panel->toplabel),versionmarkup);
 
   gtk_container_add (GTK_CONTAINER(panel->topframe), panel->mainbox);
   gtk_box_pack_end(GTK_BOX(panel->mainbox),panel->box1,0,0,0);

<p><p>1.11      +24 -15    postfish/multibar.c

Index: multibar.c
===================================================================
RCS file: /usr/local/cvsroot/postfish/multibar.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- multibar.c	17 Oct 2003 06:28:15 -0000	1.10
+++ multibar.c	18 Oct 2003 07:29:47 -0000	1.11
@@ -212,7 +212,7 @@
       rgb.green=g;
       rgb.blue=b;
       gdk_gc_set_rgb_fg_color(m->boxcolor,&rgb);
-      gdk_draw_rectangle(m->backing,m->boxcolor,1,x+1,1,next-x,widget->allocation.height-2);
+      gdk_draw_rectangle(m->backing,m->boxcolor,1,x+1,1,next-x,widget->allocation.height-3);
 
       x=next;
     }
@@ -225,8 +225,8 @@
       
       gdk_draw_line (m->backing,
                      widget->style->fg_gc[1],
-		     0, widget->allocation.height-1, 
-		     widget->allocation.width-1, widget->allocation.height-1);
+		     0, widget->allocation.height-2, 
+		     widget->allocation.width-1, widget->allocation.height-2);
     }else{
       gdk_draw_line (m->backing,
                      widget->style->white_gc,
@@ -234,8 +234,8 @@
       
       gdk_draw_line (m->backing,
                      widget->style->white_gc,
-		     0, widget->allocation.height-1, 
-		     widget->allocation.width-1, widget->allocation.height-1);
+		     0, widget->allocation.height-2, 
+		     widget->allocation.width-1, widget->allocation.height-2);
     }
     
     /* peak follower */
@@ -256,16 +256,25 @@
       for(j=0;j<n;j++)
         if(x<pixhi[j])x=pixhi[j];
       
-	 
-      gdk_draw_polygon(m->backing,widget->style->fg_gc[0],1,
-		       (GdkPoint[]){{x,5},{x+5,0},{x-4,0}},3);
-      gdk_draw_polygon(m->backing,widget->style->fg_gc[0],1,
-		       (GdkPoint[]){{x,widget->allocation.height-6},
-			 {x+5,widget->allocation.height},
-			   {x-5,widget->allocation.height}},3);
-      
-      
-      gdk_draw_line(m->backing,widget->style->fg_gc[0],x,0,x,widget->allocation.height-1);
+      {
+	int y=widget->allocation.height-1;
+
+	gdk_draw_line(m->backing,widget->style->fg_gc[0],
+		      x-3,0,x+3,0);
+	gdk_draw_line(m->backing,widget->style->fg_gc[0],
+		      x-2,1,x+2,1);
+	gdk_draw_line(m->backing,widget->style->fg_gc[0],
+		      x-1,2,x+1,2);
+	gdk_draw_line(m->backing,widget->style->fg_gc[0],
+		      x-3,y-1,x+3,y-1);
+	gdk_draw_line(m->backing,widget->style->fg_gc[0],
+		      x-2,y-2,x+2,y-2);
+	gdk_draw_line(m->backing,widget->style->fg_gc[0],
+		      x-1,y-3,x+1,y-3);
+      
+	gdk_draw_line(m->backing,widget->style->fg_gc[0],
+		      x,0,x,y-1);
+      }
     }
   }
 

<p><p>1.16      +2 -2      postfish/version.h

Index: version.h
===================================================================
RCS file: /usr/local/cvsroot/postfish/version.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- version.h	17 Oct 2003 08:40:18 -0000	1.15
+++ version.h	18 Oct 2003 07:29:47 -0000	1.16
@@ -1,2 +1,2 @@
-#define VERSION "$Id: version.h,v 1.15 2003/10/17 08:40:18 xiphmont Exp $ "
-/* DO NOT EDIT: Automated versioning hack [Fri Oct 17 04:38:49 EDT 2003] */
+#define VERSION "$Id: version.h,v 1.16 2003/10/18 07:29:47 xiphmont Exp $ "
+/* DO NOT EDIT: Automated versioning hack [Sat Oct 18 03:15:02 EDT 2003] */

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.