Author: bugman
Date: Wed Jun 15 16:41:27 2011
New Revision: 13047
URL: http://svn.gna.org/viewcvs/relax?rev=13047&view=rev
Log:
Merged revisions 13045-13046 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r13045 | bugman | 2011-06-15 16:29:43 +0200 (Wed, 15 Jun 2011) | 3 lines
Added the document-close Oxygen icons.
........
r13046 | bugman | 2011-06-15 16:32:19 +0200 (Wed, 15 Jun 2011) | 3 lines
Added the document-close Oxygen icon to the paths module.
........
Added:
branches/gui_testing/graphics/oxygen_icons/16x16/actions/document-close.png
- copied unchanged from r13046,
1.3/graphics/oxygen_icons/16x16/actions/document-close.png
branches/gui_testing/graphics/oxygen_icons/22x22/actions/document-close.png
- copied unchanged from r13046,
1.3/graphics/oxygen_icons/22x22/actions/document-close.png
branches/gui_testing/graphics/oxygen_icons/32x32/actions/document-close.png
- copied unchanged from r13046,
1.3/graphics/oxygen_icons/32x32/actions/document-close.png
branches/gui_testing/graphics/oxygen_icons/48x48/actions/document-close.png
- copied unchanged from r13046,
1.3/graphics/oxygen_icons/48x48/actions/document-close.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 16:41:27 2011
@@ -1,1 +1,1 @@
-/1.3:1-13030
+/1.3:1-13046
Modified: branches/gui_testing/gui/paths.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/paths.py?rev=13047&r1=13046&r2=13047&view=diff
==============================================================================
--- branches/gui_testing/gui/paths.py (original)
+++ branches/gui_testing/gui/paths.py Wed Jun 15 16:41:27 2011
@@ -70,6 +70,7 @@
self.contact = path + 'actions' + sep +
'mail-mark-unread-new.png'
self.controller = path + 'apps' + sep +
'preferences-system-performance.png'
self.copy = path + 'actions' + sep +
'list-add.png'
+ self.document_close = path + 'actions' + sep +
'document-close.png'
self.edit_delete = path + 'actions' + sep +
'edit-delete.png'
self.exit = path + 'actions' + sep +
'system-shutdown.png'
self.load = path + 'actions' + sep +
'arrow-right.png'
@@ -104,6 +105,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.document_close = path + 'actions' + sep +
'document-close.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'
@@ -135,6 +137,7 @@
self.apply = path + 'actions' + sep + 'dialog-ok-apply.png'
self.cancel = path + 'actions' + sep + 'dialog-cancel.png'
self.close = path + 'actions' + sep + 'dialog-close.png'
+ self.document_close = path + 'actions' + sep +
'document-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'
@@ -157,6 +160,7 @@
self.backwards = path + 'actions' + sep + 'go-previous-view.png'
self.cancel = path + 'actions' + sep + 'dialog-cancel.png'
self.copy = path + 'actions' + sep + 'list-add.png'
+ self.document_close = path + 'actions' + sep +
'document-close.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'
r13047 - in /branches/gui_testing: ./ graphics/oxygen_icons/16x16/actions/ graphics/oxygen_icons/22x22/actions/ graphics/oxy...