Reorganization in the toolbar, consistent now with menu, shorter texts

svn: r20409

src/gui/viewmanager.py

@@ -190,17 +190,15 @@ UIDEFAULT = '''<ui>
 <toolbar name="ToolBar">
   <placeholder name="CommonNavigation"/>
   <separator/>
-  <toolitem action="Clipboard"/>
-  <toolitem action="Reports"/>
-  <toolitem action="Tools"/>
-  <separator/>
-  <placeholder name="TagTool"/>
-  <separator/>
   <placeholder name="CommonEdit"/>
-  <separator/>
+  <placeholder name="TagTool"/>
-  <placeholder name="ViewsInCategory"/>
+  <toolitem action="Clipboard"/>
   <separator/>
   <toolitem action="ConfigView"/>
+  <placeholder name="ViewsInCategory"/>
+  <separator/>
+  <toolitem action="Reports"/>
+  <toolitem action="Tools"/>
 </toolbar>
 <accelerator action="F2"/>
 <accelerator action="F3"/>
@@ -830,7 +828,7 @@ class ViewManager(CLIManager):
              _("Open the tools dialog"), self.tools_clicked),
             ('BookMenu', None, _('_Bookmarks')),
             ('ToolsMenu', None, _('_Tools')),
-            ('ConfigView', 'gramps-config', _('_Configure View...'),
+            ('ConfigView', 'gramps-config', _('_Configure...'),
              '<shift><PRIMARY>c', _('Configure the active view'),
              self.config_view),
             ]

src/plugins/view/fanchartview.py

@@ -163,7 +163,7 @@ class FanChartView(fanchart.FanChartGrampsGUI, NavigationView):
         """
         NavigationView.define_actions(self)
 
-        self._add_action('PrintView', Gtk.STOCK_PRINT, _("_Print/Save View..."), 
+        self._add_action('PrintView', Gtk.STOCK_PRINT, _("_Print..."), 
                          accel="<PRIMARY>P", 
                          tip=_("Print or save the Fan Chart View"), 
                          callback=self.printview)

src/plugins/view/view.gpr.py

@@ -32,7 +32,7 @@
 
 register(VIEW, 
 id    = 'eventview',
-name  = _("Event View"),
+name  = _("Events"),
 description =  _("The view showing all the events"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -47,7 +47,7 @@ order = START,
 
 register(VIEW, 
 id    = 'familyview',
-name  = _("Family View"),
+name  = _("Families"),
 description =  _("The view showing all families"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -62,7 +62,7 @@ order = START,
 
 register(VIEW, 
 id    = 'grampletview',
-name  = _("Gramplet View"),
+name  = _("Gramplets"),
 description =  _("The view showing Gramplets"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -77,7 +77,7 @@ order = START,
 
 register(VIEW, 
 id    = 'mediaview',
-name  = _("Media View"),
+name  = _("Media"),
 description =  _("The view showing all the media objects"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -92,7 +92,7 @@ order = START,
 
 register(VIEW, 
 id    = 'noteview',
-name  = _("Note View"),
+name  = _("Notes"),
 description =  _("The view showing all the notes"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -107,7 +107,7 @@ order = START,
 
 register(VIEW, 
 id    = 'relview',
-name  = _("Relationship View"),
+name  = _("Relationships"),
 description =  _("The view showing all relationships of the selected person"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -122,7 +122,7 @@ order = START,
 
 register(VIEW, 
 id    = 'pedigreeview',
-name  = _("Pedigree View"),
+name  = _("Pedigree"),
 description =  _("The view showing an ancestor pedigree of the selected person"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -130,7 +130,7 @@ status = STABLE,
 fname = 'pedigreeview.py',
 authors = [u"The Gramps project"],
 authors_email = ["http://gramps-project.org"],
-category = ("Ancestry", _("Ancestry")),
+category = ("Ancestry", _("Graphs")),
 viewclass = 'PedigreeView',
 order = START,
 stock_icon = 'gramps-pedigree',
@@ -138,8 +138,8 @@ stock_icon = 'gramps-pedigree',
 
 register(VIEW, 
 id    = 'fanchartview',
-name  = _("Fan Chart View"),
+name  = _("Fan Chart"),
-category = ("Ancestry", _("Ancestry")),
+category = ("Ancestry", _("Graphs")),
 description =  _("A view showing parents through a fanchart"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -153,8 +153,8 @@ stock_icon = 'gramps-fanchart',
 
 register(VIEW, 
 id    = 'fanchartdescview',
-name  = _("Descendants Fan Chart View"),
+name  = _("Descendant Fan"),
-category = ("Ancestry", _("Ancestry")),
+category = ("Ancestry", _("Graphs")),
 description =  _("Showing descendants through a fanchart"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -168,7 +168,7 @@ stock_icon = 'gramps-fanchart',
 
 register(VIEW, 
 id    = 'personview',
-name  = _("Person Tree View"),
+name  = _("Person Tree"),
 description =  _("The view showing all people in the family tree"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -184,7 +184,7 @@ stock_icon = 'gramps-tree-group',
 
 register(VIEW, 
 id    = 'personlistview',
-name  = _("Person View"),
+name  = _("Persons"),
 description =  _("The view showing all people in the family tree"
                  " in a flat list"),
 version = '1.0',
@@ -201,7 +201,7 @@ stock_icon = 'gramps-tree-list',
   
 register(VIEW, 
 id    = 'placelistview',
-name  = _("Place View"),
+name  = _("Places"),
 description =  _("The view showing all the places of the family tree"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -217,7 +217,7 @@ stock_icon = 'gramps-tree-list',
 
 register(VIEW, 
 id = 'placetreeview',
-name = _("Place Tree View"),
+name = _("Place Tree"),
 description =  _("A view displaying places in a tree format."),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -232,7 +232,7 @@ stock_icon = 'gramps-tree-group',
 
 register(VIEW, 
 id    = 'repoview',
-name  = _("Repository View"),
+name  = _("Repositories"),
 description =  _("The view showing all the repositories"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -247,7 +247,7 @@ order = START,
 
 register(VIEW, 
 id    = 'sourceview',
-name  = _("Source View"),
+name  = _("Sources"),
 description =  _("The view showing all the sources"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -263,7 +263,7 @@ stock_icon = 'gramps-tree-list',
 
 register(VIEW, 
 id    = 'citationlistview',
-name  = _("Citation View"),
+name  = _("Citations"),
 description =  _("The view showing all the citations"),
 version = '1.0',
 gramps_target_version = '4.0',
@@ -278,7 +278,7 @@ order = START,
 
 register(VIEW, 
 id = 'citationtreeview',
-name = _("Citation Tree View"),
+name = _("Citation Tree"),
 description =  _("A view displaying citations and sources in a tree format."),
 version = '1.0',
 gramps_target_version = '4.0',