[Gsdesign-commits] r318 - in pkg/gsDesignExplorer-dev/trunk: . gsDesignExplorer/inst gsDesignExplorer/inst/images gsDesignExplorer/inst/images/splash gsDesignExplorer/inst/images/toolbar gsDesignExplorer/inst/libs gsDesignExplorer/src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Aug 19 07:39:50 CEST 2011
Author: "tony"
Date: 2011-08-19 07:39:50 +0200 (Fri, 19 Aug 2011)
New Revision: 318
Added:
pkg/gsDesignExplorer-dev/trunk/.RData
pkg/gsDesignExplorer-dev/trunk/.Rhistory
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsDesignSplash.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsDesignSplash.xcf
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsdSplash.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designDefault.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designDelete.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designExecute.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designExport.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designLoad.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designNew.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/edit.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/fileOpen.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/fileSave.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/help.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/home.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/plotExport.png
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/libs/
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/libs/libgsDesignExplorer.so
Modified:
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/src/CMakeLists.txt
pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/src/gsdesign.ui
Log:
Updated to work on Ubuntu
Added: pkg/gsDesignExplorer-dev/trunk/.RData
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/.RData
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/.Rhistory
===================================================================
--- pkg/gsDesignExplorer-dev/trunk/.Rhistory (rev 0)
+++ pkg/gsDesignExplorer-dev/trunk/.Rhistory 2011-08-19 05:39:50 UTC (rev 318)
@@ -0,0 +1,12 @@
+install.packages("gsDesign")
+library(gsDesignExplorer)
+gsDesignExplorer()
+gsDesignExplorer()
+quit()
+library(gsDesignExplorer)
+gsDesignExplorer()
+quit()
+gsDesignExplorer()
+library(gsDesignExplorer)
+gsDesignExplorer()
+quit()
Property changes on: pkg/gsDesignExplorer-dev/trunk/.Rhistory
___________________________________________________________________
Added: svn:eol-style
+ native
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsDesignSplash.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsDesignSplash.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsDesignSplash.xcf
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsDesignSplash.xcf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsdSplash.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/splash/gsdSplash.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designDefault.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designDefault.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designDelete.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designDelete.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designExecute.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designExecute.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designExport.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designExport.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designLoad.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designLoad.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designNew.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/designNew.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/edit.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/edit.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/fileOpen.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/fileOpen.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/fileSave.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/fileSave.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/help.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/help.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/home.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/home.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/plotExport.png
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/images/toolbar/plotExport.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/libs/libgsDesignExplorer.so
===================================================================
(Binary files differ)
Property changes on: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/inst/libs/libgsDesignExplorer.so
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/src/CMakeLists.txt
===================================================================
--- pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/src/CMakeLists.txt 2011-08-19 05:39:34 UTC (rev 317)
+++ pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/src/CMakeLists.txt 2011-08-19 05:39:50 UTC (rev 318)
@@ -36,7 +36,8 @@
c:/Qwt-5.2.2-svn/include
c:/Qwt/include
c:/Qwt-6.0.1-svn/include
- c:/dev/libs/qwt/qwt-6.0/src
+ c:/dev/libs/qwt/qwt-6.0/src
+ /home/tony/Libraries/qwt/qwt-6.0/src
)
SET(QWT_NAMES ${QWT_NAMES} qwtd5 qwt libqwt)
Modified: pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/src/gsdesign.ui
===================================================================
--- pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/src/gsdesign.ui 2011-08-19 05:39:34 UTC (rev 317)
+++ pkg/gsDesignExplorer-dev/trunk/gsDesignExplorer/src/gsdesign.ui 2011-08-19 05:39:50 UTC (rev 318)
@@ -56,7 +56,7 @@
<x>3</x>
<y>10</y>
<width>731</width>
- <height>55</height>
+ <height>60</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -525,21 +525,6 @@
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderStretchLastSection">
- <bool>false</bool>
- </attribute>
- <attribute name="horizontalHeaderDefaultSectionSize">
- <number>167</number>
- </attribute>
<row/>
<row/>
<row/>
@@ -1477,8 +1462,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>179</width>
- <height>71</height>
+ <width>165</width>
+ <height>75</height>
</rect>
</property>
<attribute name="label">
@@ -1569,8 +1554,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>176</width>
- <height>59</height>
+ <width>159</width>
+ <height>62</height>
</rect>
</property>
<attribute name="label">
@@ -1681,8 +1666,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>234</width>
- <height>176</height>
+ <width>214</width>
+ <height>172</height>
</rect>
</property>
<attribute name="label">
@@ -1983,8 +1968,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>189</width>
- <height>171</height>
+ <width>170</width>
+ <height>157</height>
</rect>
</property>
<attribute name="label">
@@ -2268,7 +2253,7 @@
<x>0</x>
<y>0</y>
<width>340</width>
- <height>157</height>
+ <height>146</height>
</rect>
</property>
<attribute name="label">
@@ -2410,21 +2395,6 @@
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderStretchLastSection">
- <bool>false</bool>
- </attribute>
- <attribute name="horizontalHeaderDefaultSectionSize">
- <number>167</number>
- </attribute>
<row/>
<row/>
<row/>
@@ -2526,27 +2496,6 @@
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
- <bool>false</bool>
- </attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderShowSortIndicator" stdset="0">
- <bool>false</bool>
- </attribute>
- <attribute name="verticalHeaderStretchLastSection">
- <bool>false</bool>
- </attribute>
- <attribute name="horizontalHeaderDefaultSectionSize">
- <number>167</number>
- </attribute>
<row/>
<row/>
<row/>
@@ -2650,8 +2599,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>430</width>
- <height>296</height>
+ <width>165</width>
+ <height>75</height>
</rect>
</property>
<attribute name="label">
@@ -2742,8 +2691,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>176</width>
- <height>59</height>
+ <width>159</width>
+ <height>62</height>
</rect>
</property>
<attribute name="label">
@@ -2854,8 +2803,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>245</width>
- <height>176</height>
+ <width>220</width>
+ <height>172</height>
</rect>
</property>
<attribute name="label">
@@ -3169,8 +3118,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>189</width>
- <height>171</height>
+ <width>170</width>
+ <height>157</height>
</rect>
</property>
<attribute name="label">
@@ -3472,8 +3421,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>272</width>
- <height>157</height>
+ <width>252</width>
+ <height>146</height>
</rect>
</property>
<attribute name="label">
@@ -3615,21 +3564,6 @@
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderStretchLastSection">
- <bool>false</bool>
- </attribute>
- <attribute name="horizontalHeaderDefaultSectionSize">
- <number>50</number>
- </attribute>
<row/>
<row/>
<row/>
@@ -3731,27 +3665,6 @@
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
- <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
- <bool>false</bool>
- </attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderCascadingSectionResizes">
- <bool>true</bool>
- </attribute>
- <attribute name="verticalHeaderShowSortIndicator" stdset="0">
- <bool>false</bool>
- </attribute>
- <attribute name="verticalHeaderStretchLastSection">
- <bool>false</bool>
- </attribute>
- <attribute name="horizontalHeaderDefaultSectionSize">
- <number>120</number>
- </attribute>
<row/>
<row/>
<row/>
@@ -4232,12 +4145,6 @@
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
- <attribute name="horizontalHeaderStretchLastSection">
- <bool>true</bool>
- </attribute>
- <attribute name="horizontalHeaderDefaultSectionSize">
- <number>160</number>
- </attribute>
<row/>
<row/>
<row/>
@@ -5156,7 +5063,7 @@
<x>0</x>
<y>0</y>
<width>1338</width>
- <height>24</height>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuDesign">
@@ -5279,7 +5186,7 @@
</widget>
<action name="toolbarActionSaveDesign">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/fileSave.png</normaloff>:/toolbar/images/toolbar/fileSave.png</iconset>
</property>
<property name="text">
@@ -5299,7 +5206,7 @@
</action>
<action name="toolbarActionLoadDesign">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/designLoad.png</normaloff>:/toolbar/images/toolbar/designLoad.png</iconset>
</property>
<property name="text">
@@ -5311,7 +5218,7 @@
</action>
<action name="toolbarActionNewDesign">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/designNew.png</normaloff>:/toolbar/images/toolbar/designNew.png</iconset>
</property>
<property name="text">
@@ -5326,7 +5233,7 @@
</action>
<action name="toolbarActionRunDesign">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/designExecute.png</normaloff>:/toolbar/images/toolbar/designExecute.png</iconset>
</property>
<property name="text">
@@ -5359,7 +5266,7 @@
<bool>true</bool>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/help.png</normaloff>:/toolbar/images/toolbar/help.png</iconset>
</property>
<property name="text">
@@ -5376,7 +5283,7 @@
</action>
<action name="toolbarActionDeleteDesign">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/designDelete.png</normaloff>:/toolbar/images/toolbar/designDelete.png</iconset>
</property>
<property name="text">
@@ -5406,7 +5313,7 @@
</action>
<action name="toolbarActionDefaultDesign">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/designDefault.png</normaloff>:/toolbar/images/toolbar/designDefault.png</iconset>
</property>
<property name="text">
@@ -5436,7 +5343,7 @@
</action>
<action name="toolbarActionExportDesign">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/designExport.png</normaloff>:/toolbar/images/toolbar/designExport.png</iconset>
</property>
<property name="text">
@@ -5464,7 +5371,7 @@
<bool>true</bool>
</property>
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/edit.png</normaloff>:/toolbar/images/toolbar/edit.png</iconset>
</property>
<property name="text">
@@ -5479,7 +5386,7 @@
</action>
<action name="toolbarActionExportPlot">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/plotExport.png</normaloff>:/toolbar/images/toolbar/plotExport.png</iconset>
</property>
<property name="text">
@@ -5507,7 +5414,7 @@
</action>
<action name="toolbarActionSetWorkingDirectory">
<property name="icon">
- <iconset>
+ <iconset resource="images.qrc">
<normaloff>:/toolbar/images/toolbar/home.png</normaloff>:/toolbar/images/toolbar/home.png</iconset>
</property>
<property name="text">
@@ -5553,7 +5460,7 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../../../../gsDesignExplorer/gsDesignGUI/images.qrc"/>
+ <include location="images.qrc"/>
</resources>
<connections/>
<slots>
More information about the Gsdesign-commits
mailing list