r13031 - in /branches/gui_testing: ./ graphics/oxygen_icons/22x22/actions/ graphics/oxygen_icons/32x32/actions/ graphics/oxy... -- June 15, 2011 - 10:56

Author: bugman
Date: Wed Jun 15 10:56:15 2011
New Revision: 13031

URL: http://svn.gna.org/viewcvs/relax?rev=13031&view=rev
Log:
Merged revisions 13028-13029 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r13028 | bugman | 2011-06-15 10:52:36 +0200 (Wed, 15 Jun 2011) | 3 lines
  
  Added larger versions of the document-new.png Oxygen icons.
........
  r13029 | bugman | 2011-06-15 10:53:44 +0200 (Wed, 15 Jun 2011) | 3 lines
  
  Added the new document-new icons to the paths module.
........

Added:
    branches/gui_testing/graphics/oxygen_icons/22x22/actions/document-new.png
      - copied unchanged from r13029, 
1.3/graphics/oxygen_icons/22x22/actions/document-new.png
    branches/gui_testing/graphics/oxygen_icons/32x32/actions/document-new.png
      - copied unchanged from r13029, 
1.3/graphics/oxygen_icons/32x32/actions/document-new.png
    branches/gui_testing/graphics/oxygen_icons/48x48/actions/document-new.png
      - copied unchanged from r13029, 
1.3/graphics/oxygen_icons/48x48/actions/document-new.png
Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/gui/paths.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 15 10:56:15 2011
@@ -1,1 +1,1 @@
-/1.3:1-13022
+/1.3:1-13030

Modified: branches/gui_testing/gui/paths.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/paths.py?rev=13031&r1=13030&r2=13031&view=diff
==============================================================================
--- branches/gui_testing/gui/paths.py (original)
+++ branches/gui_testing/gui/paths.py Wed Jun 15 10:56:15 2011
@@ -104,6 +104,7 @@
         self.cancel =               path + 'actions' + sep + 
'dialog-cancel.png'
         self.close =                path + 'actions' + sep + 
'dialog-close.png'
         self.copy =                 path + 'actions' + sep + 'list-add.png'
+        self.new =                  path + 'actions' + sep + 
'document-new.png'
         self.ok =                   path + 'actions' + sep + 'dialog-ok.png'
         self.open_folder =          path + 'actions' + sep + 
'document-open-folder.png'
         self.save =                 path + 'actions' + sep + 
'document-save.png'
@@ -135,6 +136,7 @@
         self.cancel =       path + 'actions' + sep + 'dialog-cancel.png'
         self.close =        path + 'actions' + sep + 'dialog-close.png'
         self.copy =         path + 'actions' + sep + 'list-add.png'
+        self.new =          path + 'actions' + sep + 'document-new.png'
         self.ok =           path + 'actions' + sep + 'dialog-ok.png'
         self.open_folder =  path + 'actions' + sep + 
'document-open-folder.png'
         self.save =         path + 'actions' + sep + 'document-save.png'
@@ -156,6 +158,7 @@
         self.cancel =       path + 'actions' + sep + 'dialog-cancel.png'
         self.copy =         path + 'actions' + sep + 'list-add.png'
         self.forwards =     path + 'actions' + sep + 'go-next-view.png'
+        self.new =          path + 'actions' + sep + 'document-new.png'
         self.open_folder =  path + 'actions' + sep + 
'document-open-folder.png'
         self.remove =       path + 'actions' + sep + 'list-remove.png'
         self.save =         path + 'actions' + sep + 'document-save.png'