diff --git a/0.3x/gpyfsa b/0.3x/gpyfsa
index 86bea89..f1cb9ec 100755
--- a/0.3x/gpyfsa
+++ b/0.3x/gpyfsa
@@ -2,4 +2,4 @@
dn=$(dirname $0)
cd $dn
-gksu python "src/gpyfsa_main.py"
+gksu python2 "src/gpyfsa_main.py"
diff --git a/0.3x/res/gpyfsa.glade b/0.3x/res/gpyfsa.glade
index 32b48af..8012258 100644
--- a/0.3x/res/gpyfsa.glade
+++ b/0.3x/res/gpyfsa.glade
@@ -9,7 +9,7 @@
900
680
True
- img/gpyfsa.svg
+ img/gpyfsa.png
@@ -777,7 +777,7 @@
25
True
- img/gpyfsa_refresh.svg
+ img/gpyfsa_refresh.png
3
@@ -933,7 +933,7 @@
True
0
- img/gpyfsa_tab1.svg
+ img/gpyfsa_tab1.png
False
@@ -992,7 +992,7 @@
True
0
- img/gpyfsa_tab2.svg
+ img/gpyfsa_tab2.png
False
@@ -1052,7 +1052,7 @@
True
0
- img/gpyfsa_tab3.svg
+ img/gpyfsa_tab3.png
False
diff --git a/0.3x/res/img/gpyfsa_dev.png b/0.3x/res/img/gpyfsa_dev.png
index c05f0a8..ce6d3eb 100644
Binary files a/0.3x/res/img/gpyfsa_dev.png and b/0.3x/res/img/gpyfsa_dev.png differ
diff --git a/0.3x/res/img/gpyfsa_devlocked.png b/0.3x/res/img/gpyfsa_devlocked.png
index 816b748..2cf09fb 100644
Binary files a/0.3x/res/img/gpyfsa_devlocked.png and b/0.3x/res/img/gpyfsa_devlocked.png differ
diff --git a/0.3x/res/img/gpyfsa_refresh.png b/0.3x/res/img/gpyfsa_refresh.png
new file mode 100644
index 0000000..e4ca416
Binary files /dev/null and b/0.3x/res/img/gpyfsa_refresh.png differ
diff --git a/0.3x/src/gpyfsa_conf.py b/0.3x/src/gpyfsa_conf.py
index dafe853..27123de 100644
--- a/0.3x/src/gpyfsa_conf.py
+++ b/0.3x/src/gpyfsa_conf.py
@@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# software : GPyFSA #
-# version : 0.31 #
+# version : 0.32 #
# date : 2010 #
# licence : GPLv3.0 #
# author : a-Sansara #
@@ -63,8 +63,8 @@ K_DEV_ACTIVATABLE = 1
K_DEV_ACTIVE = 2
K_DEV = 3
L_COLSNAME = ('',_('device'),_('type'),_('label'),_('size'),_('used'),_('free'),_('%used'),_('mount point'))
-IMG_TV_DEVICE = PATH_IMG+'gpyfsa_dev.svg'
-IMG_TV_DEVICE_LOCKED = PATH_IMG+'gpyfsa_devlocked.svg'
+IMG_TV_DEVICE = PATH_IMG+'gpyfsa_dev.png'
+IMG_TV_DEVICE_LOCKED = PATH_IMG+'gpyfsa_devlocked.png'
K_TYPE = K_FILTER_NAME = PAGE_SAVE = 0
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 getShell() : return sh
-
-
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/0.3x/src/gpyfsa_devlistmanager.py b/0.3x/src/gpyfsa_devlistmanager.py
index 6ae412b..40f124d 100644
--- a/0.3x/src/gpyfsa_devlistmanager.py
+++ b/0.3x/src/gpyfsa_devlistmanager.py
@@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# software : GPyFSA #
-# version : 0.31 #
+# version : 0.32 #
# date : 2010 #
# licence : GPLv3.0 #
# author : a-Sansara #
@@ -26,7 +26,7 @@
# You should have received a copy of the GNU General Public License
# along with GPyFSA. If not, see .
-import gtk, os, os.path
+import gtk, os, os.path, pprint
from gpyfsa_fsa import ProbeReader
from gpyfsa_ui import getNewWidget, insertWidget
from operator import itemgetter
@@ -145,11 +145,13 @@ class DevListManager():
# 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')
ldev = ProbeReader(self.conf).getListDevices()
+
for i,l in enumerate(ldev):
hasntLockedDev = True
self.preformatStoreData(l[self.conf.K_DISK],False,self.conf.IMG_TV_DEVICE)
diter = store.append(None,l[self.conf.K_DISK])
for j,dev in enumerate(l[self.conf.K_DEVICE]):
+ print j
imgn = self.conf.IMG_TV_DEVICE
if dev[self.conf.K_DEV_RWRIT]:
imgn = self.conf.IMG_TV_DEVICE_LOCKED
@@ -163,7 +165,8 @@ class DevListManager():
except :
pass
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
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -201,6 +204,3 @@ class DevListManager():
self.conf = conf
self.buildTreeDevices()
self.bindEvents()
-
-
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/0.3x/src/gpyfsa_fsa.py b/0.3x/src/gpyfsa_fsa.py
index f653d58..c0c682a 100644
--- a/0.3x/src/gpyfsa_fsa.py
+++ b/0.3x/src/gpyfsa_fsa.py
@@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# software : GPyFSA #
-# version : 0.31 #
+# version : 0.32 #
# date : 2010 #
# licence : GPLv3.0 #
# author : a-Sansara #
@@ -186,5 +186,3 @@ class LogReader:
self.textview.scroll_to_iter(self.buf.get_end_iter(),0)
self.end = True
-
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/0.3x/src/gpyfsa_main.py b/0.3x/src/gpyfsa_main.py
index 9109427..82e4d17 100644
--- a/0.3x/src/gpyfsa_main.py
+++ b/0.3x/src/gpyfsa_main.py
@@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# software : GPyFSA #
-# version : 0.31 #
+# version : 0.32 #
# date : 2010 #
# licence : GPLv3.0 #
# author : a-Sansara #
@@ -242,5 +242,3 @@ if __name__ == '__main__':
# msgfmt gpyfsa.po -o gpyfsa.mo
# intltool-extract --type=gettext/glade res/*.glade
# msgmerge -U locale/fr/LC_MESSAGES/gpyfsa.po gpyfsa.pot
-
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/0.3x/src/gpyfsa_savefs.py b/0.3x/src/gpyfsa_savefs.py
index 163f20e..e74c99d 100644
--- a/0.3x/src/gpyfsa_savefs.py
+++ b/0.3x/src/gpyfsa_savefs.py
@@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# software : GPyFSA #
-# version : 0.31 #
+# version : 0.32 #
# date : 2010 #
# licence : GPLv3.0 #
# author : a-Sansara #
@@ -30,6 +30,3 @@
class SaveFS(gtk.Window):
pass
-
-
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/0.3x/src/gpyfsa_shell.py b/0.3x/src/gpyfsa_shell.py
index 9475593..573e92d 100644
--- a/0.3x/src/gpyfsa_shell.py
+++ b/0.3x/src/gpyfsa_shell.py
@@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# software : GPyFSA #
-# version : 0.31 #
+# version : 0.32 #
# date : 2010 #
# licence : GPLv3.0 #
# author : a-Sansara #
@@ -63,5 +63,3 @@ class Shell:
def __getGrepPipeOut(self,cmd,grepStr):
try : return self.__pipe(cmd, [self.CMD_GREP, grepStr]).stdout.read().split("\n")
except : return ""
-
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/0.3x/src/gpyfsa_ui.py b/0.3x/src/gpyfsa_ui.py
index b465457..53d3036 100755
--- a/0.3x/src/gpyfsa_ui.py
+++ b/0.3x/src/gpyfsa_ui.py
@@ -3,7 +3,7 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# software : GPyFSA #
-# version : 0.31 #
+# version : 0.32 #
# date : 2010 #
# licence : GPLv3.0 #
# author : a-Sansara #
@@ -160,5 +160,3 @@ def setTimeout(ms, bind, callback, clearCallback, data=None):
if(type(data) != tuple): data = (data,)
for i in range(len(data)): params += ", data["+str(i)+"]"
return eval("gobject.timeout_add(ms, bind, callback, clearCallback "+params+")")
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #