Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
5e45d26
MAINT: update some wxGlade panels version
dragonyanglong May 28, 2019
ad0cd78
MNT: rebuild gui code for wxpython 3
pavoljuhas Jul 19, 2019
767fc06
MNT: update wxglade-mark comments
pavoljuhas Jul 19, 2019
d1899bf
MNT: sync fitnotebookpanel.wxg with hardcoded change
pavoljuhas Jul 19, 2019
5cc141f
MNT: wx4 - migrate to renamed static functions
pavoljuhas Jul 19, 2019
0700f12
MNT WX4: use EVT_GRID_CMD_CELL_CHANGED
pavoljuhas Jul 19, 2019
67508d7
MNT WX4: fix configuration of monospace font
pavoljuhas Jul 19, 2019
204c056
MNT WX4: drop undefined flag wx.TR_EXTENDED
pavoljuhas Jul 19, 2019
8b51578
MNT WX4: remove tooltips for non-existant sizers
pavoljuhas Jul 19, 2019
a11c511
MNT WX4: update GridEvent initialization
pavoljuhas Jul 19, 2019
8ab573c
MNT WX4: replace deprecated wx functions
pavoljuhas Jul 22, 2019
33c1855
MNT WX4: fix renamed FileDialog constants
pavoljuhas Jul 22, 2019
1220a31
MNT WX4: rename deprecated functions
pavoljuhas Jul 22, 2019
ace9c86
MNT WX4: use Bind instead of `Event.__call__`
pavoljuhas Jul 22, 2019
8f95908
BUG WX4: replace method for text background color
pavoljuhas Jul 22, 2019
5e37792
MNT WX4: replace deprecated function
pavoljuhas Jul 22, 2019
919ab2e
BUG WX4: fix wxAssertionError on PDFgui exit
pavoljuhas Jul 23, 2019
993cca4
MNT: remove long dead code
pavoljuhas Jul 23, 2019
7e7c72f
TST: add overridewebbrowser helper function
pavoljuhas Jul 23, 2019
4beb70c
TST: cover gui.aboutdialog module
pavoljuhas Jul 23, 2019
181db2a
MNT: prune code for showing about dialog
pavoljuhas Jul 23, 2019
a19512a
TST: clean up wx.App instances when done
pavoljuhas Jul 23, 2019
f690097
BLD: require wxpython 4 for conda build
pavoljuhas Jul 23, 2019
d9c6186
BLD: fix conda recipe
pavoljuhas Jul 23, 2019
0c61d8e
CI: use `easy_install` for native Linux on travis
pavoljuhas Jul 24, 2019
59b9a01
TST: add GUITestCase specialized class
pavoljuhas Jul 24, 2019
bba709e
TST: add stub test of PhaseConfigurePanel
pavoljuhas Jul 24, 2019
96e8c7d
ENH: define more tooltips for phase panel
pavoljuhas Aug 9, 2019
b72f13f
MNT: use wx3/4 compatible tooltips for dopingseriespanel
pavoljuhas Aug 9, 2019
22939d1
BUG: fix aui layout for dopingseriespanel
pavoljuhas Aug 9, 2019
dd2dad9
MNT: use wx34 compatible tooltips in phaseconfigurepanel
pavoljuhas Aug 13, 2019
ef0186f
MNT: pyflakes - fix incorrect comparison
pavoljuhas Aug 13, 2019
00b03b0
MNT: excise dead code
pavoljuhas Aug 13, 2019
f0706fc
MNT: move tooltip setup to `__customProperties`
pavoljuhas Aug 13, 2019
31e5c22
MNT: use wx34 compatible tooltips in phaseconstraintspanel
pavoljuhas Aug 13, 2019
5f59e7a
MNT: use wx34 compatible tooltips in phaseresultspanel
pavoljuhas Aug 13, 2019
3177fb1
MNT: use wx34 compatible tooltips in plotpanel
pavoljuhas Aug 13, 2019
6003898
STY: reformat tooltip definitions for preferencespanel
pavoljuhas Aug 13, 2019
a6892a5
MNT: use wx34 compatible tooltips in preferencespanel
pavoljuhas Aug 13, 2019
c67c800
MNT: use wx34 compatible tooltips in temperatureseriespanel
pavoljuhas Aug 13, 2019
6338354
MNT: use wx34 compatible tooltips in datasetconfigurepanel
pavoljuhas Aug 13, 2019
b435d35
MNT: avoid renamed imports from tooltips
pavoljuhas Aug 13, 2019
8d0fc7e
MNT: refactor `_TMainFrame` to shared test utility
pavoljuhas Aug 13, 2019
87a53e2
TST: setup more flags in GUITestCase fixture
pavoljuhas Aug 13, 2019
c393936
MNT: refactor os.chmod use in writeConfiguration
pavoljuhas Aug 13, 2019
a313b9d
TST: add few more test helper functions
pavoljuhas Aug 13, 2019
e798ec9
TST: cover tooltips code in PhaseConfigurePanel
pavoljuhas Aug 13, 2019
3a41fb5
TST: disable test failure in unrelated wx3 code
pavoljuhas Aug 13, 2019
c0c3d5e
ENH: disable fit thread in GUITestCase fixture
pavoljuhas Aug 14, 2019
af75d92
TST: cover tooltips in DataSetConfigurePanel
pavoljuhas Aug 14, 2019
af6add8
MNT: rename test module for dataset panels
pavoljuhas Aug 16, 2019
a624fb1
TST: cover changes in DataSetConstraintPanel
pavoljuhas Aug 16, 2019
72f564e
Merge branch 'wx34-compat-tooltips' into support-wxpython-4
pavoljuhas Aug 19, 2019
13424b6
ENH: fix monospace font in output and results texts
pavoljuhas Aug 23, 2019
7cd18be
MNT: fix welcomepanel bitmap for wx3
pavoljuhas Aug 26, 2019
38adee8
ENH: add wx12 module to support wx3
pavoljuhas Aug 26, 2019
94662a8
MNT: support ListCtrl.InsertItem in wx3
pavoljuhas Aug 27, 2019
e0029e6
MNT: support Menu.Append in wx3
pavoljuhas Aug 27, 2019
26d4d32
MNT: support TreeCtrl.GetItemData in wx3
pavoljuhas Aug 27, 2019
fe6c92f
TST: enable skipped tests for WX3
pavoljuhas Aug 27, 2019
f38fd38
CI: install matplotlib for native Linux test
pavoljuhas Aug 27, 2019
1ca21e2
MNT: refactor deprecated `Menu.Append(id, t, sub)`
pavoljuhas Aug 27, 2019
b870686
MNT: replace named colors with color constants
pavoljuhas Aug 27, 2019
9aae6d6
MNT: backport IsMainThread function for wx3
pavoljuhas Aug 27, 2019
900ddd3
ENH: fix logo sizing in aboutdialog
pavoljuhas Aug 27, 2019
0ada551
TST: covert DataSetConfigurePanel.onSampling
pavoljuhas Aug 28, 2019
0978191
TST: cover MainFrame.onRightClick
pavoljuhas Aug 28, 2019
40ce7ea
BUG: fix wx12.Menu.Append support for WX3
pavoljuhas Aug 28, 2019
3a84080
MNT: replace methods deprecated in WX4
pavoljuhas Aug 28, 2019
c038796
TST: cover DataSetPanel.refreshSelectedPage
pavoljuhas Aug 28, 2019
22d1da1
TST: avoid display of modal menu
pavoljuhas Aug 28, 2019
3c2031b
TST: partially cover DopingSeriesPanel class
pavoljuhas Aug 30, 2019
a2f4f5a
MNT: replace deprecated ListCtrl.InsertStringItem
pavoljuhas Aug 30, 2019
a0416a4
MNT: correct name of a test case class
pavoljuhas Sep 6, 2019
f2a66c9
TST: partial cover of ExtendedPlotFrame
pavoljuhas Sep 6, 2019
547f7ca
MNT: support ToolBar.AddTool overload in wx3
pavoljuhas Sep 6, 2019
7d5d6ce
TST: cover ExtendedPlotFrame.savePlotData
pavoljuhas Sep 9, 2019
719e515
BUG: fix wx constants renamed in wx4
pavoljuhas Sep 9, 2019
24ba5b1
MNT: remove dead code
pavoljuhas Sep 9, 2019
4c8ea2d
CI: remove obsolete workaround
pavoljuhas Sep 9, 2019
45b029c
TST: cover insertrowsdialog module
pavoljuhas Sep 10, 2019
51754f3
TST: partially cover MainFrame.disableMainMenuItems
pavoljuhas Sep 10, 2019
2834bad
TST: partially cover TemperatureSeriesPanel class
pavoljuhas Sep 17, 2019
eb4e0e6
MNT: replace deprecated ListCtrl.SetStringItem
pavoljuhas Sep 19, 2019
87e9858
MNT: replace deprecated wx.NewId with wx.NewIdRef
pavoljuhas Sep 19, 2019
2d2c0f5
MNT: remove unused method
pavoljuhas Sep 19, 2019
d363b77
TST: cover ParametersPanel.popupMenu
pavoljuhas Sep 19, 2019
b7e395b
TST: skip failing test of deprecated feature
pavoljuhas Sep 19, 2019
0fc384f
MNT: add shared test helper function `clickcell`
pavoljuhas Sep 20, 2019
e609247
TST: cover PhaseConfigurePanel.popupMenu
pavoljuhas Sep 20, 2019
e2614a6
TST: add helper context `overrideclipboard`
pavoljuhas Sep 24, 2019
97c9760
TST: fix blocking test on Linux
pavoljuhas Sep 24, 2019
50943ae
MNT: fix commented-out definition of TestFitDataSet
pavoljuhas Sep 24, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MNT WX4: fix renamed FileDialog constants
Must start with `FD_` prefix.
Drop single `FD_OPEN` which is already the default style.
  • Loading branch information
pavoljuhas committed Jul 22, 2019
commit 33c1855d954cd94fea536b830837d4e78f85bc2b
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/adddatapanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def onOpen(self, event): # wxGlade: AddDataPanel.<event_handler>
"PDF calculation files (*.calc)", "*.calc",
"All Files", "*"
))
d = wx.FileDialog(None, "Choose a file", dir, "", matchstring, wx.OPEN)
d = wx.FileDialog(None, "Choose a file", dir, "", matchstring)
if d.ShowModal() == wx.ID_OK:
self.fullpath = d.GetPath()
self.mainFrame.workpath = os.path.dirname(self.fullpath)
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/addphasepanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def onOpen(self, event): # wxGlade: AddPhasePanel.<event_handler>
"Coordinate files (*.xyz)", "*.xyz;*.XYZ",
"All Files", "*",
))
d = wx.FileDialog(None, "Choose a file", dir, "", matchstring, wx.OPEN)
d = wx.FileDialog(None, "Choose a file", dir, "", matchstring)
if d.ShowModal() == wx.ID_OK:
self.fullpath = d.GetPath()
self.mainFrame.workpath = os.path.dirname(self.fullpath)
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/dopingseriespanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def onAdd(self, event): # wxGlade: DopingSeriesPanel.<event_handler>

matchstring = "PDF data files (*.gr)|*.gr|PDF fit files (*.fgr)|*.fgr|PDF fit files (*.fit)|*.fit|PDF calculation files (*.cgr)|*.cgr|PDF calculation files (*.calc)|*.calc|All Files|*"
d = wx.FileDialog(None, "Choose files", dir, "", matchstring,
wx.OPEN|wx.FILE_MUST_EXIST|wx.MULTIPLE)
wx.FD_OPEN|wx.FD_FILE_MUST_EXIST|wx.FD_MULTIPLE)
paths = []
if d.ShowModal() == wx.ID_OK:
paths = d.GetPaths()
Expand Down
6 changes: 2 additions & 4 deletions src/diffpy/pdfgui/gui/mainframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -2127,8 +2127,7 @@ def onOpen(self, event):
if not dir:
dir = self.workpath
matchstring = "PDFgui project files (*.ddp)|*.ddp"
d = wx.FileDialog(None, "Choose a file", dir
, "", matchstring, wx.OPEN)
d = wx.FileDialog(None, "Choose a file", dir, "", matchstring)
if d.ShowModal() == wx.ID_OK:
fullpath = d.GetPath()
# Load this file into the control center.
Expand Down Expand Up @@ -2261,8 +2260,7 @@ def onExportRes(self, event):

def onImportScript(self, event):
matchstring = "pdffit2 script files (*.py)|*.py|All Files|*"
d = wx.FileDialog(None, "Choose a file", self.workpath, "", matchstring,
wx.OPEN)
d = wx.FileDialog(None, "Choose a file", self.workpath, "", matchstring)
if d.ShowModal() == wx.ID_OK:
fullpath = d.GetPath()
self.workpath = os.path.dirname(fullpath)
Expand Down
4 changes: 2 additions & 2 deletions src/diffpy/pdfgui/gui/preferencespanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ def refresh(self):
return

def onBrowse(self, event): # wxGlade: PreferencesPanel.<event_handler>
d = wx.FileDialog(None, "Choose structure viewer", ".",
"", "All Files|*", wx.OPEN|wx.FD_FILE_MUST_EXIST)
d = wx.FileDialog(None, "Choose structure viewer", ".", "",
"All Files|*", wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
if d.ShowModal() == wx.ID_OK:
fullpath = d.GetPath()
self.textCtrlViewer.SetValue(fullpath)
Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/pdfgui/gui/temperatureseriespanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def onAdd(self, event): # wxGlade: TemperatureSeriesPanel.<event_handler>

matchstring = "PDF data files (*.gr)|*.gr|PDF fit files (*.fgr)|*.fgr|PDF fit files (*.fit)|*.fit|PDF calculation files (*.cgr)|*.cgr|PDF calculation files (*.calc)|*.calc|All Files|*"
d = wx.FileDialog(None, "Choose files", dir, "", matchstring,
wx.OPEN|wx.FILE_MUST_EXIST|wx.MULTIPLE)
wx.FD_OPEN|wx.FD_FILE_MUST_EXIST|wx.FD_MULTIPLE)
paths = []
if d.ShowModal() == wx.ID_OK:
paths = d.GetPaths()
Expand Down