Changeset 225
- Timestamp:
- 06/12/06 15:34:33 (2 years ago)
- Files:
-
- trunk/src/MainPter.cxx (modified) (1 diff)
- trunk/src/gtk/MainView.cxx (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/MainPter.cxx
r224 r225 253 253 MainPter::setZoomText (gdouble zoom) 254 254 { 255 gchar *zoomText = g_strdup_printf ("%.3g %%", zoom * 100.0);255 gchar *zoomText = g_strdup_printf ("%.3g", zoom * 100.0); 256 256 getView ().setZoomText (zoomText); 257 257 g_free (zoomText); trunk/src/gtk/MainView.cxx
r213 r225 37 37 static gint CURRENT_PAGE_WIDTH = 14; 38 38 static gint CURRENT_ZOOM_POS = 8; 39 static gint CURRENT_ZOOM_WIDTH = 7;39 static gint CURRENT_ZOOM_WIDTH = 6; 40 40 41 41 // Enumerations. … … 51 51 static void main_window_about_box_cb (GtkWidget *, gpointer); 52 52 static void main_window_find_cb (GtkWidget *, gpointer); 53 static gboolean main_window_moved_or_resized_cb (GtkWidget *, 53 static gboolean main_window_moved_or_resized_cb (GtkWidget *, 54 54 GdkEventConfigure *, gpointer); 55 55 static void main_window_go_to_first_page_cb (GtkWidget *, gpointer); … … 519 519 MainView::sensitiveZoom (gboolean sensitive) 520 520 { 521 gtk_widget_set_sensitive ( m_CurrentZoom, sensitive);521 gtk_widget_set_sensitive (GTK_WIDGET (m_CurrentZoomToolItem), sensitive); 522 522 } 523 523 … … 533 533 MainView::sensitiveZoomOut (gboolean sensitive) 534 534 { 535 GtkAction *zoomOut = 535 GtkAction *zoomOut = 536 536 gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomOut"); 537 537 gtk_action_set_sensitive (zoomOut, sensitive); 538 538 } 539 539 540 void 540 void 541 541 MainView::sensitiveZoomFit (gboolean sensitive) 542 542 { 543 GtkAction *zoomFit = 543 GtkAction *zoomFit = 544 544 gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit"); 545 545 gtk_action_set_sensitive (zoomFit, sensitive); … … 784 784 G_CALLBACK (main_window_zoom_cb), m_Pter); 785 785 786 GtkWidget *zoomBox = gtk_hbox_new (FALSE, 3); 787 gtk_box_pack_start_defaults (GTK_BOX (zoomBox), m_CurrentZoom); 788 gtk_box_pack_start (GTK_BOX (zoomBox), gtk_label_new ("%"), 789 FALSE, FALSE, 0); 786 790 m_CurrentZoomToolItem = gtk_tool_item_new (); 787 gtk_container_add (GTK_CONTAINER (m_CurrentZoomToolItem), m_CurrentZoom);791 gtk_container_add (GTK_CONTAINER (m_CurrentZoomToolItem), zoomBox); 788 792 } 789 793
