From 61abb8dcd5399f2d2bfa089026e661d179032dfa Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Tue, 19 Jun 2012 17:21:33 +0100 Subject: [PATCH] linux: Reorder file structure --- .gitignore | 1 + Makefile.am | 2 +- .../Common/HTML}/Makefile.am | 0 .../Common/HTML}/day-entry.html | 0 .../Common/HTML}/event-entry.html | 0 .../Common/HTML}/event-log.html | 0 .../Common/HTML}/jquery.js | 0 .../add-to-sparkleshare-button.png | Bin .../HTML}/protocol-handler-test/invite.xml | 0 .../protocol-handler-test.htm | 0 SparkleShare/Common/Makefile.am | 3 + SparkleShare/Common/Pixmaps/Makefile.am | 20 +++++ .../Pixmaps/Sources/about-dialog.svg | 0 .../{ => Common}/Pixmaps/Sources/actions.svg | 0 .../Pixmaps/Sources/add-project-dialog.svg | 0 .../{ => Common}/Pixmaps/Sources/avatars.svg | 0 .../Pixmaps/Sources/side-splash.svg | 0 .../Pixmaps/Sources/sparkleshare-android.svg | 0 .../Pixmaps/Sources/sparkleshare-gnome.svg | 0 .../Pixmaps/Sources/sparkleshare-mac.svg | 0 .../Pixmaps/Sources/sparkleshare-mist.svg | 0 .../Pixmaps/Sources/sparkleshare-windows.svg | 0 .../{ => Common}/Pixmaps/Sources/ssnet.svg | 0 .../{ => Common}/Pixmaps/Sources/tutorial.svg | 0 .../Common/Pixmaps}/about.png | Bin .../Common/Pixmaps}/avatar-a.png | Bin .../Common/Pixmaps}/avatar-b.png | Bin .../Common/Pixmaps}/avatar-c.png | Bin .../Common/Pixmaps}/avatar-d.png | Bin .../Common/Pixmaps}/avatar-e.png | Bin .../Common/Pixmaps}/avatar-f.png | Bin .../Common/Pixmaps}/avatar-g.png | Bin .../Common/Pixmaps}/avatar-h.png | Bin .../Common/Pixmaps}/avatar-i.png | Bin .../Common/Pixmaps}/avatar-j.png | Bin .../Common/Pixmaps}/avatar-k.png | Bin .../Common/Pixmaps}/side-splash.png | Bin .../Common/Pixmaps}/tutorial-slide-4.png | Bin .../Common/Plugins}/Makefile.am | 0 .../Common/Plugins}/bitbucket.png | Bin SparkleShare/Common/Plugins/bitbucket.xml | 54 ++++++++++++++ .../Common/Plugins}/bitbucket.xml.in | 0 .../Common/Plugins}/build.cmd | 0 .../Common/Plugins}/github.png | Bin SparkleShare/Common/Plugins/github.xml | 43 +++++++++++ .../Common/Plugins}/github.xml.in | 0 .../Common/Plugins}/gitorious.png | Bin SparkleShare/Common/Plugins/gitorious.xml | 70 ++++++++++++++++++ .../Common/Plugins}/gitorious.xml.in | 0 .../Common/Plugins}/gnome.png | Bin SparkleShare/Common/Plugins/gnome.xml | 69 +++++++++++++++++ .../Common/Plugins}/gnome.xml.in | 0 .../Common/Plugins}/own-server.png | Bin SparkleShare/Common/Plugins/own-server.xml | 54 ++++++++++++++ .../Common/Plugins}/own-server.xml.in | 0 .../Common/Plugins}/parse_plugins.xsl | 0 .../Common/Plugins}/ssnet.png | Bin SparkleShare/Common/Plugins/ssnet.xml | 30 ++++++++ .../Common/Plugins}/ssnet.xml.in | 0 SparkleShare/Linux/Makefile.am | 3 +- SparkleShare/Linux/Pixmaps/Makefile.am | 11 +++ SparkleShare/Linux/Pixmaps/icons/Makefile.am | 49 ++++++++++++ .../Pixmaps}/icons/document-added-12.png | Bin .../Pixmaps}/icons/document-deleted-12.png | Bin .../Pixmaps}/icons/document-edited-12.png | Bin .../Pixmaps}/icons/document-moved-12.png | Bin .../Pixmaps}/icons/folder-sparkleshare-16.png | Bin .../Pixmaps}/icons/folder-sparkleshare-22.png | Bin .../Pixmaps}/icons/folder-sparkleshare-24.png | Bin .../icons/folder-sparkleshare-256.png | Bin .../Pixmaps}/icons/folder-sparkleshare-32.png | Bin .../Pixmaps}/icons/folder-sparkleshare-48.png | Bin .../Linux/Pixmaps}/icons/list-point-16.png | Bin .../icons/process-syncing-error-24.png | Bin .../process-syncing-error-mono-dark-24.png | Bin .../process-syncing-error-mono-light-24.png | Bin .../Pixmaps/icons/process-syncing-i-24.png | Bin .../Pixmaps/icons/process-syncing-ii-24.png | Bin .../Pixmaps/icons/process-syncing-iii-24.png | Bin .../Pixmaps/icons/process-syncing-iiii-24.png | Bin .../icons/process-syncing-iiiii-24.png | Bin .../icons/process-syncing-mono-dark-i-24.png | Bin .../icons/process-syncing-mono-dark-ii-24.png | Bin .../process-syncing-mono-dark-iii-24.png | Bin .../process-syncing-mono-dark-iiii-24.png | Bin .../process-syncing-mono-dark-iiiii-24.png | Bin .../icons/process-syncing-mono-light-i-24.png | Bin .../process-syncing-mono-light-ii-24.png | Bin .../process-syncing-mono-light-iii-24.png | Bin .../process-syncing-mono-light-iiii-24.png | Bin .../process-syncing-mono-light-iiiii-24.png | Bin .../Pixmaps}/icons/process-working-22.png | Bin .../Linux/Pixmaps}/tutorial-slide-1.png | Bin .../Linux/Pixmaps}/tutorial-slide-2.png | Bin .../Linux/Pixmaps}/tutorial-slide-3.png | Bin SparkleShare/Makefile.am | 3 +- SparkleShare/SparkleControllerBase.cs | 2 +- .../Windows/Pixmaps/folder.png | Bin .../Windows/Pixmaps/process-syncing-error.png | Bin .../Windows/Pixmaps/process-syncing-i.png | Bin .../Windows/Pixmaps/process-syncing-ii.png | Bin .../Windows/Pixmaps/process-syncing-iii.png | Bin .../Windows/Pixmaps/process-syncing-iiii.png | Bin .../Windows/Pixmaps/process-syncing-iiiii.png | Bin .../Windows/Pixmaps/sparkleshare-app.ico | Bin .../Windows/Pixmaps/sparkleshare-folder.png | Bin .../Windows/Pixmaps/tutorial-slide-1.png | Bin .../Windows/Pixmaps/tutorial-slide-2.png | Bin .../Windows/Pixmaps/tutorial-slide-3.png | Bin configure.ac | 10 ++- data/Makefile.am | 28 ------- data/icons/Makefile.am | 52 ------------- data/icons/dialog-error-16.png | Bin 747 -> 0 bytes data/icons/dialog-error-24.png | Bin 1251 -> 0 bytes .../icons/process-syncing-sparkleshare-24.png | Bin 2560 -> 0 bytes data/icons/sparkleshare-android-36.png | Bin 2250 -> 0 bytes data/icons/sparkleshare-android-48.png | Bin 3171 -> 0 bytes data/icons/sparkleshare-android-72.png | Bin 5439 -> 0 bytes 118 files changed, 416 insertions(+), 88 deletions(-) rename {data/html => SparkleShare/Common/HTML}/Makefile.am (100%) rename {data/html => SparkleShare/Common/HTML}/day-entry.html (100%) rename {data/html => SparkleShare/Common/HTML}/event-entry.html (100%) rename {data/html => SparkleShare/Common/HTML}/event-log.html (100%) rename {data/html => SparkleShare/Common/HTML}/jquery.js (100%) rename {data/html => SparkleShare/Common/HTML}/protocol-handler-test/add-to-sparkleshare-button.png (100%) rename {data/html => SparkleShare/Common/HTML}/protocol-handler-test/invite.xml (100%) rename {data/html => SparkleShare/Common/HTML}/protocol-handler-test/protocol-handler-test.htm (100%) create mode 100644 SparkleShare/Common/Makefile.am create mode 100644 SparkleShare/Common/Pixmaps/Makefile.am rename SparkleShare/{ => Common}/Pixmaps/Sources/about-dialog.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/actions.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/add-project-dialog.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/avatars.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/side-splash.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/sparkleshare-android.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/sparkleshare-gnome.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/sparkleshare-mac.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/sparkleshare-mist.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/sparkleshare-windows.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/ssnet.svg (100%) rename SparkleShare/{ => Common}/Pixmaps/Sources/tutorial.svg (100%) rename {data => SparkleShare/Common/Pixmaps}/about.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-a.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-b.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-c.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-d.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-e.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-f.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-g.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-h.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-i.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-j.png (100%) rename {data => SparkleShare/Common/Pixmaps}/avatar-k.png (100%) rename {data => SparkleShare/Common/Pixmaps}/side-splash.png (100%) rename {data => SparkleShare/Common/Pixmaps}/tutorial-slide-4.png (100%) rename {data/plugins => SparkleShare/Common/Plugins}/Makefile.am (100%) rename {data/plugins => SparkleShare/Common/Plugins}/bitbucket.png (100%) create mode 100644 SparkleShare/Common/Plugins/bitbucket.xml rename {data/plugins => SparkleShare/Common/Plugins}/bitbucket.xml.in (100%) rename {data/plugins => SparkleShare/Common/Plugins}/build.cmd (100%) rename {data/plugins => SparkleShare/Common/Plugins}/github.png (100%) create mode 100644 SparkleShare/Common/Plugins/github.xml rename {data/plugins => SparkleShare/Common/Plugins}/github.xml.in (100%) rename {data/plugins => SparkleShare/Common/Plugins}/gitorious.png (100%) create mode 100644 SparkleShare/Common/Plugins/gitorious.xml rename {data/plugins => SparkleShare/Common/Plugins}/gitorious.xml.in (100%) rename {data/plugins => SparkleShare/Common/Plugins}/gnome.png (100%) create mode 100644 SparkleShare/Common/Plugins/gnome.xml rename {data/plugins => SparkleShare/Common/Plugins}/gnome.xml.in (100%) rename {data/plugins => SparkleShare/Common/Plugins}/own-server.png (100%) create mode 100644 SparkleShare/Common/Plugins/own-server.xml rename {data/plugins => SparkleShare/Common/Plugins}/own-server.xml.in (100%) rename {data/plugins => SparkleShare/Common/Plugins}/parse_plugins.xsl (100%) rename {data/plugins => SparkleShare/Common/Plugins}/ssnet.png (100%) create mode 100644 SparkleShare/Common/Plugins/ssnet.xml rename {data/plugins => SparkleShare/Common/Plugins}/ssnet.xml.in (100%) create mode 100755 SparkleShare/Linux/Pixmaps/Makefile.am create mode 100755 SparkleShare/Linux/Pixmaps/icons/Makefile.am rename {data => SparkleShare/Linux/Pixmaps}/icons/document-added-12.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/document-deleted-12.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/document-edited-12.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/document-moved-12.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/folder-sparkleshare-16.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/folder-sparkleshare-22.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/folder-sparkleshare-24.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/folder-sparkleshare-256.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/folder-sparkleshare-32.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/folder-sparkleshare-48.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/list-point-16.png (100%) rename data/icons/sparkleshare-syncing-error-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-error-24.png (100%) rename data/icons/sparkleshare-syncing-error-mono-dark-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-error-mono-dark-24.png (100%) rename data/icons/sparkleshare-syncing-error-mono-light-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-error-mono-light-24.png (100%) rename data/icons/process-syncing-sparkleshare-i-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-i-24.png (100%) rename data/icons/process-syncing-sparkleshare-ii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-ii-24.png (100%) rename data/icons/process-syncing-sparkleshare-iii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-iii-24.png (100%) rename data/icons/process-syncing-sparkleshare-iiii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-iiii-24.png (100%) rename data/icons/process-syncing-sparkleshare-iiiii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-iiiii-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-dark-i-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-i-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-dark-ii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-ii-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-dark-iii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iii-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-dark-iiii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iiii-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-dark-iiiii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-dark-iiiii-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-light-i-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-i-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-light-ii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-ii-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-light-iii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iii-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-light-iiii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iiii-24.png (100%) rename data/icons/process-syncing-sparkleshare-mono-light-iiiii-24.png => SparkleShare/Linux/Pixmaps/icons/process-syncing-mono-light-iiiii-24.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/icons/process-working-22.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/tutorial-slide-1.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/tutorial-slide-2.png (100%) rename {data => SparkleShare/Linux/Pixmaps}/tutorial-slide-3.png (100%) rename data/icons/folder-windows-16.png => SparkleShare/Windows/Pixmaps/folder.png (100%) rename data/icons/sparkleshare-syncing-error-windows.png => SparkleShare/Windows/Pixmaps/process-syncing-error.png (100%) rename data/icons/process-syncing-sparkleshare-windows-i.png => SparkleShare/Windows/Pixmaps/process-syncing-i.png (100%) rename data/icons/process-syncing-sparkleshare-windows-ii.png => SparkleShare/Windows/Pixmaps/process-syncing-ii.png (100%) rename data/icons/process-syncing-sparkleshare-windows-iii.png => SparkleShare/Windows/Pixmaps/process-syncing-iii.png (100%) rename data/icons/process-syncing-sparkleshare-windows-iiii.png => SparkleShare/Windows/Pixmaps/process-syncing-iiii.png (100%) rename data/icons/process-syncing-sparkleshare-windows-iiiii.png => SparkleShare/Windows/Pixmaps/process-syncing-iiiii.png (100%) rename data/icons/sparkleshare.ico => SparkleShare/Windows/Pixmaps/sparkleshare-app.ico (100%) rename data/icons/folder-sparkleshare-windows-16.png => SparkleShare/Windows/Pixmaps/sparkleshare-folder.png (100%) rename data/tutorial-slide-1-windows.png => SparkleShare/Windows/Pixmaps/tutorial-slide-1.png (100%) rename data/tutorial-slide-2-windows.png => SparkleShare/Windows/Pixmaps/tutorial-slide-2.png (100%) rename data/tutorial-slide-3-windows.png => SparkleShare/Windows/Pixmaps/tutorial-slide-3.png (100%) delete mode 100755 data/Makefile.am delete mode 100755 data/icons/Makefile.am delete mode 100755 data/icons/dialog-error-16.png delete mode 100755 data/icons/dialog-error-24.png delete mode 100755 data/icons/process-syncing-sparkleshare-24.png delete mode 100644 data/icons/sparkleshare-android-36.png delete mode 100644 data/icons/sparkleshare-android-48.png delete mode 100644 data/icons/sparkleshare-android-72.png 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 0b0d8bee85d05366e4c580bbe90723d53e993a8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 747 zcmV6loO2fA_1ZPOATA)Jz9Q5EEmR$wm@fNtir} z;0w5L{ZUvuKGuLuL*fK0Y}2at@p; z?#?(qUcI^);I5jjV0K;2P}R4lx@PcXc5iQETrZ~!R#)Twot+0!rE=ff)2U6h0@LRq z1nlq#+uygZTie6p7rEMB=^6m!F4L^9FNQYCag?N5@z%LjY;D;KDhm z)fm26&x?b@%}%#_>lgPj2IyS6^gycV4Su>2HVE7T=-GiwX>Eh2dU;lHV zt@;r7Rd(9#MM;tu$^2YR4i51=M?yfxa=JTahPy+f4i{%QdiHWqoSfVah1p$c)KeJ@ z@jNGlFk%!DMG+wcMCA0Pmq9*Ya;BXIxD(85MJkoxc|H<|jB<;7|I4@^@Z&CVqb?@0 z61(bkk_7MPv^O^)iuhls(wUzp`e6!FT?ks1;NSB7s}uhPcZagX%!t+OZQ0Ln#z{

