Skip to content

Commit

Permalink
correct tab order from soundlibrarysavedialog & soundlibrarypropertie…
Browse files Browse the repository at this point in the history
…sdialog. temp. remove Qt3Support from sconstruct because build and linking fails

git-svn-id: http://svn.assembla.com/svn/hydrogen/trunk@432 3b3fb362-3133-0410-aa15-cf69e0a59cb7
  • Loading branch information
wolkstein committed Sep 2, 2008
1 parent 1af8aed commit 631e926
Showing 3 changed files with 33 additions and 4 deletions.
11 changes: 10 additions & 1 deletion Sconstruct
Original file line number Diff line number Diff line change
@@ -180,7 +180,16 @@ def get_hydrogen_gui( lib_hydrogen ):
qt4ToolLocation="."

env = Environment(tools=['default','qt4'], toolpath=[qt4ToolLocation], ENV=os.environ, CPPPATH = includes, CPPFLAGS = cppflags, CCFLAGS = "", LINKFLAGS=ldflags )
env.EnableQt4Modules( ['QtCore', 'QtGui','QtNetwork','QtXml','Qt3Support'], debug=False)

#hi, can't compile h2 with Qt3Support on my linux machines anymore (debian unstable & ubuntu )
#, although i have correct installed "libqt4-qt3support"
#after correct one error into SoundLibraryPanal.cpp i get linking or what ever errors (sorry never seen before) after compiling.
#so, think it is better to disable qt3 support for now
#
#env.EnableQt4Modules( ['QtCore', 'QtGui','QtNetwork','QtXml','Qt3Support'], debug=False)
#
env.EnableQt4Modules( ['QtCore', 'QtGui','QtNetwork','QtXml'], debug=False)
#
env.CacheDir( "scons_cache" )

# rcc needs a -name flag because examples use identified resource files
14 changes: 13 additions & 1 deletion gui/src/SoundLibrary/SoundLibraryPropertiesDialog_UI.ui
Original file line number Diff line number Diff line change
@@ -160,6 +160,9 @@
<height>0</height>
</size>
</property>
<property name="text" >
<string/>
</property>
</widget>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
@@ -170,7 +173,7 @@
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout" >
<layout class="QHBoxLayout" >
<item>
<widget class="QPushButton" name="saveBtn" >
<property name="text" >
@@ -201,6 +204,15 @@
</property>
</widget>
</widget>
<tabstops>
<tabstop>nameTxt</tabstop>
<tabstop>authorTxt</tabstop>
<tabstop>licenseTxt</tabstop>
<tabstop>infoTxt</tabstop>
<tabstop>saveChanges_checkBox</tabstop>
<tabstop>saveBtn</tabstop>
<tabstop>m_cancelBtn</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
12 changes: 10 additions & 2 deletions gui/src/SoundLibrary/SoundLibrarySaveDialog_UI.ui
Original file line number Diff line number Diff line change
@@ -161,7 +161,7 @@
</size>
</property>
</widget>
<widget class="QWidget" name="" >
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>360</x>
@@ -170,7 +170,7 @@
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout" >
<layout class="QHBoxLayout" >
<item>
<widget class="QPushButton" name="saveBtn" >
<property name="text" >
@@ -188,6 +188,14 @@
</layout>
</widget>
</widget>
<tabstops>
<tabstop>nameTxt</tabstop>
<tabstop>authorTxt</tabstop>
<tabstop>licenseTxt</tabstop>
<tabstop>infoTxt</tabstop>
<tabstop>saveBtn</tabstop>
<tabstop>m_cancelBtn</tabstop>
</tabstops>
<resources/>
<connections>
<connection>

0 comments on commit 631e926

Please sign in to comment.