Changeset 954:ad190b3a88c7

Timestamp:

05/12/19 07:15:26 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Removed text2unicode (re #347).

Location:

src/mlx/gui

Files:

• bugreport.py (modified) (1 diff)
• checklist.py (modified) (2 diffs)
• common.py (modified) (2 diffs)
• flight.py (modified) (5 diffs)
• gui.py (modified) (1 diff)
• info.py (modified) (1 diff)
• prefs.py (modified) (2 diffs)

src/mlx/gui/bugreport.py

@@ -126 +126 @@
                                      descriptionBuffer.get_end_iter(),
                                      False)
-        description = text2unicode(description)
         self.set_sensitive(False)
-        self._gui.sendBugReport(text2unicode(self._summary.get_text()),
+        self._gui.sendBugReport(self._summary.get_text(),
                                 description,
-                                text2unicode(self._email.get_text()),
+                                self._email.get_text(),
                                 self._bugReportSent)
 

src/mlx/gui/checklist.py

@@ -204 +204 @@
         numSelected = 0
         for path in fileChooser.get_filenames():
-            path = text2unicode(path)
             numSelected += 1
             if os.path.isfile(path): numFiles += 1
@@ -213 +212 @@
         """Called when the Add button is clicked."""
         for path in self._fileChooser.get_filenames():
-            path = text2unicode(path)
             self._fileListModel.append([os.path.basename(path),
                                         path])

src/mlx/gui/common.py

@@ -110 +110 @@
 
     pixbuf_new_from_file = gdk.pixbuf_new_from_file
-
-    def text2unicode(text):
-        """Convert the given text, returned by a Gtk widget, to Unicode."""
-        return str(text)
-
-    def text2str(text):
-        """Convert the given text, returned by xstr to a string."""
-        return str(text)
 
 else: # pygobject
@@ -199 +191 @@
     import codecs
     _utf8Decoder = codecs.getdecoder("utf-8")
-
-    def text2unicode(str):
-        """Convert the given text, returned by a Gtk widget, to Unicode."""
-        return _utf8Decoder(str)[0]
-
-    def text2str(text):
-        """Convert the given text, returned by xstr to a string."""
-        return _utf8Decoder(text)[0]
 
 import cairo

src/mlx/gui/flight.py

@@ -648 +648 @@
 
         if response==RESPONSETYPE_OK:
-            fileName = text2unicode(dialog.get_filename())
+            fileName = dialog.get_filename()
             print("Saving", fileName)
             try:
@@ -939 +939 @@
 
         if response==RESPONSETYPE_OK:
-            fileName = text2unicode(dialog.get_filename())
+            fileName = dialog.get_filename()
             print("Loading", fileName)
             bookedFlight = web.BookedFlight()
@@ -4740 +4740 @@
         self._lastSavePath = os.path.join(self._wizard.gui.config.pirepDirectory,
                                           self._getDefaultPIREPName())
-        self._lastSavePath = text2unicode(self._lastSavePath)
+        self._lastSavePath = self._lastSavePath
         self._savePIREP(page, automatic = True)
 
@@ -4777 +4777 @@
 
         if result==RESPONSETYPE_OK:
-            self._lastSavePath = text2unicode(dialog.get_filename())
+            self._lastSavePath = dialog.get_filename()
             self._savePIREP(page)
 
@@ -4797 +4797 @@
             type = MESSAGETYPE_ERROR
             message = xstr("finish_save_failed")
-            secondary = xstr("finish_save_failed_sec") % (text2unicode(error),)
+            secondary = xstr("finish_save_failed_sec") % (error,)
         else:
             type = MESSAGETYPE_INFO

src/mlx/gui/gui.py

@@ -1492 +1492 @@
 
         if result==RESPONSETYPE_OK:
-            self._lastLoadedPIREP = text2unicode(dialog.get_filename())
+            self._lastLoadedPIREP = dialog.get_filename()
 
             pirep = PIREP.load(self._lastLoadedPIREP)

src/mlx/gui/info.py

@@ -108 +108 @@
         """Get the comments."""
         buffer = self._comments.get_buffer()
-        return text2unicode(buffer.get_text(buffer.get_start_iter(),
-                                            buffer.get_end_iter(), True))
+        return buffer.get_text(buffer.get_start_iter(),
+                               buffer.get_end_iter(), True)
 
     @comments.setter

src/mlx/gui/prefs.py

@@ -296 +296 @@
                                                        self._vsSmoothingLength)
         config.useSimBrief = self._useSimBrief.get_active()
-        config.pirepDirectory = text2unicode(self._pirepDirectory.get_text())
+        config.pirepDirectory = self._pirepDirectory.get_text()
         config.pirepAutoSave = self._pirepAutoSave.get_active()
 
@@ -565 +565 @@
 
         if result==RESPONSETYPE_OK:
-            self._pirepDirectory.set_text(text2unicode(dialog.get_filename()))
+            self._pirepDirectory.set_text(dialog.get_filename())
 
     def _pirepDirectoryChanged(self, entry):