Commit c8dd1110 authored by Jim Nelson's avatar Jim Nelson

#2536: Yandex.Fotki Web service support. Courtesy Evgeniy Polyakov.

parent e2d46534
......@@ -97,6 +97,7 @@ SRC_FILES = \
SlideshowPage.vala \
LibraryFiles.vala \
FlickrConnector.vala \
YandexConnector.vala \
Printing.vala \
Tag.vala \
TagPage.vala \
......@@ -155,7 +156,7 @@ RESOURCE_FILES = \
tags.ui \
trash.ui \
offline.ui \
media.ui \
yandex_publish_model.glade \
shotwell.glade
SYS_INTEGRATION_FILES = \
......@@ -274,7 +275,8 @@ EXT_PKGS = \
glib-2.0 \
libexif \
sqlite3 \
gexiv2
gexiv2 \
json-glib-1.0
LIBRAW_PKG = \
libraw
......
......@@ -19,6 +19,7 @@ Tobias Lott <tobias@lott.eu.org>
Rafael Monica <monraaf@gmail.com>
Jani Monoses <jani@ubuntu.com>
Paul Novak <pnovak@alumni.caltech.edu>
Evgeniy Polyakov <zbr@ioremap.net>
Martin Robinson <martin.james.robinson@gmail.com>
Elliott S <quantum.analyst@gmail.com>
Marcel Stimberg <stimberg@users.sourceforge.net>
......
......@@ -289,6 +289,21 @@ public class Config {
return get_string("/apps/shotwell/sharing/picasa/auth_token");
}
public string? get_publishing_string(string id, string key) {
return get_string(_("/apps/shotwell/sharing/%s/%s").printf(id, key));
}
public void set_publishing_string(string id, string key, string value) {
set_string(_("/apps/shotwell/sharing/%s/%s").printf(id, key), value);
}
public void unset_publishing_string(string id, string key) {
try {
client.recursive_unset(_("/apps/shotwell/sharing/%s/%s").printf(id, key), GConf.UnsetFlags.NAMES);
} catch (GLib.Error err) {
}
}
public bool set_printing_content_layout(int layout_code) {
return set_int("/apps/shotwell/printing/content_layout", layout_code + 1);
}
......
......@@ -1110,6 +1110,7 @@ public class ServiceFactory {
result += "Facebook";
result += "Flickr";
result += "Picasa Web Albums";
result += "Yandex.Fotki";
return result;
}
......@@ -1121,6 +1122,8 @@ public class ServiceFactory {
return new FlickrConnector.Interactor(host);
} else if (service_name == "Picasa Web Albums") {
return new PicasaConnector.Interactor(host);
} else if (service_name == "Yandex.Fotki") {
return new YandexConnector.Interactor(host);
} else {
error("ServiceInteractor: unsupported service '%s'", service_name);
}
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="publish_options_window">
<child>
<object class="GtkAlignment" id="alignment">
<property name="visible">True</property>
<property name="xalign">0.30000001192092896</property>
<property name="xscale">0.10000000149011612</property>
<property name="yscale">0.10000000149011612</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0.30000001192092896</property>
<property name="label" translatable="yes">_Albums (or write new):</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">album_list</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="ypad">6</property>
<property name="label" translatable="yes">Access _type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">access_type_list</property>
</object>
</child>
<child>
<object class="GtkComboBoxEntry" id="access_type_list">
<property name="visible">True</property>
<property name="model">liststore1</property>
<property name="active">0</property>
<property name="text_column">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_padding">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxEntry" id="album_list">
<property name="visible">True</property>
<property name="model">liststore2</property>
<property name="active">0</property>
<property name="text_column">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_padding">1</property>
</packing>
</child>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkCheckButton" id="disable_comments_check">
<property name="label" translatable="yes">Disable _comments</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.30000001192092896</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="padding">2</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="hide_original_check">
<property name="label" translatable="yes">_Forbid downloading original photo</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0.30000001192092896</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<property name="layout_style">spread</property>
<child>
<object class="GtkButton" id="logout_button">
<property name="label" translatable="yes">_Logout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="publish_button">
<property name="label" translatable="yes">_Publish</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="padding">12</property>
<property name="position">4</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name text -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Public</col>
</row>
<row>
<col id="0" translatable="yes">Friends</col>
</row>
<row>
<col id="0" translatable="yes">Private</col>
</row>
</data>
</object>
<object class="GtkListStore" id="liststore2">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
</columns>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment