diff --git a/configure.ac b/configure.ac index 7f1f8da4..83aea255 100644 --- a/configure.ac +++ b/configure.ac @@ -588,7 +588,6 @@ if test $enable_gui != "no"; then PKG_CHECK_MODULES(GUI, $gui_modules) - AC_PATH_PROG([GTK_BUILDER_CONV], gtk-builder-convert) elif test "$enable_dbus_service" = "yes"; then # syncevo-dbus-server needs localization : diff --git a/src/gtk-ui/gtk-ui.am b/src/gtk-ui/gtk-ui.am index c1438325..d647790c 100644 --- a/src/gtk-ui/gtk-ui.am +++ b/src/gtk-ui/gtk-ui.am @@ -39,12 +39,8 @@ dist_src_gtk_ui_themerc_DATA = $(src_gtk_ui_themercfiles) src_gtk_ui_desktopdir = $(datadir)/applications dist_noinst_DATA += \ - src/gtk-ui/ui.glade \ $(src_gtk_ui_applications_in_files) -src/gtk-ui/ui.xml: src/gtk-ui/ui.glade - $(AM_V_GEN)$(GTK_BUILDER_CONV) $< $@ - # sync-ui: default GUI, could be plain GTK or Moblin UX # sync-ui-gtk: GTK GUI # sync-ui-moblin: Moblin UX @@ -99,6 +95,5 @@ src_gtk_ui_sync_ui_moblin_CFLAGS = $(src_gtk_ui_sync_ui_CFLAGS) src_gtk_ui_sync_ui_moblin_CPPFLAGS = $(src_gtk_ui_sync_ui_CPPFLAGS) -DUSE_MOBLIN_UX CLEANFILES += \ - src/gtk-ui/ui.xml \ src/gtk-ui/sync-moblin.desktop \ $(src_gtk_ui_applications_generated) diff --git a/src/gtk-ui/ui.glade b/src/gtk-ui/ui.xml similarity index 69% rename from src/gtk-ui/ui.glade rename to src/gtk-ui/ui.xml index ed409319..d6d168e3 100644 --- a/src/gtk-ui/ui.glade +++ b/src/gtk-ui/ui.xml @@ -1,792 +1,9 @@ - - + + - - - 1024 - Sync - 800 - 550 - - - True - - - True - 4 - 4 - - - True - vertical - - - True - 0 - none - - - True - vertical - - - True - - - 48 - 48 - True - - - True - gtk-missing-image - 6 - - - 0 - - - - - False - 10 - 0 - - - - - True - 0 - 0.20000000298023224 - True - end - 42 - - - False - 5 - 1 - - - - - True - 6 - vertical - 4 - - - - - - - - - False - False - 8 - end - 2 - - - - - False - 16 - 0 - - - - - True - vertical - - - True - - - True - vertical - - - True - - - True - vertical - - - True - vertical - - - - - - 0 - - - - - vertical - - - True - 0 - none - - - True - 5 - 12 - - - True - vertical - - - - - - - - - - - - - - - - - - - - label_item - - - - - False - False - 0 - - - - - - - - 1 - - - - - 55 - 0 - - - - - False - False - 6 - 0 - - - - - - - False - 0 - - - - - - - - False - 1 - - - - - - - True - True - - - label_item - - - - - 0 - - - - - 0 - - - - - 250 - True - vertical - 5 - - - True - vertical - - - True - 0 - in - - - True - vertical - - - True - vertical - - - True - - - True - 0 - - - False - False - 6 - 0 - - - - - 24 - True - vertical - - - True - gtk-missing-image - - - False - 0 - - - - - False - 1 - - - - - 0 - - - - - False - 10 - 0 - - - - - True - - - True - vertical - - - - - - - - 0 - - - - - False - 5 - 0 - - - - - False - 5 - 1 - - - - - 25 - True - - - 0.029999999329447746 - end - - - 5 - end - 0 - - - - - False - False - 2 - - - - - True - - - True - vertical - 10 - - - True - 0 - <b>Actions</b> - True - - - 0 - - - - - Sync now - True - True - True - - - False - 1 - - - - - True - True - True - - - True - Change or edit -sync service - center - - - - - False - 2 - - - - - Fix a sync -emergency - True - True - True - - - False - False - 3 - - - - - 30 - 0 - - - - - False - 20 - 3 - - - - - - - - - - - - - True - True - - - label_item - - - - - 0 - - - - - 0 - - - - - False - end - 1 - - - - - 0 - - - - - - - 1024 - 5 - Settings - True - 800 - 550 - True - sync_win - - - True - 4 - vertical - - - True - 0 - none - - - True - True - never - automatic - - - True - queue - - - True - - - True - 12 - 36 - 12 - - - True - vertical - 12 - - - True - vertical - 5 - - - True - 0 - <big>Network sync</big> - True - - - False - 0 - - - - - True - - - True - To sync you'll need a network connection and an account with a sync service. -We support the following services: - - - False - 0 - - - - - False - 1 - - - - - 300 - True - True - automatic - automatic - - - True - queue - - - True - vertical - - - - - - - - - - - - - 2 - - - - - True - - - True - 0 - If you don't see your service above but know that your sync provider uses SyncML -you can setup a service manually. - - - 0 - - - - - Add new service - 150 - True - True - True - - - False - 8 - 1 - - - - - False - False - 3 - - - - - 8 - 0 - - - - - 400 - True - vertical - 5 - - - True - 0 - <big>Direct sync</big> - True - - - False - 0 - - - - - True - - - True - Use Bluetooth to Sync your data from one device to another. - - - False - 0 - - - - - False - 1 - - - - - 300 - True - True - automatic - automatic - - - True - queue - - - True - vertical - - - - - - - - - - - - - 2 - - - - - True - - - True - 0 - You will need to add Bluetooth devices before they can be synced. - - - 0 - - - - - Add new device - 150 - True - True - - - False - 8 - 1 - - - - - False - False - 3 - - - - - 1 - - - - - - - 0 - - - - - - - - - - - True - True - - - label_item - - - - - 6 - 0 - - - - - True - - - Close - True - True - True - - - False - 12 - end - 0 - - - - - False - 1 - - - - - - + 1024 + False 5 Sync Emergency True @@ -795,238 +12,268 @@ you can setup a service manually. True sync_win - + True + False 4 - vertical - + True + False 0 none - + True True never - automatic - + True + False queue - + True + False - + True - vertical + False 8 - + True - vertical + False 8 - + 800 True + False 0 If something has gone horribly wrong you can try a slow sync, start from scratch or restore from backup. True - + False + True 0 - + True True - + True + False 0 20 - + True + False 2 - + Calendar True True False + False True - + - + Tasks True True False + False True - + 1 2 - + - + - - + + True + False Affected data: - - - label_item - + - + + True + True 1 - + False + True 8 0 - + True - vertical + False 5 - + True + False 0 <big>Slow sync</big> True - + False + True 0 - + True + False 0 0 0 40 40 - + True + False 6 - + True True True + False - + True + False 16 Slow sync - + - + + True + True 0 - + True + False 8 A slow sync compares items from both sides and tries to merge them. This may fail in some cases, leading to duplicates or lost information. - + + True + True 1 - + - + False + True 1 - + False + True 8 1 - + True - vertical + False 5 - + True + False 0 <big>Start from scratch</big> True - + False + True 0 - + True + False 0 0 0 40 40 - + True + False - + True True True + False - + True + False 16 Delete all your local information and replace with data from Zyb - + - + False + True 0 - + True + False 15 <b>or</b> True - + False False @@ -1034,75 +281,84 @@ with data from Zyb - + True True True + False - + True + False 16 Delete all data on Zyb and replace with your local information - + - + False + True 2 - + - + False + True 1 - + False + True 8 2 - + True - vertical + False 5 - + True + False 0 <big>Restore from backup</big> True - + False + True 0 - + True + False queue 40 40 - + True - vertical + False - + 800 True + False 0 Backups are made before every time we Sync. Choose a backup to restore. Any changes you have made since then will be lost. True - + False False @@ -1110,28 +366,29 @@ local information - + True True - automatic - automatic - + True + False queue - + True + False 10 2 16 - + True + False 0 5 Backup before syncing Dec 5th 2009 16:35 - + 2 3 @@ -1140,12 +397,13 @@ local information - + True + False 0 5 Backup before syncing Dec 5th 2009 13:35 - + 3 4 @@ -1154,12 +412,13 @@ local information - + True + False 0 5 Backup before syncing Dec 5th 2009 11:35 - + 4 5 @@ -1168,12 +427,13 @@ local information - + True + False 0 5 Backup before syncing Dec 3rd - + 5 6 @@ -1182,12 +442,13 @@ local information - + True + False 0 5 Backup before syncing Dec 1st - + 6 7 @@ -1196,12 +457,13 @@ local information - + True + False 0 5 Backup before syncing yesterday - + 1 2 @@ -1210,23 +472,25 @@ local information - + True + False 0 5 Backup before syncing two hours ago - + GTK_FILL - + Restore True True True - + False + 1 2 @@ -1271,78 +535,973 @@ local information - + - + - + + True + True 1 - + - + + True + True 1 - + + True + True 8 3 - + + True + True 40 0 - + - + - + - - + + True + False True - - - label_item - + - + + True + True 0 - + True + False - + Close True True True - + False + False + True 12 end 0 - + False + True 1 - + - - + + + 1024 + False + 5 + Settings + True + 800 + 550 + True + sync_win + + + True + False + 4 + + + True + False + 0 + none + + + True + True + never + + + True + False + queue + + + True + False + + + True + False + 12 + 36 + 12 + + + True + False + 12 + + + True + False + 5 + + + True + False + 0 + <big>Network sync</big> + True + + + False + True + 0 + + + + + True + False + + + True + False + To sync you'll need a network connection and an account with a sync service. +We support the following services: + + + False + True + 0 + + + + + False + True + 1 + + + + + 300 + True + True + + + True + False + queue + + + True + False + + + + + + + + + + + + + True + True + 2 + + + + + True + False + + + True + False + 0 + If you don't see your service above but know that your sync provider uses SyncML +you can setup a service manually. + + + True + True + 0 + + + + + Add new service + 150 + True + True + True + False + + + False + True + 8 + 1 + + + + + False + False + 3 + + + + + True + True + 8 + 0 + + + + + 400 + True + False + 5 + + + True + False + 0 + <big>Direct sync</big> + True + + + False + True + 0 + + + + + True + False + + + True + False + Use Bluetooth to Sync your data from one device to another. + + + False + True + 0 + + + + + False + True + 1 + + + + + 300 + True + True + + + True + False + queue + + + True + False + + + + + + + + + + + + + True + True + 2 + + + + + True + False + + + True + False + 0 + You will need to add Bluetooth devices before they can be synced. + + + True + True + 0 + + + + + Add new device + 150 + True + True + False + + + False + True + 8 + 1 + + + + + False + False + 3 + + + + + True + True + 1 + + + + + + + True + True + 0 + + + + + + + + + + + True + False + True + + + + + True + True + 6 + 0 + + + + + True + False + + + Close + True + True + True + False + + + False + True + 12 + end + 0 + + + + + False + True + 1 + + + + + + + 1024 + False + Sync + 800 + 550 + + + True + False + + + True + False + 4 + 4 + + + True + False + + + True + False + 0 + none + + + True + False + + + True + False + + + 48 + 48 + True + False + + + True + False + gtk-missing-image + 6 + + + True + True + 0 + + + + + False + True + 10 + 0 + + + + + True + False + 0 + 0.20000000298023224 + True + end + 42 + + + False + True + 5 + 1 + + + + + True + False + 6 + 4 + + + + + + + + + False + False + 8 + end + 2 + + + + + False + True + 16 + 0 + + + + + True + False + + + True + False + + + True + False + + + True + False + + + True + False + + + True + False + + + + + + True + True + 0 + + + + + False + + + True + False + 0 + none + + + True + False + 5 + 12 + + + True + False + + + + + + + + + + + + + + + + + + + + + + False + False + 0 + + + + + + + + True + True + 1 + + + + + True + True + 55 + 0 + + + + + False + False + 6 + 0 + + + + + + + False + True + 0 + + + + + + + + False + True + 1 + + + + + + + True + False + True + + + + + True + True + 0 + + + + + True + True + 0 + + + + + 250 + True + False + 5 + + + True + False + + + True + False + 0 + in + + + True + False + + + True + False + + + True + False + + + True + False + 0 + + + False + False + 6 + 0 + + + + + 24 + True + False + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + False + True + 1 + + + + + False + True + 0 + + + + + False + True + 10 + 0 + + + + + True + False + + + True + False + + + False + + + + + + False + True + 0 + + + + + False + True + 5 + 0 + + + + + False + True + 5 + 1 + + + + + 25 + True + False + + + False + end + + + True + True + 5 + end + 0 + + + + + False + False + 2 + + + + + True + False + + + True + False + 10 + + + True + False + 0 + <b>Actions</b> + True + + + False + True + 0 + + + + + Sync now + True + True + True + False + + + False + False + 1 + + + + + True + True + True + False + + + True + False + Change or edit +sync service + center + + + + + False + False + 2 + + + + + Fix a sync +emergency + True + True + True + False + + + False + False + 3 + + + + + True + True + 30 + 0 + + + + + False + True + 20 + 3 + + + + + + + + + + + + + True + False + True + + + + + True + True + 0 + + + + + True + True + 0 + + + + + False + True + end + 1 + + + + + True + True + 0 + + + + + +