From 4d88b981f76b4e028c6532279bd7c7238adf5fe3 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sun, 13 Jun 2004 16:29:34 +0000 Subject: [PATCH] Remove use of old TRUE and FALSE. git-svn-id: https://rox.svn.sourceforge.net/svnroot/rox/trunk/Edit@3555 66de3db3-b00d-0410-b41b-f4738ad19bea --- EditWindow.py | 45 +++++++++++++++++++++------------------------ Help/Changes | 2 +- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/EditWindow.py b/EditWindow.py index 457da5a..0ecb364 100644 --- a/EditWindow.py +++ b/EditWindow.py @@ -11,9 +11,6 @@ import codecs to_utf8 = codecs.getencoder('utf-8') -FALSE = g.FALSE -TRUE = g.TRUE - from rox.Menu import Menu, set_save_name, SubMenu, Separator, Action, ToggleItem default_font = Option('default_font', 'serif') @@ -138,9 +135,9 @@ class EditWindow(rox.Window, XDSLoader, Saveable): self.insert_mark = self.buffer.get_mark('insert') self.selection_bound_mark = self.buffer.get_mark('selection_bound') start = self.buffer.get_start_iter() - self.mark_start = self.buffer.create_mark('mark_start', start, TRUE) - self.mark_end = self.buffer.create_mark('mark_end', start, FALSE) - self.mark_tmp = self.buffer.create_mark('mark_tmp', start, FALSE) + self.mark_start = self.buffer.create_mark('mark_start', start, True) + self.mark_end = self.buffer.create_mark('mark_end', start, False) + self.mark_tmp = self.buffer.create_mark('mark_tmp', start, False) tag = self.buffer.create_tag('marked') tag.set_property('background', 'green') self.marked = 0 @@ -148,14 +145,14 @@ class EditWindow(rox.Window, XDSLoader, Saveable): # When searching, this is where the cursor was when the minibuffer # was opened. start = self.buffer.get_start_iter() - self.search_base = self.buffer.create_mark('search_base', start, TRUE) + self.search_base = self.buffer.create_mark('search_base', start, True) - vbox = g.VBox(FALSE) + vbox = g.VBox(False) self.add(vbox) tools = g.Toolbar() tools.set_style(g.TOOLBAR_ICONS) - vbox.pack_start(tools, FALSE, TRUE, 0) + vbox.pack_start(tools, False, True, 0) tools.show() self.status_label = g.Label('') @@ -193,7 +190,7 @@ class EditWindow(rox.Window, XDSLoader, Saveable): self.show_all() # Create the minibuffer - self.mini_hbox = g.HBox(FALSE) + self.mini_hbox = g.HBox(False) info = g.Button() info.set_relief(g.RELIEF_NONE) info.unset_flags(g.CAN_FOCUS) @@ -203,12 +200,12 @@ class EditWindow(rox.Window, XDSLoader, Saveable): info.show_all() info.connect('clicked', self.mini_show_info) - self.mini_hbox.pack_start(info, FALSE, TRUE, 0) + self.mini_hbox.pack_start(info, False, True, 0) self.mini_label = g.Label('') - self.mini_hbox.pack_start(self.mini_label, FALSE, TRUE, 0) + self.mini_hbox.pack_start(self.mini_label, False, True, 0) self.mini_entry = g.Entry() - self.mini_hbox.pack_start(self.mini_entry, TRUE, TRUE, 0) - vbox.pack_start(self.mini_hbox, FALSE, TRUE) + self.mini_hbox.pack_start(self.mini_entry, True, True, 0) + vbox.pack_start(self.mini_hbox, False, True) self.mini_entry.connect('key-press-event', self.mini_key_press) self.mini_entry.connect('changed', self.mini_changed) @@ -260,7 +257,7 @@ class EditWindow(rox.Window, XDSLoader, Saveable): raise self.buffer.connect('modified-changed', self.update_title) - self.buffer.set_modified(FALSE) + self.buffer.set_modified(False) def button_press(text, event): if event.button != 3: @@ -348,23 +345,23 @@ class EditWindow(rox.Window, XDSLoader, Saveable): def get_encoding(self, message): "Returns (encoding, errors), or raises Abort to cancel." box = g.MessageDialog(self, 0, g.MESSAGE_QUESTION, g.BUTTONS_CANCEL, message) - box.set_has_separator(FALSE) + box.set_has_separator(False) frame = g.Frame() - box.vbox.pack_start(frame, TRUE, TRUE) + box.vbox.pack_start(frame, True, True) frame.set_border_width(6) - hbox = g.HBox(FALSE, 4) + hbox = g.HBox(False, 4) hbox.set_border_width(6) - hbox.pack_start(g.Label(_('Encoding:')), FALSE, TRUE, 0) + hbox.pack_start(g.Label(_('Encoding:')), False, True, 0) combo = g.Combo() combo.disable_activate() combo.entry.connect('activate', lambda w: box.activate_default()) combo.set_popdown_strings(known_codecs) - hbox.pack_start(combo, TRUE, TRUE, 0) + hbox.pack_start(combo, True, True, 0) ignore_errors = g.CheckButton(_('Ignore errors')) - hbox.pack_start(ignore_errors, FALSE, TRUE) + hbox.pack_start(ignore_errors, False, True) frame.add(hbox) @@ -501,11 +498,11 @@ class EditWindow(rox.Window, XDSLoader, Saveable): def save_to_stream(self, stream): s = self.buffer.get_start_iter() e = self.buffer.get_end_iter() - stream.write(self.buffer.get_text(s, e, TRUE)) + stream.write(self.buffer.get_text(s, e, True)) def set_uri(self, uri): self.uri = uri - self.buffer.set_modified(FALSE) + self.buffer.set_modified(False) self.update_title() def new(self): @@ -669,7 +666,7 @@ class SelectionSaver(Saveable): def save_to_stream(self, stream): s, e = self.window.get_marked_range() - stream.write(self.window.buffer.get_text(s, e, TRUE)) + stream.write(self.window.buffer.get_text(s, e, True)) def destroy(self): # Called when savebox is remove. Get rid of the selection marker diff --git a/Help/Changes b/Help/Changes index 79078a6..1776d11 100644 --- a/Help/Changes +++ b/Help/Changes @@ -4,7 +4,7 @@ Dnd loading: Loads to cursor, not indicated point. -18-Apr-2004 +18-Apr-2004 (Release 1.9.6) ~~~~~~~~~~~ Added Word Wrap menu item and toolbar toggle (Ken Hayber). -- 2.11.4.GIT