Changeset 8fe8df2aeb16e772b40db3d12111cee811c816d6

Timestamp:

09/23/09 23:56:15 (2 years ago)

Author:

Flupke <luper.rouch@…>

Children:

f862cc9092a9988eea1a30d617040be530eb4d15

Parents:

8ff53121022153f33f8619682042a8d38e7d181d

git-committer:

Flupke <luper.rouch@…> (09/23/09 23:56:15)

Message:

boxsort: commit to test dnd under windows

Files:

• .gitignore (modified) (1 diff)
• boxsort/.gitignore (added)
• boxsort/boxsort/__init__.py (modified) (3 diffs)
• boxsort/boxsort/gui/dialogs/main.py (modified) (7 diffs)
• boxsort/boxsort/gui/ui/main_dialog.py (modified) (3 diffs)
• boxsort/boxsort/gui/widgets/__init__.py (added)
• boxsort/boxsort/gui/widgets/file_drop_plain_text_edit.py (added)
• boxsort/files/gui/main_dialog.ui (modified) (2 diffs)
• various/config/vimrc-linux (modified) (1 diff)

.gitignore

@@ -2 +2 @@
 *.swp
 .DS_Store
+*.pyo

boxsort/boxsort/__init__.py

@@ -87 +87 @@
         if len(side_boxes):
             # There is at least one side box, place it at start
-            self.append(side_boxes.pop(0))
+            try:
+                self.append(side_boxes.pop(0))
+            except DeckOverflowError:
+                raise ArangeError("can't place first box")
         else:
             # There is no side box, put an empty space at start
@@ -105 +108 @@
             except DeckOverflowError:
                 garbage_boxes.append(box)
+        assert len(side_boxes) == 0
         return garbage_boxes
 
@@ -205 +209 @@
             deck_id += 1
     # Continue aranging boxes while there are garbage boxes left
+    outfile.write("###################### BEGIN GARBAGE ######################\n")
     while garbage_boxes:
-        out_deck = Deck()
+        out_deck = Deck(size=decks_size, feather_size=feather_size)
         garbage_boxes = out_deck.place(garbage_boxes)
         out_count += len(out_deck.boxes)

boxsort/boxsort/gui/dialogs/main.py

@@ -4 +4 @@
 from PyQt4.QtCore import *    
 from boxsort.gui.ui.main_dialog import *
-from pyflu.qt.util import get_open_path, get_save_path
+from pyflu.qt.util import get_open_path, get_save_path, long_operation
 from cStringIO import StringIO
 import boxsort
@@ -30 +30 @@
             self.open_input(path)
 
+    @long_operation
     def open_input(self, path):
         # Parse input file
@@ -39 +40 @@
                     self.trUtf8("Fichier en entrée invalide: %1")
                         .arg(str(e)))
+            self.enable_output(False)
         else:
             # Show input content
@@ -45 +47 @@
             # Update output
             self.update_output()
-            # Enable save/copy output buttons
-            self.copy_output_button.setEnabled(True)
-            self.save_output_button.setEnabled(True)
-            self.decks_size.setEnabled(True)
-            self.feather_size.setEnabled(True)        
-            self.decks_per_module.setEnabled(True)
+            self.enable_output()
         f.close()
+
+    def enable_output(self, enable=True):
+        self.copy_output_button.setEnabled(enable)
+        self.save_output_button.setEnabled(enable)
+        self.decks_size.setEnabled(enable)
+        self.feather_size.setEnabled(enable)        
+        self.decks_per_module.setEnabled(enable)
+        if not enable:
+            self.output_text.clear()
 
     def copy_output(self):
@@ -64 +70 @@
             f.close()
 
+    @long_operation
     def update_output(self, _=None):
         output_file = StringIO()
@@ -75 +82 @@
                     self.trUtf8("Impossible de ranger les boites: %1")
                         .arg(str(e)))
+            self.output_text.clear()
         else:
             output_file.seek(0)
@@ -80 +88 @@
 
     def keyPressEvent(self, event):
+        # Disable ESC key
         if event.key() == Qt.Key_Escape:
             event.ignore()

boxsort/boxsort/gui/ui/main_dialog.py

@@ -3 +3 @@
 # Form implementation generated from reading ui file 'files/gui/main_dialog.ui'
 #
-# Created: Wed Sep 23 19:26:55 2009
+# Created: Wed Sep 23 23:49:49 2009
 #      by: PyQt4 UI code generator 4.4.4
 #
@@ -84 +84 @@
         self.horizontalLayout_2 = QtGui.QHBoxLayout(self.groupBox)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.input_text = QtGui.QPlainTextEdit(self.groupBox)
-        font = QtGui.QFont()
-        font.setFamily("Monospace")
-        self.input_text.setFont(font)
+        self.input_text = FileDropPlainTextEdit(self.groupBox)
         self.input_text.setTabChangesFocus(True)
         self.input_text.setUndoRedoEnabled(False)
@@ -147 +144 @@
         self.save_output_button.setText(QtGui.QApplication.translate("BoxSortDialog", "Enregistrer la sortie sous...", None, QtGui.QApplication.UnicodeUTF8))
 
+from boxsort.gui.widgets.file_drop_plain_text_edit import FileDropPlainTextEdit

boxsort/files/gui/main_dialog.ui

@@ -190 +190 @@
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
-         <widget class="QPlainTextEdit" name="input_text">
-          <property name="font">
-           <font>
-            <family>Monospace</family>
-           </font>
-          </property>
+         <widget class="FileDropPlainTextEdit" name="input_text">
           <property name="tabChangesFocus">
            <bool>true</bool>
@@ -287 +282 @@
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>FileDropPlainTextEdit</class>
+   <extends>QPlainTextEdit</extends>
+   <header>boxsort.gui.widgets.file_drop_plain_text_edit</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>select_input_button</tabstop>

various/config/vimrc-linux

@@ -112 +112 @@
 " Configure NERDTree
 source ~/.vim/plugin/NERD_tree.vim
-let NERDTreeIgnore=['\~$', '\.pyc$']
+let NERDTreeIgnore=['\~$', '\.pyc$', '\.pyo$']
 "NERDTree
 map <F6> <ESC>:NERDTreeToggle<CR>