Changeset 36

Timestamp:

04/12/06 06:33:09 (2 years ago)

Author:

jordi

Message:

I've forgoten the rotate left and rotate right sensitivity. I've added the two functions to the main view's interface and gtk shell. Also added to the test suite.

Now the gtk shell can change the sensitiveness of the widgets.

Location:

trunk

Files:

• src/IMainView.h (modified) (1 diff)
• src/MainPter.cxx (modified) (3 diffs)
• src/gtk/MainView.cxx (modified) (13 diffs)
• src/gtk/MainView.h (modified) (1 diff)
• tests/DumbMainView.cxx (modified) (3 diffs)
• tests/DumbMainView.h (modified) (3 diffs)
• tests/MainPterTest.cxx (modified) (8 diffs)

trunk/src/IMainView.h

@@ -38 +38 @@
             virtual void sensitiveGoToPage (gboolean sensitive) = 0;
             virtual void sensitiveGoToPreviousPage (gboolean sensitive) = 0;
+            virtual void sensitiveRotateLeft (gboolean sensitive) = 0;
+            virtual void sensitiveRotateRight (gboolean sensitive) = 0;
             virtual void sensitiveZoomIn (gboolean sensitive) = 0;
             virtual void sensitiveZoomOut (gboolean sensitive) = 0;

trunk/src/MainPter.cxx

@@ -52 +52 @@
 {
     delete m_Document;
+    delete m_View;
     delete m_DocumentPage;
-    delete m_View;
 }
 
@@ -80 +80 @@
         }
         view.sensitiveGoToPage (TRUE);
+        view.sensitiveRotateRight (TRUE);
+        view.sensitiveRotateLeft (TRUE);
         view.sensitiveZoomIn (TRUE);
         view.sensitiveZoomOut (TRUE);
@@ -95 +97 @@
         view.sensitiveGoToPage (FALSE);
         view.sensitiveGoToPreviousPage (FALSE);
+        view.sensitiveRotateRight (FALSE);
+        view.sensitiveRotateLeft (FALSE);
         view.sensitiveZoomIn (FALSE);
         view.sensitiveZoomOut (FALSE);

trunk/src/gtk/MainView.cxx

@@ -26 +26 @@
 
 // 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_previous_page_cb (GtkWidget *, gpointer);
 static void main_window_open_file_cb (GtkWidget *, gpointer);
 static void main_window_quit_cb (GtkWidget *, gpointer);
@@ -60 +64 @@
 MainView::~MainView ()
 {
+    g_object_unref (G_OBJECT (m_UIManager));
 }
 
@@ -92 +97 @@
 MainView::sensitiveGoToFirstPage (gboolean sensitive)
 {
+    GtkAction *goToFirstPage = gtk_ui_manager_get_action (m_UIManager,
+            "/MenuBar/GoMenu/GoToFirstPage");
+    gtk_action_set_sensitive (goToFirstPage, sensitive);
 }
 
@@ -97 +105 @@
 MainView::sensitiveGoToLastPage (gboolean sensitive)
 {
+    GtkAction *goToLastPage = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToLastPage");
+    gtk_action_set_sensitive (goToLastPage, sensitive);
 }
 
@@ -102 +113 @@
 MainView::sensitiveGoToNextPage (gboolean sensitive)
 {
+    GtkAction *goToNextPage = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToNextPage");
+    gtk_action_set_sensitive (goToNextPage, sensitive);
 }
 
@@ -112 +126 @@
 MainView::sensitiveGoToPreviousPage (gboolean sensitive)
 {
+    GtkAction *goToPreviousPage = gtk_ui_manager_get_action (m_UIManager, 
+            "/MenuBar/GoMenu/GoToPreviousPage");
+    gtk_action_set_sensitive (goToPreviousPage, sensitive);
+}
+
+void 
+MainView::sensitiveRotateLeft (gboolean sensitive)
+{
+    GtkAction *rotateLeft = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/RotateLeft");
+    gtk_action_set_sensitive (rotateLeft, sensitive);
+}
+
+void 
+MainView::sensitiveRotateRight (gboolean sensitive)
+{
+    GtkAction *rotateRight = gtk_ui_manager_get_action (m_UIManager, 
+            "/MenuBar/ViewMenu/RotateRight");
+    gtk_action_set_sensitive (rotateRight, sensitive);
 }
 
@@ -117 +150 @@
 MainView::sensitiveZoomIn (gboolean sensitive)
 {
+    GtkAction *zoomIn = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomIn");
+    gtk_action_set_sensitive (zoomIn, sensitive);
 }
 
@@ -122 +158 @@
 MainView::sensitiveZoomOut (gboolean sensitive)
 {
+    GtkAction *zoomOut = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomOut");
+    gtk_action_set_sensitive (zoomOut, sensitive);
 }
 
@@ -127 +166 @@
 MainView::sensitiveZoomFit (gboolean sensitive)
 {
+    GtkAction *zoomFit = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit");
+    gtk_action_set_sensitive (zoomFit, sensitive);
 }
 
