Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign file switcher (a la Sublime Text) #2590

Merged
merged 61 commits into from
Aug 20, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2fbe8f5
bugfix - fileListDialog signal/handler name clash
Apr 20, 2015
7d2a745
feature - fileListDialog live switch files and cancel switch
Apr 20, 2015
c07f5ef
bugfix - previous
Apr 20, 2015
b2a88c2
feature - fileListDialog up/down keys work from text
Apr 20, 2015
45f7177
style - fileListDialog frameless
Apr 20, 2015
6d4830f
feature - fileListDialog focus set on text
Apr 20, 2015
451f0b4
feature - fileListDialog highlights matching filter text
Apr 20, 2015
4917e27
fix - editor menu update action label
Apr 20, 2015
49b9a17
style - fileListDialog positioned at top of editor
Apr 20, 2015
6713075
clean up dirty code
Apr 21, 2015
4a6dd21
feature - fileListDialog case insensitive matching and...
Apr 21, 2015
81dacc6
style - fileListDialog alpha transparency
Apr 21, 2015
a617c72
bugfix - fileListDialog initial selection
Apr 21, 2015
46243d9
trying to make global shortcut
Apr 21, 2015
e625d13
global shortcut works
Apr 21, 2015
df80f06
fileListDialog misc...
Apr 21, 2015
5dc1304
feature - fileListDialog uses ";" for goto line
Apr 21, 2015
bc9207e
improve previous - make goto line cancelable
Apr 21, 2015
4cc92a7
bugfix - launch file switcher for current editor stack not 0th
Apr 21, 2015
bc6452a
remove old gotoline action
Apr 21, 2015
5fb24d7
hint label - reinstated/new hint in fileListDialog
Apr 21, 2015
d4a4663
feature - can close tabs from fileListDialog
Apr 22, 2015
699dd52
refactor previous - now using path str rather than tab idx
Apr 22, 2015
8959adf
bugfix - linenum now canceled when moving off from a given tab
Apr 22, 2015
87e2928
fix regression
Apr 22, 2015
1be4b27
first draft - nearly working
Apr 22, 2015
41b987d
bugfix previous
Apr 23, 2015
8904e94
style - file info on same line & larger width
Apr 23, 2015
a784c5d
bugfix - path works with only dir
Apr 23, 2015
289bf59
simplify tokenising of path
Apr 23, 2015
ad995c0
bugfix previous
Apr 23, 2015
c8c16f7
feature - display line numbers on request
Apr 23, 2015
640227e
style - path on separate line with smaller font
Apr 23, 2015
57f0de4
refactor - file_switcher now in own file
Apr 23, 2015
dec3d8c
restore goto line stuff
Apr 23, 2015
ce0384e
remove print shortcut (previous commit started this)
Apr 23, 2015
e850671
clean up previous commits and bugfix
Apr 23, 2015
cfa55fd
converted hint label to hint tooltip with button
Apr 23, 2015
9da4991
pep8 is the boss
Apr 26, 2015
9f82939
cleanup- len=0, iter, sig_*, mv HelperToolButton
May 1, 2015
a8721af
remove print shortcut (previous commit started this)
Apr 23, 2015
c1537e8
fix rebase
Jun 15, 2015
2b4ab6c
hide path for unsaved files and fix rebase
Jun 15, 2015
650137a
close on focusOut
Jun 15, 2015
a21b5b4
config - fix rebase and bump version
Jun 15, 2015
3cf512b
move helperwidget styling to class def
Jun 15, 2015
5ee06ff
remove redundant handler
Jun 15, 2015
a25ef8a
fuzzy matching
Jun 17, 2015
a3eb679
Fix config
goanpeca Aug 3, 2015
9dfd346
Remove HTMLDelegate, use the on in helperwidgets
goanpeca Aug 3, 2015
46ac6f5
Fix comments and some docstrings
goanpeca Aug 3, 2015
38e5265
Fix uppercase marching
goanpeca Aug 3, 2015
0a644b2
Add fuzzy ordered search and size autoadjust
goanpeca Aug 3, 2015
f92f2ba
Add symbol search, refactor codebase
goanpeca Aug 10, 2015
b87f999
Add new style config
goanpeca Aug 10, 2015
56b19d5
Upadte string matching and update shortcuts editor with change
goanpeca Aug 10, 2015
62e7933
Clean up and refactor code
goanpeca Aug 15, 2015
86d8b88
Fix style and add errased code
goanpeca Aug 15, 2015
d75eb09
Fix tab error
goanpeca Aug 16, 2015
72b6969
Fix py3 compatibility issues
goanpeca Aug 17, 2015
b41e5d5
Fix bug with cells in outline explorer data
goanpeca Aug 17, 2015
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
clean up dirty code
  • Loading branch information
Daniel Manson authored and goanpeca committed Aug 10, 2015
commit 6713075c6a349b8035bcc19cfaf697b9213562d6
10 changes: 5 additions & 5 deletions spyderlib/widgets/editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

class UpDownFilter(QObject):
up_down = Signal(int)
def eventFilter(self,src, e):
def eventFilter(self, src, e):
if isinstance(e,QKeyEvent) and e.type() == QEvent.KeyPress:
if e.key() == Qt.Key_Up:
self.up_down.emit(-1)
Expand All @@ -75,7 +75,7 @@ def __init__(self, parent, tabs, fullpath_sorting):
# (e.g. the editor's analysis thread in Spyder), thus leading to
# a segmentation fault on UNIX or an application crash on Windows
self.setAttribute(Qt.WA_DeleteOnClose)
self.setWindowFlags(Qt.Dialog | Qt.FramelessWindowHint) #self.windowFlags()
self.setWindowFlags(Qt.Dialog | Qt.FramelessWindowHint)
self.indexes = None

self.setWindowIcon(ima.icon('filelist'))
Expand Down Expand Up @@ -117,9 +117,9 @@ def __init__(self, parent, tabs, fullpath_sorting):
top += geo.top()
left += geo.left()
parent = parent.parent()
self.move(left,top)#parent_rect.center()-self_rect.center(),parent_rect.top())
self.move(left, top)

def handle_up_down(self,up_down):
def handle_up_down(self, up_down):
row = self.listwidget.currentRow() + up_down
if 0 <= row < self.listwidget.count():
self.listwidget.setCurrentRow(row)
Expand All @@ -133,7 +133,7 @@ def handle_edit_file(self):
if self.listwidget.count() > 0 and row >= 0:
self.edit_file.emit(self.indexes[row])
self.accept()

def item_selection_changed(self):
if self.original_index is None:
self.original_index = self.tabs.currentIndex()
Expand Down
4 changes: 0 additions & 4 deletions spyderlib/widgets/html_delegate.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ def paint(self, painter, option, index):

ctx = QtGui.QAbstractTextDocumentLayout.PaintContext()

# Highlighting text if item is selected
#if (optionV4.state & QStyle::State_Selected)
#ctx.palette.setColor(QPalette::Text, optionV4.palette.color(QPalette::Active, QPalette::HighlightedText));

textRect = style.subElementRect(QtGui.QStyle.SE_ItemViewItemText, options)
painter.save()
painter.translate(textRect.topLeft())
Expand Down