diff --git a/.gitignore b/.gitignore index 9c9e259c..b67aaa03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *~ *.swp +*.swo .DS_Store *.exe *.exe.mdb diff --git a/Makefile.am b/Makefile.am index 4167d4a6..5c7798a8 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -basedirs = build SparkleLib SparkleLib/Git data po +basedirs = build SparkleLib SparkleLib/Git po SUBDIRS = $(basedirs) $(GUISUBDIRS) DIST_SUBDIRS = $(basedirs) SparkleShare diff --git a/data/html/Makefile.am b/SparkleShare/Common/HTML/Makefile.am similarity index 100% rename from data/html/Makefile.am rename to SparkleShare/Common/HTML/Makefile.am diff --git a/data/html/day-entry.html b/SparkleShare/Common/HTML/day-entry.html similarity index 100% rename from data/html/day-entry.html rename to SparkleShare/Common/HTML/day-entry.html diff --git a/data/html/event-entry.html b/SparkleShare/Common/HTML/event-entry.html similarity index 100% rename from data/html/event-entry.html rename to SparkleShare/Common/HTML/event-entry.html diff --git a/data/html/event-log.html b/SparkleShare/Common/HTML/event-log.html similarity index 100% rename from data/html/event-log.html rename to SparkleShare/Common/HTML/event-log.html diff --git a/data/html/jquery.js b/SparkleShare/Common/HTML/jquery.js similarity index 100% rename from data/html/jquery.js rename to SparkleShare/Common/HTML/jquery.js diff --git a/data/html/protocol-handler-test/add-to-sparkleshare-button.png b/SparkleShare/Common/HTML/protocol-handler-test/add-to-sparkleshare-button.png similarity index 100% rename from data/html/protocol-handler-test/add-to-sparkleshare-button.png rename to SparkleShare/Common/HTML/protocol-handler-test/add-to-sparkleshare-button.png diff --git a/data/html/protocol-handler-test/invite.xml b/SparkleShare/Common/HTML/protocol-handler-test/invite.xml similarity index 100% rename from data/html/protocol-handler-test/invite.xml rename to SparkleShare/Common/HTML/protocol-handler-test/invite.xml diff --git a/data/html/protocol-handler-test/protocol-handler-test.htm b/SparkleShare/Common/HTML/protocol-handler-test/protocol-handler-test.htm similarity index 100% rename from data/html/protocol-handler-test/protocol-handler-test.htm rename to SparkleShare/Common/HTML/protocol-handler-test/protocol-handler-test.htm diff --git a/SparkleShare/Common/Makefile.am b/SparkleShare/Common/Makefile.am new file mode 100644 index 00000000..2f972e5d --- /dev/null +++ b/SparkleShare/Common/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = HTML \ + Plugins \ + Pixmaps diff --git a/SparkleShare/Common/Pixmaps/Makefile.am b/SparkleShare/Common/Pixmaps/Makefile.am new file mode 100644 index 00000000..4b8fec4c --- /dev/null +++ b/SparkleShare/Common/Pixmaps/Makefile.am @@ -0,0 +1,20 @@ +dist_pixmaps_DATA = \ + tutorial-slide-4.png \ + side-splash.png \ + avatar-a.png \ + avatar-b.png \ + avatar-c.png \ + avatar-d.png \ + avatar-e.png \ + avatar-f.png \ + avatar-g.png \ + avatar-h.png \ + avatar-i.png \ + avatar-j.png \ + avatar-k.png \ + about.png + +pixmapsdir = $(pkgdatadir)/pixmaps/ + +MAINTAINERCLEANFILES = \ + Makefile.in diff --git a/SparkleShare/Pixmaps/Sources/about-dialog.svg b/SparkleShare/Common/Pixmaps/Sources/about-dialog.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/about-dialog.svg rename to SparkleShare/Common/Pixmaps/Sources/about-dialog.svg diff --git a/SparkleShare/Pixmaps/Sources/actions.svg b/SparkleShare/Common/Pixmaps/Sources/actions.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/actions.svg rename to SparkleShare/Common/Pixmaps/Sources/actions.svg diff --git a/SparkleShare/Pixmaps/Sources/add-project-dialog.svg b/SparkleShare/Common/Pixmaps/Sources/add-project-dialog.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/add-project-dialog.svg rename to SparkleShare/Common/Pixmaps/Sources/add-project-dialog.svg diff --git a/SparkleShare/Pixmaps/Sources/avatars.svg b/SparkleShare/Common/Pixmaps/Sources/avatars.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/avatars.svg rename to SparkleShare/Common/Pixmaps/Sources/avatars.svg diff --git a/SparkleShare/Pixmaps/Sources/side-splash.svg b/SparkleShare/Common/Pixmaps/Sources/side-splash.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/side-splash.svg rename to SparkleShare/Common/Pixmaps/Sources/side-splash.svg diff --git a/SparkleShare/Pixmaps/Sources/sparkleshare-android.svg b/SparkleShare/Common/Pixmaps/Sources/sparkleshare-android.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/sparkleshare-android.svg rename to SparkleShare/Common/Pixmaps/Sources/sparkleshare-android.svg diff --git a/SparkleShare/Pixmaps/Sources/sparkleshare-gnome.svg b/SparkleShare/Common/Pixmaps/Sources/sparkleshare-gnome.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/sparkleshare-gnome.svg rename to SparkleShare/Common/Pixmaps/Sources/sparkleshare-gnome.svg diff --git a/SparkleShare/Pixmaps/Sources/sparkleshare-mac.svg b/SparkleShare/Common/Pixmaps/Sources/sparkleshare-mac.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/sparkleshare-mac.svg rename to SparkleShare/Common/Pixmaps/Sources/sparkleshare-mac.svg diff --git a/SparkleShare/Pixmaps/Sources/sparkleshare-mist.svg b/SparkleShare/Common/Pixmaps/Sources/sparkleshare-mist.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/sparkleshare-mist.svg rename to SparkleShare/Common/Pixmaps/Sources/sparkleshare-mist.svg diff --git a/SparkleShare/Pixmaps/Sources/sparkleshare-windows.svg b/SparkleShare/Common/Pixmaps/Sources/sparkleshare-windows.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/sparkleshare-windows.svg rename to SparkleShare/Common/Pixmaps/Sources/sparkleshare-windows.svg diff --git a/SparkleShare/Pixmaps/Sources/ssnet.svg b/SparkleShare/Common/Pixmaps/Sources/ssnet.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/ssnet.svg rename to SparkleShare/Common/Pixmaps/Sources/ssnet.svg diff --git a/SparkleShare/Pixmaps/Sources/tutorial.svg b/SparkleShare/Common/Pixmaps/Sources/tutorial.svg similarity index 100% rename from SparkleShare/Pixmaps/Sources/tutorial.svg rename to SparkleShare/Common/Pixmaps/Sources/tutorial.svg diff --git a/data/about.png b/SparkleShare/Common/Pixmaps/about.png similarity index 100% rename from data/about.png rename to SparkleShare/Common/Pixmaps/about.png diff --git a/data/avatar-a.png b/SparkleShare/Common/Pixmaps/avatar-a.png similarity index 100% rename from data/avatar-a.png rename to SparkleShare/Common/Pixmaps/avatar-a.png diff --git a/data/avatar-b.png b/SparkleShare/Common/Pixmaps/avatar-b.png similarity index 100% rename from data/avatar-b.png rename to SparkleShare/Common/Pixmaps/avatar-b.png diff --git a/data/avatar-c.png b/SparkleShare/Common/Pixmaps/avatar-c.png similarity index 100% rename from data/avatar-c.png rename to SparkleShare/Common/Pixmaps/avatar-c.png diff --git a/data/avatar-d.png b/SparkleShare/Common/Pixmaps/avatar-d.png similarity index 100% rename from data/avatar-d.png rename to SparkleShare/Common/Pixmaps/avatar-d.png diff --git a/data/avatar-e.png b/SparkleShare/Common/Pixmaps/avatar-e.png similarity index 100% rename from data/avatar-e.png rename to SparkleShare/Common/Pixmaps/avatar-e.png diff --git a/data/avatar-f.png b/SparkleShare/Common/Pixmaps/avatar-f.png similarity index 100% rename from data/avatar-f.png rename to SparkleShare/Common/Pixmaps/avatar-f.png diff --git a/data/avatar-g.png b/SparkleShare/Common/Pixmaps/avatar-g.png similarity index 100% rename from data/avatar-g.png rename to SparkleShare/Common/Pixmaps/avatar-g.png diff --git a/data/avatar-h.png b/SparkleShare/Common/Pixmaps/avatar-h.png similarity index 100% rename from data/avatar-h.png rename to SparkleShare/Common/Pixmaps/avatar-h.png diff --git a/data/avatar-i.png b/SparkleShare/Common/Pixmaps/avatar-i.png similarity index 100% rename from data/avatar-i.png rename to SparkleShare/Common/Pixmaps/avatar-i.png diff --git a/data/avatar-j.png b/SparkleShare/Common/Pixmaps/avatar-j.png similarity index 100% rename from data/avatar-j.png rename to SparkleShare/Common/Pixmaps/avatar-j.png diff --git a/data/avatar-k.png b/SparkleShare/Common/Pixmaps/avatar-k.png similarity index 100% rename from data/avatar-k.png rename to SparkleShare/Common/Pixmaps/avatar-k.png diff --git a/data/side-splash.png b/SparkleShare/Common/Pixmaps/side-splash.png similarity index 100% rename from data/side-splash.png rename to SparkleShare/Common/Pixmaps/side-splash.png diff --git a/data/tutorial-slide-4.png b/SparkleShare/Common/Pixmaps/tutorial-slide-4.png similarity index 100% rename from data/tutorial-slide-4.png rename to SparkleShare/Common/Pixmaps/tutorial-slide-4.png diff --git a/data/plugins/Makefile.am b/SparkleShare/Common/Plugins/Makefile.am similarity index 100% rename from data/plugins/Makefile.am rename to SparkleShare/Common/Plugins/Makefile.am diff --git a/data/plugins/bitbucket.png b/SparkleShare/Common/Plugins/bitbucket.png similarity index 100% rename from data/plugins/bitbucket.png rename to SparkleShare/Common/Plugins/bitbucket.png diff --git a/SparkleShare/Common/Plugins/bitbucket.xml b/SparkleShare/Common/Plugins/bitbucket.xml new file mode 100644 index 00000000..9d9860a7 --- /dev/null +++ b/SparkleShare/Common/Plugins/bitbucket.xml @@ -0,0 +1,54 @@ + + + + + Bitbucket + Bitbucket + Bitbucket + Bitbucket + Bitbucket + Bitbucket + Bitbucket + Bitbucket + Bitbucket + Bitbucket + Bitbucket + 小桶 + Free code hosting for Git and Mercurial + Freies Code-Hosting für Git und Mercurial + Δωρεάν φιλοξενία κώδικα για Git και Mercurial + Alojamiento gratuito de código fuente para Git y Mercurial + Hébergement gratuit de code pour Git et Mercurial + Hosting gratuito di codice per Git e Mercurial + Gratis hosting voor Git en Mercurial + Darmowe utrzymywanie kodu dla projektów zarządzanych przez git oraz Mercurial + Hospedagem gratuita de código para Git e Mercurial + Бесплатный хостинг проектов и их совместной разработки, основанный на системе контроля версий Mercurial и Git + Gratis källkodslagring för Git och Mercurial + 免费的Git与Mercurial代码托管 + bitbucket.png + Git + 97:8c:1b:f2:6f:14:6b:5c:3b:ec:aa:46:46:74:7c:40 + +
+ ssh://git@bitbucket.org/ + +
+ + + /username/project + /username/project + /username/project + /usuario/proyecto + /nom-d-utilisateur/projet + /nome-utente/progetto + /gebruikersnaam/project + /nazwa uzytkownika/projekt + /usuário/projeto + /username/project + /användare/projekt + /username/project + True + + + \ No newline at end of file diff --git a/data/plugins/bitbucket.xml.in b/SparkleShare/Common/Plugins/bitbucket.xml.in similarity index 100% rename from data/plugins/bitbucket.xml.in rename to SparkleShare/Common/Plugins/bitbucket.xml.in diff --git a/data/plugins/build.cmd b/SparkleShare/Common/Plugins/build.cmd similarity index 100% rename from data/plugins/build.cmd rename to SparkleShare/Common/Plugins/build.cmd diff --git a/data/plugins/github.png b/SparkleShare/Common/Plugins/github.png similarity index 100% rename from data/plugins/github.png rename to SparkleShare/Common/Plugins/github.png diff --git a/SparkleShare/Common/Plugins/github.xml b/SparkleShare/Common/Plugins/github.xml new file mode 100644 index 00000000..37aac562 --- /dev/null +++ b/SparkleShare/Common/Plugins/github.xml @@ -0,0 +1,43 @@ + + + + + Github + Github + Github + Github + Github + Github + Github + Github + Github + Github + Github + Github + Github + Collaborate on projects hosted on Github + github.png + Git + 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48 + +
+ ssh://git@github.com/ + +
+ + + /username/project + /username/project + /username/project + /usuario/proyecto + /nom-d-utilisateur/projet + /nome-utente/progetto + /gebruikersnaam/project + /nazwa uzytkownika/projekt + /usuário/projeto + /username/project + /användare/projekt + /username/project + + + \ No newline at end of file diff --git a/data/plugins/github.xml.in b/SparkleShare/Common/Plugins/github.xml.in similarity index 100% rename from data/plugins/github.xml.in rename to SparkleShare/Common/Plugins/github.xml.in diff --git a/data/plugins/gitorious.png b/SparkleShare/Common/Plugins/gitorious.png similarity index 100% rename from data/plugins/gitorious.png rename to SparkleShare/Common/Plugins/gitorious.png diff --git a/SparkleShare/Common/Plugins/gitorious.xml b/SparkleShare/Common/Plugins/gitorious.xml new file mode 100644 index 00000000..a441e6e2 --- /dev/null +++ b/SparkleShare/Common/Plugins/gitorious.xml @@ -0,0 +1,70 @@ + + + + + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + גיטוריוס + Gitorious + Gitorius + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Gitorious + Гиториус + Gitorious + Gitorious + Gitorious + Gitorious + Open source infrastructure for hosting open source projects + Quelloffene Infrastruktur zum hosten von quelloffenen Projekten + Open source υποδομή για φιλοξενία open source projects + Infraestructura de código libre para almacenar proyectos de código libre + Infrastructure open source d'hébergement de projets open source + Infrastruttura Open sourc per lo hosting di progetti open source + Opensource infrastructuur voor het hosten van opensource projecten. + Infrastruktura o otwartym kodzie źródłowym dla projektów o otwartym kodzie źródłowym + Infra-estrutura de código aberto para hospedagem de projetos com código aberto + Open source инфраструктура для размещения ваших open source проектов + Infrastruktur för delning av öppen källkod-projekt + 托管开源项目的开源架构 + gitorious.png + Git + 7e:af:8d:ec:f0:39:5e:ba:52:16:ce:19:fa:d4:b8:7d + +
+ ssh://git@gitorious.org/ + +
+ + + /project/repository + /Projekt/Ablage + /project/repository + /proyecto/repositorio + /projet/depot + /progetto/repository + /project/repository + /projekt/repozytorium + /projeto/repositório + /project/repository + /projekt/arkiv + /project/repository + + + \ No newline at end of file diff --git a/data/plugins/gitorious.xml.in b/SparkleShare/Common/Plugins/gitorious.xml.in similarity index 100% rename from data/plugins/gitorious.xml.in rename to SparkleShare/Common/Plugins/gitorious.xml.in diff --git a/data/plugins/gnome.png b/SparkleShare/Common/Plugins/gnome.png similarity index 100% rename from data/plugins/gnome.png rename to SparkleShare/Common/Plugins/gnome.png diff --git a/SparkleShare/Common/Plugins/gnome.xml b/SparkleShare/Common/Plugins/gnome.xml new file mode 100644 index 00000000..909b9617 --- /dev/null +++ b/SparkleShare/Common/Plugins/gnome.xml @@ -0,0 +1,69 @@ + + + + + The GNOME Project + مشروع جنوم. + Проектът GNOME + El projecte GNOME + Projekt GNOME + GNOME-projektet + Das GNOME Projekt + Το GNOME Project + La GNOME-projekto + El Proyecto GNOME + GNOME-projekti + Le projet GNOME + פרוייקט גנום + A GNOME Project + The GNOME Project + GNOMEプロジェクト + Het GNOME Project + GNOME-prosjektet + GNOME Prosjektet + Projekt GNOME + O projeto GNOME + The GNOME Project + Projekt GNOME + Пројекат ГНОМ + GNOME-projektet + Проект GNOME + GMOME项目 + GNOME 專案 + A free and easy interface for your computer + Eine freie und einfache Schnittstelle für deinen Computer + Ένα ελεύθερο και απλό interface για τον υπολογιστή σου + Una interfaz libre y sencilla para tu ordenador + Une interface facile et gratuite pour votre ordinateur + Un'interfaccia gratuita e facile per il tuo computer + Een gratis en gemakkelijke interface voor uw computer + Wolny i prosty interfejs dla komputerów + Uma interface fácil e gratuita para o seu computador + Бесплатный и простой интерфейс для вашего компьютера + Ett gratis och enkelt gränssnitt för din dator + 为你的计算机提供一个免费并且简单的接口 + gnome.png + Git + 00:39:fd:1a:a4:2c:6b:28:b8:2e:95:31:c2:90:72:03 + +
+ ssh://git@gnome.org/ + +
+ + + /project + /Projekt + /project + /proyecto + /projet + /progetto + /project + /project + /projeto + /project + /projekt + /project + + + \ No newline at end of file diff --git a/data/plugins/gnome.xml.in b/SparkleShare/Common/Plugins/gnome.xml.in similarity index 100% rename from data/plugins/gnome.xml.in rename to SparkleShare/Common/Plugins/gnome.xml.in diff --git a/data/plugins/own-server.png b/SparkleShare/Common/Plugins/own-server.png similarity index 100% rename from data/plugins/own-server.png rename to SparkleShare/Common/Plugins/own-server.png diff --git a/SparkleShare/Common/Plugins/own-server.xml b/SparkleShare/Common/Plugins/own-server.xml new file mode 100644 index 00000000..d0cd0647 --- /dev/null +++ b/SparkleShare/Common/Plugins/own-server.xml @@ -0,0 +1,54 @@ + + + + + On my own server + Auf meinem eigenen Server + Στον δικό μου server + En mi propio servidor + Mon propre serveur + שרת משלי + Il mio server + Op mijn eigen server + Na własnym serwerze + Em meu próprio servidor + Мой личный сервер + På min egen server + 拥有你自己的服务器 + Everything under my control + Alles unter meiner Kontrolle + Όλα κάτω απ' τον δικό μου έλεγχο + Todo bajo mi control + Tout est sous mon contrôle + הכל תחת שליטתי + Tutto sotto il mio controllo + Alles onder mijn controle + Wszystko pod własną kontrolą + Tudo sob meu controle + Всё под моим контролем + Allting under min kontroll + 一切尽在你的掌控 + own-server.png + Git + +
+ + [user@]hostname[:port] +
+ + + /path/to/project + /Pfad/zum/Projekt + /path/to/project + /ruta/al/proyecto + /chemin/du/projet + /percorso/per/progetto + /pad/naar/project + /ścieżka/do/projektu + /caminho/para/projeto + /path/to/project + /sökväg/till/projekt + /path/to/project + + + \ No newline at end of file diff --git a/data/plugins/own-server.xml.in b/SparkleShare/Common/Plugins/own-server.xml.in similarity index 100% rename from data/plugins/own-server.xml.in rename to SparkleShare/Common/Plugins/own-server.xml.in diff --git a/data/plugins/parse_plugins.xsl b/SparkleShare/Common/Plugins/parse_plugins.xsl similarity index 100% rename from data/plugins/parse_plugins.xsl rename to SparkleShare/Common/Plugins/parse_plugins.xsl diff --git a/data/plugins/ssnet.png b/SparkleShare/Common/Plugins/ssnet.png similarity index 100% rename from data/plugins/ssnet.png rename to SparkleShare/Common/Plugins/ssnet.png diff --git a/SparkleShare/Common/Plugins/ssnet.xml b/SparkleShare/Common/Plugins/ssnet.xml new file mode 100644 index 00000000..8d4ff150 --- /dev/null +++ b/SparkleShare/Common/Plugins/ssnet.xml @@ -0,0 +1,30 @@ + + + + + SparkleShare.Net + The easiest way to share projects with SparkleShare + ssnet.png + Git + +
+ ssh://storage@sparkleshare.net/ + +
+ + + /username/project + /username/project + /username/project + /usuario/proyecto + /nom-d-utilisateur/projet + /nome-utente/progetto + /gebruikersnaam/project + /nazwa uzytkownika/projekt + /usuário/projeto + /username/project + /användare/projekt + /username/project + + + \ No newline at end of file diff --git a/data/plugins/ssnet.xml.in b/SparkleShare/Common/Plugins/ssnet.xml.in similarity index 100% rename from data/plugins/ssnet.xml.in rename to SparkleShare/Common/Plugins/ssnet.xml.in diff --git a/SparkleShare/Linux/Makefile.am b/SparkleShare/Linux/Makefile.am index b03141e6..bd6e14e5 100644 --- a/SparkleShare/Linux/Makefile.am +++ b/SparkleShare/Linux/Makefile.am @@ -1,4 +1,5 @@ -SUBDIRS = Nautilus +SUBDIRS = Nautilus \ + Pixmaps ASSEMBLY = SparkleShare TARGET = exe diff --git a/SparkleShare/Linux/Pixmaps/Makefile.am b/SparkleShare/Linux/Pixmaps/Makefile.am new file mode 100755 index 00000000..e3bb71d8 --- /dev/null +++ b/SparkleShare/Linux/Pixmaps/Makefile.am @@ -0,0 +1,11 @@ +SUBDIRS = icons + +dist_pixmaps_DATA = \ + tutorial-slide-1.png \ + tutorial-slide-2.png \ + tutorial-slide-3.png + +pixmapsdir = $(pkgdatadir)/pixmaps/ + +MAINTAINERCLEANFILES = \ + Makefile.in diff --git a/SparkleShare/Linux/Pixmaps/icons/Makefile.am b/SparkleShare/Linux/Pixmaps/icons/Makefile.am new file mode 100755 index 00000000..841fb80b --- /dev/null +++ b/SparkleShare/Linux/Pixmaps/icons/Makefile.am @@ -0,0 +1,49 @@ +theme = hicolor +system_themedir = $(datadir)/icons/$(theme) +app_themedir = $(pkgdatadir)/icons/$(theme) + +system_theme_icons = \ + apps,folder-sparkleshare-16.png \ + apps,folder-sparkleshare-22.png \ + apps,folder-sparkleshare-24.png \ + apps,folder-sparkleshare-256.png \ + apps,folder-sparkleshare-32.png \ + apps,folder-sparkleshare-48.png + +app_theme_icons = \ + animations,process-working-22.png \ + places,folder-sparkleshare-16.png \ + places,folder-sparkleshare-22.png \ + places,folder-sparkleshare-24.png \ + places,folder-sparkleshare-256.png \ + places,folder-sparkleshare-32.png \ + places,folder-sparkleshare-48.png \ + status,process-syncing-i-24.png \ + status,process-syncing-ii-24.png \ + status,process-syncing-iii-24.png \ + status,process-syncing-iiii-24.png \ + status,process-syncing-iiiii-24.png \ + status,process-syncing-error-24.png \ + status,document-added-12.png \ + status,document-edited-12.png \ + status,document-deleted-12.png \ + status,document-moved-12.png \ + status,list-point-16.png + +install_icon_exec = $(top_srcdir)/build/icon-theme-installer \ + -t "$(theme)" \ + -s "$(srcdir)" \ + -d "x$(DESTDIR)" \ + -m "$(mkinstalldirs)" \ + -x "$(INSTALL_DATA)" + +install-data-local: + @-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons) + @-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons) + +uninstall-hook: + @-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons) + @-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons) + +MAINTAINERCLEANFILES = Makefile.in +EXTRA_DIST = $(wildcard *.png *.svg) diff --git a/data/icons/document-added-12.png b/SparkleShare/Linux/Pixmaps/icons/document-added-12.png similarity index 100% rename from data/icons/document-added-12.png rename to SparkleShare/Linux/Pixmaps/icons/document-added-12.png diff --git a/data/icons/document-deleted-12.png b/SparkleShare/Linux/Pixmaps/icons/document-deleted-12.png similarity index 100% rename from data/icons/document-deleted-12.png rename to SparkleShare/Linux/Pixmaps/icons/document-deleted-12.png diff --git a/data/icons/document-edited-12.png b/SparkleShare/Linux/Pixmaps/icons/document-edited-12.png similarity index 100% rename from data/icons/document-edited-12.png rename to SparkleShare/Linux/Pixmaps/icons/document-edited-12.png diff --git a/data/icons/document-moved-12.png b/SparkleShare/Linux/Pixmaps/icons/document-moved-12.png similarity index 100% rename from data/icons/document-moved-12.png rename to SparkleShare/Linux/Pixmaps/icons/document-moved-12.png diff --git a/data/icons/folder-sparkleshare-16.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-16.png similarity index 100% rename from data/icons/folder-sparkleshare-16.png rename to SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-16.png diff --git a/data/icons/folder-sparkleshare-22.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-22.png similarity index 100% rename from data/icons/folder-sparkleshare-22.png rename to SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-22.png diff --git a/data/icons/folder-sparkleshare-24.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-24.png similarity index 100% rename from data/icons/folder-sparkleshare-24.png rename to SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-24.png diff --git a/data/icons/folder-sparkleshare-256.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-256.png similarity index 100% rename from data/icons/folder-sparkleshare-256.png rename to SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-256.png diff --git a/data/icons/folder-sparkleshare-32.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-32.png similarity index 100% rename from data/icons/folder-sparkleshare-32.png rename to SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-32.png diff --git a/data/icons/folder-sparkleshare-48.png b/SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-48.png similarity index 100% rename from data/icons/folder-sparkleshare-48.png rename to SparkleShare/Linux/Pixmaps/icons/folder-sparkleshare-48.png diff --git a/data/icons/list-point-16.png b/SparkleShare/Linux/Pixmaps/icons/list-point-16.png similarity index 100% rename from data/icons/list-point-16.png rename to SparkleShare/Linux/Pixmaps/icons/list-point-16.png diff --git a/data/icons/sparkleshare-syncing-error-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-24.png similarity index 100% rename from data/icons/sparkleshare-syncing-error-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-error-24.png diff --git a/data/icons/sparkleshare-syncing-error-mono-dark-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-mono-dark-24.png similarity index 100% rename from data/icons/sparkleshare-syncing-error-mono-dark-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-error-mono-dark-24.png diff --git a/data/icons/sparkleshare-syncing-error-mono-light-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-mono-light-24.png similarity index 100% rename from data/icons/sparkleshare-syncing-error-mono-light-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-error-mono-light-24.png diff --git a/data/icons/process-syncing-sparkleshare-i-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-i-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-i-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-i-24.png diff --git a/data/icons/process-syncing-sparkleshare-ii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-ii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-ii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-ii-24.png diff --git a/data/icons/process-syncing-sparkleshare-iii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-iii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-iii-24.png diff --git a/data/icons/process-syncing-sparkleshare-iiii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iiii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-iiii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-iiii-24.png diff --git a/data/icons/process-syncing-sparkleshare-iiiii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-iiiii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-iiiii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-iiiii-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-i-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-i-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-dark-i-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-i-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-ii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-ii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-dark-ii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-ii-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-iii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-dark-iii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iii-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-iiii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iiii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-dark-iiii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iiii-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-dark-iiiii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iiiii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-dark-iiiii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iiiii-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-light-i-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-i-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-light-i-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-i-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-light-ii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-ii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-light-ii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-ii-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-light-iii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-light-iii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iii-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-light-iiii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iiii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-light-iiii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iiii-24.png diff --git a/data/icons/process-syncing-sparkleshare-mono-light-iiiii-24.png b/SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iiiii-24.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-mono-light-iiiii-24.png rename to SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iiiii-24.png diff --git a/data/icons/process-working-22.png b/SparkleShare/Linux/Pixmaps/icons/process-working-22.png similarity index 100% rename from data/icons/process-working-22.png rename to SparkleShare/Linux/Pixmaps/icons/process-working-22.png diff --git a/data/tutorial-slide-1.png b/SparkleShare/Linux/Pixmaps/tutorial-slide-1.png similarity index 100% rename from data/tutorial-slide-1.png rename to SparkleShare/Linux/Pixmaps/tutorial-slide-1.png diff --git a/data/tutorial-slide-2.png b/SparkleShare/Linux/Pixmaps/tutorial-slide-2.png similarity index 100% rename from data/tutorial-slide-2.png rename to SparkleShare/Linux/Pixmaps/tutorial-slide-2.png diff --git a/data/tutorial-slide-3.png b/SparkleShare/Linux/Pixmaps/tutorial-slide-3.png similarity index 100% rename from data/tutorial-slide-3.png rename to SparkleShare/Linux/Pixmaps/tutorial-slide-3.png diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am index 26117920..79812a57 100755 --- a/SparkleShare/Makefile.am +++ b/SparkleShare/Makefile.am @@ -1,4 +1,5 @@ -SUBDIRS = Linux +SUBDIRS = Linux \ + Common ASSEMBLY = SparkleShare TARGET = exe diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index 3a17c6cc..ba6316ad 100644 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -274,7 +274,7 @@ namespace SparkleShare { public void UIHasLoaded () { - if (!FirstRun) + if (FirstRun) ShowSetupWindow (PageType.Setup); else new Thread (new ThreadStart (PopulateRepositories)).Start (); diff --git a/data/icons/folder-windows-16.png b/SparkleShare/Windows/Pixmaps/folder.png similarity index 100% rename from data/icons/folder-windows-16.png rename to SparkleShare/Windows/Pixmaps/folder.png diff --git a/data/icons/sparkleshare-syncing-error-windows.png b/SparkleShare/Windows/Pixmaps/process-syncing-error.png similarity index 100% rename from data/icons/sparkleshare-syncing-error-windows.png rename to SparkleShare/Windows/Pixmaps/process-syncing-error.png diff --git a/data/icons/process-syncing-sparkleshare-windows-i.png b/SparkleShare/Windows/Pixmaps/process-syncing-i.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-windows-i.png rename to SparkleShare/Windows/Pixmaps/process-syncing-i.png diff --git a/data/icons/process-syncing-sparkleshare-windows-ii.png b/SparkleShare/Windows/Pixmaps/process-syncing-ii.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-windows-ii.png rename to SparkleShare/Windows/Pixmaps/process-syncing-ii.png diff --git a/data/icons/process-syncing-sparkleshare-windows-iii.png b/SparkleShare/Windows/Pixmaps/process-syncing-iii.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-windows-iii.png rename to SparkleShare/Windows/Pixmaps/process-syncing-iii.png diff --git a/data/icons/process-syncing-sparkleshare-windows-iiii.png b/SparkleShare/Windows/Pixmaps/process-syncing-iiii.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-windows-iiii.png rename to SparkleShare/Windows/Pixmaps/process-syncing-iiii.png diff --git a/data/icons/process-syncing-sparkleshare-windows-iiiii.png b/SparkleShare/Windows/Pixmaps/process-syncing-iiiii.png similarity index 100% rename from data/icons/process-syncing-sparkleshare-windows-iiiii.png rename to SparkleShare/Windows/Pixmaps/process-syncing-iiiii.png diff --git a/data/icons/sparkleshare.ico b/SparkleShare/Windows/Pixmaps/sparkleshare-app.ico similarity index 100% rename from data/icons/sparkleshare.ico rename to SparkleShare/Windows/Pixmaps/sparkleshare-app.ico diff --git a/data/icons/folder-sparkleshare-windows-16.png b/SparkleShare/Windows/Pixmaps/sparkleshare-folder.png similarity index 100% rename from data/icons/folder-sparkleshare-windows-16.png rename to SparkleShare/Windows/Pixmaps/sparkleshare-folder.png diff --git a/data/tutorial-slide-1-windows.png b/SparkleShare/Windows/Pixmaps/tutorial-slide-1.png similarity index 100% rename from data/tutorial-slide-1-windows.png rename to SparkleShare/Windows/Pixmaps/tutorial-slide-1.png diff --git a/data/tutorial-slide-2-windows.png b/SparkleShare/Windows/Pixmaps/tutorial-slide-2.png similarity index 100% rename from data/tutorial-slide-2-windows.png rename to SparkleShare/Windows/Pixmaps/tutorial-slide-2.png diff --git a/data/tutorial-slide-3-windows.png b/SparkleShare/Windows/Pixmaps/tutorial-slide-3.png similarity index 100% rename from data/tutorial-slide-3-windows.png rename to SparkleShare/Windows/Pixmaps/tutorial-slide-3.png diff --git a/configure.ac b/configure.ac index f28dca06..d937d0a3 100755 --- a/configure.ac +++ b/configure.ac @@ -145,15 +145,17 @@ build/Makefile build/m4/Makefile build/m4/shave/shave build/m4/shave/shave-libtool -data/Makefile -data/icons/Makefile -data/html/Makefile -data/plugins/Makefile SparkleLib/AssemblyInfo.cs SparkleLib/Defines.cs SparkleLib/Makefile SparkleLib/Git/Makefile +SparkleShare/Common/Makefile +SparkleShare/Common/HTML/Makefile +SparkleShare/Common/Plugins/Makefile +SparkleShare/Common/Pixmaps/Makefile SparkleShare/Linux/Makefile +SparkleShare/Linux/Pixmaps/Makefile +SparkleShare/Linux/Pixmaps/icons/Makefile SparkleShare/Linux/sparkleshare SparkleShare/Linux/Nautilus/Makefile SparkleShare/Linux/Nautilus/sparkleshare-nautilus-extension.py diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100755 index cf1520b3..00000000 --- a/data/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -SUBDIRS = \ - icons \ - html \ - plugins - -dist_pixmaps_DATA = \ - side-splash.png \ - tutorial-slide-1.png \ - tutorial-slide-2.png \ - tutorial-slide-3.png \ - tutorial-slide-4.png \ - avatar-a.png \ - avatar-b.png \ - avatar-c.png \ - avatar-d.png \ - avatar-e.png \ - avatar-f.png \ - avatar-g.png \ - avatar-h.png \ - avatar-i.png \ - avatar-j.png \ - avatar-k.png \ - about.png - -pixmapsdir = $(pkgdatadir)/pixmaps/ - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100755 index 1e63fee0..00000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -theme = hicolor -system_themedir = $(datadir)/icons/$(theme) -app_themedir = $(pkgdatadir)/icons/$(theme) - -system_theme_icons = \ - apps,folder-sparkleshare-16.png \ - apps,folder-sparkleshare-22.png \ - apps,folder-sparkleshare-24.png \ - apps,folder-sparkleshare-256.png \ - apps,folder-sparkleshare-32.png \ - apps,folder-sparkleshare-48.png \ - status,process-syncing-sparkleshare-i-24.png \ - status,process-syncing-sparkleshare-ii-24.png \ - status,process-syncing-sparkleshare-iii-24.png \ - status,process-syncing-sparkleshare-iiii-24.png \ - status,process-syncing-sparkleshare-iiiii-24.png - -app_theme_icons = \ - animations,process-syncing-sparkleshare-24.png \ - animations,process-working-22.png \ - places,folder-sparkleshare-16.png \ - places,folder-sparkleshare-22.png \ - places,folder-sparkleshare-24.png \ - places,folder-sparkleshare-256.png \ - places,folder-sparkleshare-32.png \ - places,folder-sparkleshare-48.png \ - status,sparkleshare-syncing-error-24.png \ - status,document-added-12.png \ - status,document-edited-12.png \ - status,document-deleted-12.png \ - status,document-moved-12.png \ - status,dialog-error-16.png \ - status,list-point-16.png \ - status,dialog-error-24.png - -install_icon_exec = $(top_srcdir)/build/icon-theme-installer \ - -t "$(theme)" \ - -s "$(srcdir)" \ - -d "x$(DESTDIR)" \ - -m "$(mkinstalldirs)" \ - -x "$(INSTALL_DATA)" - -install-data-local: - @-$(install_icon_exec) -i -b "$(system_themedir)" $(system_theme_icons) - @-$(install_icon_exec) -i -b "$(app_themedir)" $(app_theme_icons) - -uninstall-hook: - @-$(install_icon_exec) -u -b "$(system_themedir)" $(system_theme_icons) - @-$(install_icon_exec) -u -b "$(app_themedir)" $(app_theme_icons) - -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = $(wildcard *.png *.svg) diff --git a/data/icons/dialog-error-16.png b/data/icons/dialog-error-16.png deleted file mode 100755 index 0b0d8bee..00000000 Binary files a/data/icons/dialog-error-16.png and /dev/null differ diff --git a/data/icons/dialog-error-24.png b/data/icons/dialog-error-24.png deleted file mode 100755 index 9821d780..00000000 Binary files a/data/icons/dialog-error-24.png and /dev/null differ diff --git a/data/icons/process-syncing-sparkleshare-24.png b/data/icons/process-syncing-sparkleshare-24.png deleted file mode 100755 index 632a3e26..00000000 Binary files a/data/icons/process-syncing-sparkleshare-24.png and /dev/null differ diff --git a/data/icons/sparkleshare-android-36.png b/data/icons/sparkleshare-android-36.png deleted file mode 100644 index 84bf2bb9..00000000 Binary files a/data/icons/sparkleshare-android-36.png and /dev/null differ diff --git a/data/icons/sparkleshare-android-48.png b/data/icons/sparkleshare-android-48.png deleted file mode 100644 index e858d598..00000000 Binary files a/data/icons/sparkleshare-android-48.png and /dev/null differ diff --git a/data/icons/sparkleshare-android-72.png b/data/icons/sparkleshare-android-72.png deleted file mode 100644 index 49d147ef..00000000 Binary files a/data/icons/sparkleshare-android-72.png and /dev/null differ