pk(?)g1RH2%pNlbrt_lv{Ru;jj>s*kem5B+d%3Y(lf+kq;Urtsr5y}#b)s6AeG zUl(`hwMc@<%Sxkhtv+|9CaPFJhv5(hLbXb0)bUD%-saYz>~^=@eR;{fI6bC6MB-)$ z4-vUnooT0Wt0_^liHJ~S8D+QUgU;?3R38Js{qvZ{@Ji&Sz#S1;arXsArF!S?YYtDB d-PgzUe*>nwjFaH$5-|V(002ovPDHLkV1l4HV0Qoj diff --git a/data/icons/dialog-error-24.png b/data/icons/dialog-error-24.png deleted file mode 100755 index 9821d780fde6d24ebfd976e1453b438ef14e48c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1251 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%b@U_I1CZGssfk$L9 zP{%b8W}J{;IR_+IR^XTpq`~?bDtwkMV_;x@?&;zf;&J@yRPTK0P?6*RpWplV!?0{l zImeRB0*^q~=m|w<36>(8kv{6uG2T)|Hr)zq|AM|J~0QBp>{@d$FgV=|!{C!(|<3 z3_&^9&UP-EibOXTCX zyjLmdQvF+6r|7lU&OcwA7#OeQE&Q<3Pvu=gmeJXtbBvxUANZ`e?)Dvn8~k6MIxJQ; zsQxWu_fxmy@P~Jz*Y~BMdq=-_bCT(Ocq~V$1i}t06_mZAtA9pVw@i4V?;pYzwPp3_k2& z-;j2uc}LV;p8o!szdo;bu{sj)y3m`|*FuA70(K?kPV_q|X8KziNqV zL`h0wNvc(HQ7VvPFfuT()HO8JH8Kt{G_^7{w=%TUHZZg@F!*G;z70h~ZhlH;S|x4` z%^BiWKn;>08-nxGO3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSV(@hJb6Mw<&;$TJ CjUJo; diff --git a/data/icons/process-syncing-sparkleshare-24.png b/data/icons/process-syncing-sparkleshare-24.png deleted file mode 100755 index 632a3e2625aaf14a970c60c6ac1b7c7174e722d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2560 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 YFYwPo%Ze?;O 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 JPDHLkV1k)uo%Ze?;O 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 px0U{W$BF>`e{Vx~HGbBr_P=WrT&Sb