pymoul-svn Mailing List for pyMoul (Page 12)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 16
          http://pymoul.svn.sourceforge.net/pymoul/?rev=16&view=rev
Author:   tiran
Date:     2007-01-12 08:23:37 -0800 (Fri, 12 Jan 2007)

Log Message:
-----------
Removed GTK support in favor of QT. Qt Desinger is cool and PyQt makes more fun :)

Modified Paths:
--------------
    pymoul/trunk/INSTALL.txt
    pymoul/trunk/setup.py
    pymoul/trunk/setup_win32.py
    pymoul/trunk/src/moul/qt/MainWindow.ui

Removed Paths:
-------------
    pymoul/trunk/README.gtk.txt
    pymoul/trunk/src/moul/gtk/

Property Changed:
----------------
    pymoul/trunk/


Property changes on: pymoul/trunk
___________________________________________________________________
Name: svn:ignore
   - build
dist
distgtk

   + build
dist


Modified: pymoul/trunk/INSTALL.txt
===================================================================

--- pymoul/trunk/INSTALL.txt	2007-01-12 16:19:52 UTC (rev 15)
+++ pymoul/trunk/INSTALL.txt	2007-01-12 16:23:37 UTC (rev 16)
@@ -3,7 +3,7 @@
 
  * Python 2.5.x
 
- Also read README.qt.txt and README.gtk.txt
+ Also read README.qt.txt
 
 Windows
 -------

Deleted: pymoul/trunk/README.gtk.txt
===================================================================
--- pymoul/trunk/README.gtk.txt	2007-01-12 16:19:52 UTC (rev 15)
+++ pymoul/trunk/README.gtk.txt	2007-01-12 16:23:37 UTC (rev 16)
@@ -1,5 +0,0 @@
- * PyGTK (Win32: http://www.pcpm.ucl.ac.be/~gustin/win32_ports/)
- * Gtk+ Development Environment (Win32: http://gladewin32.sourceforge.net/)
- * Tepache http://www.gnomefiles.org/app.php/tepache
- * GnuWin32 patch and diffutils http://gnuwin32.sourceforge.net/packages.html
- * GTK+ 2.8 Runtime Environment (Win32: http://gladewin32.sourceforge.net/)
\ No newline at end of file

Modified: pymoul/trunk/setup.py
===================================================================
--- pymoul/trunk/setup.py	2007-01-12 16:19:52 UTC (rev 15)
+++ pymoul/trunk/setup.py	2007-01-12 16:23:37 UTC (rev 16)
@@ -45,7 +45,7 @@
     options = {},
     data_files = [],
     package_dir = {'' : 'src'},
-    packages = find_packages('src', exclude="moul.gtk,moul.qt"),
+    packages = find_packages('src', exclude="moul.qt"),
     include_package_data = True, 
     zip_safe = True,
 )
@@ -71,13 +71,10 @@
 
 if sys.platform.startswith('win'):
     from setup_win32 import updateSetupOptions
-    from setup_win32 import updateSetupOptionsGTK
     from setup_win32 import updateSetupOptionsQT
     from setup_win32 import upxPack
-    from setup_win32 import copyGTK
     updateSetupOptions(kwargs)
     updateSetupOptionsQT(kwargs)
-    #updateSetupOptionsGTK(kwargs)
 
 setup(**kwargs)
 
@@ -86,4 +83,3 @@
 if sys.platform.startswith('win') and 'py2exe' in sys.argv:
     pass
     upxPack('dist')
-    #copyGTK()

Modified: pymoul/trunk/setup_win32.py
===================================================================
--- pymoul/trunk/setup_win32.py	2007-01-12 16:19:52 UTC (rev 15)
+++ pymoul/trunk/setup_win32.py	2007-01-12 16:23:37 UTC (rev 16)
@@ -1,15 +1,4 @@
 """Win23 helpers for setup.py
-        'dll_excludes': [
-            'iconv.dll','intl.dll','libatk-1.0-0.dll',
-            'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',
-            'libglib-2.0-0.dll','libgmodule-2.0-0.dll',
-            'libgobject-2.0-0.dll','libgthread-2.0-0.dll',
-            'libgtk-win32-2.0-0.dll','libpango-1.0-0.dll',
-            'libpangowin32-1.0-0.dll','libcairo-2.dll',
-            'libpangocairo-1.0-0.dll','libpangoft2-1.0-0.dll',
-            # my
-            'libglade-2.0-0.dll',
-        ],
 """
 import os
 import sys
@@ -80,24 +69,6 @@
     pexe['includes'] = 'encodings,encodings.*'
     kw['zipfile'] = 'library.zip'
 
-def updateSetupOptionsGTK(kw):
-    for req in ():
-        kw['setup_requires'].append(req)
-    for req in ('pygtk>=2.0',):
-        kw['install_requires'].append(req)
-    for f in ('src/moul/gtk/moulgtk.glade',):
-        kw['data_files'].append(f)
-    kw['packages'].append('moul.gtk')
-    windows = kw.setdefault('windows', [])
-    windows.append({
-        "script" : "src/moul/gtk/moulgtk.py",
-        "icon_resources": [(1, "src/moul/uru.ico")]
-           }
-        )
-    pexe = kw['options']['py2exe']
-    includes = pexe.setdefault('includes', '')
-    pexe['includes'] = ','.join(('pango,atk,gobject,cairo,pangocairo,gtk.keysyms', includes))
-
 def updateSetupOptionsQT(kw):
     pexe = kw['options'].setdefault('py2exe', {})
     pexe['includes'] = 'PyQt4.uic,PyQt4.uic.*'
@@ -108,17 +79,3 @@
         "icon_resources": [(1, "src/moul/uru.ico")]
            }
         )