@@ -132 +174 @@
 MainView::sensitiveZoomWidth (gboolean sensitive)
 {
+    GtkAction *zoomWidth = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth");
+    gtk_action_set_sensitive (zoomWidth, sensitive);
 }
 
@@ -226 +271 @@
         { "RotateRight", GTK_STOCK_REDO, _("Rotate _Right"), NULL, NULL, NULL},
         { "RotateLeft", GTK_STOCK_UNDO, _("Rotate Left"), NULL, NULL, NULL},
-        { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, _("_First Page"), "Home", NULL, NULL },
-        { "GoToNextPage", GTK_STOCK_GO_FORWARD, _("_Next Page"), "Page_Down", NULL, NULL },
-        { "GoToPreviousPage", GTK_STOCK_GO_BACK, _("_Previous Page"), "Page_Up", NULL, NULL },
-        { "GoToLastPage", GTK_STOCK_GOTO_LAST, _("_Last Page"), "End", NULL, NULL },
+        { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, _("_First Page"), "Home", NULL, G_CALLBACK (main_window_go_to_first_page_cb) },
+        { "GoToNextPage", GTK_STOCK_GO_FORWARD, _("_Next Page"), "Page_Down", NULL, G_CALLBACK (main_window_go_to_next_page_cb) },
+        { "GoToPreviousPage", GTK_STOCK_GO_BACK, _("_Previous Page"), "Page_Up", NULL, G_CALLBACK (main_window_go_to_previous_page_cb) },
+        { "GoToLastPage", GTK_STOCK_GOTO_LAST, _("_Last Page"), "End", NULL, G_CALLBACK (main_window_go_to_last_page_cb) },
         { "About", GTK_STOCK_ABOUT, "_About", NULL, NULL, NULL }
     };
@@ -237 +282 @@
         "  <menubar name='MenuBar'>"
         "    <menu action='FileMenu'>"
-        "      <menuitem action='OpenFile'/>"
+        "      <menuitem name='OpenFile' action='OpenFile'/>"
         "      <separator/>"
-        "      <menuitem action='Quit'/>"
+        "      <menuitem name='Quit' action='Quit'/>"
         "    </menu>"
         "    <menu action='ViewMenu'>"
-        "      <menuitem action='ZoomIn'/>"
-        "      <menuitem action='ZoomOut'/>"
-        "      <menuitem action='ZoomFit'/>"
-        "      <menuitem action='ZoomWidth'/>"
+        "      <menuitem name='ZoomIn' action='ZoomIn'/>"
+        "      <menuitem name='ZoomOut' action='ZoomOut'/>"
+        "      <menuitem name='ZoomFit' action='ZoomFit'/>"
+        "      <menuitem name='ZoomWidth' action='ZoomWidth'/>"
         "      <separator />"
-        "      <menuitem action='RotateRight'/>"
-        "      <menuitem action='RotateLeft'/>"
+        "      <menuitem name='RotateRight' action='RotateRight'/>"
+        "      <menuitem name='RotateLeft' action='RotateLeft'/>"
         "    </menu>"
         "    <menu action='GoMenu'>"
-        "      <menuitem action='GoToFirstPage'/>"
-        "      <menuitem action='GoToPreviousPage'/>"
-        "      <menuitem action='GoToNextPage'/>"
-        "      <menuitem action='GoToLastPage'/>"
+        "      <menuitem name='GoToFirstPage' action='GoToFirstPage'/>"
+        "      <menuitem name='GoToPreviousPage' action='GoToPreviousPage'/>"
+        "      <menuitem name='GoToNextPage' action='GoToNextPage'/>"
+        "      <menuitem name='GoToLastPage' action='GoToLastPage'/>"
         "    </menu>"
         "    <menu action='HelpMenu'>"
-        "      <menuitem action='About'/>"
+        "      <menuitem name='About' action='About'/>"
         "    </menu>"
         "  </menubar>"
         "  <toolbar name='ToolBar'>"
-        "    <toolitem action='OpenFile'/>"
+        "    <toolitem name='OpenFile' action='OpenFile'/>"
         "    <separator/>"
-        "    <toolitem action='GoToPreviousPage'/>"
-        "    <toolitem action='GoToNextPage'/>"
+        "    <toolitem name='GoToPreviousPage' action='GoToPreviousPage'/>"
+        "    <toolitem name='GoToNextPage' action='GoToNextPage'/>"
         "    <separator/>"
         "    <separator/>"
-        "    <toolitem action='ZoomIn'/>"
-        "    <toolitem action='ZoomOut'/>"
-        "    <toolitem action='ZoomFit'/>"
-        "    <toolitem action='ZoomWidth'/>"
+        "    <toolitem name='ZoomIn' action='ZoomIn'/>"
+        "    <toolitem name='ZoomOut' action='ZoomOut'/>"
+        "    <toolitem name='ZoomFit' action='ZoomFit'/>"
+        "    <toolitem name='ZoomWidth' action='ZoomWidth'/>"
         "  </toolbar>"
         "</ui>";
