Changeset 996:8035d80d5feb for src/mlx/gui/flightlist.py
- Timestamp:
- 07/04/19 17:57:45 (5 years ago)
- Branch:
- python3
- hg-Phase:
- (<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mlx/gui/flightlist.py
r995 r996 22 22 self._convertFn = convertFn 23 23 self._renderer = \ 24 gtk.CellRendererText() if renderer is None else renderer24 Gtk.CellRendererText() if renderer is None else renderer 25 25 self._extraColumnAttributes = extraColumnAttributes 26 26 self._sortable = sortable … … 47 47 48 48 @param index is the 0-based index of the column.""" 49 if isinstance(self._renderer, gtk.CellRendererText):50 column = gtk.TreeViewColumn(self._heading, self._renderer,49 if isinstance(self._renderer, Gtk.CellRendererText): 50 column = Gtk.TreeViewColumn(self._heading, self._renderer, 51 51 text = index) 52 elif isinstance(self._renderer, gtk.CellRendererToggle):53 column = gtk.TreeViewColumn(self._heading, self._renderer,52 elif isinstance(self._renderer, Gtk.CellRendererToggle): 53 column = Gtk.TreeViewColumn(self._heading, self._renderer, 54 54 active = index) 55 55 else: 56 column = gtk.TreeViewColumn(self._heading, self._renderer)56 column = Gtk.TreeViewColumn(self._heading, self._renderer) 57 57 column.set_expand(True) 58 58 if self._sortable: … … 83 83 #----------------------------------------------------------------------------- 84 84 85 class FlightList( gtk.Alignment):85 class FlightList(Gtk.Alignment): 86 86 """Construct the flight list. 87 87 … … 114 114 columnDescriptor.appendType(types) 115 115 116 self._model = gtk.ListStore(*types)116 self._model = Gtk.ListStore(*types) 117 117 if defaultSortableIndex is not None: 118 118 sortOrder = SORT_DESCENDING \ … … 120 120 else SORT_ASCENDING 121 121 self._model.set_sort_column_id(defaultSortableIndex, sortOrder) 122 self._view = gtk.TreeView(self._model)123 124 flightIndexColumn = gtk.TreeViewColumn()122 self._view = Gtk.TreeView(self._model) 123 124 flightIndexColumn = Gtk.TreeViewColumn() 125 125 flightIndexColumn.set_visible(False) 126 126 self._view.append_column(flightIndexColumn) … … 140 140 selection.set_mode(SELECTION_MULTIPLE) 141 141 142 scrolledWindow = gtk.ScrolledWindow()142 scrolledWindow = Gtk.ScrolledWindow() 143 143 scrolledWindow.add(self._view) 144 144 if widthRequest is not None: 145 145 scrolledWindow.set_size_request(widthRequest, -1) 146 146 # FIXME: these should be constants in common.py 147 scrolledWindow.set_policy( gtk.PolicyType.AUTOMATIC,148 gtk.PolicyType.AUTOMATIC)149 scrolledWindow.set_shadow_type( gtk.ShadowType.IN)147 scrolledWindow.set_policy(Gtk.PolicyType.AUTOMATIC, 148 Gtk.PolicyType.AUTOMATIC) 149 scrolledWindow.set_shadow_type(Gtk.ShadowType.IN) 150 150 151 151 super(FlightList, self).__init__(xalign = 0.5, yalign = 0.0, … … 235 235 #----------------------------------------------------------------------------- 236 236 237 class PendingFlightsFrame( gtk.Frame):237 class PendingFlightsFrame(Gtk.Frame): 238 238 """A frame for a list of pending (reported or rejected) flights. 239 239 … … 273 273 self._pirepEditable = pirepEditable 274 274 275 alignment = gtk.Alignment(xscale = 1.0, yscale = 1.0)275 alignment = Gtk.Alignment(xscale = 1.0, yscale = 1.0) 276 276 alignment.set_padding(padding_top = 2, padding_bottom = 8, 277 277 padding_left = 4, padding_right = 4) 278 278 279 hbox = gtk.HBox()279 hbox = Gtk.HBox() 280 280 281 281 self._flights = [] … … 289 289 hbox.pack_start(self._flightList, True, True, 4) 290 290 291 buttonBox = gtk.VBox()292 293 self._editButton = gtk.Button(xstr("pendflt_" +291 buttonBox = Gtk.VBox() 292 293 self._editButton = Gtk.Button(xstr("pendflt_" + 294 294 ("edit" if pirepEditable else 295 295 "view") + "_" + which)) … … 299 299 buttonBox.pack_start(self._editButton, False, False, 2) 300 300 301 self._reflyButton = gtk.Button(xstr("pendflt_refly_" + which))301 self._reflyButton = Gtk.Button(xstr("pendflt_refly_" + which)) 302 302 self._reflyButton.set_sensitive(False) 303 303 self._reflyButton.set_use_underline(True) … … 305 305 buttonBox.pack_start(self._reflyButton, False, False, 2) 306 306 307 self._deleteButton = gtk.Button(xstr("pendflt_delete_" + which))307 self._deleteButton = Gtk.Button(xstr("pendflt_delete_" + which)) 308 308 self._deleteButton.set_sensitive(False) 309 309 self._deleteButton.set_use_underline(True) … … 458 458 def _producePopupMenu(self): 459 459 """Create the popup menu for the flights.""" 460 menu = gtk.Menu()461 462 menuItem = gtk.MenuItem()460 menu = Gtk.Menu() 461 462 menuItem = Gtk.MenuItem() 463 463 menuItem.set_label(xstr("pendflt_" + 464 464 ("edit" if self._pirepEditable else "view") + … … 470 470 menu.append(menuItem) 471 471 472 menuItem = gtk.MenuItem()472 menuItem = Gtk.MenuItem() 473 473 menuItem.set_label(xstr("pendflt_refly_" + self._which)) 474 474 menuItem.set_use_underline(True) … … 478 478 menu.append(menuItem) 479 479 480 menuItem = gtk.MenuItem()480 menuItem = Gtk.MenuItem() 481 481 menuItem.set_label(xstr("pendflt_delete_" + self._which)) 482 482 menuItem.set_use_underline(True) … … 503 503 #----------------------------------------------------------------------------- 504 504 505 class PendingFlightsWindow( gtk.Window):505 class PendingFlightsWindow(Gtk.Window): 506 506 """The window to display the lists of the pending (reported or rejected) 507 507 flights.""" … … 517 517 self.set_modal(True) 518 518 519 mainAlignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,519 mainAlignment = Gtk.Alignment(xalign = 0.5, yalign = 0.5, 520 520 xscale = 1.0, yscale = 1.0) 521 521 mainAlignment.set_padding(padding_top = 0, padding_bottom = 12, 522 522 padding_left = 8, padding_right = 8) 523 523 524 vbox = gtk.VBox()524 vbox = Gtk.VBox() 525 525 526 526 self._reportedFrame = PendingFlightsFrame("reported", wizard, self, … … 531 531 vbox.pack_start(self._rejectedFrame, True, True, 2) 532 532 533 alignment = gtk.Alignment(xalign = 0.5, yalign = 0.5,533 alignment = Gtk.Alignment(xalign = 0.5, yalign = 0.5, 534 534 xscale = 0.0, yscale = 0.0) 535 self._closeButton = gtk.Button(xstr("button_ok"))535 self._closeButton = Gtk.Button(xstr("button_ok")) 536 536 self._closeButton.connect("clicked", self._closeClicked) 537 537 self._closeButton.set_use_underline(True) … … 586 586 #----------------------------------------------------------------------------- 587 587 588 class AcceptedFlightsWindow( gtk.Window):588 class AcceptedFlightsWindow(Gtk.Window): 589 589 """A window for a list of accepted flights.""" 590 590 def getFlightDuration(flightTimeStart, flight): … … 638 638 self.set_transient_for(gui.mainWindow) 639 639 640 alignment = gtk.Alignment(xscale = 1.0, yscale = 1.0)640 alignment = Gtk.Alignment(xscale = 1.0, yscale = 1.0) 641 641 alignment.set_padding(padding_top = 2, padding_bottom = 8, 642 642 padding_left = 4, padding_right = 4) 643 643 644 vbox = gtk.VBox()645 646 hbox = gtk.HBox()644 vbox = Gtk.VBox() 645 646 hbox = Gtk.HBox() 647 647 vbox.pack_start(hbox, True, True, 4) 648 648 … … 657 657 hbox.pack_start(self._flightList, True, True, 4) 658 658 659 buttonBox = gtk.VBox()660 661 self._refreshButton = gtk.Button(xstr("acceptedflt_refresh"))659 buttonBox = Gtk.VBox() 660 661 self._refreshButton = Gtk.Button(xstr("acceptedflt_refresh")) 662 662 self._refreshButton.set_sensitive(True) 663 663 self._refreshButton.set_use_underline(True) … … 665 665 buttonBox.pack_start(self._refreshButton, False, False, 2) 666 666 667 filler = gtk.Alignment(xalign = 0.0, yalign = 0.0,667 filler = Gtk.Alignment(xalign = 0.0, yalign = 0.0, 668 668 xscale = 1.0, yscale = 1.0) 669 669 filler.set_size_request(-1, 4) 670 670 buttonBox.pack_start(filler, False, False, 0) 671 671 672 self._viewButton = gtk.Button(xstr("acceptedflt_view"))672 self._viewButton = Gtk.Button(xstr("acceptedflt_view")) 673 673 self._viewButton.set_sensitive(False) 674 674 self._viewButton.set_use_underline(True) … … 678 678 hbox.pack_start(buttonBox, False, False, 4) 679 679 680 buttonAlignment = gtk.Alignment(xscale = 0.0, yscale = 0.0,680 buttonAlignment = Gtk.Alignment(xscale = 0.0, yscale = 0.0, 681 681 xalign = 0.5, yalign = 0.5) 682 682 683 self._closeButton = gtk.Button(xstr("button_ok"))683 self._closeButton = Gtk.Button(xstr("button_ok")) 684 684 self._closeButton.connect("clicked", self._closeClicked) 685 685 self._closeButton.set_use_underline(True)
Note:
See TracChangeset
for help on using the changeset viewer.