Author: bugman
Date: Thu May 10 22:48:48 2012
New Revision: 16214
URL: http://svn.gna.org/viewcvs/relax?rev=16214&view=rev
Log:
Redesigned the free file format window.
The settings module has been renamed to components.free_file_format, as it
simply contains the free
file format window. This renaming is in preparation for shifting all of the
free file format code
into this module to create a special GUI element object for it, rather than
being part of the wizard
page code base.
The Base_window code has been merged into the Free_file_format_window code,
as no other windows use
it any more.
Added:
branches/uf_redesign/gui/components/free_file_format.py
- copied, changed from r16213, branches/uf_redesign/gui/settings.py
Removed:
branches/uf_redesign/gui/settings.py
Modified:
branches/uf_redesign/gui/relax_gui.py
Copied: branches/uf_redesign/gui/components/free_file_format.py (from r16213,
branches/uf_redesign/gui/settings.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/components/free_file_format.py?p2=branches/uf_redesign/gui/components/free_file_format.py&p1=branches/uf_redesign/gui/settings.py&r1=16213&r2=16214&rev=16214&view=diff
==============================================================================
--- branches/uf_redesign/gui/settings.py (original)
+++ branches/uf_redesign/gui/components/free_file_format.py Thu May 10
22:48:48 2012
@@ -1,7 +1,7 @@
###############################################################################
#
#
# Copyright (C) 2009 Michael Bieri
#
-# Copyright (C) 2010-2011 Edward d'Auvergne
#
+# Copyright (C) 2010-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -22,29 +22,23 @@
###############################################################################
# Python module imports.
-from os import F_OK, access, path, sep
-import sys
import wx
# relax module imports.
from data import Relax_data_store; ds = Relax_data_store()
-from status import Status; status = Status()
# relax GUI module imports.
-from gui.filedialog import RelaxFileDialog
from gui.fonts import font
from gui.icons import relax_icons
-from gui.message import error_message
-from gui.misc import gui_to_int, int_to_gui
from gui import paths
from gui.wizard import Wiz_page
-class Base_window(wx.Dialog):
- """Base class for the settings windows."""
+class Free_file_format_window(wx.Dialog, Wiz_page):
+ """The free file format setting window."""
# The window size.
- SIZE = (600, 600)
+ SIZE = (500, 550)
# A border.
BORDER = 10
@@ -52,11 +46,15 @@
# Sizes.
SIZE_BUTTON = (100, 33)
- def __init__(self, parent=None, id=-1, title='', heading='',
style=wx.DEFAULT_FRAME_STYLE):
+ def __init__(self, parent=None):
"""Set up the window."""
# Execute the base __init__() method.
- wx.Dialog.__init__(self, parent, id=id, title=title, style=style)
+ wx.Dialog.__init__(self, parent, id=-1, title="Free file format",
style=wx.DEFAULT_FRAME_STYLE)
+
+ # The sizes.
+ self._main_size = self.SIZE[0] - 2*self.BORDER
+ self._div_left = self._main_size / 2
# Set up the window icon.
self.SetIcons(relax_icons)
@@ -65,7 +63,7 @@
self.main_sizer = self.build_frame()
# The heading.
- text = wx.StaticText(self, -1, heading)
+ text = wx.StaticText(self, -1, "Settings for the free file format")
text.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.main_sizer.Add(text, 0, wx.ALIGN_CENTER_HORIZONTAL, 5)
self.main_sizer.AddStretchSpacer()
@@ -134,11 +132,17 @@
def add_centre(self, sizer):
- """Dummy base class method for adding the centre of the settings
window.
+ """Add the centre of the free file format settings window.
@param sizer: A sizer object.
@type sizer: wx.Sizer instance
"""
+
+ # The widget.
+ self.free_file_format(sizer, data_cols=True, save=False, reset=False)
+
+ # Spacing.
+ self.main_sizer.AddStretchSpacer()
def build_frame(self):
@@ -166,8 +170,8 @@
return central_sizer
- def save(self, event):
- """Dummy base class save method.
+ def cancel(self, event):
+ """Close the window.
@param event: The wx event.
@type event: wx event
@@ -177,69 +181,26 @@
self.Destroy()
- def cancel(self, event):
- """Close the window.
+ def reset(self, event):
+ """Reset the free file format settings.
@param event: The wx event.
@type event: wx event
"""
+ # Execute the base class method.
+ self._free_file_format_reset(event)
+
+
+ def save(self, event):
+ """Save the free file format widget contents into the relax data
store.
+
+ @param event: The wx event.
+ @type event: wx event
+ """
+
+ # Execute the base class method.
+ self._free_file_format_save(event)
+
# Destroy the window.
self.Destroy()
-
-
-
-class Free_file_format(Base_window, Wiz_page):
- """The free file format setting window."""
-
- # The window size.
- SIZE = (500, 550)
-
- def __init__(self, parent=None):
- """Set up the window."""
-
- # The sizes.
- self._main_size = self.SIZE[0] - 2*self.BORDER
- self._div_left = self._main_size / 2
-
- # Execute the base __init__() method.
- super(Free_file_format, self).__init__(parent=parent, id=-1,
title="Free file format", heading="Settings for the free file format")
-
-
- def add_centre(self, sizer):
- """Add the centre of the free file format settings window.
-
- @param sizer: A sizer object.
- @type sizer: wx.Sizer instance
- """
-
- # The widget.
- self.free_file_format(sizer, data_cols=True, save=False, reset=False)
-
- # Spacing.
- self.main_sizer.AddStretchSpacer()
-
-
- def reset(self, event):
- """Reset the free file format settings.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Execute the base class method.
- self._free_file_format_reset(event)
-
-
- def save(self, event):
- """Save the free file format widget contents into the relax data
store.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Execute the base class method.
- self._free_file_format_save(event)
-
- # Destroy the window.
- self.Destroy()
Modified: branches/uf_redesign/gui/relax_gui.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/relax_gui.py?rev=16214&r1=16213&r2=16214&view=diff
==============================================================================
--- branches/uf_redesign/gui/relax_gui.py (original)
+++ branches/uf_redesign/gui/relax_gui.py Thu May 10 22:48:48 2012
@@ -70,7 +70,7 @@
from gui.references import References
from gui.relax_prompt import Prompt
from gui.results_viewer import Results_viewer
-from gui.settings import Free_file_format
+from gui.components.free_file_format import Free_file_format_window
from gui.uf_objects import Uf_storage, Uf_object
from gui.uf_pages import User_functions; user_functions = User_functions()
@@ -419,7 +419,7 @@
"""
# Build the window.
- win = Free_file_format()
+ win = Free_file_format_window()
# Show the window.
if status.show_gui:
Removed: branches/uf_redesign/gui/settings.py
URL:
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/settings.py?rev=16213&view=auto
==============================================================================
--- branches/uf_redesign/gui/settings.py (original)
+++ branches/uf_redesign/gui/settings.py (removed)
@@ -1,245 +1,0 @@
-###############################################################################
-#
#
-# Copyright (C) 2009 Michael Bieri
#
-# Copyright (C) 2010-2011 Edward d'Auvergne
#
-#
#
-# This file is part of the program relax.
#
-#
#
-# relax is free software; you can redistribute it and/or modify
#
-# it under the terms of the GNU General Public License as published by
#
-# the Free Software Foundation; either version 2 of the License, or
#
-# (at your option) any later version.
#
-#
#
-# relax is distributed in the hope that it will be useful,
#
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
-# GNU General Public License for more details.
#
-#
#
-# You should have received a copy of the GNU General Public License
#
-# along with relax; if not, write to the Free Software
#
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-#
#
-###############################################################################
-
-# Python module imports.
-from os import F_OK, access, path, sep
-import sys
-import wx
-
-# relax module imports.
-from data import Relax_data_store; ds = Relax_data_store()
-from status import Status; status = Status()
-
-# relax GUI module imports.
-from gui.filedialog import RelaxFileDialog
-from gui.fonts import font
-from gui.icons import relax_icons
-from gui.message import error_message
-from gui.misc import gui_to_int, int_to_gui
-from gui import paths
-from gui.wizard import Wiz_page
-
-
-class Base_window(wx.Dialog):
- """Base class for the settings windows."""
-
- # The window size.
- SIZE = (600, 600)
-
- # A border.
- BORDER = 10
-
- # Sizes.
- SIZE_BUTTON = (100, 33)
-
- def __init__(self, parent=None, id=-1, title='', heading='',
style=wx.DEFAULT_FRAME_STYLE):
- """Set up the window."""
-
- # Execute the base __init__() method.
- wx.Dialog.__init__(self, parent, id=id, title=title, style=style)
-
- # Set up the window icon.
- self.SetIcons(relax_icons)
-
- # The main sizer.
- self.main_sizer = self.build_frame()
-
- # The heading.
- text = wx.StaticText(self, -1, heading)
- text.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
- self.main_sizer.Add(text, 0, wx.ALIGN_CENTER_HORIZONTAL, 5)
- self.main_sizer.AddStretchSpacer()
-
- # The relax logo.
- bmp = wx.StaticBitmap(self, -1,
wx.Bitmap(paths.IMAGE_PATH+'relax.gif', wx.BITMAP_TYPE_ANY))
- self.main_sizer.Add(bmp, 0, wx.ALIGN_CENTER_HORIZONTAL, 5)
- self.main_sizer.AddStretchSpacer()
-
- # The centre section.
- self.add_centre(self.main_sizer)
-
- # The bottom buttons.
- self.add_buttons(self.main_sizer)
-
- # Set the window size.
- self.SetSize(self.SIZE)
- self.SetMinSize(self.SIZE)
-
- # Centre the window.
- self.Center()
-
-
- def add_buttons(self, sizer):
- """Add the buttons to the sizer.
-
- @param sizer: A sizer object.
- @type sizer: wx.Sizer instance
- """
-
- # Create a horizontal layout for the buttons.
- button_sizer = wx.BoxSizer(wx.HORIZONTAL)
- sizer.Add(button_sizer, 0, wx.ALIGN_CENTER|wx.ALL, 0)
-
- # The save button.
- button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, "
Save")
- button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.save,
wx.BITMAP_TYPE_ANY))
- button.SetFont(font.normal)
- button.SetToolTipString("Save the free file format settings within
the relax data store.")
- button.SetMinSize(self.SIZE_BUTTON)
- button_sizer.Add(button, 0, wx.ADJUST_MINSIZE, 0)
- self.Bind(wx.EVT_BUTTON, self.save, button)
-
- # Spacer.
- button_sizer.AddSpacer(20)
-
- # The reset button.
- button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, "
Reset")
- button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.edit_delete,
wx.BITMAP_TYPE_ANY))
- button.SetFont(font.normal)
- button.SetToolTipString("Reset the free file format settings to the
original values.")
- button.SetMinSize(self.SIZE_BUTTON)
- button_sizer.Add(button, 0, wx.ADJUST_MINSIZE, 0)
- self.Bind(wx.EVT_BUTTON, self.reset, button)
-
- # Spacer.
- button_sizer.AddSpacer(20)
-
- # The cancel button.
- button = wx.lib.buttons.ThemedGenBitmapTextButton(self, -1, None, "
Cancel")
- button.SetBitmapLabel(wx.Bitmap(paths.icon_22x22.dialog_cancel,
wx.BITMAP_TYPE_ANY))
- button.SetFont(font.normal)
- button.SetMinSize(self.SIZE_BUTTON)
- button_sizer.Add(button, 0, wx.ADJUST_MINSIZE, 0)
- self.Bind(wx.EVT_BUTTON, self.cancel, button)
-
-
- def add_centre(self, sizer):
- """Dummy base class method for adding the centre of the settings
window.
-
- @param sizer: A sizer object.
- @type sizer: wx.Sizer instance
- """
-
-
- def build_frame(self):
- """Create the main part of the frame, returning the central sizer."""
-
- # The sizers.
- sizer1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer2 = wx.BoxSizer(wx.VERTICAL)
- central_sizer = wx.BoxSizer(wx.VERTICAL)
-
- # Left and right borders.
- sizer1.AddSpacer(self.BORDER)
- sizer1.Add(sizer2, 1, wx.EXPAND|wx.ALL, 0)
- sizer1.AddSpacer(self.BORDER)
-
- # Top and bottom borders.
- sizer2.AddSpacer(self.BORDER)
- sizer2.Add(central_sizer, 1, wx.EXPAND|wx.ALL, 0)
- sizer2.AddSpacer(self.BORDER)
-
- # Set the sizer for the frame.
- self.SetSizer(sizer1)
-
- # Return the central sizer.
- return central_sizer
-
-
- def save(self, event):
- """Dummy base class save method.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Destroy the window.
- self.Destroy()
-
-
- def cancel(self, event):
- """Close the window.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Destroy the window.
- self.Destroy()
-
-
-
-class Free_file_format(Base_window, Wiz_page):
- """The free file format setting window."""
-
- # The window size.
- SIZE = (500, 550)
-
- def __init__(self, parent=None):
- """Set up the window."""
-
- # The sizes.
- self._main_size = self.SIZE[0] - 2*self.BORDER
- self._div_left = self._main_size / 2
-
- # Execute the base __init__() method.
- super(Free_file_format, self).__init__(parent=parent, id=-1,
title="Free file format", heading="Settings for the free file format")
-
-
- def add_centre(self, sizer):
- """Add the centre of the free file format settings window.
-
- @param sizer: A sizer object.
- @type sizer: wx.Sizer instance
- """
-
- # The widget.
- self.free_file_format(sizer, data_cols=True, save=False, reset=False)
-
- # Spacing.
- self.main_sizer.AddStretchSpacer()
-
-
- def reset(self, event):
- """Reset the free file format settings.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Execute the base class method.
- self._free_file_format_reset(event)
-
-
- def save(self, event):
- """Save the free file format widget contents into the relax data
store.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Execute the base class method.
- self._free_file_format_save(event)
-
- # Destroy the window.
- self.Destroy()
r16214 - in /branches/uf_redesign/gui: components/free_file_format.py relax_gui.py settings.py