Changeset 227 for trunk/src/gtk/MainView.cxx

Timestamp:

06/12/06 16:40:59 (2 years ago)

Author:

jordi

Message:

The MainView? now has a separate widget for the current page number and the total page number, as requested in bug #37 closed in this revision.

Files:

• trunk/src/gtk/MainView.cxx (modified) (5 diffs)

trunk/src/gtk/MainView.cxx

@@ -35 +35 @@
 // Constants.
 static gint CURRENT_PAGE_POS = 5;
-static gint CURRENT_PAGE_WIDTH = 14;
+static gint CURRENT_PAGE_WIDTH = 5;
 static gint CURRENT_ZOOM_POS = 8;
 static gint CURRENT_ZOOM_WIDTH = 6;
 
 // Enumerations.
-static enum
+enum indexColumns
 {
     outlineTitleColumn,
@@ -46 +46 @@
     outlineDataColumn,
     outlineNumColumns
-} indexColumns;
+};
 
 // Forward declarations.
@@ -625 +625 @@
 }
 
-void 
-MainView::setTotalPages (gint pages)
-{
-    m_TotalPages = pages;
-}
-
-void 
+void
+MainView::setNumberOfPagesText (const gchar *text)
+{
+    gtk_label_set_text (GTK_LABEL (m_NumberOfPages), text);
+}
+
+void
 MainView::setGoToPageText (const gchar *text)
 {
@@ -756 +756 @@
     GtkWidget *hbox = gtk_hbox_new (FALSE, 3);
 
-    GtkWidget *pageLabel= gtk_label_new (_("Page"));
+    GtkWidget *pageLabel = gtk_label_new (_("Page"));
     gtk_box_pack_start (GTK_BOX (hbox), pageLabel, FALSE, FALSE, 0);
 
     m_CurrentPage = gtk_entry_new ();
-    gtk_entry_set_text (GTK_ENTRY (m_CurrentPage), _("0 of 0"));
+    gtk_entry_set_text (GTK_ENTRY (m_CurrentPage), "0");
     gtk_entry_set_alignment (GTK_ENTRY (m_CurrentPage), 1.0f);
     gtk_entry_set_width_chars (GTK_ENTRY (m_CurrentPage), CURRENT_PAGE_WIDTH);
@@ -766 +766 @@
                       G_CALLBACK (main_window_go_to_page_cb), m_Pter);
     gtk_box_pack_start (GTK_BOX (hbox), m_CurrentPage, TRUE, TRUE, 0);
+    m_NumberOfPages = gtk_label_new (_("of 0"));
+    gtk_misc_set_alignment (GTK_MISC (m_NumberOfPages), 0.0f, 0.5f);
+    gtk_box_pack_start (GTK_BOX (hbox), m_NumberOfPages, FALSE, FALSE, 0);
 
     m_CurrentPageToolItem = gtk_tool_item_new ();