← Back to branch summary

~ubuntu-branches/ubuntu/wily/spyder/wily-proposed

« back to all changes in this revision

Viewing changes to spyderlib/widgets/importwizard.py

  • Committer: Package Import Robot
  • Author(s): Ghislain Antony Vaillant, Ghislain Antony Vaillant, Picca Frédéric-Emmanuel
  • Date: 2014-10-19 11:42:57 UTC
  • mfrom: (1.2.8)
  • Revision ID: package-import@ubuntu.com-20141019114257-st1rz4fmmscgphhm
Tags: 2.3.1+dfsg-1
http://bugs.debian.org/765963
* Team upload

[Ghislain Antony Vaillant]
* New upstream release. (Closes: #765963)
* Bump Standards-Version to 3.9.6 (no changes required).
* d/control: fix pedantic lintian warning regarding capitalization in
  packages' description.

[Picca Frédéric-Emmanuel]
* Update the homepage now that upstream moved to bitbucket.
* debian/copyright
  - updated for 2.3.1 version
* debian/control
  + Recommends: python-pandas and python3-pandas

Show diffs side-by-side

added added

removed removed

Lines of Context:
spyderlib/widgets/importwizard.py
412
412
        
413
413
        vert_layout = QVBoxLayout()
414
414
        
415
 
        hor_layout = QHBoxLayout()
416
 
        self.array_box = QCheckBox(_("Import as array"))
417
 
        self.array_box.setEnabled(ndarray is not FakeObject)
418
 
        self.array_box.setChecked(ndarray is not FakeObject)
419
 
        hor_layout.addWidget(self.array_box)
 
415
        # Type frame
 
416
        type_layout = QHBoxLayout()
 
417
        type_label = QLabel(_("Import as"))
 
418
        type_layout.addWidget(type_label)
 
419
        self.array_btn = array_btn = QRadioButton(_("array"))
 
420
        array_btn.setEnabled(ndarray is not FakeObject)
 
421
        array_btn.setChecked(ndarray is not FakeObject)
 
422
 
 
423
        type_layout.addWidget(array_btn)
 
424
        list_btn = QRadioButton(_("list"))
 
425
        list_btn.setChecked(not array_btn.isChecked())
 
426
        type_layout.addWidget(list_btn)    
420
427
        h_spacer = QSpacerItem(40, 20,
421
 
                               QSizePolicy.Expanding, QSizePolicy.Minimum)        
422
 
        hor_layout.addItem(h_spacer)
 
428
                               QSizePolicy.Expanding, QSizePolicy.Minimum)
 
429
        type_layout.addItem(h_spacer)        
 
430
        type_frame = QFrame()
 
431
        type_frame.setLayout(type_layout)
423
432
        
424
433
        self._table_view = PreviewTable(self)
425
 
        vert_layout.addLayout(hor_layout)
 
434
        vert_layout.addWidget(type_frame)
426
435
        vert_layout.addWidget(self._table_view)
427
436
        self.setLayout(vert_layout)
428
437
 
473
482
        self.tab_widget.setTabEnabled(1, False)
474
483
        
475
484
        name_layout = QHBoxLayout()
476
 
        name_h_spacer = QSpacerItem(40, 20, 
477
 
                                    QSizePolicy.Expanding, QSizePolicy.Minimum)
478
 
        name_layout.addItem(name_h_spacer)
479
 
        
480
 
        name_label = QLabel(_("Name"))
 
485
        name_label = QLabel(_("Variable Name"))
481
486
        name_layout.addWidget(name_label)
 
487
        
482
488
        self.name_edt = QLineEdit()
483
 
        self.name_edt.setMaximumWidth(100)
484
489
        self.name_edt.setText(varname)
485
490
        name_layout.addWidget(self.name_edt)
486
491
        
571
576
        """Return clipboard processed as data"""
572
577
        data = self._simplify_shape(
573
578
                self.table_widget.get_data())
574
 
        if self.table_widget.array_box.isChecked():
 
579
        if self.table_widget.array_btn.isChecked():
575
580
            return array(data)
576
581
        return data
577
582