diff --git a/python/bin/gwinwrap-0-0-1-x64.deb b/python/bin/gwinwrap-0-0-1-x64.deb
index 8b4f22d..55715a9 100644
Binary files a/python/bin/gwinwrap-0-0-1-x64.deb and b/python/bin/gwinwrap-0-0-1-x64.deb differ
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py b/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py
old mode 100644
new mode 100755
index 0f3167d..c0c8f85
--- a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py
+++ b/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/GWinWrap.py
@@ -34,9 +34,9 @@ class GWinWrap:
self.window.connect("draw", self.area_draw)
# bind css file
- cssProvider = gtk.CssProvider()
+ cssProvider = gtk.CssProvider()
cssProvider.load_from_path('resources/stylesheet.css')
- screen = gdk.Screen.get_default()
+ screen = gdk.Screen.get_default()
styleContext = gtk.StyleContext()
styleContext.add_provider_for_screen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_USER)
@@ -77,12 +77,14 @@ class GWinWrap:
xscreenList.append((file,))
self.selectedImg = None # EventBox holder
+ self.defPath = None
self.player = None
self.imgVwr = None
- self.retrieveSettings()
+ self.retrieveSettings()
self.window.show()
+
def area_draw(self, widget, cr):
cr.set_source_rgba(0, 0, 0, 0.64)
cr.set_operator(cairo.OPERATOR_SOURCE)
@@ -234,16 +236,22 @@ class GWinWrap:
self.builder.get_object("settingsWindow").popup()
def saveToSettingsFile(self, widget):
- self.player = self.builder.get_object("customVideoPlyr").get_text().strip()
- self.imgVwr = self.builder.get_object("customImgVwr").get_text().strip()
- self.sttngsSver.saveSettings(self.player, self.imgVwr)
+ self.defPath = self.builder.get_object("customDefaultPath").get_text().strip()
+ self.player = self.builder.get_object("customVideoPlyr").get_text().strip()
+ self.imgVwr = self.builder.get_object("customImgVwr").get_text().strip()
+
+ self.sttngsSver.saveSettings(self.defPath, self.player, self.imgVwr)
def retrieveSettings(self):
- data = self.sttngsSver.retrieveSettings()
- self.player = data[0]
- self.imgVwr = data[1]
+ data = self.sttngsSver.retrieveSettings()
+ self.defPath = data[0]
+ self.player = data[1]
+ self.imgVwr = data[2]
+
+ self.builder.get_object("customDefaultPath").set_text(self.defPath)
self.builder.get_object("customVideoPlyr").set_text(self.player)
self.builder.get_object("customImgVwr").set_text(self.imgVwr)
+ self.builder.get_object("selectedDirDialog").set_filename(self.defPath)
def saveToFile(self, widget, data=None):
saveLoc = self.builder.get_object("saveLoc").get_active_text()
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/GWinWrap.glade b/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/GWinWrap.glade
index 9efcfda..671cdbc 100644
--- a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/GWinWrap.glade
+++ b/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/resources/GWinWrap.glade
@@ -685,6 +685,43 @@
True
False
vertical
+
+
+
+ False
+ True
+ 0
+
+
@@ -758,7 +795,7 @@
False
True
- 1
+ 2
@@ -774,7 +811,7 @@
False
True
- 2
+ 3
diff --git a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveGWinWrapSettings.py b/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveGWinWrapSettings.py
index eecc8b9..a26fbb5 100644
--- a/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveGWinWrapSettings.py
+++ b/python/src/debs/gwinwrap-0-0-1-x64/opt/GWinWrap/utils/SaveGWinWrapSettings.py
@@ -14,20 +14,20 @@ class SaveGWinWrapSettings:
open(self.configFile, 'a').close()
- def saveSettings(self, player, imgVwr):
+ def saveSettings(self, defPath, player, imgVwr):
data = {}
data['gwinwrap_settings'] = []
data['gwinwrap_settings'].append({
- 'player': player,
- 'imgvwr': imgVwr
+ 'defPath' : defPath,
+ 'player' : player,
+ 'imgvwr' : imgVwr
})
with open(self.configFile, 'w') as outfile:
json.dump(data, outfile)
-
def retrieveSettings(self):
returnData = []
@@ -35,14 +35,18 @@ class SaveGWinWrapSettings:
try:
data = json.load(infile)
for obj in data['gwinwrap_settings']:
- returnData = [obj['player'], obj['imgvwr']]
+ returnData = [obj['defPath'], obj['player'], obj['imgvwr']]
except Exception as e:
- returnData = ['mplayer', 'xdg-open']
+ returnData = ['', 'mplayer', 'xdg-open']
+
if returnData[0] == '':
- returnData[0] = 'mplayer'
+ returnData[0] = ''
if returnData[1] == '':
- returnData[1] = 'xdg-open'
+ returnData[1] = 'mplayer'
+
+ if returnData[2] == '':
+ returnData[2] = 'xdg-open'
return returnData
diff --git a/python/src/versions/0.0.1/GWinWrap/GWinWrap.py b/python/src/versions/0.0.1/GWinWrap/GWinWrap.py
old mode 100644
new mode 100755
index 0f3167d..c0c8f85
--- a/python/src/versions/0.0.1/GWinWrap/GWinWrap.py
+++ b/python/src/versions/0.0.1/GWinWrap/GWinWrap.py
@@ -34,9 +34,9 @@ class GWinWrap:
self.window.connect("draw", self.area_draw)
# bind css file
- cssProvider = gtk.CssProvider()
+ cssProvider = gtk.CssProvider()
cssProvider.load_from_path('resources/stylesheet.css')
- screen = gdk.Screen.get_default()
+ screen = gdk.Screen.get_default()
styleContext = gtk.StyleContext()
styleContext.add_provider_for_screen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_USER)
@@ -77,12 +77,14 @@ class GWinWrap:
xscreenList.append((file,))
self.selectedImg = None # EventBox holder
+ self.defPath = None
self.player = None
self.imgVwr = None
- self.retrieveSettings()
+ self.retrieveSettings()
self.window.show()
+
def area_draw(self, widget, cr):
cr.set_source_rgba(0, 0, 0, 0.64)
cr.set_operator(cairo.OPERATOR_SOURCE)
@@ -234,16 +236,22 @@ class GWinWrap:
self.builder.get_object("settingsWindow").popup()
def saveToSettingsFile(self, widget):
- self.player = self.builder.get_object("customVideoPlyr").get_text().strip()
- self.imgVwr = self.builder.get_object("customImgVwr").get_text().strip()
- self.sttngsSver.saveSettings(self.player, self.imgVwr)
+ self.defPath = self.builder.get_object("customDefaultPath").get_text().strip()
+ self.player = self.builder.get_object("customVideoPlyr").get_text().strip()
+ self.imgVwr = self.builder.get_object("customImgVwr").get_text().strip()
+
+ self.sttngsSver.saveSettings(self.defPath, self.player, self.imgVwr)
def retrieveSettings(self):
- data = self.sttngsSver.retrieveSettings()
- self.player = data[0]
- self.imgVwr = data[1]
+ data = self.sttngsSver.retrieveSettings()
+ self.defPath = data[0]
+ self.player = data[1]
+ self.imgVwr = data[2]
+
+ self.builder.get_object("customDefaultPath").set_text(self.defPath)
self.builder.get_object("customVideoPlyr").set_text(self.player)
self.builder.get_object("customImgVwr").set_text(self.imgVwr)
+ self.builder.get_object("selectedDirDialog").set_filename(self.defPath)
def saveToFile(self, widget, data=None):
saveLoc = self.builder.get_object("saveLoc").get_active_text()
diff --git a/python/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade b/python/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade
index 9efcfda..671cdbc 100644
--- a/python/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade
+++ b/python/src/versions/0.0.1/GWinWrap/resources/GWinWrap.glade
@@ -685,6 +685,43 @@
True
False
vertical
+
+
+
+ False
+ True
+ 0
+
+
@@ -758,7 +795,7 @@
False
True
- 1
+ 2
@@ -774,7 +811,7 @@
False
True
- 2
+ 3
diff --git a/python/src/versions/0.0.1/GWinWrap/utils/SaveGWinWrapSettings.py b/python/src/versions/0.0.1/GWinWrap/utils/SaveGWinWrapSettings.py
index eecc8b9..a26fbb5 100644
--- a/python/src/versions/0.0.1/GWinWrap/utils/SaveGWinWrapSettings.py
+++ b/python/src/versions/0.0.1/GWinWrap/utils/SaveGWinWrapSettings.py
@@ -14,20 +14,20 @@ class SaveGWinWrapSettings:
open(self.configFile, 'a').close()
- def saveSettings(self, player, imgVwr):
+ def saveSettings(self, defPath, player, imgVwr):
data = {}
data['gwinwrap_settings'] = []
data['gwinwrap_settings'].append({
- 'player': player,
- 'imgvwr': imgVwr
+ 'defPath' : defPath,
+ 'player' : player,
+ 'imgvwr' : imgVwr
})
with open(self.configFile, 'w') as outfile:
json.dump(data, outfile)
-
def retrieveSettings(self):
returnData = []
@@ -35,14 +35,18 @@ class SaveGWinWrapSettings:
try:
data = json.load(infile)
for obj in data['gwinwrap_settings']:
- returnData = [obj['player'], obj['imgvwr']]
+ returnData = [obj['defPath'], obj['player'], obj['imgvwr']]
except Exception as e:
- returnData = ['mplayer', 'xdg-open']
+ returnData = ['', 'mplayer', 'xdg-open']
+
if returnData[0] == '':
- returnData[0] = 'mplayer'
+ returnData[0] = ''
if returnData[1] == '':
- returnData[1] = 'xdg-open'
+ returnData[1] = 'mplayer'
+
+ if returnData[2] == '':
+ returnData[2] = 'xdg-open'
return returnData