@@ -305 +350 @@
 ////////////////////////////////////////////////////////////////
 
+void
+main_window_go_to_first_page_cb (GtkWidget *, gpointer)
+{
+}
+
+void
+main_window_go_to_last_page_cb (GtkWidget *, gpointer)
+{
+}
+
+void
+main_window_go_to_next_page_cb (GtkWidget *, gpointer)
+{
+}
+
+void
+main_window_go_to_previous_page_cb (GtkWidget *, gpointer)
+{
+}
+
 ///
 /// @brief The user tries to open a file.

trunk/src/gtk/MainView.h

@@ -39 +39 @@
             void sensitiveGoToPage (gboolean sensitive);
             void sensitiveGoToPreviousPage (gboolean sensitive);
+            void sensitiveRotateLeft (gboolean sensitive);
+            void sensitiveRotateRight (gboolean sensitive);
             void sensitiveZoomIn (gboolean sensitive);
             void sensitiveZoomOut (gboolean sensitive);

trunk/tests/DumbMainView.cxx

@@ -38 +38 @@
     m_SensitiveGoToPage = TRUE;
     m_SensitiveGoToPreviousPage = TRUE;
+    m_SensitiveRotateLeft = TRUE;
+    m_SensitiveRotateRight = TRUE;
     m_SensitiveZoomIn = TRUE;
     m_SensitiveZoomOut = TRUE;
@@ -100 +102 @@
 }
 
+void 
+DumbMainView::sensitiveRotateLeft (gboolean sensitive)
+{
+    m_SensitiveRotateLeft = sensitive;
+}
+
+void 
+DumbMainView::sensitiveRotateRight (gboolean sensitive)
+{
+    m_SensitiveRotateRight = sensitive;
+}
+
 void
 DumbMainView::sensitiveZoomIn (gboolean sensitive)
@@ -248 +262 @@
 {
     return m_SensitiveGoToPreviousPage;
+}
+
+gboolean
+DumbMainView::isSensitiveRotateLeft ()
+{
+    return m_SensitiveRotateLeft;
+}
+
+gboolean
+DumbMainView::isSensitiveRotateRight ()
+{
+    return m_SensitiveRotateRight;
 }
 

trunk/tests/DumbMainView.h

@@ -35 +35 @@
             void sensitiveGoToPage (gboolean sensitive);
             void sensitiveGoToPreviousPage (gboolean sensitive);
+            void sensitiveRotateLeft (gboolean sensitive);
+            void sensitiveRotateRight (gboolean sensitive);
             void sensitiveZoomIn (gboolean sensitive);
             void sensitiveZoomOut (gboolean sensitive);
@@ -60 +62 @@
             gboolean isSensitiveGoToPage (void);
             gboolean isSensitiveGoToPreviousPage (void);
+            gboolean isSensitiveRotateLeft (void);
+            gboolean isSensitiveRotateRight (void);
             gboolean isSensitiveZoomIn (void);        
             gboolean isSensitiveZoomOut (void);
@@ -79 +83 @@
             gboolean m_SensitiveGoToPage;
             gboolean m_SensitiveGoToPreviousPage;
+            gboolean m_SensitiveRotateLeft;
+            gboolean m_SensitiveRotateRight;
             gboolean m_SensitiveZoomIn;
             gboolean m_SensitiveZoomOut;

trunk/tests/MainPterTest.cxx

@@ -68 +68 @@
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPage ());
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateLeft ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateRight ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
@@ -95 +97 @@
     CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveRotateLeft ());
+    CPPUNIT_ASSERT (m_View->isSensitiveRotateRight ());
     CPPUNIT_ASSERT (m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (m_View->isSensitiveZoomOut ());
@@ -111 +115 @@
     CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveRotateLeft ());
+    CPPUNIT_ASSERT (m_View->isSensitiveRotateRight ());
     CPPUNIT_ASSERT (m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (m_View->isSensitiveZoomOut ());
@@ -136 +142 @@
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPage ());
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateLeft ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateRight ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
@@ -164 +172 @@
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPage ());
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateLeft ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateRight ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
@@ -194 +204 @@
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPage ());
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateLeft ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateRight ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
@@ -224 +236 @@
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPage ());
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateLeft ());
+    CPPUNIT_ASSERT (!m_View->isSensitiveRotateRight ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (!m_View->isSensitiveZoomOut ());
@@ -254 +268 @@
     CPPUNIT_ASSERT (m_View->isSensitiveGoToPage ());
     CPPUNIT_ASSERT (!m_View->isSensitiveGoToPreviousPage ());
+    CPPUNIT_ASSERT (m_View->isSensitiveRotateLeft ());
+    CPPUNIT_ASSERT (m_View->isSensitiveRotateRight ());
     CPPUNIT_ASSERT (m_View->isSensitiveZoomIn ());
     CPPUNIT_ASSERT (m_View->isSensitiveZoomOut ());