Changeset f862cc9092a9988eea1a30d617040be530eb4d15

Timestamp:

09/24/09 00:29:29 (3 years ago)

Author:

Flupke <luper.rouch@…>

Children:

67fb7f47d19800052eec97fb8068824ea9163433

Parents:

8fe8df2aeb16e772b40db3d12111cee811c816d6

git-committer:

Flupke <luper.rouch@…> (09/24/09 00:29:29)

Message:

boxsort:

• implemented dnd
• fixed unicode errors in error messages formating

Location:

boxsort/boxsort

Files:

• __init__.py (modified) (7 diffs)
• gui/dialogs/main.py (modified) (3 diffs)
• gui/widgets/file_drop_plain_text_edit.py (modified) (2 diffs)

boxsort/boxsort/__init__.py

@@ -90 +90 @@
                 self.append(side_boxes.pop(0))
             except DeckOverflowError:
-                raise ArangeError("can't place first box")
+                raise ArangeError(u"impossible de placer la première boite ; "
+                    u"la taille des plateaux est trop petite par rapport aux "
+                    u"boites.")
         else:
             # There is no side box, put an empty space at start
@@ -119 +121 @@
         if box.size + self.insert_pos > self.size + 1:
             # No space left to insert box
-            raise DeckOverflowError
+            raise DeckOverflowError()
         if box.size < self.feather_size and \
                 self.insert_pos + box.size > self.size - self.feather_size + 1:
             # Can't insert small boxes at the end of the deck
-            raise DeckOverflowError
+            raise DeckOverflowError()
         box.move(self.insert_pos)
         self.boxes.append(box)
@@ -168 +170 @@
             match = box_line_pattern.match(line)
             if not match:
-                raise InvalidInputError("erreur à la ligne %d: '%s'" %
-                        (current_line, line))
+                raise InvalidInputError(u"erreur à la ligne %d: format "
+                        u"invalide." % current_line)
             current_deck.append(Box(*match.groups()))        
         else:
@@ -200 +202 @@
             out_deck.set_module(module_letters[module_id])
         except IndexError:
-            raise ArangeError("plus de lettres de modules disponibles")
+            raise ArangeError(u"plus de lettres de modules disponibles")
         outfile.write(str(out_deck))
         if deck_id == decks_per_module:
@@ -209 +211 @@
             deck_id += 1
     # Continue aranging boxes while there are garbage boxes left
-    outfile.write("###################### BEGIN GARBAGE ######################\n")
     while garbage_boxes:
         out_deck = Deck(size=decks_size, feather_size=feather_size)
@@ -218 +219 @@
             out_deck.set_module(module_letters[module_id])
         except IndexError:
-            raise ArangeError("plus de lettres de modules disponibles")
+            raise ArangeError(u"plus de lettres de modules disponibles")
         outfile.write(str(out_deck))
         if deck_id == decks_per_module:
@@ -227 +228 @@
             deck_id += 1
     if in_count != out_count:
-        raise ArangeError("le nombre de boites en sortie est différent du "
-                "nombre de boites en entrée")
-
+        raise ArangeError(u"le nombre de boites en sortie est différent du "
+                u"nombre de boites en entrée")
+

boxsort/boxsort/gui/dialogs/main.py

@@ -24 +24 @@
         c(self.decks_per_module, SIGNAL("valueChanged(int)"),
                 self.update_output)
+        c(self.input_text, SIGNAL("loaded"), self.open_input)
 
     def select_input(self):
         path = get_open_path(self, "directories/input_dir")
         if path:
+            self.input_text.load_file(path)
             self.open_input(path)
 
@@ -39 +41 @@
             QMessageBox.critical(self, self.trUtf8("Erreur"),
                     self.trUtf8("Fichier en entrée invalide: %1")
-                        .arg(str(e)))
+                        .arg(unicode(e)))
             self.enable_output(False)
+            self.input_text.clear()
         else:
             # Show input content
@@ -81 +84 @@
             QMessageBox.critical(self, self.trUtf8("Erreur"), 
                     self.trUtf8("Impossible de ranger les boites: %1")
-                        .arg(str(e)))
+                        .arg(unicode(e)))
             self.output_text.clear()
         else:

boxsort/boxsort/gui/widgets/file_drop_plain_text_edit.py

@@ -1 +1 @@
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
+import os.path
 
 
@@ -6 +7 @@
 
     def dragEnterEvent(self, event):
-        event.acceptProposedAction()
+        self.get_event_file(event)
 
     def dragMoveEvent(self, event):
-        event.acceptProposedAction()
+        self.get_event_file(event)
 
     def dropEvent(self, event):
-        mime_data = event.mimeData()
-        print [str(x) for x in mime_data.formats()]
-        print repr(mime_data.data("text/uri-list"))
-        event.acceptProposedAction()
+        path = self.get_event_file(event)
+        if path is not None:
+            self.load_file(path)
+            self.emit(SIGNAL("loaded"), path)
 
     def dragLeaveEvent(self, event):
         event.accept()
 
+    def get_event_file(self, event):
+        mime_data = event.mimeData()
+        if mime_data.hasUrls():
+            for url in mime_data.urls():
+                path = url.path()
+                if os.path.isfile(path):
+                    event.acceptProposedAction()
+                    return path
+        return None
 
+    def load_file(self, path):
+        f = open(path)
+        self.setPlainText(f.read())
+        f.close()