Skip to content

Commit

Permalink
mainwindow: fixed focus settings
Browse files Browse the repository at this point in the history
  • Loading branch information
chrmoritz committed Feb 28, 2015
1 parent 46d11a2 commit de34455
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 5 deletions.
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ build_script:
- cd src
- python C:\Python27\Scripts\cxfreeze zoxel.py --target-dir ..\dist --base-name Win32GUI --include-modules atexit,PySide.QtNetwork,PySide.QtWebKit,OpenGL,OpenGL.platform.win32,OpenGL.arrays.nones,OpenGL.arrays.lists,OpenGL.arrays.strings,OpenGL.arrays.numbers,OpenGL.arrays.ctypesarrays,OpenGL.arrays.ctypesparameters,OpenGL.arrays.ctypespointers --include-path .
- cd ..\dist
- ps: "& 7z a -r zoxel-0.5.9-win32.zip ."
- ps: "& 7z a -r zoxel-0.5.10-win32.zip ."

test: off

artifacts:
- path: dist/zoxel-0.5.9-win32.zip
- path: dist/zoxel-0.5.10-win32.zip

deploy:
provider: GitHub
auth_token:
secure: DUZQbCQFI4HKfOcnF+S9Krti2Kz1agHaSLFUJv8mK8Ov/DjeOhR9YyEkqLGY/I9J
artifact: dist/zoxel-0.5.9-win32.zip
artifact: dist/zoxel-0.5.10-win32.zip
on:
appveyor_repo_tag: true
4 changes: 2 additions & 2 deletions src/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

ZOXEL_VERSION = "0.5.9 (28th February 2015)"
ZOXEL_TAG = "0.5.9"
ZOXEL_VERSION = "0.5.10 (28th February 2015)"
ZOXEL_TAG = "0.5.10"
30 changes: 30 additions & 0 deletions src/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QWidget" name="glparent" native="true">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2"/>
</widget>
</item>
Expand All @@ -36,6 +39,9 @@
</rect>
</property>
<widget class="QMenu" name="menu_file">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="title">
<string>File</string>
</property>
Expand All @@ -50,12 +56,18 @@
<addaction name="action_exit"/>
</widget>
<widget class="QMenu" name="menu_help">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="title">
<string>Help</string>
</property>
<addaction name="action_about"/>
</widget>
<widget class="QMenu" name="menuView">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="title">
<string>View</string>
</property>
Expand All @@ -67,6 +79,9 @@
<addaction name="action_zoom_out"/>
</widget>
<widget class="QMenu" name="menuEdit">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="title">
<string>Edit</string>
</property>
Expand All @@ -84,6 +99,9 @@
<addaction name="action_resize"/>
</widget>
<widget class="QMenu" name="menuAnimation">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="title">
<string>Animation</string>
</property>
Expand All @@ -104,6 +122,9 @@
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolbar">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="windowTitle">
<string>toolBar</string>
</property>
Expand Down Expand Up @@ -157,9 +178,15 @@
<height>0</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLineEdit" name="paletteRGBvalue">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="text">
<string>#ff0000</string>
</property>
Expand All @@ -172,6 +199,9 @@
</widget>
</widget>
<widget class="QToolBar" name="toolbar_animation">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="windowTitle">
<string>toolBar</string>
</property>
Expand Down

0 comments on commit de34455

Please sign in to comment.