Skip to content
This repository has been archived by the owner on Nov 10, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release/v0.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Nunes committed Mar 15, 2016
2 parents 0013f12 + 252c600 commit 360a974
Show file tree
Hide file tree
Showing 39 changed files with 1,760 additions and 9 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ var/
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
Expand Down Expand Up @@ -63,3 +62,7 @@ target/

#PyCharm
.idea/

#Vagrant
.vagrant/

4 changes: 2 additions & 2 deletions .python-version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
fomod-editor
2.7.11
miniconda3-3.19.0/envs/fomod-editor
3.5.1
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Changelog

0.0.1 (2016-03-15)

* GUI draft completed.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# FOMOD Visual Editor
# FOMOD Designer

*A visual editor to quickly create .fomod installers for Nexus based mods.*

Expand All @@ -8,7 +8,9 @@

## Installation

*TODO*
* Download the zip file corresponding to your OS from the [latest release](https://github.com/GandaG/fomod-editor/releases/latest);
* Extract the folder within to a location of your choice;
* Run the "designer" executable within the folder.

## Usage

Expand All @@ -24,8 +26,7 @@ Thank you, [contributors]!

## License

FOMOD Visual Editor is Copyright (c) 2015 thoughtbot, inc.
It is free software, and may be redistributed
***FOMOD Designer*** is free software and may be redistributed
under the terms specified in the [LICENSE] file.

[LICENSE]: /LICENSE
15 changes: 15 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# -*- mode: ruby -*- vi: set ft=ruby :


Vagrant.configure(2) do |config|
config.vm.define "ubuntu", primary: true do |ubuntu|
ubuntu.vm.box = "ubuntu/wily64"
ubuntu.vm.provision :shell, :path => "dev/vagrant-ubuntu-bootstrap.sh", :privileged => false
end

config.ssh.insert_key = false

config.vm.provider "virtualbox" do |vb|
vb.memory = "1024"
end
end
25 changes: 25 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
install:
- set PATH=C:\Miniconda-x64;C:\Miniconda-x64\Scripts;%PATH%
- conda create -y -n fomod-editor -c https://conda.anaconda.org/mmcauliffe -c https://conda.anaconda.org/anaconda pyqt5=5.5.1 python=3.5.1 lxml=3.5.0
- activate fomod-editor
- pip install pip -U
- pip install setuptools -U
- pip install -r reqs.txt

build: off

test_script:
- inv build

artifacts:
- path: dist\*

deploy:
- provider: GitHub
auth_token:
secure: iMaZrvVT+OI/9jRs8LyOvmzVqIBa0/jpiK96wNzZww/KqKsMcferhIeSK7faNzOo
artifact: 'dist\*.zip'
force_update: true
on:
branch: master
appveyor_repo_tag: true
33 changes: 33 additions & 0 deletions build-linux.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# -*- mode: python -*-

block_cipher = None


a = Analysis(['dev/pyinstaller-bootstrap.py'],
pathex=['/vagrant'],
binaries=None,
datas=[('fomod/gui/logos', 'fomod/gui/logos')],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)
pyz = PYZ(a.pure, a.zipped_data,
cipher=block_cipher)
exe = EXE(pyz,
a.scripts,
exclude_binaries=True,
name='designer',
debug=False,
strip=False,
upx=True,
console=False )
coll = COLLECT(exe,
a.binaries,
a.zipfiles,
a.datas,
strip=False,
upx=True,
name='FOMOD Designer')
33 changes: 33 additions & 0 deletions build-windows.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# -*- mode: python -*-

block_cipher = None


a = Analysis(['dev\\pyinstaller-bootstrap.py'],
pathex=['C:\\projects\\fomod-editor'],
binaries=None,
datas=[('./fomod/gui/logos', './fomod/gui/logos')],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher)
pyz = PYZ(a.pure, a.zipped_data,
cipher=block_cipher)
exe = EXE(pyz,
a.scripts,
exclude_binaries=True,
name='designer',
debug=False,
strip=False,
upx=True,
console=False )
coll = COLLECT(exe,
a.binaries,
a.zipfiles,
a.datas,
strip=False,
upx=True,
name='FOMOD Designer')
20 changes: 20 additions & 0 deletions dev/pyinstaller-bootstrap.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env python

# Copyright 2016 Daniel Nunes
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from fomod.__main__ import main

if __name__ == '__main__':
main()
91 changes: 91 additions & 0 deletions dev/vagrant-ubuntu-bootstrap.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
#!/usr/bin/env bash

# Copyright 2016 Daniel Nunes
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

sudo apt-get update

# get git - needed for pyenv

sudo apt-get install -y git git-flow
sudo apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev


# shorten the command prompt

echo 'parse_git_branch() {
git branch 2> /dev/null | sed -e '\''/^[^*]/d'\'' -e '\''s/* \(.*\)/ (\1)/'\''
}
export PS1="\[\033[38;5;10m\]\u@ \$(parse_git_branch)\w\\$ \[$(tput sgr0)\]"' >> /home/vagrant/.bashrc

parse_git_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
}
export PS1="\[\033[38;5;10m\]\u@ \$(parse_git_branch)\w\\$ \[$(tput sgr0)\]"


# configure git so you don't have to go back and forward all the time.

git config --global user.email "gandaganza@gmail.com"
git config --global user.name "Daniel Nunes"
git config --global core.editor nano
git config --global push.default simple
git config --global credential.helper 'cache --timeout=18000'


# get pyenv - I hate messing with system python on ubuntu

git clone https://github.com/yyuu/pyenv.git /home/vagrant/.pyenv
{
echo 'export PYENV_ROOT="$HOME/.pyenv"'
echo 'export PATH="$PYENV_ROOT/bin:$PATH"'
echo 'eval "$(pyenv init -)"'
} >> /home/vagrant/.bashrc

export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"


# get pyenv-virtualenv instead of plain old virtualenv

git clone https://github.com/yyuu/pyenv-virtualenv.git \
/home/vagrant/.pyenv/plugins/pyenv-virtualenv
echo 'eval "$(pyenv virtualenv-init -)"' >> /home/vagrant/.bashrc
eval "$(pyenv virtualenv-init -)"


# start installing the python versions

env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install miniconda3-3.19.0
env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 3.5.1


# make the virtualenv

pyenv shell miniconda3-3.19.0
conda create -y -n fomod-editor \
-c https://conda.anaconda.org/mmcauliffe \
-c https://conda.anaconda.org/anaconda \
python=3.5.1 pyqt5=5.5.1 lxml=3.5.0
pyenv shell miniconda3-3.19.0/envs/fomod-editor


# move to the project folder and install the pip reqs

cd /vagrant || exit
pip install pip -U
pip install setuptools -U
pip install -r reqs.txt
4 changes: 3 additions & 1 deletion fomod/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env python

# Copyright 2016 Daniel Nunes
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.0.0"
__version__ = "0.0.1"
11 changes: 10 additions & 1 deletion fomod/__main__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env python

# Copyright 2016 Daniel Nunes
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -12,9 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from .gui import mainframe
from PyQt5 import QtWidgets


def main():
pass
import sys
app = QtWidgets.QApplication(sys.argv)
window = mainframe.MainFrame()
window.show()
sys.exit(app.exec_())

if __name__ == "__main__":
main()
2 changes: 2 additions & 0 deletions fomod/gui/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env python

# Copyright 2016 Daniel Nunes
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
45 changes: 45 additions & 0 deletions fomod/gui/generic.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#!/usr/bin/env python

# Copyright 2016 Daniel Nunes
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from PyQt5 import QtWidgets, QtGui
from .templates import notimplemented as template


class NotImplementedDialog(QtWidgets.QDialog, template.Ui_Dialog):
def __init__(self):
super(NotImplementedDialog, self).__init__()
self.setupUi(self)

self.label_2.setPixmap(QtGui.QPixmap("fomod/gui/logos/1456477754_user-admin.png"))

self.pushButton.clicked.connect(self.ok)

def ok(self):
self.close()


def main():
window = NotImplementedDialog()
window.exec_()


# For testing and debugging.
if __name__ == "__main__":
import sys
app = QtWidgets.QApplication(sys.argv)
window = NotImplementedDialog()
window.show()
sys.exit(app.exec_())
Loading

0 comments on commit 360a974

Please sign in to comment.