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.

Sign up for GitHub

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

Jump to bottom

Fixed issue #856 #1103

Merged
merged 9 commits into from Mar 12, 2013
Merged

Fixed issue #856 #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a59b2c1
Fixed issue #856
malderete Feb 13, 2013
125e620
Merge and replace pep8mod patch using new settings utility functions
malderete Feb 13, 2013
0b59e7d
fixing git weird behavior...
malderete Feb 13, 2013
26088a5
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
malderete Feb 24, 2013
191d5a9
Missing parentheses on function call in settings.py
malderete Mar 2, 2013
dc6e494
Removed unused IS_LINUX and IS_MAC flags from settings.py
malderete Mar 11, 2013
44798f8
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
malderete Mar 11, 2013
166eab1
Merge with ninja-ide master
malderete Mar 11, 2013
e7bfd88
Solved conflicts between local branch and master (latest changes)
malderete Mar 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions ninja_ide/core/settings.py
View file
Open in desktop
Expand Up @@ -26,6 +26,9 @@
# OS DETECTOR
###############################################################################

# Use this flags instead of sys.platform spreaded in the source code
IS_WINDOWS = False

OS_KEY = "Ctrl"

FONT_FAMILY = 'Monospace'
Expand All @@ -40,6 +43,7 @@
elif sys.platform == "win32":
FONT_FAMILY = 'Courier'
FONT_SIZE = 10
IS_WINDOWS = True

###############################################################################
# IDE
Expand Down Expand Up @@ -424,8 +428,8 @@ def load_settings():
'preferences/editor/showTabsAndSpaces', 'true') == 'true'
USE_TABS = qsettings.value('preferences/editor/useTabs', 'false') == 'true'
if USE_TABS:
pep8mod.options.ignore.append("W191")
pep8mod.refresh_checks()
pep8mod_add_ignore("W191")
pep8mod_refresh_checks()
ALLOW_WORD_WRAP = qsettings.value(
'preferences/editor/allowWordWrap', 'false') == 'true'
COMPLETE_DECLARATIONS = qsettings.value(
Expand Down
9 changes: 7 additions & 2 deletions ninja_ide/gui/explorer/tree_projects_widget.py
View file
Open in desktop
Expand Up @@ -109,8 +109,13 @@ def __init__(self, state_index=list()):
self.connect(self, SIGNAL(
"customContextMenuRequested(const QPoint &)"),
self._menu_context_tree)
self.connect(self, SIGNAL("itemClicked(QTreeWidgetItem *, int)"),
self._open_file)

signal_name = "itemClicked(QTreeWidgetItem *, int)"
# For windows double click instead of single click
if settings.IS_WINDOWS:
signal_name = "itemDoubleClicked(QTreeWidgetItem *, int)"

self.connect(self, SIGNAL(signal_name), self._open_file)
self.connect(self._fileWatcher, SIGNAL("fileChanged(int, QString)"),
self._refresh_project_by_path)
self.itemExpanded.connect(self._item_expanded)
Expand Down