Changeset 42

Timestamp:

04/12/06 12:12:23 (2 years ago)

Author:

jordi

Message:

The stock icons are now stored in the $(pkgdatadir)/pixmap instead. Also, the UI definition is kept on a file (epdfview-ui.xml) which is installed on $(pkgdatadir)/ui.

Location:

trunk

Files:

• data/Makefile.am (modified) (1 diff)
• data/epdfview-ui.xml (added)
• src/gtk/MainView.cxx (modified) (2 diffs)
• src/gtk/Makefile.am (modified) (1 diff)
• src/gtk/StockIcons.cxx (modified) (1 diff)

trunk/data/Makefile.am

@@ -1 +1 @@
 # Process this file with automake to produce a Makefile.in file.
 
-stockdir = $(datadir)/pixmaps/epdfview
+stockdir = $(pkgdatadir)/pixmaps
 stock_DATA =    \
     stock_rotate-90.png \
     stock_rotate-270.png    \
-    stock_zoom-page-width.png   
+    stock_zoom-page-width.png
+
+uidir = $(pkgdatadir)/ui
+ui_DATA =   \
+    epdfview-ui.xml

trunk/src/gtk/MainView.cxx

@@ -375 +375 @@
         { "About", GTK_STOCK_ABOUT, "_About", NULL, NULL, NULL }
     };
-    
-    gchar * uiString = 
-        "<ui>"
-        "  <menubar name='MenuBar'>"
-        "    <menu action='FileMenu'>"
-        "      <menuitem name='OpenFile' action='OpenFile'/>"
-        "      <separator/>"
-        "      <menuitem name='Quit' action='Quit'/>"
-        "    </menu>"
-        "    <menu action='ViewMenu'>"
-        "      <menuitem name='ZoomIn' action='ZoomIn'/>"
-        "      <menuitem name='ZoomOut' action='ZoomOut'/>"
-        "      <menuitem name='ZoomFit' action='ZoomFit'/>"
-        "      <menuitem name='ZoomWidth' action='ZoomWidth'/>"
-        "      <separator />"
-        "      <menuitem name='RotateRight' action='RotateRight'/>"
-        "      <menuitem name='RotateLeft' action='RotateLeft'/>"
-        "    </menu>"
-        "    <menu action='GoMenu'>"
-        "      <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 name='About' action='About'/>"
-        "    </menu>"
-        "  </menubar>"
-        "  <toolbar name='ToolBar'>"
-        "    <toolitem name='OpenFile' action='OpenFile'/>"
-        "    <separator/>"
-        "    <toolitem name='GoToPreviousPage' action='GoToPreviousPage'/>"
-        "    <toolitem name='GoToNextPage' action='GoToNextPage'/>"
-        "    <separator/>"
-        "    <toolitem name='ZoomIn' action='ZoomIn'/>"
-        "    <toolitem name='ZoomOut' action='ZoomOut'/>"
-        "    <toolitem name='ZoomFit' action='ZoomFit'/>"
-        "    <toolitem name='ZoomWidth' action='ZoomWidth'/>"
-        "  </toolbar>"
-        "</ui>";
-    
+        
     GtkActionGroup *actionGroup = gtk_action_group_new ("ePDFView");
     // The data passed to all actions is the presenter
@@ -424 +384 @@
     
     GError *error = NULL;
-    if ( !gtk_ui_manager_add_ui_from_string (m_UIManager, uiString,
-                                             strlen (uiString), &error) )
+    if ( !gtk_ui_manager_add_ui_from_file (m_UIManager, 
+                                           DATADIR"/ui/epdfview-ui.xml", 
+                                           &error) )
     {
         g_message (_("Error building UI manager: %s\n"), error->message);

trunk/src/gtk/Makefile.am

@@ -8 +8 @@
 
 libshell_gtk_a_CXXFLAGS =   \
-    -DDATADIR='"$(datadir)"'    \
+    -DDATADIR='"$(pkgdatadir)"' \
     -I$(top_srcdir)/src \
     $(GTK2_CFLAGS)

trunk/src/gtk/StockIcons.cxx

@@ -43 +43 @@
     for ( int iconIndex = 0 ; iconIndex < numIcons ; iconIndex++ )
     {
-        gchar *fileName = g_strdup_printf ("%s/pixmaps/epdfview/%s", DATADIR,
+        gchar *fileName = g_strdup_printf ("%s/pixmaps/%s", DATADIR,
                 stockIcons[iconIndex].iconFile);
         GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (fileName, NULL);