Created SugarDownloadManager and ClipboardService's wrapper. Show and hide the frame when adding an object to the clipboard.
Tomeu Vizoso
18 years ago
parent
b9f75c1472
commit
a7e4092b0e
@ -1,46 +0,0 @@
|
|||||||
#ifndef __SUGAR_BROWSER_CHANDLER_H__
|
|
||||||
#define __SUGAR_BROWSER_CHANDLER_H__
|
|
||||||
|
|
||||||
#include <glib-object.h>
|
|
||||||
#include <glib.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
typedef struct _SugarBrowserChandler SugarBrowserChandler;
|
|
||||||
typedef struct _SugarBrowserChandlerClass SugarBrowserChandlerClass;
|
|
||||||
|
|
||||||
#define SUGAR_TYPE_BROWSER_CHANDLER (sugar_browser_chandler_get_type())
|
|
||||||
#define SUGAR_BROWSER_CHANDLER(object) (G_TYPE_CHECK_INSTANCE_CAST((object), SUGAR_TYPE_BROWSER_CHANDLER, SugarBrowserChandler))
|
|
||||||
#define SUGAR_BROWSER_CHANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SUGAR_TYPE_BROWSER_CHANDLER, SugarBrowserChandlerClass))
|
|
||||||
#define SUGAR_IS_BROWSER_CHANDLER(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), SUGAR_TYPE_BROWSER_CHANDLER))
|
|
||||||
#define SUGAR_IS_BROWSER_CHANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SUGAR_TYPE_BROWSER_CHANDLER))
|
|
||||||
#define SUGAR_BROWSER_CHANDLER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), SUGAR_TYPE_BROWSER_CHANDLER, SugarBrowserChandlerClass))
|
|
||||||
|
|
||||||
struct _SugarBrowserChandler {
|
|
||||||
GObject base_instance;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _SugarBrowserChandlerClass {
|
|
||||||
GObjectClass base_class;
|
|
||||||
|
|
||||||
void (* handle_content) (char *url, char *tmp_file_name);
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
GType sugar_browser_chandler_get_type (void);
|
|
||||||
SugarBrowserChandler *sugar_get_browser_chandler (void);
|
|
||||||
void sugar_browser_chandler_download_started (SugarBrowserChandler *chandler,
|
|
||||||
const char *url,
|
|
||||||
const char *mime_type,
|
|
||||||
const char *tmp_file_name);
|
|
||||||
void sugar_browser_chandler_download_completed (SugarBrowserChandler *chandler,
|
|
||||||
const char *tmp_file_name);
|
|
||||||
void sugar_browser_chandler_download_cancelled (SugarBrowserChandler *chandler,
|
|
||||||
const char *tmp_file_name);
|
|
||||||
void sugar_browser_chandler_update_progress (SugarBrowserChandler *chandler,
|
|
||||||
const char *tmp_file_name,
|
|
||||||
const int percent);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
#ifndef __SUGAR_DOWNLOAD_MANAGER_H__
|
||||||
|
#define __SUGAR_DOWNLOAD_MANAGER_H__
|
||||||
|
|
||||||
|
#include <glib-object.h>
|
||||||
|
#include <glib.h>
|
||||||
|
|
||||||
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
|
typedef struct _SugarDownloadManager SugarDownloadManager;
|
||||||
|
typedef struct _SugarDownloadManagerClass SugarDownloadManagerClass;
|
||||||
|
|
||||||
|
#define SUGAR_TYPE_DOWNLOAD_MANAGER (sugar_download_manager_get_type())
|
||||||
|
#define SUGAR_DOWNLOAD_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST((object), SUGAR_TYPE_DOWNLOAD_MANAGER, SugarDownloadManager))
|
||||||
|
#define SUGAR_DOWNLOAD_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SUGAR_TYPE_DOWNLOAD_MANAGER, SugarDownloadManagerClass))
|
||||||
|
#define SUGAR_IS_DOWNLOAD_MANAGER(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), SUGAR_TYPE_DOWNLOAD_MANAGER))
|
||||||
|
#define SUGAR_IS_DOWNLOAD_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SUGAR_TYPE_DOWNLOAD_MANAGER))
|
||||||
|
#define SUGAR_DOWNLOAD_MANAGER_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), SUGAR_TYPE_DOWNLOAD_MANAGER, SugarDownloadManagerClass))
|
||||||
|
|
||||||
|
struct _SugarDownloadManager {
|
||||||
|
GObject base_instance;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct _SugarDownloadManagerClass {
|
||||||
|
GObjectClass base_class;
|
||||||
|
|
||||||
|
void (* handle_content) (char *url, char *tmp_file_name);
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
GType sugar_download_manager_get_type(void);
|
||||||
|
|
||||||
|
SugarDownloadManager *sugar_get_download_manager(void);
|
||||||
|
|
||||||
|
void sugar_download_manager_download_started(
|
||||||
|
SugarDownloadManager *download_manager,
|
||||||
|
const char *url,
|
||||||
|
const char *mime_type,
|
||||||
|
const char *tmp_file_name);
|
||||||
|
|
||||||
|
void sugar_download_manager_download_completed(
|
||||||
|
SugarDownloadManager *download_manager,
|
||||||
|
const char *tmp_file_name);
|
||||||
|
|
||||||
|
void sugar_download_manager_download_cancelled(
|
||||||
|
SugarDownloadManager *download_manager,
|
||||||
|
const char *tmp_file_name);
|
||||||
|
|
||||||
|
void sugar_download_manager_update_progress(
|
||||||
|
SugarDownloadManager *download_manager,
|
||||||
|
const char *tmp_file_name,
|
||||||
|
const int percent);
|
||||||
|
|
||||||
|
G_END_DECLS
|
||||||
|
|
||||||
|
#endif
|
||||||
@ -0,0 +1,73 @@
|
|||||||
|
import dbus
|
||||||
|
import gobject
|
||||||
|
|
||||||
|
DBUS_SERVICE = "org.laptop.Clipboard"
|
||||||
|
DBUS_INTERFACE = "org.laptop.Clipboard"
|
||||||
|
DBUS_PATH = "/org/laptop/Clipboard"
|
||||||
|
|
||||||
|
class ClipboardService(gobject.GObject):
|
||||||
|
|
||||||
|
__gsignals__ = {
|
||||||
|
'object-added': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
|
||||||
|
([str, str])),
|
||||||
|
'object-deleted': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
|
||||||
|
([str])),
|
||||||
|
'object-state-updated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
|
||||||
|
([str, int])),
|
||||||
|
}
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
gobject.GObject.__init__(self)
|
||||||
|
|
||||||
|
self._dbus_service = None
|
||||||
|
bus = dbus.SessionBus()
|
||||||
|
bus.add_signal_receiver(self._name_owner_changed_cb,
|
||||||
|
signal_name="NameOwnerChanged",
|
||||||
|
dbus_interface="org.freedesktop.DBus")
|
||||||
|
# Try to register to ClipboardService, if we fail, we'll try later.
|
||||||
|
try:
|
||||||
|
self._connect_clipboard_signals()
|
||||||
|
except dbus.DBusException, exception:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def _connect_clipboard_signals(self):
|
||||||
|
bus = dbus.SessionBus()
|
||||||
|
proxy_obj = bus.get_object(DBUS_SERVICE, DBUS_PATH)
|
||||||
|
self._dbus_service = dbus.Interface(proxy_obj, DBUS_SERVICE)
|
||||||
|
self._dbus_service.connect_to_signal('object_added', self._object_added_cb)
|
||||||
|
self._dbus_service.connect_to_signal('object_deleted', self._object_deleted_cb)
|
||||||
|
self._dbus_service.connect_to_signal('object_state_updated',
|
||||||
|
self._object_state_updated_cb)
|
||||||
|
|
||||||
|
def _name_owner_changed_cb(self, name, old, new):
|
||||||
|
if name != DBUS_SERVICE:
|
||||||
|
return
|
||||||
|
|
||||||
|
if (not old and not len(old)) and (new and len(new)):
|
||||||
|
# ClipboardService started up
|
||||||
|
self._connect_clipboard_signals()
|
||||||
|
|
||||||
|
def _object_added_cb(self, mimeType, fileName):
|
||||||
|
self.emit('object-added', mimeType, fileName)
|
||||||
|
|
||||||
|
def _object_deleted_cb(self, fileName):
|
||||||
|
self.emit('object-deleted', fileName)
|
||||||
|
|
||||||
|
def _object_state_updated_cb(self, fileName, percent):
|
||||||
|
self.emit('object-state-updated', fileName, percent)
|
||||||
|
|
||||||
|
def add_object(self, mimeType, fileName):
|
||||||
|
self._dbus_service.add_object(mimeType, fileName)
|
||||||
|
|
||||||
|
def delete_object(self, fileName):
|
||||||
|
self._dbus_service.delete_object(fileName)
|
||||||
|
|
||||||
|
def update_object_state(self, fileName, percent):
|
||||||
|
self._dbus_service.update_object_state(fileName, percent)
|
||||||
|
|
||||||
|
_clipboard_service = None
|
||||||
|
def get_instance():
|
||||||
|
global _clipboard_service
|
||||||
|
if not _clipboard_service:
|
||||||
|
_clipboard_service = ClipboardService()
|
||||||
|
return _clipboard_service
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
sugardir = $(pythondir)/sugar/clipboard
|
||||||
|
sugar_PYTHON = \
|
||||||
|
__init__.py \
|
||||||
|
ClipboardService.py
|
||||||
|
|
||||||
Loading…
Reference in New Issue