[conduit] Finished porting Shutterfly to new config system.
- From: Alexandre Rosenfeld <arosenfeld src gnome org>
- To: svn-commits-list gnome org
- Subject: [conduit] Finished porting Shutterfly to new config system.
- Date: Sun, 3 May 2009 00:22:53 -0400 (EDT)
commit 771b08340ff46bfc468ba8d77d0b4eb52399a483
Author: Alexandre Rosenfeld <airmind gmail com>
Date: Fri May 1 22:48:41 2009 -0300
Finished porting Shutterfly to new config system.
---
conduit/modules/ShutterflyModule/Makefile.am | 3 -
.../modules/ShutterflyModule/ShutterflyModule.py | 47 +------
conduit/modules/ShutterflyModule/shutterfly.glade | 145 --------------------
3 files changed, 6 insertions(+), 189 deletions(-)
diff --git a/conduit/modules/ShutterflyModule/Makefile.am b/conduit/modules/ShutterflyModule/Makefile.am
index e71bb6b..d1287c3 100644
--- a/conduit/modules/ShutterflyModule/Makefile.am
+++ b/conduit/modules/ShutterflyModule/Makefile.am
@@ -3,8 +3,5 @@ SUBDIRS = shutterfly
conduit_handlersdir = $(libdir)/conduit/modules/ShutterflyModule
conduit_handlers_PYTHON = ShutterflyModule.py
-conduit_handlers_DATA = shutterfly.glade
-EXTRA_DIST = shutterfly.glade
-
clean-local:
rm -rf *.pyc *.pyo
diff --git a/conduit/modules/ShutterflyModule/ShutterflyModule.py b/conduit/modules/ShutterflyModule/ShutterflyModule.py
index beefae7..10f0a8f 100644
--- a/conduit/modules/ShutterflyModule/ShutterflyModule.py
+++ b/conduit/modules/ShutterflyModule/ShutterflyModule.py
@@ -31,9 +31,11 @@ class ShutterflySink(Image.ImageSink):
def __init__(self, *args):
Image.ImageSink.__init__(self)
- self.username = ""
- self.password = ""
- self.album = ""
+ self.update_configuration(
+ username = "",
+ password = "",
+ album = ""
+ )
self.sapi = None
self.salbum = None
self.sphotos = None
@@ -114,44 +116,7 @@ class ShutterflySink(Image.ImageSink):
config.add_section('Saved photo settings')
config.add_item('Album', 'text',
config_name = 'album',
- )
-
- def configure_(self, window):
- """
- Configures the ShutterflySink
- """
- widget = Utils.dataprovider_glade_get_widget(
- __file__,
- "shutterfly.glade",
- "ShutterflySinkConfigDialog")
-
- # Get configuration widgets
- username = widget.get_widget("username")
- password = widget.get_widget("password")
- album = widget.get_widget("album")
-
- # Load the widgets with presets
- username.set_text(self.username)
- password.set_text(self.password)
- album.set_text(self.album)
-
- dlg = widget.get_widget("ShutterflySinkConfigDialog")
-
- response = Utils.run_dialog(dlg, window)
-
- if response == True:
- self.username = username.get_text()
- self.password = password.get_text()
- self.album = album.get_text()
-
- dlg.destroy()
-
- def get_configuration(self):
- return {
- "username" : self.username,
- "password" : self.password,
- "album" : self.album
- }
+ )
def is_configured(self, isSource, isTwoWay):
if len(self.username) < 1:
diff --git a/conduit/modules/ShutterflyModule/shutterfly.glade b/conduit/modules/ShutterflyModule/shutterfly.glade
deleted file mode 100644
index a57a374..0000000
--- a/conduit/modules/ShutterflyModule/shutterfly.glade
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
- <widget class="GtkDialog" id="ShutterflySinkConfigDialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Shutterfly</property>
- <property name="resizable">False</property>
- <property name="default_width">250</property>
- <property name="default_height">350</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="vbox30">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="label74">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Account Details</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label75">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Username:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="username">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label76">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Password:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="password">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label78">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Saved Photo Settings</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label77">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Album:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="album">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">9</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox12">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="button32">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="button33">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="response_id">-5</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]