Author: bugman
Date: Thu Jul 28 22:24:51 2011
New Revision: 13972
URL: http://svn.gna.org/viewcvs/relax?rev=13972&view=rev
Log:
Modified all the paths to the dialog-* oxygen icons to start with dialog_*.
Modified:
branches/gui_testing/gui/paths.py
branches/gui_testing/gui/wizard.py
Modified: branches/gui_testing/gui/paths.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/paths.py?rev=13972&r1=13971&r2=13972&view=diff
==============================================================================
--- branches/gui_testing/gui/paths.py (original)
+++ branches/gui_testing/gui/paths.py Thu Jul 28 22:24:51 2011
@@ -73,10 +73,12 @@
path = OXY_ICON_PATH + '16x16' + sep
self.about = path + 'actions' + sep +
'help-about.png'
self.add = path + 'actions' + sep +
'list-add-relax-blue.png'
- self.cancel = path + 'actions' + sep +
'dialog-cancel.png'
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.dialog_cancel = path + 'actions' + sep +
'dialog-cancel.png'
+ self.dialog_ok = path + 'actions' + sep +
'dialog-ok.png'
+ self.dialog_ok_apply = path + 'actions' + sep +
'dialog-ok-apply.png'
self.dialog_close = path + 'actions' + sep +
'dialog-close.png'
self.dialog_warning = path + 'status' + sep +
'dialog-warning.png'
self.document_properties = path + 'actions' + sep +
'document-properties.png'
@@ -119,11 +121,11 @@
path = OXY_ICON_PATH + '22x22' + sep
self.about = path + 'actions' + sep +
'help-about.png'
self.add = path + 'actions' + sep +
'list-add-relax-blue.png'
- 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.copy = path + 'actions' + sep +
'list-add.png'
- self.dialog_close = path + 'actions' + sep +
'dialog-close.png'
+ self.copy = path + 'actions' + sep +
'list-add.png'
+ self.dialog_cancel = path + 'actions' + sep +
'dialog-cancel.png'
+ self.dialog_close = path + 'actions' + sep +
'dialog-close.png'
+ self.dialog_ok = path + 'actions' + sep +
'dialog-ok.png'
+ self.dialog_ok_apply = path + 'actions' + sep +
'dialog-ok-apply.png'
self.dialog_warning = path + 'status' + sep +
'dialog-warning.png'
self.document_close = path + 'actions' + sep +
'document-close.png'
self.document_properties = path + 'actions' + sep +
'document-properties.png'
@@ -132,7 +134,6 @@
self.go_next_view = path + 'actions' + sep +
'go-next-view.png'
self.list_remove = path + 'actions' + sep +
'list-remove.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.pipe_switch = path + 'actions' + sep +
'system-switch-user.png'
self.save = path + 'actions' + sep +
'document-save.png'
@@ -171,18 +172,17 @@
path = OXY_ICON_PATH + '32x32' + sep
self.about = path + 'actions' + sep +
'help-about.png'
self.add = path + 'actions' + sep +
'list-add-relax-blue.png'
- 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.dialog_close = path + 'actions' + sep +
'dialog-close.png'
- self.dialog_warning = path + 'status' + sep +
'dialog-warning.png'
- self.document_close = path + 'actions' + sep +
'document-close.png'
- self.document_properties = path + 'actions' + sep +
'document-properties.png'
- self.copy = path + 'actions' + sep +
'list-add.png'
- self.go_bottom = path + 'actions' + sep +
'go-bottom.png'
- self.list_remove = path + 'actions' + sep +
'list-remove.png'
- self.new = path + 'actions' + sep +
'document-new.png'
- self.ok = path + 'actions' + sep +
'dialog-ok.png'
+ self.dialog_cancel = path + 'actions' + sep +
'dialog-cancel.png'
+ self.dialog_close = path + 'actions' + sep +
'dialog-close.png'
+ self.dialog_ok = path + 'actions' + sep +
'dialog-ok.png'
+ self.dialog_ok_apply = path + 'actions' + sep +
'dialog-ok-apply.png'
+ self.dialog_warning = path + 'status' + sep +
'dialog-warning.png'
+ self.document_close = path + 'actions' + sep +
'document-close.png'
+ self.document_properties = path + 'actions' + sep +
'document-properties.png'
+ self.copy = path + 'actions' + sep +
'list-add.png'
+ self.go_bottom = path + 'actions' + sep +
'go-bottom.png'
+ self.list_remove = path + 'actions' + sep +
'list-remove.png'
+ self.new = path + 'actions' + sep +
'document-new.png'
self.open_folder = path + 'actions' + sep +
'document-open-folder.png'
self.pipe_switch = path + 'actions' + sep +
'system-switch-user.png'
self.save = path + 'actions' + sep +
'document-save.png'
@@ -208,9 +208,11 @@
self.about = path + 'actions' + sep +
'help-about.png'
self.add = path + 'actions' + sep +
'list-add-relax-blue.png'
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.dialog_close = path + 'actions' + sep +
'dialog-close.png'
+ self.copy = path + 'actions' + sep +
'list-add.png'
+ self.dialog_cancel = path + 'actions' + sep +
'dialog-cancel.png'
+ self.dialog_close = path + 'actions' + sep +
'dialog-close.png'
+ self.dialog_ok = path + 'actions' + sep +
'dialog-ok.png'
+ self.dialog_ok_apply = path + 'actions' + sep +
'dialog-ok-apply.png'
self.dialog_warning = path + 'status' + sep +
'dialog-warning.png'
self.document_close = path + 'actions' + sep +
'document-close.png'
self.document_properties = path + 'actions' + sep +
'document-properties.png'
Modified: branches/gui_testing/gui/wizard.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/wizard.py?rev=13972&r1=13971&r2=13972&view=diff
==============================================================================
--- branches/gui_testing/gui/wizard.py (original)
+++ branches/gui_testing/gui/wizard.py Thu Jul 28 22:24:51 2011
@@ -1055,7 +1055,7 @@
if self._button_apply_flag[i]:
# Create the button.
button = buttons.ThemedGenBitmapTextButton(self, -1, None, "
Apply")
- button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.apply,
wx.BITMAP_TYPE_ANY))
+
button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.dialog_apply,
wx.BITMAP_TYPE_ANY))
button.SetToolTipString("Apply the operation")
button.SetMinSize(self._size_button)
self._button_sizers[i].Add(button, 0, wx.ADJUST_MINSIZE, 0)
@@ -1093,7 +1093,7 @@
# The OK button (only for single pages).
if self._num_pages == 1:
button = buttons.ThemedGenBitmapTextButton(self, -1, None, "
OK")
- button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.ok,
wx.BITMAP_TYPE_ANY))
+ button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.dialog_ok,
wx.BITMAP_TYPE_ANY))
button.SetToolTipString("Accept the operation")
button.SetMinSize(self._size_button)
self._button_sizers[i].Add(button, 0, wx.ADJUST_MINSIZE, 0)
@@ -1103,7 +1103,7 @@
# The finish button (only for the last page with multi-pages).
if self._num_pages > 1 and i == self._num_pages - 1:
button = buttons.ThemedGenBitmapTextButton(self, -1, None, "
Finish")
- button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.ok,
wx.BITMAP_TYPE_ANY))
+ button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.dialog_ok,
wx.BITMAP_TYPE_ANY))
button.SetToolTipString("Accept the operation")
button.SetMinSize(self._size_button)
self._button_sizers[i].Add(button, 0, wx.ADJUST_MINSIZE, 0)
@@ -1115,7 +1115,7 @@
# The cancel button.
button = buttons.ThemedGenBitmapTextButton(self, -1, None, "
Cancel")
- button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.cancel,
wx.BITMAP_TYPE_ANY))
+ button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.dialog_cancel,
wx.BITMAP_TYPE_ANY))
button.SetToolTipString("Abort the operation")
button.SetMinSize(self._size_button)
self._button_sizers[i].Add(button, 0, wx.ADJUST_MINSIZE, 0)
r13972 - in /branches/gui_testing/gui: paths.py wizard.py