-def copyGTK():
-    print >>sys.stderr, """
-*** COPY GTK FILES ***
-
-Now you have to copy the following directories from %s into the dist folder:
-
- * etc/
- * lib/pango/
- * lib/gtk-2.0/2.10.0/ [TBT]
- * share/themes/
- * share/locales/ for every language you want to support
-
-You have to do this only once 
-""" % os.environ.get('GTK_BASEPATH', "NOT FOUND")

Modified: pymoul/trunk/src/moul/qt/MainWindow.ui
===================================================================
--- pymoul/trunk/src/moul/qt/MainWindow.ui	2007-01-12 16:19:52 UTC (rev 15)
+++ pymoul/trunk/src/moul/qt/MainWindow.ui	2007-01-12 16:23:37 UTC (rev 16)
@@ -1,6 +1,9 @@
 <ui version="4.0" >
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow" >
+  <property name="windowModality" >
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -11,46 +14,120 @@
   </property>
   <property name="sizePolicy" >
    <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+    <hsizetype>13</hsizetype>
+    <vsizetype>13</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize" >
+   <size>
+    <width>350</width>
+    <height>450</height>
+   </size>
+  </property>
+  <property name="maximumSize" >
+   <size>
+    <width>350</width>
+    <height>450</height>
+   </size>
+  </property>
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <widget class="QSlider" name="horizontalSlider" >
+   <property name="enabled" >
+    <bool>true</bool>
+   </property>
+   <widget class="QTabWidget" name="tabWidget" >
     <property name="geometry" >
      <rect>
-      <x>100</x>
-      <y>230</y>
-      <width>160</width>
-      <height>16</height>
+      <x>0</x>
+      <y>40</y>
+      <width>351</width>
+      <height>391</height>
      </rect>
     </property>
-    <property name="maximum" >
-     <number>11</number>
-    </property>
-    <property name="pageStep" >
-     <number>1</number>
-    </property>
-    <property name="sliderPosition" >
+    <property name="currentIndex" >
      <number>0</number>
     </property>
-    <property name="tracking" >
-     <bool>true</bool>
-    </property>
-    <property name="orientation" >
-     <enum>Qt::Horizontal</enum>
-    </property>
-    <property name="tickPosition" >
-     <enum>QSlider::TicksBelow</enum>
-    </property>
-    <property name="tickInterval" >
-     <number>1</number>
-    </property>
+    <widget class="QWidget" name="tab" >
+     <attribute name="title" >
+      <string>Tab 1</string>
+     </attribute>
+    </widget>
+    <widget class="QWidget" name="tab_3" >
+     <attribute name="title" >
+      <string>Page</string>
+     </attribute>
+     <widget class="QGroupBox" name="groupBox" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>10</y>
+        <width>181</width>
+        <height>81</height>
+       </rect>
+      </property>
+      <property name="title" >
+       <string>GroupBox</string>
+      </property>
+      <widget class="QSlider" name="horizontalSlider" >
+       <property name="geometry" >
+        <rect>
+         <x>10</x>
+         <y>30</y>
+         <width>160</width>
+         <height>16</height>
+        </rect>
+       </property>
+       <property name="maximum" >
+        <number>11</number>
+       </property>
+       <property name="pageStep" >
+        <number>1</number>
+       </property>
+       <property name="sliderPosition" >
+        <number>0</number>
+       </property>
+       <property name="tracking" >
+        <bool>true</bool>
+       </property>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="tickPosition" >
+        <enum>QSlider::TicksBelow</enum>
+       </property>
+       <property name="tickInterval" >
+        <number>1</number>
+       </property>
+      </widget>
+     </widget>
+     <widget class="QGroupBox" name="groupBox_2" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>100</y>
+        <width>331</width>
+        <height>251</height>
+       </rect>
+      </property>
+      <property name="title" >
+       <string>GroupBox</string>
+      </property>
+     </widget>
+    </widget>
+    <widget class="QWidget" name="tab_2" >
+     <attribute name="title" >
+      <string>Tab 2</string>
+     </attribute>
+    </widget>
+    <widget class="QWidget" name="tab_4" >
+     <attribute name="title" >
+      <string>Page</string>
+     </attribute>
+    </widget>
    </widget>
   </widget>
   <widget class="QStatusBar" name="statusbar" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




pymoul-svn Mailing List for pyMoul (Page 12)

pymoul-svn — Subversion commit list