Changeset 39

Timestamp:

04/12/06 07:52:38 (3 years ago)

Author:

jordi

Message:

The "Go To Page" entry is now on the toolbar and works as expected. The only remaining functionally to implement is the password dialog and then I can concentrate on cosmetic details (Gnome HIG!).

Location:

trunk/src/gtk

Files:

• MainView.cxx (modified) (9 diffs)
• MainView.h (modified) (1 diff)

trunk/src/gtk/MainView.cxx

@@ -25 +25 @@
 using namespace ePDFView;
 
+// Constants.
+static gint CURRENT_PAGE_POS = 5;
+
 // Forward delarations.
 static void main_window_go_to_first_page_cb (GtkWidget *, gpointer);
 static void main_window_go_to_last_page_cb (GtkWidget *, gpointer);
 static void main_window_go_to_next_page_cb (GtkWidget *, gpointer);
+static void main_window_go_to_page_cb (GtkWidget *, gpointer);
 static void main_window_go_to_previous_page_cb (GtkWidget *, gpointer);
 static void main_window_rotate_left (GtkWidget *, gpointer);
@@ -63 +67 @@
     GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
     gtk_box_pack_start (GTK_BOX (m_MainBox), toolBar, FALSE, FALSE, 0);
+    // Add the current page tool item.
+    GtkToolItem *currentPage = createCurrentPage ();
+    gtk_toolbar_insert (GTK_TOOLBAR (toolBar), currentPage, CURRENT_PAGE_POS);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolBar), gtk_separator_tool_item_new (),
+                        CURRENT_PAGE_POS + 1);
     // Create the page view
     createPageView ();
@@ -127 +136 @@
 MainView::sensitiveGoToPage (gboolean sensitive)
 {
+    gtk_widget_set_sensitive (m_CurrentPage, sensitive);
 }
 
@@ -219 +229 @@
 MainView::setTotalPages (gint pages)
 {
+    m_TotalPages = pages;
 }
 
@@ -224 +235 @@
 MainView::setGoToPageText (const gchar *text)
 {
+    gchar *pageText = g_strdup_printf (_("%s of %d"), text, m_TotalPages);
+    gtk_entry_set_text (GTK_ENTRY (m_CurrentPage), pageText);
+    g_free (pageText);
 }
 
@@ -229 +243 @@
 MainView::getGoToPageText (void)
 {
-    return "1";
+    return gtk_entry_get_text (GTK_ENTRY (m_CurrentPage));
 }
 
@@ -251 +265 @@
 // GTK+ Functions.
 ////////////////////////////////////////////////////////////////
+
+GtkToolItem *
+MainView::createCurrentPage ()
+{
+    GtkWidget *hbox = gtk_hbox_new (0, FALSE);
+    
+    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_alignment (GTK_ENTRY (m_CurrentPage), 1.0f);
+    g_signal_connect (G_OBJECT (m_CurrentPage), "activate",
+                      G_CALLBACK (main_window_go_to_page_cb), m_Pter);
+    gtk_box_pack_start (GTK_BOX (hbox), m_CurrentPage, TRUE, TRUE, 0);
+    
+    GtkToolItem *toolItem = gtk_tool_item_new ();
+    gtk_container_add (GTK_CONTAINER (toolItem), hbox);
+
+    return toolItem;
+}
 
 void
@@ -321 +356 @@
         "    <toolitem name='GoToNextPage' action='GoToNextPage'/>"
         "    <separator/>"
-        "    <separator/>"
         "    <toolitem name='ZoomIn' action='ZoomIn'/>"
         "    <toolitem name='ZoomOut' action='ZoomOut'/>"
@@ -388 +422 @@
 
 void
+main_window_go_to_page_cb (GtkWidget *widget, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->goToPageActivated ();
+}
+
+void
 main_window_go_to_previous_page_cb (GtkWidget *widget, gpointer data)
 {

trunk/src/gtk/MainView.h

@@ -55 +55 @@
 
         protected:
+            GtkWidget *m_CurrentPage;
             GtkWidget *m_MainWindow; 
             GtkWidget *m_MainBox;
             GtkWidget *m_PageView;
             GtkWidget *m_PageViewScroll;
+            gint m_TotalPages;
             GtkUIManager *m_UIManager;
 
+            GtkToolItem *createCurrentPage (void);
             void createPageView (void);
             void createUIManager (void);