meta-tech/gpyfsa
meta-tech/gpyfsa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix #3540526 python 2 version

Browse Source 
bugfix #3540527 images displaying
This commit is contained in:
a-sansara 2012-07-05 19:38:00 +00:00
parent 9c6906acfe
commit a03bf51a18
12 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0.3x/gpyfsa
View File

@ -2,4 +2,4 @@
dn=$(dirname $0) dn=$(dirname $0)
cd $dn cd $dn
gksu python "src/gpyfsa_main.py" gksu python2 "src/gpyfsa_main.py"

10
0.3x/res/gpyfsa.glade
View File

@ -9,7 +9,7 @@
<property name="default_width">900</property> <property name="default_width">900</property>
<property name="default_height">680</property> <property name="default_height">680</property>
<property name="destroy_with_parent">True</property> <property name="destroy_with_parent">True</property>
<property name="icon">img/gpyfsa.svg</property> <property name="icon">img/gpyfsa.png</property>
<signal name="destroy" handler="on_gpyfsa_destroy"/> <signal name="destroy" handler="on_gpyfsa_destroy"/>
<child> <child>
<widget class="GtkVBox" id="vbox1"> <widget class="GtkVBox" id="vbox1">
@ -777,7 +777,7 @@
<widget class="GtkImage" id="i_refresh"> <widget class="GtkImage" id="i_refresh">
<property name="height_request">25</property> <property name="height_request">25</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">img/gpyfsa_refresh.svg</property> <property name="pixbuf">img/gpyfsa_refresh.png</property>
</widget> </widget>
<packing> <packing>
<property name="padding">3</property> <property name="padding">3</property>
@ -933,7 +933,7 @@
<widget class="GtkImage" id="i_tabSave"> <widget class="GtkImage" id="i_tabSave">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="pixbuf">img/gpyfsa_tab1.svg</property> <property name="pixbuf">img/gpyfsa_tab1.png</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -992,7 +992,7 @@
<widget class="GtkImage" id="i_tabRestore"> <widget class="GtkImage" id="i_tabRestore">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="pixbuf">img/gpyfsa_tab2.svg</property> <property name="pixbuf">img/gpyfsa_tab2.png</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -1052,7 +1052,7 @@
<widget class="GtkImage" id="i_tabArchive"> <widget class="GtkImage" id="i_tabArchive">
<property name="visible">True</property> <property name="visible">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="pixbuf">img/gpyfsa_tab3.svg</property> <property name="pixbuf">img/gpyfsa_tab3.png</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

BIN
0.3x/res/img/gpyfsa_dev.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
0.3x/res/img/gpyfsa_devlocked.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
0.3x/res/img/gpyfsa_refresh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

9
0.3x/src/gpyfsa_conf.py
View File

@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # #
# software : GPyFSA <http://gpyfsa.sourceforge.net/> # # software : GPyFSA <http://gpyfsa.sourceforge.net/> #
# version : 0.31 # # version : 0.32 #
# date : 2010 # # date : 2010 #
# licence : GPLv3.0 <http://www.gnu.org/licenses/> # # licence : GPLv3.0 <http://www.gnu.org/licenses/> #
# author : a-Sansara <http://www.a-sansara.net/> # # author : a-Sansara <http://www.a-sansara.net/> #
@ -63,8 +63,8 @@ K_DEV_ACTIVATABLE = 1
K_DEV_ACTIVE = 2 K_DEV_ACTIVE = 2
K_DEV = 3 K_DEV = 3
L_COLSNAME = ('',_('device'),_('type'),_('label'),_('size'),_('used'),_('free'),_('%used'),_('mount point')) L_COLSNAME = ('',_('device'),_('type'),_('label'),_('size'),_('used'),_('free'),_('%used'),_('mount point'))
IMG_TV_DEVICE = PATH_IMG+'gpyfsa_dev.svg' IMG_TV_DEVICE = PATH_IMG+'gpyfsa_dev.png'
IMG_TV_DEVICE_LOCKED = PATH_IMG+'gpyfsa_devlocked.svg' IMG_TV_DEVICE_LOCKED = PATH_IMG+'gpyfsa_devlocked.png'
K_TYPE = K_FILTER_NAME = PAGE_SAVE = 0 K_TYPE = K_FILTER_NAME = PAGE_SAVE = 0
K_TITLE = K_FILTER_PATTERN = PAGE_REST = 1 K_TITLE = K_FILTER_PATTERN = PAGE_REST = 1
@ -89,6 +89,3 @@ def getGladeXML() : return gtk.glade.XML(PATH_RES+APP_NAME+".glade",APP_NAME)
def chdir(path) : return os.chdir(path) def chdir(path) : return os.chdir(path)
def getShell() : return sh def getShell() : return sh
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

12
0.3x/src/gpyfsa_devlistmanager.py
View File

@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # #
# software : GPyFSA <http://gpyfsa.sourceforge.net/> # # software : GPyFSA <http://gpyfsa.sourceforge.net/> #
# version : 0.31 # # version : 0.32 #
# date : 2010 # # date : 2010 #
# licence : GPLv3.0 <http://www.gnu.org/licenses/> # # licence : GPLv3.0 <http://www.gnu.org/licenses/> #
# author : a-Sansara <http://www.a-sansara.net/> # # author : a-Sansara <http://www.a-sansara.net/> #
@ -26,7 +26,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GPyFSA. If not, see <http://www.gnu.org/licenses/>. # along with GPyFSA. If not, see <http://www.gnu.org/licenses/>.
import gtk, os, os.path import gtk, os, os.path, pprint
from gpyfsa_fsa import ProbeReader from gpyfsa_fsa import ProbeReader
from gpyfsa_ui import getNewWidget, insertWidget from gpyfsa_ui import getNewWidget, insertWidget
from operator import itemgetter from operator import itemgetter
@ -145,11 +145,13 @@ class DevListManager():
# ICO ACTIVATABLE ACTIVE _K_DEV_ NO READ-WRITE # ICO ACTIVATABLE ACTIVE _K_DEV_ NO READ-WRITE
store = gtk.TreeStore(gtk.gdk.Pixbuf, 'gboolean', 'gboolean', str, str, str, str, str, str, str, str, 'gboolean') store = gtk.TreeStore(gtk.gdk.Pixbuf, 'gboolean', 'gboolean', str, str, str, str, str, str, str, str, 'gboolean')
ldev = ProbeReader(self.conf).getListDevices() ldev = ProbeReader(self.conf).getListDevices()
for i,l in enumerate(ldev): for i,l in enumerate(ldev):
hasntLockedDev = True hasntLockedDev = True
self.preformatStoreData(l[self.conf.K_DISK],False,self.conf.IMG_TV_DEVICE) self.preformatStoreData(l[self.conf.K_DISK],False,self.conf.IMG_TV_DEVICE)
diter = store.append(None,l[self.conf.K_DISK]) diter = store.append(None,l[self.conf.K_DISK])
for j,dev in enumerate(l[self.conf.K_DEVICE]): for j,dev in enumerate(l[self.conf.K_DEVICE]):
print j
imgn = self.conf.IMG_TV_DEVICE imgn = self.conf.IMG_TV_DEVICE
if dev[self.conf.K_DEV_RWRIT]: if dev[self.conf.K_DEV_RWRIT]:
imgn = self.conf.IMG_TV_DEVICE_LOCKED imgn = self.conf.IMG_TV_DEVICE_LOCKED
@ -163,7 +165,8 @@ class DevListManager():
except : except :
pass pass
self.preformatStoreData(dev,not dev[self.conf.K_DEV_RWRIT],imgn,active) self.preformatStoreData(dev,not dev[self.conf.K_DEV_RWRIT],imgn,active)
store.append(diter,dev) # inspect later possible wrong length
store.append(diter,dev[:12])
return store return store
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@ -201,6 +204,3 @@ class DevListManager():
self.conf = conf self.conf = conf
self.buildTreeDevices() self.buildTreeDevices()
self.bindEvents() self.bindEvents()
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

4
0.3x/src/gpyfsa_fsa.py
View File

@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # #
# software : GPyFSA <http://gpyfsa.sourceforge.net/> # # software : GPyFSA <http://gpyfsa.sourceforge.net/> #
# version : 0.31 # # version : 0.32 #
# date : 2010 # # date : 2010 #
# licence : GPLv3.0 <http://www.gnu.org/licenses/> # # licence : GPLv3.0 <http://www.gnu.org/licenses/> #
# author : a-Sansara <http://www.a-sansara.net/> # # author : a-Sansara <http://www.a-sansara.net/> #
@ -186,5 +186,3 @@ class LogReader:
self.textview.scroll_to_iter(self.buf.get_end_iter(),0) self.textview.scroll_to_iter(self.buf.get_end_iter(),0)
self.end = True self.end = True
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

4
0.3x/src/gpyfsa_main.py
View File

@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # #
# software : GPyFSA <http://gpyfsa.sourceforge.net/> # # software : GPyFSA <http://gpyfsa.sourceforge.net/> #
# version : 0.31 # # version : 0.32 #
# date : 2010 # # date : 2010 #
# licence : GPLv3.0 <http://www.gnu.org/licenses/> # # licence : GPLv3.0 <http://www.gnu.org/licenses/> #
# author : a-Sansara <http://www.a-sansara.net/> # # author : a-Sansara <http://www.a-sansara.net/> #
@ -242,5 +242,3 @@ if __name__ == '__main__':
# msgfmt gpyfsa.po -o gpyfsa.mo # msgfmt gpyfsa.po -o gpyfsa.mo
# intltool-extract --type=gettext/glade res/*.glade # intltool-extract --type=gettext/glade res/*.glade
# msgmerge -U locale/fr/LC_MESSAGES/gpyfsa.po gpyfsa.pot # msgmerge -U locale/fr/LC_MESSAGES/gpyfsa.po gpyfsa.pot
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

5
0.3x/src/gpyfsa_savefs.py
View File

@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # #
# software : GPyFSA <http://gpyfsa.sourceforge.net/> # # software : GPyFSA <http://gpyfsa.sourceforge.net/> #
# version : 0.31 # # version : 0.32 #
# date : 2010 # # date : 2010 #
# licence : GPLv3.0 <http://www.gnu.org/licenses/> # # licence : GPLv3.0 <http://www.gnu.org/licenses/> #
# author : a-Sansara <http://www.a-sansara.net/> # # author : a-Sansara <http://www.a-sansara.net/> #
@ -30,6 +30,3 @@
class SaveFS(gtk.Window): class SaveFS(gtk.Window):
pass pass
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

4
0.3x/src/gpyfsa_shell.py
View File

@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # #
# software : GPyFSA <http://gpyfsa.sourceforge.net/> # # software : GPyFSA <http://gpyfsa.sourceforge.net/> #
# version : 0.31 # # version : 0.32 #
# date : 2010 # # date : 2010 #
# licence : GPLv3.0 <http://www.gnu.org/licenses/> # # licence : GPLv3.0 <http://www.gnu.org/licenses/> #
# author : a-Sansara <http://www.a-sansara.net/> # # author : a-Sansara <http://www.a-sansara.net/> #
@ -63,5 +63,3 @@ class Shell:
def __getGrepPipeOut(self,cmd,grepStr): def __getGrepPipeOut(self,cmd,grepStr):
try : return self.__pipe(cmd, [self.CMD_GREP, grepStr]).stdout.read().split("\n") try : return self.__pipe(cmd, [self.CMD_GREP, grepStr]).stdout.read().split("\n")
except : return "" except : return ""
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

4
0.3x/src/gpyfsa_ui.py
View File

@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # #
# software : GPyFSA <http://gpyfsa.sourceforge.net/> # # software : GPyFSA <http://gpyfsa.sourceforge.net/> #
# version : 0.31 # # version : 0.32 #
# date : 2010 # # date : 2010 #
# licence : GPLv3.0 <http://www.gnu.org/licenses/> # # licence : GPLv3.0 <http://www.gnu.org/licenses/> #
# author : a-Sansara <http://www.a-sansara.net/> # # author : a-Sansara <http://www.a-sansara.net/> #
@ -160,5 +160,3 @@ def setTimeout(ms, bind, callback, clearCallback, data=None):
if(type(data) != tuple): data = (data,) if(type(data) != tuple): data = (data,)
for i in range(len(data)): params += ", data["+str(i)+"]" for i in range(len(data)): params += ", data["+str(i)+"]"
return eval("gobject.timeout_add(ms, bind, callback, clearCallback "+params+")") return eval("gobject.timeout_add(ms, bind, callback, clearCallback "+params+")")
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #