[Avida-cvs] [avida-svn] r896 - branches/developers/avida-edward/source/python/AvidaGui2
baerb at myxo.css.msu.edu
baerb at myxo.css.msu.edu
Fri Aug 25 11:45:59 PDT 2006
Author: baerb
Date: 2006-08-25 14:45:59 -0400 (Fri, 25 Aug 2006)
New Revision: 896
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleView.py
branches/developers/avida-edward/source/python/AvidaGui2/pyNewIconView.py
branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
Log:
Modified pyBdforeStartView to look like other dialog boxes in program.
Fixed pyGradientScaleView so it does not drop into scientfic notation so early.
Got rid of trash can icon and put picture of trash can in the background of
the trash can box -- quick fix to problem with drag to trash can not working.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2006-08-25 01:56:22 UTC (rev 895)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2006-08-25 18:45:59 UTC (rev 896)
@@ -8,134 +8,101 @@
<rect>
<x>0</x>
<y>0</y>
- <width>307</width>
- <height>168</height>
+ <width>507</width>
+ <height>113</height>
</rect>
</property>
- <property name="paletteBackgroundColor">
- <color>
- <red>255</red>
- <green>255</green>
- <blue>100</blue>
- </color>
- </property>
<property name="caption">
<string>Chose Active Workspace</string>
</property>
- <widget class="QButtonGroup">
+ <vbox>
<property name="name">
- <cstring>BeforeStartingButtonGroup</cstring>
+ <cstring>unnamed</cstring>
</property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>310</width>
- <height>203</height>
- </rect>
- </property>
- <property name="title">
- <string></string>
- </property>
- <vbox>
+ <widget class="QLabel">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>BeforeStartTextLabel</cstring>
</property>
- <widget class="QLabel">
+ <property name="text">
+ <string><p align="center">Before you can freeze a petri dish or organism<br> you must choose a workspace to work with</p></string>
+ </property>
+ <property name="textFormat">
+ <enum>AutoText</enum>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout21</cstring>
+ </property>
+ <hbox>
<property name="name">
- <cstring>BeforeStartTextLabel</cstring>
+ <cstring>unnamed</cstring>
</property>
- <property name="font">
- <font>
- <pointsize>12</pointsize>
- </font>
- </property>
- <property name="text">
- <string><p align="center">Before you can freeze a petri dish or organism<br> you must choose a workspace to work with</p></string>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>OpenExistingPushButton</cstring>
- </property>
- <property name="paletteBackgroundColor">
- <color>
- <red>255</red>
- <green>255</green>
- <blue>100</blue>
- </color>
- </property>
- <property name="focusPolicy">
- <enum>StrongFocus</enum>
- </property>
- <property name="text">
- <string>Open Existing Workspace</string>
- </property>
- <property name="toggleButton">
- <bool>true</bool>
- </property>
- <property name="on">
- <bool>false</bool>
- </property>
- <property name="toolTip" stdset="0">
- <string><p>Use a workspace that has already been created</P></string>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>CreateNewPushButton</cstring>
- </property>
- <property name="paletteBackgroundColor">
- <color>
- <red>255</red>
- <green>255</green>
- <blue>100</blue>
- </color>
- </property>
- <property name="focusPolicy">
- <enum>StrongFocus</enum>
- </property>
- <property name="text">
- <string>Create New Workspace</string>
- </property>
- <property name="toggleButton">
- <bool>true</bool>
- </property>
- <property name="toolTip" stdset="0">
- <string><P>Create a new workspace to save your work</P></string>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>CancelPushButton</cstring>
- </property>
- <property name="paletteBackgroundColor">
- <color>
- <red>255</red>
- <green>255</green>
- <blue>100</blue>
- </color>
- </property>
- <property name="focusPolicy">
- <enum>StrongFocus</enum>
- </property>
- <property name="text">
- <string>Cancel</string>
- </property>
- <property name="toggleButton">
- <bool>true</bool>
- </property>
- <property name="toolTip" stdset="0">
- <string><p>Don't freeze; return to the program</P></string>
- </property>
- </widget>
- </vbox>
- </widget>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>OpenExistingPushButton</cstring>
+ </property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string>Open Existing Workspace</string>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string><p>Use a workspace that has already been created</P></string>
+ </property>
+ </widget>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>CreateNewPushButton</cstring>
+ </property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string>Crreate New Workspace</string>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string><P>Create a new workspace to save your work</P></string>
+ </property>
+ </widget>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>CancelPushButton</cstring>
+ </property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string><p>Don't freeze; return to the program</P></string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ </vbox>
</widget>
-<tabstops>
- <tabstop>OpenExistingPushButton</tabstop>
- <tabstop>CreateNewPushButton</tabstop>
- <tabstop>CancelPushButton</tabstop>
-</tabstops>
+<connections>
+ <connection>
+ <sender>OpenExistingPushButton</sender>
+ <signal>clicked()</signal>
+ <receiver>pyBeforeStartingView</receiver>
+ <slot>accept()</slot>
+ </connection>
+ <connection>
+ <sender>CancelPushButton</sender>
+ <signal>clicked()</signal>
+ <receiver>pyBeforeStartingView</receiver>
+ <slot>reject()</slot>
+ </connection>
+ <connection>
+ <sender>CreateNewPushButton</sender>
+ <signal>clicked()</signal>
+ <receiver>pyBeforeStartingView</receiver>
+ <slot>accept()</slot>
+ </connection>
+</connections>
<layoutdefaults spacing="6" margin="11"/>
</UI>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-08-25 01:56:22 UTC (rev 895)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-08-25 18:45:59 UTC (rev 896)
@@ -152,13 +152,13 @@
# set up the trash can ot have one trash can icon that can not be selected
- self.TrashCanIconView.setItemTextPos(QIconView.Right)
- self.TrashCanIconView.setSpacing(1)
+ # self.TrashCanIconView.setItemTextPos(QIconView.Right)
+ # self.TrashCanIconView.setSpacing(1)
self.TrashCanIconView.setVScrollBarMode(QIconView.AlwaysOff)
self.TrashCanIconView.setHScrollBarMode(QIconView.AlwaysOff)
self.TrashCanIconView.setSelectionMode(QIconView.NoSelection)
self.TrashCanIconView.setAutoArrange(False)
- TCIcon = pyNewIconView.TrashIconViewItem(self.TrashCanIconView)
+ # TCIcon = pyNewIconView.TrashIconViewItem(self.TrashCanIconView)
self.show()
@@ -513,6 +513,10 @@
def DroppedInTrashSlot(self, e):
+ descr("BDB")
+ if self.m_session_mdl.m_warn_about_trash:
+ self.m_session_mdl.m_warn_about_trash = False
+ warningNoMethodName("Anything dropped in the trash can will be pemenently deleted")
# Try to decode to the data you understand...
freezer_item_list = QString()
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-08-25 01:56:22 UTC (rev 895)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-08-25 18:45:59 UTC (rev 896)
@@ -132,6 +132,9 @@
<height>40</height>
</size>
</property>
+ <property name="paletteBackgroundPixmap">
+ <pixmap>image0</pixmap>
+ </property>
<property name="acceptDrops">
<bool>true</bool>
</property>
@@ -241,7 +244,7 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- <pixmap>image0</pixmap>
+ <pixmap>image1</pixmap>
<property type="0">3</property>
<property type="1">pyFreezerView</property>
<property type="3">-1</property>
@@ -297,6 +300,8 @@
<property type="0">-1</property>
<property type="1">pyFreezerView</property>
<property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
<property type="pyFreezerView"></property>
<property type="-1">1</property>
</customwidget>
@@ -314,7 +319,7 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- <pixmap>image0</pixmap>
+ <pixmap>image1</pixmap>
<property type="0">3</property>
<property type="1">pyNavBarView</property>
<property type="3">-1</property>
@@ -370,6 +375,8 @@
<property type="0">-1</property>
<property type="1">pyNavBarView</property>
<property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
<property type="pyNavBarView"></property>
<property type="-1">1</property>
</customwidget>
@@ -387,7 +394,7 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- <pixmap>image0</pixmap>
+ <pixmap>image1</pixmap>
<property type="0">3</property>
<property type="1">pyNewIconView</property>
<property type="3">-1</property>
@@ -399,7 +406,7 @@
<cstring>fileNewAction</cstring>
</property>
<property name="iconSet">
- <iconset>image1</iconset>
+ <iconset>image2</iconset>
</property>
<property name="text">
<string>New Workspace</string>
@@ -416,7 +423,7 @@
<cstring>fileOpenAction</cstring>
</property>
<property name="iconSet">
- <iconset>image2</iconset>
+ <iconset>image3</iconset>
</property>
<property name="text">
<string>Open Workspace...</string>
@@ -433,7 +440,7 @@
<cstring>fileSaveAction</cstring>
</property>
<property name="iconSet">
- <iconset>image3</iconset>
+ <iconset>image4</iconset>
</property>
<property name="text">
<string>&Save Workspace</string>
@@ -492,7 +499,7 @@
<cstring>m_print_action</cstring>
</property>
<property name="iconSet">
- <iconset>image4</iconset>
+ <iconset>image5</iconset>
</property>
<property name="text">
<string>&Print</string>
@@ -523,7 +530,7 @@
<cstring>editUndoAction</cstring>
</property>
<property name="iconSet">
- <iconset>image5</iconset>
+ <iconset>image6</iconset>
</property>
<property name="text">
<string>Undo</string>
@@ -540,7 +547,7 @@
<cstring>editRedoAction</cstring>
</property>
<property name="iconSet">
- <iconset>image6</iconset>
+ <iconset>image7</iconset>
</property>
<property name="text">
<string>Redo</string>
@@ -557,7 +564,7 @@
<cstring>editCutAction</cstring>
</property>
<property name="iconSet">
- <iconset>image7</iconset>
+ <iconset>image8</iconset>
</property>
<property name="text">
<string>Cut</string>
@@ -574,7 +581,7 @@
<cstring>editCopyAction</cstring>
</property>
<property name="iconSet">
- <iconset>image8</iconset>
+ <iconset>image9</iconset>
</property>
<property name="text">
<string>Copy</string>
@@ -591,7 +598,7 @@
<cstring>editPasteAction</cstring>
</property>
<property name="iconSet">
- <iconset>image9</iconset>
+ <iconset>image10</iconset>
</property>
<property name="text">
<string>Paste</string>
@@ -608,7 +615,7 @@
<cstring>editFindAction</cstring>
</property>
<property name="iconSet">
- <iconset>image10</iconset>
+ <iconset>image11</iconset>
</property>
<property name="text">
<string>Find</string>
@@ -858,36 +865,39 @@
</actions>
<images>
<image name="image0">
+ <data format="PNG" length="977">89504e470d0a1a0a0000000d49484452000000fa0000002508060000006b84f4c70000039849444154789ceddd2d50244718c6f17fa752450f866ecccda2585440054e5d2417739c8c3b24a8c3a5e272282eee88db53eca924362620cf9ee35c40018a5d95190c33a73a627697f055a9ca752f54787e666b7bbb66dbbcd3fdbe3d1f26848088fcbf7d71d7031091f4be1cc79f18636e5c368410cc38fe5fe4a14b1ee8c698b0b2b2c3eaea1ae7e73039d9a7dbdda528b631c60405bb487a26568e7edbacfd5fe90420124f9419dd18131617e7999ddde2ecec84b5b50daaaa47afd7e6d52bccebd7843c07638ec9b28c9d9d80b50e63de026e749c8909c7c9c9e6e037cdf622b14499d163cfe6430a749138a22edd9797dff0ecd9d7d4f5534e4e6a009c03e7eca85f59fe86738f00c8b269badd2ed65abcf700589bb3b7b7ae201789286a31ae287af47a531c1e7e647777d1f4fb843cc73c7ffe31e4797342316699a2f805ef67383e3e6665e51bf2fc11efdefd8eb535837817918892eea39f9e369f7b7b4b78bf004008a7b4db2d3a9d2eed760b80eded9f71cedd761811f94cd103dd9849f27c97a5a5f7616909634c16b6b6fea028de00e0fd02ddeeafcccfb7e974dee2dc14ad568b0f1f7ec2fb365555c51e92c88397!
6846b7b45ac335f85794e51960692aece5a897f76da0a4ae9b1cbeaa2ab22c4b332491076ccc97c09637b65adb04ba825c248d31077a93877b3f83b57f02509617c5752ddb45d24812e8ce3926268eaeb57b3f0940519c52d70b83beba7b4e24b524815e96259f3ecd5d6b2f8ad31bfbd775b3e79e659966759104ee64e97ed5304757314e248d3bb91fddfb994bdf8733ba88a431d6401fe6e875fd7ed4569646557791c4c65a8cbbc8d15700a8aa239c9b1afdaefc5c248db116e386397a553527812c9be3b6bd751189e75e3c334e557791b4ee2447bf4a557791b4c61ae8ffb68f2e22698cb51877d325b07031a38b481a632dc65dbd04b6aafe02dca51c5d44e2bbd3a57b964d03e5a51c5d44e2bb1797c02a471749eb5e55dd45248d64c5b85eaf187c3b1c3cf5b5beb6742f8a03fe99a38b481ad1033d84730e0f1fb3bfbf6cf6f70921546673f35bbcff0168f2f4f5f5ef3838386663e3fbc163a6e0c9931fa9eb7eece1880809debd363ddd3c31a6df270c3f5fbc38a2282eb6d38a6295972f036579867381aa3ac2da999b0f28229f2d6aa07bdf2284595aad45f21c93e74d7b96656176b63dea674c176b1fd3e97470ce3137f7146896efd6e631872422447c530bc47b3593ded2221257d4401791fbe95edcbd26226929d0451e80bf01ab9149d8450a2cd4000000!
0049454e44ae426082</data>
+ </image>
+ <image name="image1">
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454e44a!
e426082<
/data>
</image>
- <image name="image1">
+ <image name="image2">
<data format="PNG" length="173">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000007449444154789cedd5c109c0200c05d06fe936812c10b2ffdd85d25385b6a991480f053f081af0291210f828c5a9d9c4de96cd2b9ad9eb0000660e2fe0c2519839c4f70c4c446d5e6b3538cf928245e4b2f6f014acaa8fda1d4fc1a5741b22079f9d111d96ea8a912c78c10bee64e60719f57e9203ad452a040318f5f70000000049454e44ae426082</data>
</image>
- <image name="image2">
+ <image name="image3">
<data format="PNG" length="210">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000009949444154789ced94410e85200c445f89c7367f61bc775d2848a42860ffced9548bbe8e13043e1d928177f481a123dc2b34f6f47a3de2b865a8843f4001982a0b3d5f62c58300aa1ad70550449ab9d507a773a8a4ba4f92a2df333c64c63bebbd82e5b8addecbcc7820eb4266c639745dfa80f36faf66c66fa19c3f882fb470ec05cdc0bed07893f68e171492635f686c3eeff6ba3c8fdd366dc4c0452cf153a9590000000049454e44ae426082</data>
</image>
- <image name="image3">
+ <image name="image4">
<data format="PNG" length="217">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000a049444154789cd5954d0a802010859fd14668e18de662d222bc98376a21b4ac451992c66469e0b7f187f1f11c47052a218e762daddbfb9e99f6568f80b5364b8588ce35440400e80a398ce8f99034d2292cc37c8ebd530feb583a05e954341f8a027b2a7d3a1f09bf854dc5d5d953aa396e4f38cab199e2d2e108abe156f82e30977fcb4d8ff942d75dbebed2e143953a93f6caad3d6111f44b7d4f820ff9c0069bb51ecd122066740000000049454e44ae426082</data>
</image>
- <image name="image4">
+ <image name="image5">
<data format="PNG" length="725">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000029c49444154789c8d95ad76db4010853ff718cc3289d950d06136344c98c362964087256f503f426161021be6b2842550612e8be14299496c866dc14ab2fc77da2192665777eedc3b5af53813afafaf414448d3742f6f6600a82a005555912409575757bdeebefe396011613299b440876b4d946589f7fe68cf596080cd6673047658485571cefd3ff02900333b2a70aa23806fa792799e07336b9938e770ceede9dde82f2247fa9e65acaa244942599688486b54374eb5ff4fc6105b3c9c882e6853ec9c142719376c4e31ede655756f42ba71a40dc06ab50a5996311c0ecf8237467e7e7e022092309f5fb7787b8cdfdfdf83f79efc2347668288b40087d786695994e479ceb6daf2f0f01066b319d7d7d7bd5e1774b3f154c5163580d34c019ca408020e7ce159afffb0dd16a81a1717198bc5224ad130bd9c5ee2d2145503538e6c3103849c4f3e78656a53d2af94e79767fc57fcfad4946c7411419f9e7e85b228c3ffc457f80aa3300a12248cc228acd7ebf0e3fbcf301e8fc360908524494236c842bfda56dcdddd9c75f73052522e999223cc98311e8f4964486905cfbf5ea8aa8a7490d237c0fb22cea31988106b48ed3638!
5c54dc14c4f160dfb9c133b4217fd88019e97018d76b77fa6551e045a29e66b4be39882ed69d38031520e604f0b6c5886788df6c5a4f1cf5b835096b00b17628148b35746f673b39d278da0945e9236065e705adc976371a200a76b8e2302ba9fb6c7a633299f20debb06cc96a7cb4faba07ea9a6d35680d58cb39180c582cee2263ef7d631588412540159d338b30d2b0b21d183bcd31430496cb25f3f9bcd7cfb28c8fb70f7ebfbda16ac4f347d81b3ee93ccb0eb2edb39ea6e572c9e3e3630f3a87d06ab50aabd51bdbfaffa5686dcace99dd5f0354cb785f1993e984dbdb5beeefef5bbcbfd1f69e0c0f8448030000000049454e44ae426082</data>
</image>
- <image name="image5">
+ <image name="image6">
<data format="PNG" length="172">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000007349444154789ced92c10e80200840b1ef661d1cff4d876aa888a17669f9360f283ed80060f159425f3a71f53602e08e992b098801d02854176ae47f21ce1fb5b05d38eddc9060d0f11379635b3bc92bd518e239a943ec1d5ab7785cee107be4b215af4091f894de47181ecea59ede9ec59f380062ac28b10fe74fef0000000049454e44ae426082</data>
</image>
- <image name="image6">
+ <image name="image7">
<data format="PNG" length="173">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000007449444154789ced92c10ac02008406ddf2d3b84ffed0ea3586a26d165e0830ea53e8504487e4b910f5489f19ea5a3ca0f8a896365b306c42dd613c649bdc2598316136219f0f936c0a2ef00d75a62614d3ab22996f2a362ffa337c5ebede962aad1a2e84aaaa2f750dd12748c0fd0ab9324677800596e28b1bb69e3510000000049454e44ae426082</data>
</image>
- <image name="image7">
+ <image name="image8">
<data format="PNG" length="187">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000008249444154789ccdd341128020080550e8e02ebc38ad3273503e48537fe3e48c4f2425fa28e29c6f39920bf9276cb60185358877611388c2576418cda015f520b4e6b55be109dc0622b8e22acf31056e18dfdff80606aa551cc63564c4dcf80cd0201d577a5c85a8845fdc025ea5307afccd07e23a1df283ec2b37d9ad5fb4dfefd49cfbf72facb651b89d0000000049454e44ae426082</data>
</image>
- <image name="image8">
+ <image name="image9">
<data format="PNG" length="248">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000bf49444154789cd593410a83301045df488ee51dbc8c3ba98bf46a9eabd385350d266362444a3f0c4266fcf3f824f06f12402b66da8c55f3de2212cf9d92cb98c0ba2d7c4544cf9a07638bbad53c4491235ecf7cc1623697a92540c11ff4fda75275015d24a9389e7d6f53df4fe4ccab323eea0f03c0c4b2a0712ce6add89b59b7661c3be095985f261679ee4ebcc22c9788551fe6a2cbc4969a894bcb6f23ee361aab62e252c57294dfbfb610bbf2c897b8a46cc6677eaa519571fa087ea83762da9aba45b637520000000049454e44ae426082</data>
</image>
- <image name="image9">
+ <image name="image10">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154789cc5955d0a84300c8427e2a90a9e6c8b0f4b3dd982d7ca3e58d7fe4cd0ba5d7640024df265da0a057e2439c9eb8d9eaa8841a0c9aad8c82ab32f9c425be1e30e0dcf00c00308f0b3a7a07410a9d7142e00b42c5a5fab696b979b1c837fc0c316b6e4165b64f78d716359919bdc4570de47c04732dd5e5bcc35f0c97762ae787936dccf7513577e79f48c4b27aa0f1327b240f5117fcbe348aa33b6e0224b054d0746b8025e2e3b3e73cde0dd1c97f02e8ed9d0af1db381224bdf33eee698a934a0f617b45540d00bcf4ca08fc0dff406e325c198b16b67fb0000000049454e44ae426082</data>
</image>
- <image name="image10">
+ <image name="image11">
<data format="PNG" length="662">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000025d49444154789cd593a172db4010863f670a56ecc42278d0653693a0c21c68d6c2e60df21a818111349499c254a8329b55f0e089ddb15ba602b79d6692d699b6d399fee86e67e7db7f77efe07fd3e2c74bd775b3730eef3d5115002382b5166b2d5757578b1729bf02b76d3b0f8703b92d58aed7600400ef1ce3c70306a8aa8aebebeb57c117dfa06ddb525dd754efb600a82a49138a123532ec3ac42b9bcde655ce2ffabe9f87c340fde13dcb4d8daaa24e48ee12c6823808c107969b1a8a9ce3f1f8aa515c38e7c8ada5aa6b00c45f129c67d223938c88e6c860d118b1d592d139baae9bcf83a78965b5465134801b1d2e1f4945c0e350096408ea154490c2e0bd3fef5853c2e486a0019f4d84f58418418362b0408e8b23c924501093314dd359f01b809814112025144015f1964c0bbc1b484b07e4688880c029ebd78e4141f5b434fd76864c053f1e084b0f8580265440634044ce838bbcc03987a61350a3a2285e1d5a4414d0708aa598082162ad3d0fb6d6e287cfa498508d274050447370428c91af8d10fd4481608c390b5e00dcddddcd8e80a9de420248e804840856f03e02907d729465c9ba5ae3468731e6a79fe50260!
b55a6102c4ee40a6894c33f2cb0cb106512814f8f899b22cb9b9b959b8d1f1f8f848d334b46dfbe29bfe5eadeffbf9783c323a871881ecb4200d1151a8eb9aed76bb00188661eeba8efd7e8f3186ed76cb6ab57ae2fe591b5dd7cdde7b628c8808799e63ada5aaaa67b9bbdd6e6e9a06ef3d755d3f29fec7eafb7ebebdbd9dadb5735996f3fdfdfdfca2e3dfd5c3c3c3dc340dd334b1d96cfe1e184e63dceff7a494fe26f61fe90bbc4c5e59b8ac895e0000000049454e44ae426082</data>
</image>
</images>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-08-25 01:56:22 UTC (rev 895)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-08-25 18:45:59 UTC (rev 896)
@@ -259,33 +259,11 @@
second_level = second_level.nextSibling()
top_level = top_level.nextSibling()
- descr("BDB -- about to set up dragHolder: " + str(file_list))
dragHolder = self.itemDrag( file_list, self )
dragHolder.dragCopy()
- # def pressed_itemSlot(self, item):
+ # if freezer item is doubled clicked read file/directory assocatied with item
- # if item != None and item.depth() > 0:
- # top_level = item
- # while top_level.parent():
- # top_level = top_level.parent()
-
- # # Rebuild the file name
-
- # if str(top_level.text(0)).startswith(" Empty Petri"):
- # file_name = str(item.text(0)) + ".empty"
- # elif str(top_level.text(0)).startswith(" Full Petri"):
- # file_name = str(item.text(0)) + ".full"
- # elif str(top_level.text(0)).startswith(" Organism"):
- # file_name = str(item.text(0)) + ".organism"
- # file_name = os.path.join(self.m_session_mdl.m_current_freezer, file_name)
-
- # descr("BDB -- about to set up dragHolder: " + str(file_name))
- # dragHolder = self.itemDrag( file_name, self )
- # dragHolder.dragCopy()
-
- # if freezer item is clicked read file/directory assocatied with item
-
def double_clicked_itemSlot(self, item):
# check that the item is not at the top level
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py 2006-08-25 01:56:22 UTC (rev 895)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py 2006-08-25 18:45:59 UTC (rev 896)
@@ -23,17 +23,17 @@
def setAvidaSlot(self, avida):
- print "pyGradientScaleCtrl.setAvidaSlot() ..."
+ # print "pyGradientScaleCtrl.setAvidaSlot() ..."
old_avida = self.m_avida
self.m_avida = avida
if(old_avida):
- print "pyGradientScaleCtrl.setAvidaSlot() disconnecting old_avida ..."
+ # print "pyGradientScaleCtrl.setAvidaSlot() disconnecting old_avida ..."
self.disconnect(
self.m_avida.m_avida_thread_mdtr, PYSIGNAL("AvidaUpdatedSig"),
self.avidaUpdatedSlot)
del old_avida
if(self.m_avida):
- print "pyGradientScaleCtrl.setAvidaSlot() connecting self.m_avida ..."
+ # print "pyGradientScaleCtrl.setAvidaSlot() connecting self.m_avida ..."
self.connect(
self.m_avida.m_avida_thread_mdtr, PYSIGNAL("AvidaUpdatedSig"),
self.avidaUpdatedSlot)
@@ -45,7 +45,7 @@
pass
def destruct(self):
- print "*** called pyGradientScaleCtrl.py:destruct ***"
+ # print "*** called pyGradientScaleCtrl.py:destruct ***"
self.m_avida = None
self.disconnect(
self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"),
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleView.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleView.py 2006-08-25 01:56:22 UTC (rev 895)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleView.py 2006-08-25 18:45:59 UTC (rev 896)
@@ -246,5 +246,12 @@
if x >= 100:
ix = int(x)
x = float(ix)
- return QString("%1").arg(x, 0, 'g', 2)
+ if (x <= 10.0):
+ return QString("%1").arg(x, 0, 'f', 2)
+ elif (x < 100.0):
+ return QString("%1").arg(x, 0, 'f', 1)
+ elif (x < 10000.0):
+ return QString(str(ix))
+ else:
+ return QString("%1").arg(x, 0, 'g', 2)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyNewIconView.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyNewIconView.py 2006-08-25 01:56:22 UTC (rev 895)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyNewIconView.py 2006-08-25 18:45:59 UTC (rev 896)
@@ -171,14 +171,17 @@
return
item = item.nextItem()
- def dragEnterEvent( self, e ):
+# def dragEnterEvent( self, e ):
+#
+# descr("BDB")
+# # Check if you want the drag...
+#
+# if (canDecode(e)):
+# descr("BDB -- canDecode")
+# e.accept()
- # Check if you want the drag...
-
- if (canDecode(e)):
- e.accept()
-
def contentsDropEvent(self, e):
+ descr("BDB")
if e.source() is self:
return
self.emit(PYSIGNAL("DroppedOnNewIconViewSig"),(e,))
@@ -228,14 +231,18 @@
self.moveBy(15,0)
def contentsDropEvent(self, e):
+ descr("BDB -- TrashIconViewItem")
if e.source() is self:
return
self.QIconView.emit(PYSIGNAL("DroppedOnNewIconViewSig"),(e,))
- def dragEnterEvent( self, e ):
- e.acceptAction(True)
- if e.isAccepted():
- pass
- else:
- pass
+# def dragEnterEvent( self, e ):
+#
+# descr("BDB -- TrashIconViewItem")
+# # Check if you want the drag...
+#
+# if (canDecode(e) and not (e.source is self)):
+# descr("BDB -- TrashIconViewItem -- canDecode")
+# e.accept()
+
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-08-25 01:56:22 UTC (rev 895)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-08-25 18:45:59 UTC (rev 896)
@@ -77,6 +77,10 @@
self.m_session_mdl.m_update_to_pause = -99
+ # Variable to tell that Trash Can is permenent just once
+
+ self.m_session_mdl.m_warn_about_trash = True
+
# Create a temporary subdirectory for general use in this session. Add a
# subdirectory to that for output files -- these files will only get
# put into named directories when frozen
More information about the Avida-cvs
mailing list