jyapayne/Electrify
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Added menu bar fix for mac to display old project files.

Browse source
This commit is contained in:
Joey Payne 2015-05-07 08:37:20 -06:00
commit 045c468999
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
main.py
View file

@ -7,6 +7,7 @@ import re
import glob import glob
import sys import sys
import codecs import codecs
import platform
from PySide import QtGui, QtCore from PySide import QtGui, QtCore
from PySide.QtGui import QApplication, QHBoxLayout, QVBoxLayout from PySide.QtGui import QApplication, QHBoxLayout, QVBoxLayout
@ -56,8 +57,9 @@ class MainWindow(QtGui.QMainWindow, CommandBase):
def load_recent_projects(self): def load_recent_projects(self):
files = [] files = []
history_file = get_file('files/recent_files.txt') history_file = get_file('files/recent_files.txt')
if not os.path.exists(history_file):
with codecs.open(history_file, 'a+', 'utf-8') as f: return files
with codecs.open(history_file, encoding='utf-8') as f:
for line in f: for line in f:
line = line.strip() line = line.strip()
if line and os.path.exists(line): if line and os.path.exists(line):
@ -68,8 +70,9 @@ class MainWindow(QtGui.QMainWindow, CommandBase):
def load_last_project_path(self): def load_last_project_path(self):
proj_path = '' proj_path = ''
proj_file = get_file('files/last_project_path.txt') proj_file = get_file('files/last_project_path.txt')
with codecs.open(proj_file, 'a+', encoding='utf-8') as f: if os.path.exists(proj_file):
proj_path = f.read().strip() with codecs.open(proj_file, encoding='utf-8') as f:
proj_path = f.read().strip()
if not proj_path: if not proj_path:
proj_path = QtCore.QDir.currentPath() proj_path = QtCore.QDir.currentPath()
@ -84,7 +87,9 @@ class MainWindow(QtGui.QMainWindow, CommandBase):
def save_recent_project(self, proj): def save_recent_project(self, proj):
recent_file_path = get_file('files/recent_files.txt') recent_file_path = get_file('files/recent_files.txt')
max_length = MAX_RECENT max_length = MAX_RECENT
recent_files = codecs.open(recent_file_path, 'a+', encoding='utf-8').read().split(u'\n') recent_files = []
if os.path.exists(recent_file_path):
recent_files = codecs.open(recent_file_path, encoding='utf-8').read().split(u'\n')
try: try:
recent_files.remove(proj) recent_files.remove(proj)
except ValueError: except ValueError:
@ -117,7 +122,8 @@ class MainWindow(QtGui.QMainWindow, CommandBase):
self.setStatusBar(status_bar) self.setStatusBar(status_bar)
self.project_path = '' self.project_path = ''
if platform.system() == 'Darwin':
self.menuBar().setNativeMenuBar(False)
self.project_menu = self.menuBar().addMenu('File') self.project_menu = self.menuBar().addMenu('File')
browse_action = QtGui.QAction('Open Project', self.project_menu, browse_action = QtGui.QAction('Open Project', self.project_menu,
shortcut=QtGui.QKeySequence.Open, shortcut=QtGui.QKeySequence.Open,